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

script: fix package merging

Browse Source
This commit is contained in:
John Doe
2021-03-07 12:00:13 +08:00
parent c5bb831917
commit 4a5f0e7af1
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,8 @@ jobs:
sudo losetup -P --direct-io $LOOP_DEVICE lede.img
mkdir lede && sudo mount -o nossd,autodefrag,compress=zstd $LOOP_DEVICE lede
if [ -d 'lede/.git' ]; then
cd lede && git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" && git pull --ff -X theirs
cd lede && git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" && \
git fetch && git reset --hard origin/openwrt-18.06-k5.4 && git merge openwrt-18.06 || true
else
sudo chown $USER:$(id -gn) lede && (cd lede && git init && git remote add -t openwrt-18.06-k5.4 -f origin https://github.com/immortalwrt/immortalwrt && git checkout openwrt-18.06-k5.4)
fi

19
merge_packages.sh
View File

@@ -1,10 +1,15 @@
git clone --depth=1 https://github.com/project-lede/luci-app-godproxy && rm -r package/luci-app-godproxy && mv luci-app-godproxy package/
git clone --depth=1 https://github.com/destan19/OpenAppFilter.git && rm -r package/OpenAppFilter && mv OpenAppFilter package/
git clone --depth=1 -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git && rm -r package/lean/luci-theme-argon && mv luci-theme-argon package/lean/
function merge_package(){
rm -rf $1/.git
find package/ -type d -name $1 | xargs -r rm -r
mv $1 package/
}
svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-cifsd && rm -r package/lean/luci-app-ksmbd && mv luci-app-cifsd package/lean/
svn co https://github.com/coolsnowwolf/packages/trunk/kernel/ksmbd && rm -r package/feeds/packages/ksmbd && mv ksmbd package/feeds/packages/
svn co https://github.com/coolsnowwolf/packages/trunk/net/ksmbd-tools && rm -r package/feeds/packages/ksmbd-tools && mv ksmbd-tools package/feeds/packages/
rm -rf luci-app-godproxy && git clone --depth=1 https://github.com/project-lede/luci-app-godproxy && merge_package luci-app-godproxy
rm -rf luci-theme-argon && git clone --depth=1 -b 18.06 https://github.com/jerrykuku/luci-theme-argon && merge_package luci-theme-argon
rm -rf luci-app-ksmbd && svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-cifsd && merge_package luci-app-cifsd
rm -rf ksmbd && svn co https://github.com/coolsnowwolf/packages/trunk/kernel/ksmbd && merge_package ksmbd
rm -rf ksmbd-tools && svn co https://github.com/coolsnowwolf/packages/trunk/net/ksmbd-tools && merge_package ksmbd-tools
if [ $DEVICE = 'r2s' ]; then
mkdir -p target/linux/rockchip/armv8/base-files/usr/bin &&\
@@ -16,7 +21,7 @@ chmod +x target/linux/rockchip/armv8/base-files/etc/init.d/fa-rk3328-pwmfan
mkdir -p target/linux/rockchip/armv8/base-files/etc/rc.d &&\
ln -sf ../init.d/fa-rk3328-pwmfan target/linux/rockchip/armv8/base-files/etc/rc.d/S96fa-rk3328-pwmfan
git clone --depth=1 https://github.com/NateLol/luci-app-oled && rm -r package/luci-app-oled && mv luci-app-oled package/
rm -rf luci-app-oled && git clone --depth=1 https://github.com/NateLol/luci-app-oled && merge_package luci-app-oled
fi
sed -i 's/192.168.1.1/192.168.2.1/' package/base-files/files/bin/config_generate