diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index 9314bb1..73af28e 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -91,27 +91,7 @@ jobs: - name: Build and deploy packages 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' - elif [ $DEVICE == 'r1s-h3' ]; then - sdk_src='https://downloads.openwrt.org/snapshots/targets/sunxi/cortexa7/openwrt-sdk-sunxi-cortexa7_gcc-8.4.0_musl_eabi.Linux-x86_64.tar.xz' - fi - mkdir sdk && wget -qO- $sdk_src | tar -xJf - -C sdk - rm -rf build_dir staging_dir; mv sdk/*/build_dir ./ && rsync -a --ignore-existing sdk/*/staging_dir/ ./staging_dir/ - rm -rf sdk - fi - sed -i '/182.140.223.146/d' scripts/download.pl - sed -i '/\.cn\//d' scripts/download.pl - sed -i '/tencent/d' scripts/download.pl - make defconfig && make tools/upx/compile -j$(($(nproc) + 1)) - sed -i '/\(tools\|toolchain\)\/Makefile/d' Makefile - cat $GITHUB_WORKSPACE/extra_packages.seed >> .config - echo -e '# CONFIG_SIGNED_PACKAGES is not set\n' >> .config find package/ -type d -name luci-app-* | rev | cut -d'/' -f1 | rev | xargs -n1 -i echo CONFIG_PACKAGE_{}=y >> .config make defconfig && cat .config while true; do make download -j && break || true; done @@ -122,7 +102,6 @@ jobs: gzip -f bin/targets/*/*/packages/Packages cat $GITHUB_WORKSPACE/$DEVICE.config.seed | sed '/CONFIG_PACKAGE_luci-app-/d' > .config - echo -e '# CONFIG_SIGNED_PACKAGES is not set\n' >> .config find package/ -type d -name luci-app-* | rev | cut -d'/' -f1 | rev | xargs -n1 -i echo "# CONFIG_PACKAGE_{} is not set" >> .config make defconfig mkdir -p files/local_feed/core files/local_feed/base @@ -242,7 +221,6 @@ jobs: mkdir lede && sudo mount -o nossd,compress=zstd $LOOP_DEVICE lede cd lede cat $GITHUB_WORKSPACE/$DEVICE.config.seed > .config - echo -e '# CONFIG_SIGNED_PACKAGES is not set\n' >> .config make defconfig && make -j$(($(nproc) + 1)) mkdir -p $GITHUB_WORKSPACE/release mv $(ls -1 ./bin/targets/*/*/*img.gz) $GITHUB_WORKSPACE/release/$DEVICE.img.gz diff --git a/patches.sh b/patches.sh index 872b80a..0dea10f 100644 --- a/patches.sh +++ b/patches.sh @@ -31,3 +31,7 @@ if [[ $DEVICE =~ ('r2s'|'r4s') ]]; then git apply f341ef96fe4b509a728ba1281281da96bac23673.patch rm f341ef96fe4b509a728ba1281281da96bac23673.patch fi + +sed -i '/182.140.223.146/d' scripts/download.pl +sed -i '/\.cn\//d' scripts/download.pl +sed -i '/tencent/d' scripts/download.pl diff --git a/r1s-h3.config.seed b/r1s-h3.config.seed index 8e89e7b..bf099f4 100644 --- a/r1s-h3.config.seed +++ b/r1s-h3.config.seed @@ -8,6 +8,9 @@ CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -mtune=cortex-a7" CONFIG_TARGET_ROOTFS_PARTSIZE=400 CONFIG_TARGET_ROOTFS_EXT4FS=y # CONFIG_TARGET_ROOTFS_SQUASHFS is not set +# CONFIG_SIGNED_PACKAGES is not set +CONFIG_IB=y +CONFIG_IB_STANDALONE=y CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_ipv6helper=y diff --git a/r1s.config.seed b/r1s.config.seed index 5f2fda2..e2b257d 100644 --- a/r1s.config.seed +++ b/r1s.config.seed @@ -8,6 +8,9 @@ CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -march=armv8-a+crypto+crc -mcpu=cortex-a53 CONFIG_TARGET_ROOTFS_PARTSIZE=400 CONFIG_TARGET_ROOTFS_EXT4FS=y # CONFIG_TARGET_ROOTFS_SQUASHFS is not set +# CONFIG_SIGNED_PACKAGES is not set +CONFIG_IB=y +CONFIG_IB_STANDALONE=y CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_ipv6helper=y diff --git a/r2s.config.seed b/r2s.config.seed index b7be2f2..588a4d0 100644 --- a/r2s.config.seed +++ b/r2s.config.seed @@ -8,6 +8,9 @@ CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -march=armv8-a+crypto+crc -mcpu=cortex-a53 CONFIG_TARGET_ROOTFS_PARTSIZE=400 CONFIG_TARGET_ROOTFS_EXT4FS=y # CONFIG_TARGET_ROOTFS_SQUASHFS is not set +# CONFIG_SIGNED_PACKAGES is not set +CONFIG_IB=y +CONFIG_IB_STANDALONE=y CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_ipv6helper=y diff --git a/r4s.config.seed b/r4s.config.seed index 90951aa..2402fa5 100644 --- a/r4s.config.seed +++ b/r4s.config.seed @@ -8,6 +8,9 @@ CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -march=armv8-a+crypto+crc -mcpu=cortex-a72 CONFIG_TARGET_ROOTFS_PARTSIZE=400 CONFIG_TARGET_ROOTFS_EXT4FS=y # CONFIG_TARGET_ROOTFS_SQUASHFS is not set +# CONFIG_SIGNED_PACKAGES is not set +CONFIG_IB=y +CONFIG_IB_STANDALONE=y CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_ipv6helper=y