From 533235182141392d8031a6d2edb9d7edc91bfd5a Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 27 Sep 2024 19:10:40 +0200 Subject: [PATCH 1/3] ipq40xx: fix AP-303H PSE GPIO pin The GPIO chip is at a different start index compared to OpenWrt master. Signed-off-by: David Bauer --- target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches b/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches index f57d4c5888..fcc6e8e745 100644 --- a/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches +++ b/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches @@ -7,7 +7,7 @@ board=$(board_name) case "$board" in aruba,ap-303h) - ucidef_add_gpio_switch "poe_passtrough" "POE passtrough disable" "546" "1" + ucidef_add_gpio_switch "poe_passtrough" "POE passtrough disable" "446" "1" ;; cellc,rtl30vw) ucidef_add_gpio_switch "w_disable" "W_DISABLE mPCIE pin" "398" "1" From 87477c756e1136ee338a9fd67e0df81f853f74d4 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 27 Sep 2024 00:30:44 +0200 Subject: [PATCH 2/3] tools: bzip2: use static lib and tools Currently, bzip2 is built with a dynamically linked library on which all of the bzip2 tools depend on. However, when trying to use the staging dir bzip2 during building on Fedora 40 the following error appers: staging_dir/host/bin/bzip2: error while loading shared libraries: libbz2.so.1.0: cannot open shared object file: No such file or directory Looking into it, the binary is dynamically linked: $ ldd staging_dir/host/bin/bzip2 linux-vdso.so.1 (0x00007f5ebd9ff000) libbz2.so.1.0 => not found libc.so.6 => /lib64/libc.so.6 (0x00007f5ebd7f5000) /lib64/ld-linux-x86-64.so.2 (0x00007f5ebda01000) libbz2.so.1.0 is installed into staging_dir/lib but that directory is not evaluated for the required libraries and Fedora only ships: /usr/lib64/libbz2.so.1 /usr/lib64/libbz2.so.1.0.8 Thus it cannot find the libbz2 that bzip2 is linked against and thus trying to use bzip2 will fail and stop compilation as it is used for bzip2 compressed tarballs. So, to avoid OpenWrt compiled bzip2 to even attempt to load a required library from the host we can just static compile libbz2 and bzip2. Link: https://github.com/openwrt/openwrt/pull/16520 Signed-off-by: Robert Marko --- tools/bzip2/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/bzip2/Makefile b/tools/bzip2/Makefile index 0c5a92849a..d438832cdf 100644 --- a/tools/bzip2/Makefile +++ b/tools/bzip2/Makefile @@ -29,9 +29,9 @@ HOST_CFLAGS += $(HOST_FPIC) HOST_MAKE_FLAGS+= \ CFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - ENABLE_BIN_SHARED=1 \ - ENABLE_BIN_STATIC=0 \ - ENABLE_LIB_SHARED=1 \ + ENABLE_BIN_SHARED=0 \ + ENABLE_BIN_STATIC=1 \ + ENABLE_LIB_SHARED=0 \ ENABLE_LIB_STATIC=1 \ ENABLE_DEV=1 \ ENABLE_DOCS=1 \ From fa0a7e00e8297d3014928a2b502a634704eafc1c Mon Sep 17 00:00:00 2001 From: Jakob Haufe Date: Thu, 22 Aug 2024 23:26:04 +0200 Subject: [PATCH 3/3] octeon: ubnt-edgerouter: fix sysupgrade config backup/restore er is missing from platform_copy_config() and octeon_move_config(), so config is lost on every sysupgrade. (cherry-picked from commit 77037b09f3ce3284c8486b73cfaaceac53241990) Signed-off-by: Jakob Haufe Link: https://github.com/openwrt/openwrt/pull/16518 Signed-off-by: Hauke Mehrtens --- target/linux/octeon/base-files/lib/preinit/79_move_config | 3 ++- target/linux/octeon/base-files/lib/upgrade/platform.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target/linux/octeon/base-files/lib/preinit/79_move_config b/target/linux/octeon/base-files/lib/preinit/79_move_config index 01491500a0..e81627aaf2 100644 --- a/target/linux/octeon/base-files/lib/preinit/79_move_config +++ b/target/linux/octeon/base-files/lib/preinit/79_move_config @@ -22,7 +22,8 @@ octeon_move_config() { itus,shield-router) move_config "/dev/mmcblk1p1" ;; - ubnt,edgerouter-4 | \ + er|\ + ubnt,edgerouter-4|\ ubnt,edgerouter-6p) move_config "/dev/mmcblk0p1" ;; diff --git a/target/linux/octeon/base-files/lib/upgrade/platform.sh b/target/linux/octeon/base-files/lib/upgrade/platform.sh index 14b3eefe7e..0b018890c5 100755 --- a/target/linux/octeon/base-files/lib/upgrade/platform.sh +++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh @@ -34,6 +34,7 @@ platform_copy_config() { itus,shield-router) platform_copy_config_helper /dev/mmcblk1p1 ;; + er|\ ubnt,edgerouter-4|\ ubnt,edgerouter-6p) platform_copy_config_helper /dev/mmcblk0p1