Merge pull request #132 from openwrtdiy/openwrt-23.05

Synchronize official source code
openwrtdiy · Sep 29, 2024 · c8b0087 · c8b0087
2 parents 1b10050 + fa0a7e0
commit c8b0087
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
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
@@ -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"

diff --git 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
@@ -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

diff --git 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 \