yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
John Doe
2023-12-07 16:05:35 +08:00
parent 1f3dc07c9a
commit ac749107ff
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/lo-test.yml vendored
View File

@@ -82,7 +82,7 @@ jobs:
. $GITHUB_WORKSPACE/scripts/merge_packages.sh . $GITHUB_WORKSPACE/scripts/merge_packages.sh
. $GITHUB_WORKSPACE/scripts/patches.sh . $GITHUB_WORKSPACE/scripts/patches.sh
cd cd
svn export https://github.com/openwrt/luci/branches/master luci git clone --depth=1 --single-branch https://github.com/openwrt/luci
pushd luci pushd luci
ls -d */ | xargs -ri diff -q {} ../lede/feeds/luci/{} | grep Only | grep lede | grep -E applications\|themes | awk '{print $4}' | xargs -ri echo CONFIG_PACKAGE_{}=m > ~/lede/more_luci.txt ls -d */ | xargs -ri diff -q {} ../lede/feeds/luci/{} | grep Only | grep lede | grep -E applications\|themes | awk '{print $4}' | xargs -ri echo CONFIG_PACKAGE_{}=m > ~/lede/more_luci.txt
popd popd

2
scripts/patches.sh
View File

@@ -115,7 +115,7 @@ if [[ $DEVICE == 'r1s' ]]; then
rsync -a --delete target/linux/sunxi/. ~/lede/target/linux/sunxi/. && rsync -a --delete package/boot/. ~/lede/package/boot/. rsync -a --delete target/linux/sunxi/. ~/lede/target/linux/sunxi/. && rsync -a --delete package/boot/. ~/lede/package/boot/.
cd ~/lede cd ~/lede
sed -i 's/kmod-rtl8189es//;s/wpad-basic-openssl/wpad-basic-wolfssl/' target/linux/sunxi/image/cortexa53.mk sed -i 's/kmod-rtl8189es//;s/wpad-basic-openssl/wpad-basic-wolfssl/' target/linux/sunxi/image/cortexa53.mk
merge_package https://github.com/immortalwrt/immortalwrt/branches/openwrt-18.06-k5.4/package/emortal/autocore merge_package "-b openwrt-18.06-k5.4 https://github.com/immortalwrt/immortalwrt" package/emortal/autocore
sed -i '/luci/d' $GITHUB_WORKSPACE/common.seed $GITHUB_WORKSPACE/extra_packages.seed sed -i '/luci/d' $GITHUB_WORKSPACE/common.seed $GITHUB_WORKSPACE/extra_packages.seed
fi fi