diff --git a/include/autotools.mk b/include/autotools.mk index d0e4b3642f..7fc6f37175 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -44,7 +44,7 @@ define autoreconf touch NEWS AUTHORS COPYING ABOUT-NLS ChangeLog; \ $(AM_TOOL_PATHS) \ LIBTOOLIZE='$(STAGING_DIR_HOST)/bin/libtoolize --install' \ - $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \ + $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i \ $(if $(word 2,$(3)),--no-recursive) \ -B $(STAGING_DIR_HOST)/share/aclocal \ $(patsubst %,-I %,$(5)) \ diff --git a/package/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root index c3816c2cbf..ccfc481285 100644 --- a/package/base-files/files/lib/preinit/80_mount_root +++ b/package/base-files/files/lib/preinit/80_mount_root @@ -9,7 +9,7 @@ missing_lines() { IFS=":" while read line; do set -- $line - grep -q "^$1:" "$file2" || echo "$*" + grep -q "^$1:" "$file2" || echo "$line" done < "$file1" IFS="$oIFS" } diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index 5ec9843c48..d99e4aa8c0 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -436,7 +436,7 @@ append_iw_anqp_3gpp_cell_net() { if [ -z "$iw_anqp_3gpp_cell_net_conf" ]; then iw_anqp_3gpp_cell_net_conf="$1" else - iw_anqp_3gpp_cell_net_conf="$iw_anqp_3gpp_cell_net_conf:$1" + iw_anqp_3gpp_cell_net_conf="$iw_anqp_3gpp_cell_net_conf;$1" fi } diff --git a/target/linux/rockchip/armv8/base-files/etc/init.d/reload-sdio-wifi b/target/linux/rockchip/armv8/base-files/etc/init.d/reload-sdio-wifi index edbdea03c0..07af5ab411 100755 --- a/target/linux/rockchip/armv8/base-files/etc/init.d/reload-sdio-wifi +++ b/target/linux/rockchip/armv8/base-files/etc/init.d/reload-sdio-wifi @@ -7,7 +7,7 @@ boot() { ariaboard,photonicat) ( sleep 15s; wifi; ) & ;; - armsom,sige3| + armsom,sige3|\ firefly,rk3568-roc-pc) ( sleep 60s; wifi; ) & ;; diff --git a/tools/libtool/Makefile b/tools/libtool/Makefile index 1187191478..e76aed8ced 100644 --- a/tools/libtool/Makefile +++ b/tools/libtool/Makefile @@ -28,6 +28,7 @@ define Host/Bootstrap cd $(HOST_BUILD_DIR); \ $(AM_TOOL_PATHS) \ ./bootstrap \ + --copy \ --force \ --skip-git \ --skip-po \