fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-08-30 23:20:49 +08:00
commit 96fcadbba8
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/autotools.mk
View File

@ -44,7 +44,7 @@ define autoreconf
touch NEWS AUTHORS COPYING ABOUT-NLS ChangeLog; \ touch NEWS AUTHORS COPYING ABOUT-NLS ChangeLog; \
$(AM_TOOL_PATHS) \ $(AM_TOOL_PATHS) \
LIBTOOLIZE='$(STAGING_DIR_HOST)/bin/libtoolize --install' \ 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) \ $(if $(word 2,$(3)),--no-recursive) \
-B $(STAGING_DIR_HOST)/share/aclocal \ -B $(STAGING_DIR_HOST)/share/aclocal \
$(patsubst %,-I %,$(5)) \ $(patsubst %,-I %,$(5)) \

2
package/base-files/files/lib/preinit/80_mount_root
View File

@ -9,7 +9,7 @@ missing_lines() {
IFS=":" IFS=":"
while read line; do while read line; do
set -- $line set -- $line
grep -q "^$1:" "$file2" || echo "$*" grep -q "^$1:" "$file2" || echo "$line"
done < "$file1" done < "$file1"
IFS="$oIFS" IFS="$oIFS"
} }

2
package/network/services/hostapd/files/hostapd.sh
View File

@ -436,7 +436,7 @@ append_iw_anqp_3gpp_cell_net() {
if [ -z "$iw_anqp_3gpp_cell_net_conf" ]; then if [ -z "$iw_anqp_3gpp_cell_net_conf" ]; then
iw_anqp_3gpp_cell_net_conf="$1" iw_anqp_3gpp_cell_net_conf="$1"
else 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 fi
} }

2
target/linux/rockchip/armv8/base-files/etc/init.d/reload-sdio-wifi
View File

@ -7,7 +7,7 @@ boot() {
ariaboard,photonicat) ariaboard,photonicat)
( sleep 15s; wifi; ) & ( sleep 15s; wifi; ) &
;; ;;
armsom,sige3| armsom,sige3|\
firefly,rk3568-roc-pc) firefly,rk3568-roc-pc)
( sleep 60s; wifi; ) & ( sleep 60s; wifi; ) &
;; ;;

1
tools/libtool/Makefile
View File

@ -28,6 +28,7 @@ define Host/Bootstrap
cd $(HOST_BUILD_DIR); \ cd $(HOST_BUILD_DIR); \
$(AM_TOOL_PATHS) \ $(AM_TOOL_PATHS) \
./bootstrap \ ./bootstrap \
--copy \
--force \ --force \
--skip-git \ --skip-git \
--skip-po \ --skip-po \