fix

build.sh

@@ -92,7 +92,7 @@ fi
 if [ "$OMR_OPENWRT" = "default" ]; then
 	if [ "$OMR_KERNEL" = "5.4" ]; then
 		# Use OpenWrt 21.02 for 5.4 kernel
-        _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "f441be3921c769b732f0148f005d4f1bbace0508"
+		_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "f441be3921c769b732f0148f005d4f1bbace0508"
 		_get_repo feeds/packages https://github.com/openwrt/packages "3aa30ceee4fcf7b131bdc0f98658391069573e12"
 		_get_repo feeds/luci https://github.com/openwrt/luci "f28aaa35cd5c0cbbe59d8cc6a67de88ceeac382e"
 	else

config

@@ -215,236 +215,6 @@ CONFIG_KERNEL_MPTCP_IPV6=y
 CONFIG_KERNEL_CRYPTO_SHA256=y
 CONFIG_LUCI_LANG_en=y
 CONFIG_LUCI_LANG_zh_Hans=y
-CONFIG_LUCI_LANG_zh_Hant=y
-CONFIG_LUCI_LANG_nb_NO=y
-CONFIG_TARGET_ROOTFS_PARTSIZE=512
-CONFIG_TARGET_KERNEL_PARTSIZE=64
-CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y
-# CONFIG_LUCI_CSSTIDY is not set
-# CONFIG_LIBCURL_WOLFSSL is not set
-# CONFIG_PACKAGE_libustream-wolfssl is not set
-CONFIG_KERNEL_DEVMEM=y
-CONFIG_KERNEL_DEVKMEM=y
-CONFIG_AUTOREMOVE=y
-# CONFIG_PACKAGE_kmod-sound-core is not set
-# CONFIG_PACKAGE_kmod-video-core is not setCONFIG_DEVEL=y
-CONFIG_TOOLCHAINOPTS=y
-CONFIG_ALL_KMODS=y
-CONFIG_BUSYBOX_CUSTOM=y
-CONFIG_BUSYBOX_CONFIG_ADDUSER=y
-CONFIG_BUSYBOX_CONFIG_ARP=y
-CONFIG_BUSYBOX_CONFIG_ARPING=y
-CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
-CONFIG_BUSYBOX_CONFIG_BASE64=y
-CONFIG_BUSYBOX_CONFIG_BC=y
-CONFIG_BUSYBOX_CONFIG_CHPASSWD=y
-CONFIG_BUSYBOX_CONFIG_DELUSER=y
-CONFIG_BUSYBOX_CONFIG_DIFF=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_DATE_NANO=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_DIFF_DIR=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_PS_LONG=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_BZ2=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_SHOW_THREADS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_STAT_FILESYSTEM=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_STAT_FORMAT=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-CONFIG_BUSYBOX_CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VI_UNDO=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VI_UNDO_QUEUE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=32
-CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y
-CONFIG_BUSYBOX_CONFIG_IOSTAT=y
-CONFIG_BUSYBOX_CONFIG_LOADKMAP=y
-CONFIG_BUSYBOX_CONFIG_LSPCI=y
-CONFIG_BUSYBOX_CONFIG_LSUSB=y
-CONFIG_BUSYBOX_CONFIG_NOHUP=y
-CONFIG_BUSYBOX_CONFIG_PKILL=y
-CONFIG_BUSYBOX_CONFIG_STAT=y
-CONFIG_BUSYBOX_CONFIG_STTY=y
-CONFIG_BUSYBOX_CONFIG_TELNET=y
-CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
-CONFIG_BUSYBOX_CONFIG_WATCH=y
-# CONFIG_GDB is not set
-CONFIG_GRUB_SERIAL=""
-CONFIG_GRUB_TIMEOUT="0"
-CONFIG_GRUB_TITLE="OpenMPTCProuter"
-CONFIG_KERNEL_PCI=y
-CONFIG_KERNEL_AIO=y
-CONFIG_KERNEL_DEBUG_GPIO=y
-# CONFIG_KERNEL_DEBUG_INFO is not set
-CONFIG_KERNEL_DEBUG_PINCTRL=y
-CONFIG_KERNEL_DEVTMPFS=y
-CONFIG_KERNEL_DEVTMPFS_MOUNT=y
-CONFIG_KERNEL_DIRECT_IO=y
-CONFIG_KERNEL_DMA_ACPI=y
-CONFIG_KERNEL_FANOTIFY=y
-CONFIG_KERNEL_FHANDLE=y
-CONFIG_KERNEL_IPC_NS=y
-# CONFIG_KERNEL_MAGIC_SYSRQ is not set
-CONFIG_KERNEL_MMC_SDHCI_ACPI=y
-CONFIG_KERNEL_NAMESPACES=y
-CONFIG_KERNEL_NET_NS=y
-CONFIG_KERNEL_PID_NS=y
-# CONFIG_KERNEL_SWAP is not set
-CONFIG_KERNEL_USER_NS=y
-CONFIG_KERNEL_UTS_NS=y
-# CONFIG_PACKAGE_dnsmasq is not set
-CONFIG_PACKAGE_kmod-8021q=y
-CONFIG_PACKAGE_kmod-ata-ahci=y
-CONFIG_PACKAGE_kmod-ata-core=y
-CONFIG_PACKAGE_kmod-block2mtd=y
-CONFIG_PACKAGE_kmod-bridge=y
-CONFIG_PACKAGE_kmod-crypto-gcm=y
-CONFIG_PACKAGE_kmod-gpio-button-hotplug=y
-CONFIG_PACKAGE_kmod-hid=y
-CONFIG_PACKAGE_kmod-hid-generic=y
-CONFIG_PACKAGE_kmod-i2c-gpio=y
-CONFIG_PACKAGE_kmod-i2c-gpio-custom=y
-CONFIG_PACKAGE_kmod-ifb=y
-CONFIG_PACKAGE_kmod-ikconfig=y
-CONFIG_PACKAGE_kmod-input-evdev=y
-CONFIG_PACKAGE_kmod-loop=y
-CONFIG_PACKAGE_kmod-macvlan=y
-CONFIG_PACKAGE_kmod-mmc=y
-CONFIG_PACKAGE_kmod-mmc-spi=y
-CONFIG_PACKAGE_kmod-random-core=y
-CONFIG_DEFAULT_kmod-r8169=y
-CONFIG_PACKAGE_kmod-scsi-core=y
-CONFIG_PACKAGE_kmod-sctp=y
-CONFIG_PACKAGE_kmod-sdhci=y
-CONFIG_PACKAGE_kmod-serial-8250=y
-CONFIG_PACKAGE_kmod-stp=y
-CONFIG_PACKAGE_kmod-usb-acm=y
-CONFIG_PACKAGE_kmod-usb-core=y
-CONFIG_PACKAGE_kmod-usb-hid=y
-CONFIG_PACKAGE_kmod-usb-net=y
-CONFIG_PACKAGE_kmod-usb-net-asix=y
-CONFIG_PACKAGE_kmod-usb-net-asix-ax88179=y
-CONFIG_PACKAGE_kmod-usb-net-cdc-eem=y
-CONFIG_PACKAGE_kmod-usb-net-cdc-ether=y
-CONFIG_PACKAGE_kmod-usb-net-cdc-mbim=y
-CONFIG_PACKAGE_kmod-usb-net-cdc-ncm=y
-CONFIG_PACKAGE_kmod-usb-net-cdc-subset=y
-CONFIG_PACKAGE_kmod-usb-net-dm9601-ether=y
-CONFIG_PACKAGE_kmod-usb-net-hso=y
-CONFIG_PACKAGE_kmod-usb-net-huawei-cdc-ncm=y
-CONFIG_PACKAGE_kmod-usb-net-ipheth=y
-CONFIG_PACKAGE_kmod-usb-net-kalmia=y
-CONFIG_PACKAGE_kmod-usb-net-kaweth=y
-CONFIG_PACKAGE_kmod-usb-net-mcs7830=y
-CONFIG_PACKAGE_kmod-usb-net-pegasus=y
-CONFIG_PACKAGE_kmod-usb-net-qmi-wwan=y
-CONFIG_PACKAGE_kmod-usb-net-rndis=y
-CONFIG_PACKAGE_kmod-usb-net-rtl8150=y
-CONFIG_PACKAGE_kmod-usb-net-rtl8152=y
-CONFIG_PACKAGE_kmod-usb-net-sierrawireless=y
-CONFIG_PACKAGE_kmod-usb-net-smsc95xx=y
-CONFIG_PACKAGE_kmod-usb-net-sr9700=y
-CONFIG_PACKAGE_kmod-usb-serial=y
-CONFIG_PACKAGE_kmod-usb-serial-ark3116=y
-CONFIG_PACKAGE_kmod-usb-serial-belkin=y
-CONFIG_PACKAGE_kmod-usb-serial-ch341=y
-CONFIG_PACKAGE_kmod-usb-serial-cp210x=y
-CONFIG_PACKAGE_kmod-usb-serial-cypress-m8=y
-CONFIG_PACKAGE_kmod-usb-serial-ftdi=y
-CONFIG_PACKAGE_kmod-usb-serial-garmin=y
-CONFIG_PACKAGE_kmod-usb-serial-ipw=y
-CONFIG_PACKAGE_kmod-usb-serial-keyspan=y
-CONFIG_PACKAGE_kmod-usb-serial-mct=y
-CONFIG_PACKAGE_kmod-usb-serial-mos7720=y
-CONFIG_PACKAGE_kmod-usb-serial-option=y
-CONFIG_PACKAGE_kmod-usb-serial-oti6858=y
-CONFIG_PACKAGE_kmod-usb-serial-pl2303=y
-CONFIG_PACKAGE_kmod-usb-serial-qualcomm=y
-CONFIG_PACKAGE_kmod-usb-serial-sierrawireless=y
-CONFIG_PACKAGE_kmod-usb-serial-simple=y
-CONFIG_PACKAGE_kmod-usb-serial-ti-usb=y
-CONFIG_PACKAGE_kmod-usb-serial-visor=y
-CONFIG_PACKAGE_kmod-usb-serial-wwan=y
-CONFIG_PACKAGE_kmod-usb-storage=y
-CONFIG_PACKAGE_kmod-usb-wdm=y
-CONFIG_PACKAGE_kmod-usb2=y
-CONFIG_PACKAGE_kmod-usb3=y
-CONFIG_PACKAGE_kmod-veth=y
-CONFIG_PACKAGE_kmod-3c59x=y
-CONFIG_PACKAGE_kmod-8139cp=y
-CONFIG_PACKAGE_kmod-8139too=y
-CONFIG_PACKAGE_kmod-atl1=y
-CONFIG_PACKAGE_kmod-atl1c=y
-CONFIG_PACKAGE_kmod-atl1e=y
-CONFIG_PACKAGE_kmod-atl2=y
-CONFIG_PACKAGE_kmod-b44=y
-CONFIG_PACKAGE_kmod-bnx2=y
-CONFIG_PACKAGE_kmod-dm9000=y
-CONFIG_PACKAGE_kmod-e100=y
-CONFIG_PACKAGE_kmod-e1000=y
-CONFIG_PACKAGE_kmod-e1000e=y
-CONFIG_PACKAGE_kmod-et131x=y
-CONFIG_PACKAGE_kmod-ethoc=y
-CONFIG_PACKAGE_kmod-forcedeth=y
-CONFIG_PACKAGE_kmod-gigaset=y
-CONFIG_PACKAGE_kmod-hfcmulti=y
-CONFIG_PACKAGE_kmod-hfcpci=y
-CONFIG_PACKAGE_kmod-natsemi=y
-CONFIG_PACKAGE_kmod-ne2k-pci=y
-CONFIG_PACKAGE_kmod-of-mdio=y
-CONFIG_PACKAGE_kmod-pcnet32=y
-CONFIG_PACKAGE_kmod-phy-broadcom=y
-CONFIG_PACKAGE_kmod-ppfe=y
-CONFIG_PACKAGE_kmod-r6040=y
-CONFIG_PACKAGE_kmod-r8169=y
-CONFIG_PACKAGE_kmod-sis190=y
-CONFIG_PACKAGE_kmod-sis900=y
-CONFIG_PACKAGE_kmod-skge=y
-CONFIG_PACKAGE_kmod-sky2=y
-CONFIG_PACKAGE_kmod-solos-pci=y
-CONFIG_PACKAGE_kmod-spi-ks8995=y
-CONFIG_PACKAGE_kmod-tg3=y
-CONFIG_PACKAGE_kmod-tulip=y
-CONFIG_PACKAGE_kmod-via-rhine=y
-CONFIG_PACKAGE_kmod-via-velocity=y
-CONFIG_PACKAGE_kmod-vmxnet3=y
-CONFIG_PACKAGE_kmod-fs-vfat=y
-CONFIG_PACKAGE_kmod-macremapper=m
-CONFIG_TARGET_IMAGES_PAD=y
-CONFIG_TARGET_ROOTFS_EXT4=y
-CONFIG_KERNEL_TCP_CONG_CDG=y
-CONFIG_KERNEL_TCP_CONG_HTCP=y
-CONFIG_KERNEL_TCP_CONG_HSTCP=y
-CONFIG_KERNEL_TCP_CONG_HYBLA=y
-CONFIG_KERNEL_TCP_CONG_ILLINOIS=y
-CONFIG_KERNEL_TCP_CONG_SCALABLE=y
-CONFIG_KERNEL_TCP_CONG_VEGAS=y
-CONFIG_KERNEL_TCP_CONG_VENO=y
-CONFIG_KERNEL_TCP_CONG_WESTWOOD=y
-CONFIG_KERNEL_TCP_CONG_YEAH=y
-CONFIG_KERNEL_TCP_CONG_LIA=y
-CONFIG_KERNEL_TCP_CONG_BBR=y
-CONFIG_KERNEL_TCP_CONG_NANQINLANG=y
-CONFIG_KERNEL_TCP_CONG_OLIA=y
-CONFIG_KERNEL_TCP_CONG_WVEGAS=y
-CONFIG_KERNEL_TCP_CONG_BALIA=y
-CONFIG_KERNEL_MPTCP_FULLMESH=y
-CONFIG_KERNEL_DEFAULT_FULLMESH=y
-CONFIG_KERNEL_MPTCP_NDIFFPORTS=y
-# CONFIG_KERNEL_DEFAULT_NDIFFPORTS is not set
-CONFIG_KERNEL_MPTCP_BINDER=y
-CONFIG_KERNEL_MPTCP_ECF=y
-# CONFIG_KERNEL_DEFAULT_BINDER is not set
-# CONFIG_KERNEL_DEFAULT_DUMMY is not set
-CONFIG_KERNEL_MPTCP_ROUNDROBIN=y
-# CONFIG_KERNEL_DEFAULT_ROUNDROBIN is not set
-CONFIG_KERNEL_MPTCP_REDUNDANT=y
-# CONFIG_KERNEL_DEFAULT_REDUNDANT is not set
-CONFIG_KERNEL_DEFAULT_SCHEDULER=y
-CONFIG_KERNEL_MPTCP=y
-CONFIG_KERNEL_MPTCP_IPV6=y
-CONFIG_KERNEL_CRYPTO_SHA256=y
-CONFIG_LUCI_LANG_en=y
-CONFIG_LUCI_LANG_zh_Hans=y
-CONFIG_LUCI_LANG_zh_Hant=y
 CONFIG_LUCI_LANG_zh-tw=y
 CONFIG_TARGET_ROOTFS_PARTSIZE=512
 CONFIG_TARGET_KERNEL_PARTSIZE=64
@@ -455,9 +225,12 @@ CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y
 CONFIG_KERNEL_DEVMEM=y
 CONFIG_KERNEL_DEVKMEM=y
 CONFIG_AUTOREMOVE=y
+# CONFIG_PACKAGE_kmod-sound-core is not set
+# CONFIG_PACKAGE_kmod-video-core is not set 
 CONFIG_PACKAGE_luci-theme-argon=y
 CONFIG_PACKAGE_luci-theme-bootstrap=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
+CONFIG_PACKAGE_luci-theme-argon is not set
 CONFIG_PACKAGE_luci-app-status=m
 CONFIG_PACKAGE_luci-mod-status=y
 CONFIG_PACKAGE_frpc=y

config-rpi2

@@ -6,3 +6,4 @@ CONFIG_PACKAGE_kmod-ath9k=y
 CONFIG_PACKAGE_bcm27xx-eeprom=y
 CONFIG_PACKAGE_bcm27xx-userland=y
 CONFIG_KERNEL_ARM_MODULE_PLTS=y
+CONFIG_KERNEL_TCP_CONG_BBR=y

root/include/netfilter.mk

@@ -157,7 +157,7 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_DEFRAG_IPV6, $(P_V6)
 
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_FILTER, $(P_V6)ip6table_filter),))
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MANGLE, $(P_V6)ip6table_mangle),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_NF_LOG_IPV6, $(P_V6)nf_log_ipv6,lt 5.13),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_NF_LOG_IPV6, $(P_V6)nf_log_ipv6),lt 5.13))
 
 $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_IPTABLES, ip6t_icmp6)))
 
@@ -384,4 +384,4 @@ IPT_BUILTIN += $(EBTABLES_IP4-y)
 IPT_BUILTIN += $(EBTABLES_IP6-y)
 IPT_BUILTIN += $(EBTABLES_WATCHERS-y)
 
-endif # __inc_netfilter
+endif # __inc_netfilter

root/package/Makefile

@@ -1,114 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-curdir:=package
-
-include $(INCLUDE_DIR)/feeds.mk
-include $(INCLUDE_DIR)/rootfs.mk
-
--include $(TMP_DIR)/.packagedeps
-package-y += kernel/linux
-$(curdir)/autoremove:=1
-$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
-$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
-$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
-ifdef CHECK_ALL
-$(curdir)/builddirs-check:=$($(curdir)/builddirs)
-$(curdir)/builddirs-download:=$($(curdir)/builddirs)
-endif
-ifneq ($(IGNORE_ERRORS),)
-  package-y-filter := $(package-y)
-  package-m-filter := $(filter-out $(package-y),$(package-m))
-  package-n-filter := $(filter-out $(package-y) $(package-m),$(package-))
-  package-ignore-errors := $(filter n m y,$(IGNORE_ERRORS))
-  package-ignore-errors := $(if $(package-ignore-errors),$(package-ignore-errors),n m)
-  package-ignore-subdirs := $(sort $(foreach m,$(package-ignore-errors),$(package-$(m)-filter)))
-  $(curdir)/builddirs-ignore-download := $(package-ignore-subdirs)
-  $(curdir)/builddirs-ignore-compile := $(package-ignore-subdirs)
-  $(curdir)/builddirs-ignore-host-download := $(package-ignore-subdirs)
-  $(curdir)/builddirs-ignore-host-compile := $(package-ignore-subdirs)
-endif
-
-PACKAGE_INSTALL_FILES:= \
-	$(foreach pkg,$(sort $(package-y)), \
-		$(foreach variant, \
-			$(if $(strip $(package/$(pkg)/variants)), \
-				$(package/$(pkg)/variants), \
-				$(if $(package/$(pkg)/default-variant), \
-					$(package/$(pkg)/default-variant), \
-					default \
-				) \
-			), \
-			$(PKG_INFO_DIR)/$(lastword $(subst /,$(space),$(pkg))).$(variant).install \
-		) \
-	)
-
-$(curdir)/cleanup: $(TMP_DIR)/.build
-	rm -rf $(STAGING_DIR_ROOT)
-
-$(curdir)/merge:
-	rm -rf $(PACKAGE_DIR_ALL)
-	mkdir -p $(PACKAGE_DIR_ALL)
-	-$(foreach pdir,$(PACKAGE_SUBDIRS),$(if $(wildcard $(pdir)/*.ipk),ln -s $(pdir)/*.ipk $(PACKAGE_DIR_ALL);))
-
-$(curdir)/merge-index: $(curdir)/merge
-	(cd $(PACKAGE_DIR_ALL) && $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages; )
-
-ifndef SDK
-  $(curdir)/compile: $(curdir)/system/opkg/host/compile
-endif
-
-$(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),$(curdir)/merge-index)
-	- find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755
-	rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG)
-	mkdir -p $(TARGET_DIR)/tmp
-	$(file >$(TMP_DIR)/opkg_install_list,\
-	  $(call opkg_package_files,\
-	    $(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg)))))
-	$(call opkg,$(TARGET_DIR)) install $$(cat $(TMP_DIR)/opkg_install_list)
-	@for file in $(PACKAGE_INSTALL_FILES); do \
-		[ -s $$file.flags ] || continue; \
-		for flag in `cat $$file.flags`; do \
-			$(call opkg,$(TARGET_DIR)) flag $$flag `cat $$file`; \
-		done; \
-	done || true
-
-	$(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG)
-
-	$(call prepare_rootfs,$(TARGET_DIR),$(TOPDIR)/files)
-
-$(curdir)/index: FORCE
-	@echo Generating package index...
-	@for d in $(PACKAGE_SUBDIRS); do ( \
-		mkdir -p $$d; \
-		cd $$d || continue; \
-		$(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages.manifest; \
-		grep -vE '^(Maintainer|LicenseFiles|Source|SourceName|Require|SourceDateEpoch)' Packages.manifest > Packages; \
-		case "$$(((64 + $$(stat -L -c%s Packages)) % 128))" in 110|111) \
-			$(call ERROR_MESSAGE,WARNING: Applying padding in $$d/Packages to workaround usign SHA-512 bug!); \
-			{ echo ""; echo ""; } >> Packages;; \
-		esac; \
-		gzip -9nc Packages > Packages.gz; \
-	); done
-ifdef CONFIG_SIGNED_PACKAGES
-	@echo Signing package index...
-	@for d in $(PACKAGE_SUBDIRS); do ( \
-		[ -d $$d ] && \
-			cd $$d || continue; \
-		$(STAGING_DIR_HOST)/bin/usign -S -m Packages -s $(BUILD_KEY); \
-	); done
-endif
-
-$(curdir)/flags-install:= -j1
-
-$(eval $(call stampfile,$(curdir),package,prereq,.config))
-$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build))
-$(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build))
-$(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build))
-$(eval $(call stampfile,$(curdir),package,check,$(TMP_DIR)/.build))
-
-$(eval $(call subdir,$(curdir)))

root/package/base-files/files/sbin/sysupgrade

@@ -1,397 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /lib/functions/system.sh
-. /usr/share/libubox/jshn.sh
-
-# initialize defaults
-export MTD_ARGS=""
-export MTD_CONFIG_ARGS=""
-export INTERACTIVE=0
-export VERBOSE=1
-export SAVE_CONFIG=1
-export SAVE_OVERLAY=0
-export SAVE_OVERLAY_PATH=
-export SAVE_PARTITIONS=1
-export SAVE_INSTALLED_PKGS=1
-export SKIP_UNCHANGED=0
-export CONF_IMAGE=
-export CONF_BACKUP_LIST=0
-export CONF_BACKUP=
-export CONF_RESTORE=
-export NEED_IMAGE=
-export HELP=0
-export FORCE=0
-export TEST=0
-export UMOUNT_ETCBACKUP_DIR=0
-
-# parse options
-while [ -n "$1" ]; do
-	case "$1" in
-		-i) export INTERACTIVE=1;;
-		-v) export VERBOSE="$(($VERBOSE + 1))";;
-		-q) export VERBOSE="$(($VERBOSE - 1))";;
-		-n) export SAVE_CONFIG=0;;
-		-c) export SAVE_OVERLAY=1 SAVE_OVERLAY_PATH=/etc;;
-		-o) export SAVE_OVERLAY=1 SAVE_OVERLAY_PATH=/;;
-		-p) export SAVE_PARTITIONS=0;;
-		-k) export SAVE_INSTALLED_PKGS=1;;
-		-u) export SKIP_UNCHANGED=1;;
-		-b|--create-backup) export CONF_BACKUP="$2" NEED_IMAGE=1; shift;;
-		-r|--restore-backup) export CONF_RESTORE="$2" NEED_IMAGE=1; shift;;
-		-l|--list-backup) export CONF_BACKUP_LIST=1;;
-		-f) export CONF_IMAGE="$2"; shift;;
-		-F|--force) export FORCE=1;;
-		-T|--test) export TEST=1;;
-		-h|--help) export HELP=1; break;;
-		-*)
-			echo "Invalid option: $1" >&2
-			exit 1
-		;;
-		*) break;;
-	esac
-	shift;
-done
-
-export CONFFILES=/tmp/sysupgrade.conffiles
-export CONF_TAR=/tmp/sysupgrade.tgz
-export ETCBACKUP_DIR=/etc/backup
-export INSTALLED_PACKAGES=${ETCBACKUP_DIR}/installed_packages.txt
-
-IMAGE="$1"
-
-[ -z "$IMAGE" -a -z "$NEED_IMAGE" -a $CONF_BACKUP_LIST -eq 0 -o $HELP -gt 0 ] && {
-	cat <<EOF
-Usage: $0 [<upgrade-option>...] <image file or URL>
-       $0 [-q] [-i] [-c] [-u] [-o] [-k] <backup-command> <file>
-
-upgrade-option:
-	-f <config>  restore configuration from .tar.gz (file or url)
-	-i           interactive mode
-	-c           attempt to preserve all changed files in /etc/
-	-o           attempt to preserve all changed files in /, except those
-	             from packages but including changed confs.
-	-u           skip from backup files that are equal to those in /rom
-	-n           do not save configuration over reflash
-	-p           do not attempt to restore the partition table after flash.
-	-k           include in backup a list of current installed packages at
-	             $INSTALLED_PACKAGES
-	-T | --test
-	             Verify image and config .tar.gz but do not actually flash.
-	-F | --force
-	             Flash image even if image checks fail, this is dangerous!
-	-q           less verbose
-	-v           more verbose
-	-h | --help  display this help
-
-backup-command:
-	-b | --create-backup <file>
-	             create .tar.gz of files specified in sysupgrade.conf
-	             then exit. Does not flash an image. If file is '-',
-	             i.e. stdout, verbosity is set to 0 (i.e. quiet).
-	-r | --restore-backup <file>
-	             restore a .tar.gz created with sysupgrade -b
-	             then exit. Does not flash an image. If file is '-',
-	             the archive is read from stdin.
-	-l | --list-backup
-	             list the files that would be backed up when calling
-	             sysupgrade -b. Does not create a backup file.
-
-EOF
-	exit 1
-}
-
-[ -n "$IMAGE" -a -n "$NEED_IMAGE" ] && {
-	cat <<-EOF
-		-b|--create-backup and -r|--restore-backup do not perform a firmware upgrade.
-		Do not specify both -b|-r and a firmware image.
-	EOF
-	exit 1
-}
-
-# prevent messages from clobbering the tarball when using stdout
-[ "$CONF_BACKUP" = "-" ] && export VERBOSE=0
-
-missing_lines() {
-	local file1 file2 line
-	file1="$1"
-	file2="$2"
-	oIFS="$IFS"
-	IFS=":"
-	while read line; do
-		set -- $line
-		grep -q "^$1:" "$file2" || echo "$*"
-	done < "$file1"
-	IFS="$oIFS"
-}
-
-list_conffiles() {
-	awk '
-		BEGIN { conffiles = 0 }
-		/^Conffiles:/ { conffiles = 1; next }
-		!/^ / { conffiles = 0; next }
-		conffiles == 1 { print }
-	' /usr/lib/opkg/status
-}
-
-list_changed_conffiles() {
-	# Cannot handle spaces in filenames - but opkg cannot either...
-	list_conffiles | while read file csum; do
-		[ -r "$file" ] || continue
-
-		echo "${csum}  ${file}" | busybox sha256sum -sc - || echo "$file"
-	done
-}
-
-list_static_conffiles() {
-	local filter=$1
-
-	find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
-		/etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
-		\( -type f -o -type l \) $filter 2>/dev/null
-}
-
-add_conffiles() {
-	local file="$1"
-
-	( list_static_conffiles "$find_filter"; list_changed_conffiles ) |
-		sort -u > "$file"
-	return 0
-}
-
-add_overlayfiles() {
-	local file="$1"
-
-	local packagesfiles=$1.packagesfiles
-	touch "$packagesfiles"
-
-	if [ "$SAVE_OVERLAY_PATH" = / ]; then
-		local conffiles=$1.conffiles
-		local keepfiles=$1.keepfiles
-
-		list_conffiles | cut -f2 -d ' ' | sort -u > "$conffiles"
-
-		# backup files from /etc/sysupgrade.conf and /lib/upgrade/keep.d, but
-		# ignore those aready controlled by opkg conffiles
-		list_static_conffiles | sort -u |
-			grep -h -v -x -F -f $conffiles > "$keepfiles"
-
-		# backup conffiles, but only those changed if '-u'
-		[ $SKIP_UNCHANGED = 1 ] &&
-			list_changed_conffiles | sort -u > "$conffiles"
-
-		# do not backup files from packages, except those listed
-		# in conffiles and keep.d
-		{
-			find /usr/lib/opkg/info -type f -name "*.list" -exec cat {} \;
-			find /usr/lib/opkg/info -type f -name "*.control" -exec sed \
-				-ne '/^Alternatives/{s/^Alternatives: //;s/, /\n/g;p}' {} \; |
-				cut -f2 -d:
-		} |  grep -v -x -F -f $conffiles |
-		     grep -v -x -F -f $keepfiles | sort -u > "$packagesfiles"
-		rm -f "$keepfiles" "$conffiles"
-	fi
-
-	# busybox grep bug when file is empty
-	[ -s "$packagesfiles" ] || echo > $packagesfiles
-
-	( cd /overlay/upper/; find .$SAVE_OVERLAY_PATH \( -type f -o -type l \) $find_filter | sed \
-		-e 's,^\.,,' \
-		-e '\,^/etc/board.json$,d' \
-		-e '\,/[^/]*-opkg$,d' \
-		-e '\,^/etc/urandom.seed$,d' \
-		-e "\,^$INSTALLED_PACKAGES$,d" \
-		-e '\,^/usr/lib/opkg/.*,d' \
-	) | grep -v -x -F -f $packagesfiles > "$file"
-
-	rm -f "$packagesfiles"
-
-	return 0
-}
-
-if [ $SAVE_OVERLAY = 1 ]; then
-	[ ! -d /overlay/upper/etc ] && {
-		echo "Cannot find '/overlay/upper/etc', required for '-c'" >&2
-		exit 1
-	}
-	sysupgrade_init_conffiles="add_overlayfiles"
-else
-	sysupgrade_init_conffiles="add_conffiles"
-fi
-
-find_filter=""
-if [ $SKIP_UNCHANGED = 1 ]; then
-	[ ! -d /rom/ ] && {
-		echo "'/rom/' is required by '-u'"
-		exit 1
-	}
-	find_filter='( ( -exec test -e /rom/{} ; -exec cmp -s /{} /rom/{} ; ) -o -print )'
-fi
-
-include /lib/upgrade
-
-do_save_conffiles() {
-	local conf_tar="$1"
-
-	[ "$(rootfs_type)" = "tmpfs" ] && {
-		echo "Cannot save config while running from ramdisk." >&2
-		ask_bool 0 "Abort" && exit
-		rm -f "$conf_tar"
-		return 0
-	}
-	run_hooks "$CONFFILES" $sysupgrade_init_conffiles
-	ask_bool 0 "Edit config file list" && vi "$CONFFILES"
-
-	if [ "$SAVE_INSTALLED_PKGS" -eq 1 ]; then
-		echo "${INSTALLED_PACKAGES}" >> "$CONFFILES"
-		mkdir -p "$ETCBACKUP_DIR"
-		# Avoid touching filesystem on each backup
-		RAMFS="$(mktemp -d -t sysupgrade.XXXXXX)"
-		mkdir -p "$RAMFS/upper" "$RAMFS/work"
-		mount -t overlay overlay -o lowerdir=$ETCBACKUP_DIR,upperdir=$RAMFS/upper,workdir=$RAMFS/work $ETCBACKUP_DIR &&
-			UMOUNT_ETCBACKUP_DIR=1 || {
-				echo "Cannot mount '$ETCBACKUP_DIR' as tmpfs to avoid touching disk while saving the list of installed packages." >&2
-				ask_bool 0 "Abort" && exit
-			}
-
-		# Format: pkg-name<TAB>{rom,overlay,unkown}
-		# rom is used for pkgs in /rom, even if updated later
-		find /usr/lib/opkg/info -name "*.control" \( \
-			\( -exec test -f /rom/{} \; -exec echo {} rom \; \) -o \
-			\( -exec test -f /overlay/upper/{} \; -exec echo {} overlay \; \) -o \
-			\( -exec echo {} unknown \; \) \
-			\) | sed -e 's,.*/,,;s/\.control /\t/' > ${INSTALLED_PACKAGES}
-	fi
-
-	v "Saving config files..."
-	[ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
-	tar c${TAR_V}zf "$conf_tar" -T "$CONFFILES" 2>/dev/null
-	if [ "$?" -ne 0 ]; then
-		echo "Failed to create the configuration backup."
-		rm -f "$conf_tar"
-		exit 1
-	fi
-
-	[ "$UMOUNT_ETCBACKUP_DIR" -eq 1 ] && {
-		umount "$ETCBACKUP_DIR"
-		rm -rf "$RAMFS"
-	}
-	rm -f "$CONFFILES"
-}
-
-if [ $CONF_BACKUP_LIST -eq 1 ]; then
-	run_hooks "$CONFFILES" $sysupgrade_init_conffiles
-	[ "$SAVE_INSTALLED_PKGS" -eq 1 ] && echo ${INSTALLED_PACKAGES} >> "$CONFFILES"
-	cat "$CONFFILES"
-	rm -f "$CONFFILES"
-	exit 0
-fi
-
-if [ -n "$CONF_BACKUP" ]; then
-	do_save_conffiles "$CONF_BACKUP"
-	exit $?
-fi
-
-if [ -n "$CONF_RESTORE" ]; then
-	if [ "$CONF_RESTORE" != "-" ] && [ ! -f "$CONF_RESTORE" ]; then
-		echo "Backup archive '$CONF_RESTORE' not found." >&2
-		exit 1
-	fi
-
-	[ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
-	cp /etc/passwd /etc/group /etc/shadow /tmp
-	tar -C / -x${TAR_V}zf "$CONF_RESTORE"
-	missing_lines /tmp/passwd /etc/passwd >> /etc/passwd
-	missing_lines /tmp/group /etc/group >> /etc/group
-	missing_lines /tmp/shadow /etc/shadow >> /etc/shadow
-	rm /tmp/passwd /tmp/group /tmp/shadow
-
-	exit $?
-fi
-
-type platform_check_image >/dev/null 2>/dev/null || {
-	echo "Firmware upgrade is not implemented for this platform." >&2
-	exit 1
-}
-
-case "$IMAGE" in
-	http://*|\
-	https://*)
-		wget -O/tmp/sysupgrade.img "$IMAGE" || exit 1
-		IMAGE=/tmp/sysupgrade.img
-		;;
-esac
-
-IMAGE="$(readlink -f "$IMAGE")"
-
-case "$IMAGE" in
-	'')
-		echo "Image file not found." >&2
-		exit 1
-		;;
-	/tmp/*)	;;
-	*)
-		v "Image not in /tmp, copying..."
-		cp -f "$IMAGE" /tmp/sysupgrade.img
-		IMAGE=/tmp/sysupgrade.img
-		;;
-esac
-
-json_load "$(/usr/libexec/validate_firmware_image "$IMAGE")" || {
-	echo "Failed to check image"
-	exit 1
-}
-json_get_var valid "valid"
-[ "$valid" -eq 0 ] && {
-	if [ $FORCE -eq 1 ]; then
-		echo "Image check failed but --force given - will update anyway!" >&2
-	else
-		echo "Image check failed." >&2
-		exit 1
-	fi
-}
-
-if [ -n "$CONF_IMAGE" ]; then
-	case "$(get_magic_word $CONF_IMAGE cat)" in
-		# .gz files
-		1f8b) ;;
-		*)
-			echo "Invalid config file. Please use only .tar.gz files" >&2
-			exit 1
-		;;
-	esac
-	get_image "$CONF_IMAGE" "cat" > "$CONF_TAR"
-	export SAVE_CONFIG=1
-elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then
-	[ $TEST -eq 1 ] || do_save_conffiles "$CONF_TAR"
-	export SAVE_CONFIG=1
-else
-	[ $TEST -eq 1 ] || rm -f "$CONF_TAR"
-	export SAVE_CONFIG=0
-fi
-
-if [ $TEST -eq 1 ]; then
-	exit 0
-fi
-
-install_bin /sbin/upgraded
-v "Commencing upgrade. Closing all shell sessions."
-
-COMMAND='/lib/upgrade/do_stage2'
-
-if [ -n "$FAILSAFE" ]; then
-	printf '%s\x00%s\x00%s' "$RAM_ROOT" "$IMAGE" "$COMMAND" >/tmp/sysupgrade
-	lock -u /tmp/.failsafe
-else
-	json_init
-	json_add_string prefix "$RAM_ROOT"
-	json_add_string path "$IMAGE"
-	[ $FORCE -eq 1 ] && json_add_boolean force 1
-	[ $SAVE_CONFIG -eq 1 ] && json_add_string backup "$CONF_TAR"
-	json_add_string command "$COMMAND"
-	json_add_object options
-	json_add_int save_partitions "$SAVE_PARTITIONS"
-	json_close_object
-
-	ubus call system sysupgrade "$(json_dump)"
-fi

root/package/network/ipv6/6in4/Makefile

@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2010-2015 OpenWrt.org
-# Copyright (C) 2018-2019 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
-# - Added gateway setting
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=6in4
-PKG_VERSION:=270
-PKG_RELEASE:=2
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/6in4
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=@IPV6 +kmod-sit +uclient-fetch
-  TITLE:=IPv6-in-IPv4 configuration support
-  MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
-  PKGARCH:=all
-endef
-
-define Package/6in4/description
-Provides support for 6in4 tunnels in /etc/config/network.
-Refer to http://wiki.openwrt.org/doc/uci/network for
-configuration details.
-endef
-
-define Build/Compile
-endef
-
-define Build/Configure
-endef
-
-define Package/6in4/install
-	$(INSTALL_DIR) $(1)/lib/netifd/proto
-	$(INSTALL_BIN) ./files/6in4.sh $(1)/lib/netifd/proto/6in4.sh
-endef
-
-$(eval $(call BuildPackage,6in4))

root/package/network/ipv6/6in4/files/6in4.sh

@@ -1,149 +0,0 @@
-#!/bin/sh
-# 6in4.sh - IPv6-in-IPv4 tunnel backend
-# Copyright (c) 2010-2015 OpenWrt.org
-
-[ -n "$INCLUDE_ONLY" ] || {
-	. /lib/functions.sh
-	. /lib/functions/network.sh
-	. ../netifd-proto.sh
-	init_proto "$@"
-}
-
-proto_6in4_update() {
-	sh -c '
-		timeout=5
-
-		(while [ $((timeout--)) -gt 0 ]; do
-			sleep 1
-			kill -0 $$ || exit 0
-		done; kill -9 $$) 2>/dev/null &
-
-		exec "$@"
-	' "$1" "$@"
-}
-
-proto_6in4_add_prefix() {
-	append "$3" "$1"
-}
-
-proto_6in4_setup() {
-	local cfg="$1"
-	local iface="$2"
-	local link="6in4-$cfg"
-
-	local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix ip6prefixes tunlink tunnelid username password updatekey gateway
-	json_get_vars mtu ttl tos ipaddr peeraddr ip6addr tunlink tunnelid username password updatekey gateway
-	json_for_each_item proto_6in4_add_prefix ip6prefix ip6prefixes
-
-	[ -z "$peeraddr" ] && {
-		proto_notify_error "$cfg" "MISSING_ADDRESS"
-		proto_block_restart "$cfg"
-		return
-	}
-
-	[ -n "$tunlink" ] && ( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" )
-
-	[ -z "$ipaddr" ] && {
-		local wanif="$tunlink"
-		if [ -z "$wanif" ] && ! network_find_wan wanif; then
-			proto_notify_error "$cfg" "NO_WAN_LINK"
-			return
-		fi
-
-		if ! network_get_ipaddr ipaddr "$wanif"; then
-			proto_notify_error "$cfg" "NO_WAN_LINK"
-			return
-		fi
-	}
-
-	proto_init_update "$link" 1
-
-	[ -n "$ip6addr" ] && {
-		local local6="${ip6addr%%/*}"
-		local mask6="${ip6addr##*/}"
-		[[ "$local6" = "$mask6" ]] && mask6=
-		proto_add_ipv6_address "$local6" "$mask6"
-		proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6"
-	}
-
-	[ -n "$gateway" ] && {
-		proto_add_ipv6_route "::" 0 "$gateway"
-	}
-
-	for ip6prefix in $ip6prefixes; do
-		proto_add_ipv6_prefix "$ip6prefix"
-		proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix"
-	done
-
-	proto_add_tunnel
-	json_add_string mode sit
-	json_add_int mtu "${mtu:-1280}"
-	json_add_int ttl "${ttl:-64}"
-	[ -n "$tos" ] && json_add_string tos "$tos"
-	json_add_string local "$ipaddr"
-	json_add_string remote "$peeraddr"
-	[ -n "$tunlink" ] && json_add_string link "$tunlink"
-	proto_close_tunnel
-
-	proto_send_update "$cfg"
-
-	[ -n "$tunnelid" -a -n "$username" -a \( -n "$password" -o -n "$updatekey" \) ] && {
-		[ -n "$updatekey" ] && password="$updatekey"
-
-		local http="http"
-		local urlget="uclient-fetch"
-		local urlget_opts="-qO-"
-		local ca_path="${SSL_CERT_DIR:-/etc/ssl/certs}"
-
-		[ -f /lib/libustream-ssl.so ] && http=https
-		[ "$http" = "https" -a -z "$(find $ca_path -name "*.0" 2>/dev/null)" ] && {
-			urlget_opts="$urlget_opts --no-check-certificate"
-		}
-
-		local url="$http://ipv4.tunnelbroker.net/nic/update?hostname=$tunnelid"
-		local try=0
-		local max=3
-
-		(
-			set -o pipefail
-			while [ $((++try)) -le $max ]; do
-				if proto_6in4_update $urlget $urlget_opts --user="$username" --password="$password" "$url" 2>&1 | \
-					sed -e 's,^Killed$,timeout,' -e "s,^,update $try/$max: ," | \
-					logger -t "$link";
-				then
-					logger -t "$link" "updated"
-					return 0
-				fi
-				sleep 5
-			done
-			logger -t "$link" "update failed"
-		)
-	}
-}
-
-proto_6in4_teardown() {
-	local cfg="$1"
-}
-
-proto_6in4_init_config() {
-	no_device=1
-	available=1
-
-	proto_config_add_string "ipaddr"
-	proto_config_add_string "ip6addr"
-	proto_config_add_array "ip6prefix"
-	proto_config_add_string "peeraddr"
-	proto_config_add_string "tunlink"
-	proto_config_add_string "tunnelid"
-	proto_config_add_string "username"
-	proto_config_add_string "password"
-	proto_config_add_string "updatekey"
-	proto_config_add_string "gateway"
-	proto_config_add_int "mtu"
-	proto_config_add_int "ttl"
-	proto_config_add_string "tos"
-}
-
-[ -n "$INCLUDE_ONLY" ] || {
-	add_protocol 6in4
-}