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

tmp: remove the base

Browse Source
This commit is contained in:
John Doe
2021-04-02 00:37:06 +08:00
parent dc64bd97c8
commit a3dd4aea2c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,12 +64,12 @@ jobs:
pushd feeds/routing; git restore .; popd pushd feeds/routing; git restore .; popd
pushd feeds/telephony; git restore .; popd pushd feeds/telephony; git restore .; popd
fi fi
[ -d package/base ] && mv package/base ~/ rm -rf package/base luci package/luci-app-oled
./scripts/feeds update -a ./scripts/feeds update -a
./scripts/feeds install -a ./scripts/feeds install -a
[ -d ~/base ] && mv ~/base package/
. $GITHUB_WORKSPACE/patches.sh . $GITHUB_WORKSPACE/patches.sh
. $GITHUB_WORKSPACE/merge_packages.sh . $GITHUB_WORKSPACE/merge_packages.sh
cd
svn export https://github.com/openwrt/luci/branches/openwrt-18.06 luci svn export https://github.com/openwrt/luci/branches/openwrt-18.06 luci
pushd luci pushd luci
ls -d */ | xargs -n1 -i diff -q {} ../lede/feeds/luci/{} | grep Only | grep lede | grep -E applications\|themes | awk '{print $4}' | xargs -n1 -i echo CONFIG_PACKAGE_{}=m >> ~/lede/more_luci.txt ls -d */ | xargs -n1 -i diff -q {} ../lede/feeds/luci/{} | grep Only | grep lede | grep -E applications\|themes | awk '{print $4}' | xargs -n1 -i echo CONFIG_PACKAGE_{}=m >> ~/lede/more_luci.txt
@@ -79,6 +79,7 @@ jobs:
run: | run: |
cd ~/lede cd ~/lede
cat $GITHUB_WORKSPACE/$DEVICE.config.seed | sed 's/\(CONFIG_PACKAGE_luci-app-[^A-Z]*=\)y/\1m/' > .config cat $GITHUB_WORKSPACE/$DEVICE.config.seed | sed 's/\(CONFIG_PACKAGE_luci-app-[^A-Z]*=\)y/\1m/' > .config
find package/ -type d -name luci-app-* | rev | cut -d'/' -f1 | rev | xargs -n1 -i echo CONFIG_PACKAGE_{}=m >> .config
cat $GITHUB_WORKSPACE/extra_packages.seed >> .config cat $GITHUB_WORKSPACE/extra_packages.seed >> .config
cat more_luci.txt >> .config cat more_luci.txt >> .config
make defconfig && cat .config make defconfig && cat .config

3
merge_packages.sh
View File

@@ -21,6 +21,5 @@ merge_package https://github.com/coolsnowwolf/packages/trunk/kernel/ksmbd
merge_package https://github.com/coolsnowwolf/packages/trunk/net/ksmbd-tools merge_package https://github.com/coolsnowwolf/packages/trunk/net/ksmbd-tools
if [ $DEVICE = 'r2s' ]; then if [ $DEVICE = 'r2s' ]; then
merge_package https://github.com/NateLol/luci-app-oled sed -i "s/enable '0'/enable '1'/" `find feeds/ -type f -name oled | grep config`
sed -i "s/enable '0'/enable '1'/" package/luci-app-oled/root/etc/config/oled
fi fi