diff --git a/backports/0037-netifd-update-to-latest-HEAD.patch b/backports/0037-netifd-update-to-latest-HEAD.patch index bd5d3e4cd..0b2c13cfa 100644 --- a/backports/0037-netifd-update-to-latest-HEAD.patch +++ b/backports/0037-netifd-update-to-latest-HEAD.patch @@ -25,7 +25,7 @@ index 7061456b08..cce2529ac8 100644 -PKG_SOURCE_VERSION:=c00c8335d6188daa326ecfe5a62da15a9b9987e1 -PKG_MIRROR_HASH:=c740e51e0cec13eec336ba1c7a643db3b64a9a2235f8c1b73a566cb89e841190 +PKG_SOURCE_DATE:=2021-05-26 -+PKG_SOURCE_VERSION:=50381d0a2998f6c0fc4823f0c2aa4206063d549e ++PKG_SOURCE_VERSION:=b0d0906883021baca9ef6e80ba0480ac3e2a4b7a +PKG_MIRROR_HASH:= PKG_MAINTAINER:=Felix Fietkau diff --git a/backports/0038-mac80211-update-to-latest-HEAD.patch b/backports/0038-mac80211-update-to-latest-HEAD.patch index 16006fa25..45c122c1c 100644 --- a/backports/0038-mac80211-update-to-latest-HEAD.patch +++ b/backports/0038-mac80211-update-to-latest-HEAD.patch @@ -1,7 +1,7 @@ -From 1bf3acc4bcfb66325ea65086af71ee9d67d4e137 Mon Sep 17 00:00:00 2001 +From 55944d85d5afb04d1d54c59ef68058c7dd1da9ce Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 27 May 2021 13:25:03 +0200 -Subject: [PATCH 01/30] mac80211: update to latest HEAD +Subject: [PATCH 01/32] mac80211: update to latest HEAD Signed-off-by: John Crispin --- @@ -206,7 +206,7 @@ index fb576c5809..473bbf597c 100644 AG => Dual A-PHY G-PHY G => G-PHY diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh -index 92c56afd24..5856d0571f 100644 +index 92c56afd24..f30632cb92 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -26,7 +26,6 @@ drv_mac80211_init_device_config() { @@ -257,7 +257,7 @@ index 92c56afd24..5856d0571f 100644 + set -- $capab + [ "$(($4))" -gt 0 ] || continue + [ "$(((0x$2) & $3))" -gt 0 ] || { -+ eval "$4=0" ++ eval "$1=0" + continue + } + append base_cfg "$1=1" "$N" diff --git a/feeds/tip/certificates/files/lib/preinit/75_certificates b/feeds/tip/certificates/files/lib/preinit/75_certificates new file mode 100644 index 000000000..fba1be7f7 --- /dev/null +++ b/feeds/tip/certificates/files/lib/preinit/75_certificates @@ -0,0 +1,15 @@ +generate_certificate_volume() { + grep certificates /proc/mtd > /dev/null + [ $? -eq 0 ] || return + + ls /dev/ubi0 > /dev/null + [ $? -eq 0 ] || return + + ubinfo /dev/ubi0 -N certificates > /dev/null + [ $? -eq 0 ] || { + ubirsvol /dev/ubi0 -N rootfs_data -s 20MiB + ubimkvol /dev/ubi0 -N certificates -s 2MiB + } +} + +boot_hook_add preinit_main generate_certificate_volume diff --git a/feeds/tip/firstcontact/files/etc/init.d/firstcontact b/feeds/tip/firstcontact/files/etc/init.d/firstcontact index 0e65a10e8..060a21648 100755 --- a/feeds/tip/firstcontact/files/etc/init.d/firstcontact +++ b/feeds/tip/firstcontact/files/etc/init.d/firstcontact @@ -11,7 +11,7 @@ start_service() { ucode -m ubus -E board=/etc/board.json /usr/share/ucentral/capabilities.uc > /etc/ucentral/capabilities.json } - /usr/share/ucentral/ucentral.uc /etc/ucentral/ucentral.cfg.0000000001 + /usr/share/ucentral/ucentral.uc /etc/ucentral/ucentral.cfg.0000000001 > /dev/null procd_open_instance procd_set_param command "$PROG" -m uci -m fs -i /usr/share/ucentral/firstcontact.uc diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile index 910b917ba..078348531 100644 --- a/feeds/ucentral/ucentral-schema/Makefile +++ b/feeds/ucentral/ucentral-schema/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=1 PKG_SOURCE_URL=https://github.com/blogic/ucentral-schema.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2021-02-15 -PKG_SOURCE_VERSION:=0cd335a51bc95d705e6582d2302362de49c2ac2f +PKG_SOURCE_VERSION:=515c892d3a50a9a971d284a0a1366d8ef7a22f73 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=BSD-3-Clause diff --git a/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh b/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh index 5856d0571..f30632cb9 100644 --- a/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -117,7 +117,7 @@ mac80211_add_he_capabilities() { set -- $capab [ "$(($4))" -gt 0 ] || continue [ "$(((0x$2) & $3))" -gt 0 ] || { - eval "$4=0" + eval "$1=0" continue } append base_cfg "$1=1" "$N" diff --git a/patches/0013-base-files-ignore-sysupgrade-that-was-not-ours.patch b/patches/0013-base-files-ignore-sysupgrade-that-was-not-ours.patch new file mode 100644 index 000000000..15a901088 --- /dev/null +++ b/patches/0013-base-files-ignore-sysupgrade-that-was-not-ours.patch @@ -0,0 +1,27 @@ +From 4fb2a69f3bbdab006a6b751ce39203cfdade9ae6 Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Thu, 17 Jun 2021 08:47:51 +0200 +Subject: [PATCH] base-files: ignore sysupgrade that was not ours + +Signed-off-by: John Crispin +--- + package/base-files/files/lib/preinit/80_mount_root | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/package/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root +index 3f75411a43..7cf16e68e0 100644 +--- a/package/base-files/files/lib/preinit/80_mount_root ++++ b/package/base-files/files/lib/preinit/80_mount_root +@@ -17,7 +17,8 @@ missing_lines() { + do_mount_root() { + mount_root + boot_run_hook preinit_mount_root +- [ -f /sysupgrade.tgz ] && { ++ (tar tf /sysupgrade.tgz | grep ucentral) 2> /dev/null ++ [ $? -eq 0 ] && { + echo "- config restore -" + cp /etc/passwd /etc/group /etc/shadow /tmp + cd / +-- +2.25.1 + diff --git a/patches/0036-certificates-add-ability-to-persistently-store-certi.patch b/patches/0036-certificates-add-ability-to-persistently-store-certi.patch index 324e0dcda..8712129da 100644 --- a/patches/0036-certificates-add-ability-to-persistently-store-certi.patch +++ b/patches/0036-certificates-add-ability-to-persistently-store-certi.patch @@ -11,33 +11,6 @@ Signed-off-by: John Crispin .../linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts | 8 ++++++-- 4 files changed, 22 insertions(+), 5 deletions(-) -diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh -index ab3db4cdf2..36977244bc 100644 ---- a/package/base-files/files/lib/upgrade/nand.sh -+++ b/package/base-files/files/lib/upgrade/nand.sh -@@ -157,6 +157,8 @@ nand_upgrade_prepare_ubi() { - local kern_ubivol="$( nand_find_volume $ubidev $CI_KERNPART )" - local root_ubivol="$( nand_find_volume $ubidev $CI_ROOTPART )" - local data_ubivol="$( nand_find_volume $ubidev rootfs_data )" -+ local cert_ubivol="$( nand_find_volume $ubidev certificates )" -+ local cert_mtd="$(find_mtd_index certificates)" - - local ubiblk ubiblkvol - for ubiblk in /dev/ubiblock*_? ; do -@@ -196,6 +198,13 @@ nand_upgrade_prepare_ubi() { - fi - fi - -+ if [ -z "$cert_ubivol" -a ! "$cert_mtd" ]; then -+ if ! ubimkvol /dev/$ubidev -N certificates -s 2MiB; then -+ echo "cannot create certificates volume" -+ return 1; -+ fi -+ fi -+ - # create rootfs_data for non-ubifs rootfs - if [ "$rootfs_type" != "ubifs" ]; then - local availeb=$(cat /sys/devices/virtual/ubi/$ubidev/avail_eraseblocks) diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi index 8f971e505c..0f1f083a5b 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi