From 4fb27495037e91f4c6eebb35cbf2adfddf794a1b Mon Sep 17 00:00:00 2001 From: John Doe Date: Fri, 5 Mar 2021 07:25:43 +0800 Subject: [PATCH] package: merge upstream source --- .github/workflows/lo-test.yml | 22 ++++++++++------------ merge_packages.sh | 3 +++ r1s.config.seed | 2 +- r2s.config.seed | 4 ++-- r4s.config.seed | 4 ++-- 5 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 merge_packages.sh diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index c19d026..1dec23e 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -28,7 +28,7 @@ jobs: sudo sysctl vm.swappiness=0 nohup sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk & sudo -E apt update - nohup sudo -E apt -y --no-install-recommends install jq zstd secure-delete build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python python3 python-pip python3-pip python-ply python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool rsync swig & + nohup sudo -E apt -y --no-install-recommends install jq build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python python3 python-pip python3-pip python-ply python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool rsync swig & - uses: actions/checkout@v2 with: @@ -41,7 +41,7 @@ jobs: for i in {1..6} do curl -sL --fail https://github.com/klever1988/sshactions/releases/download/cache/lede.$DEVICE.img.zst.0$i || break - done | zstdmt -d -o lede.img || (truncate -s 40g lede.img && mkfs.xfs lede.img) + done | zstdmt -d -o lede.img || (truncate -s 35g lede.img && mkfs.xfs lede.img) LOOP_DEVICE=$(losetup -f) && echo "LOOP_DEVICE=$LOOP_DEVICE" >> $GITHUB_ENV sudo losetup -P --direct-io $LOOP_DEVICE lede.img mkdir lede && sudo mount $LOOP_DEVICE lede @@ -56,37 +56,35 @@ jobs: cd ~/lede ./scripts/feeds update -a ./scripts/feeds install -a - git clone --depth=1 https://github.com/destan19/OpenAppFilter.git && rm -rf package/OpenAppFilter && mv OpenAppFilter package/ - git clone --depth=1 -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git && rm -rf package/lean/luci-theme-argon && mv luci-theme-argon package/lean/ + . $GITHUB_WORKSPACE/merge_packages.sh - name: Custom configure file run: | cd ~/lede rm -f .config* cat $GITHUB_WORKSPACE/$DEVICE.config.seed > .config - sed -i 's/^[ \t]*//g' .config - echo ' - # CONFIG_v2ray-plugin_INCLUDE_GOPROXY is not set - # CONFIG_XRAY_CORE_COMPRESS_GOPROXY is not set - # CONFIG_UnblockNeteaseMusicGo_INCLUDE_GOPROXY is not set - ' >> .config cat .config - name: Compile firmware run: | cd ~/lede + + if [ ! -d build_dir ]; then if [[ $DEVICE =~ ('r2s'|'r4s') ]]; then sdk_src='https://downloads.openwrt.org/snapshots/targets/rockchip/armv8/openwrt-sdk-rockchip-armv8_gcc-8.4.0_musl.Linux-x86_64.tar.xz' elif [[ $DEVICE == 'r1s' ]]; then sdk_src='https://downloads.openwrt.org/snapshots/targets/sunxi/cortexa53/openwrt-sdk-sunxi-cortexa53_gcc-8.4.0_musl.Linux-x86_64.tar.xz' fi mkdir sdk && wget -qO- $sdk_src | tar -xJf - -C sdk - mv sdk/*/build_dir ./ && rsync -a --ignore-existing sdk/*/staging_dir/ ./staging_dir/ + rm -rf build_dir staging_dir; mv sdk/*/build_dir ./ && rsync -a --ignore-existing sdk/*/staging_dir/ ./staging_dir/ rm -rf sdk + fi ln -sf /usr/bin/upx-ucl staging_dir/host/bin/upx sed -i '/\(tools\|toolchain\)\/Makefile/d' Makefile echo -e '# CONFIG_SIGNED_PACKAGES is not set\n' >> .config - make defconfig + + make defconfig && cat .config + while true; do make download -j && break || true; done while true; do make package/download -j && break || true; done make -j$(($(nproc) + 1)) || make V=sc diff --git a/merge_packages.sh b/merge_packages.sh new file mode 100644 index 0000000..0011de3 --- /dev/null +++ b/merge_packages.sh @@ -0,0 +1,3 @@ +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/ +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/ diff --git a/r1s.config.seed b/r1s.config.seed index 1b99625..f9eaf0b 100644 --- a/r1s.config.seed +++ b/r1s.config.seed @@ -15,7 +15,7 @@ CONFIG_PACKAGE_ipv6helper=y CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-ipsec-vpnd=y -CONFIG_PACKAGE_luci-app-ksmbd=y +CONFIG_PACKAGE_luci-app-cifsd=y CONFIG_PACKAGE_luci-app-mentohust=y CONFIG_PACKAGE_luci-app-netdata=y CONFIG_PACKAGE_luci-app-nft-qos=y diff --git a/r2s.config.seed b/r2s.config.seed index 1122099..f669b05 100644 --- a/r2s.config.seed +++ b/r2s.config.seed @@ -15,7 +15,7 @@ CONFIG_PACKAGE_ipv6helper=y CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-ipsec-vpnd=y -CONFIG_PACKAGE_luci-app-ksmbd=y +CONFIG_PACKAGE_luci-app-cifsd=y CONFIG_PACKAGE_luci-app-mentohust=y CONFIG_PACKAGE_luci-app-netdata=y CONFIG_PACKAGE_luci-app-nft-qos=y @@ -70,4 +70,4 @@ CONFIG_PACKAGE_wpad-mini=y CONFIG_PACKAGE_wpa-supplicant=y CONFIG_DRIVER_11AC_SUPPORT=y CONFIG_DRIVER_11N_SUPPORT=y -CONFIG_DRIVER_11W_SUPPORT=y \ No newline at end of file +CONFIG_DRIVER_11W_SUPPORT=y diff --git a/r4s.config.seed b/r4s.config.seed index 468e043..06e4cf1 100644 --- a/r4s.config.seed +++ b/r4s.config.seed @@ -15,7 +15,7 @@ CONFIG_PACKAGE_ipv6helper=y CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-ipsec-vpnd=y -CONFIG_PACKAGE_luci-app-ksmbd=y +CONFIG_PACKAGE_luci-app-cifsd=y CONFIG_PACKAGE_luci-app-mentohust=y CONFIG_PACKAGE_luci-app-netdata=y CONFIG_PACKAGE_luci-app-nft-qos=y @@ -70,4 +70,4 @@ CONFIG_PACKAGE_wpad-mini=y CONFIG_PACKAGE_wpa-supplicant=y CONFIG_DRIVER_11AC_SUPPORT=y CONFIG_DRIVER_11N_SUPPORT=y -CONFIG_DRIVER_11W_SUPPORT=y \ No newline at end of file +CONFIG_DRIVER_11W_SUPPORT=y