diff --git a/.github/workflows/r1s_lean.yml b/.github/workflows/r1s_lean.yml index b58a9c8..7c376a9 100644 --- a/.github/workflows/r1s_lean.yml +++ b/.github/workflows/r1s_lean.yml @@ -2,8 +2,7 @@ name: r1s Lean版openwrt on: push: - branches: - - master + branches: [ master ] paths: - '.github/workflows/r1s_lean.yml' schedule: @@ -26,26 +25,10 @@ jobs: - name: Initialization Environment env: DEBIAN_FRONTEND: noninteractive - run: | - sudo rm -rf /etc/apt/sources.list.d - sudo apt-get update - sudo apt-get -y --no-install-recommends install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch python3 unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler - curl https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | sed '/#/d' | sed 's/\\//g' | sed 's/exit 0//g' | sed 's/sudo apt -y install//g' | sed 's/sudo apt-get -y install//g' | sed 's/:i386//g' | xargs sudo apt-get -y --no-install-recommends install - docker rmi `docker images -q` - sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk /usr/local/share/boost /opt/ghc + run: . 1_initialization_environment.sh - - name: Install Repo - run: | - git clone https://github.com/friendlyarm/repo - sudo cp repo/repo /usr/bin/ - - - name: Init Source - run: | - mkdir friendlywrt-h5 - cd friendlywrt-h5 - repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h5.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle --depth=1 - repo sync -c --no-tags --no-clone-bundle -j8 - cd friendlywrt/ && git fetch --unshallow + - name: Clone Source + run: . 2_clone_rouce.sh master h5 - name: Mods run: | @@ -54,32 +37,19 @@ jobs: cat ../app_config.seed >> configs/config_h5 echo '# CONFIG_V2RAY_COMPRESS_UPX is not set' >> configs/config_h5 cd friendlywrt - git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" git remote add upstream https://github.com/coolsnowwolf/openwrt && git fetch upstream git checkout upstream/lede-17.01 -b tmp #git checkout 33f7cb735300bd9a099995236ed768c8925fec75 -- target/linux/sunxi/image/ git rm README.md git commit -m 'reset' - git checkout origin/master + git checkout master git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto tmp -X theirs rm -f target/linux/allwinner-h5/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch git checkout upstream/lede-17.01 -- feeds.conf.default sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default cd package/lean/ - git clone https://github.com/rufengsuixing/luci-app-adguardhome - #git clone https://github.com/jerrykuku/lua-maxminddb.git - #git clone https://github.com/jerrykuku/luci-app-vssr.git - #cd luci-app-vssr/root/etc/ - #echo 'china_ssr.txt - #config/black.list - #config/white.list - #dnsmasq.oversea/oversea_list.conf - #dnsmasq.ssr/ad.conf - #dnsmasq.ssr/gfw_base.conf - #dnsmasq.ssr/gfw_list.conf' | xargs rm - #cd ../../../ rm -rf luci-theme-argon - git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git + . ../../../../3_prepare_packages.sh cd ../../ git apply ../../enable_autocore.diff sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings @@ -90,55 +60,12 @@ jobs: echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner - name: Build FriendlyWrt - run: | - cd friendlywrt-h5 - cp configs/config_h5 friendlywrt/.config - cd friendlywrt - ./scripts/feeds update -a && ./scripts/feeds install -a - sed -i '/STAMP_BUILT/d' feeds/packages/utils/runc/Makefile feeds/packages/utils/containerd/Makefile #fix compile error - make defconfig && make download -j8 - make -s -j$(nproc) || make V=s -j1 + run: . 4_build_image.sh friendlywrt-h5 nanopi_r1s.mk - #- name: Patch Kernel - # run: | - # cd friendlywrt-h5 - # #cd kernel/ && git apply ../../add_fullconenat.diff && cd ../ - # git clone https://github.com/openwrt/openwrt - # cd openwrt/ - # git checkout 5387bc9cbb9ed205f08766523a296f21dfa83b56 - # rm target/linux/generic/backport-4.14/400-v4.16-leds-trigger-Introduce-a-NETDEV-trigger.patch - # rm target/linux/generic/pending-4.14/403-mtd-hook-mtdsplit-to-Kbuild.patch - # rm target/linux/generic/hack-4.14/700-swconfig_switch_drivers.patch - # ./scripts/patch-kernel.sh ../kernel target/linux/generic/backport-4.14 - # ./scripts/patch-kernel.sh ../kernel target/linux/generic/pending-4.14 - # ./scripts/patch-kernel.sh ../kernel target/linux/generic/hack-4.14 - # cd ../kernel && git checkout -- drivers/mtd/ && cd ../ - # find friendlywrt/ -type f -name .config.override -exec cp {} ../ \; - # grep -i 'FILTER_\|FLOW' ../.config.override > .config.override - # wget https://github.com/torvalds/linux/raw/master/scripts/kconfig/merge_config.sh && chmod +x merge_config.sh - # ./merge_config.sh -m .config.override kernel/arch/arm64/configs/sunxi_arm64_defconfig && mv .config kernel/arch/arm64/configs/sunxi_arm64_defconfig - - - name: Build SD img - run: | - cd friendlywrt-h5 - sed -i '130,150 {/build_friendlywrt/d}' scripts/build.sh - ./build.sh nanopi_r1s.mk - cd .. && sudo bash fix_ownership.sh - - - name: Zip Files - run: | - gzip friendlywrt-h5/out/*.img - name: Assemble Artifact id: assemble_artifact run: | - rm -rf ./artifact/ - mkdir -p ./artifact/ - mv friendlywrt-h5/out/*img* ./artifact/ - cp friendlywrt-h5/friendlywrt/.config ./artifact/ - cd ./artifact/ - md5sum *img* > md5sum.txt - cd .. - zip -r artifact.zip ./artifact/ + . x_assemble_artifact.sh release_tag="R1S-Lean-$(date +%Y-%m-%d)" echo "##[set-output name=release_tag;]$release_tag" - name: Create Release diff --git a/.github/workflows/r1s_lean_h3.yml b/.github/workflows/r1s_lean_h3.yml index a92bd4d..8f18822 100644 --- a/.github/workflows/r1s_lean_h3.yml +++ b/.github/workflows/r1s_lean_h3.yml @@ -2,8 +2,7 @@ name: r1s(H3) Lean版openwrt on: push: - branches: - - master + branches: [ master ] paths: - '.github/workflows/r1s_lean_h3.yml' schedule: @@ -26,26 +25,10 @@ jobs: - name: Initialization Environment env: DEBIAN_FRONTEND: noninteractive - run: | - sudo rm -rf /etc/apt/sources.list.d - sudo apt-get update - sudo apt-get -y --no-install-recommends install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch python3 unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler - curl https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | sed '/#/d' | sed 's/\\//g' | sed 's/exit 0//g' | sed 's/sudo apt -y install//g' | sed 's/sudo apt-get -y install//g' | sed 's/:i386//g' | xargs sudo apt-get -y --no-install-recommends install - docker rmi `docker images -q` - sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk /usr/local/share/boost /opt/ghc + run: . 1_initialization_environment.sh - - name: Install Repo - run: | - git clone https://github.com/friendlyarm/repo - sudo cp repo/repo /usr/bin/ - - - name: Init Source - run: | - mkdir friendlywrt-h3 - cd friendlywrt-h3 - repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master-v19.07.1 -m h3.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle --depth=1 - repo sync -c --no-tags --no-clone-bundle -j8 - cd friendlywrt/ && git fetch --unshallow + - name: Clone Source + run: . 2_clone_rouce.sh master-v19.07.1 h3 - name: Mods run: | @@ -56,7 +39,6 @@ jobs: cat ../app_config.seed >> configs/config_h3 echo '# CONFIG_V2RAY_COMPRESS_UPX is not set' >> configs/config_h3 cd friendlywrt - git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" git remote add upstream https://github.com/coolsnowwolf/openwrt && git fetch upstream git checkout upstream/lede-17.01 -b tmp #git checkout 33f7cb735300bd9a099995236ed768c8925fec75 -- target/linux/sunxi/image/ @@ -68,20 +50,8 @@ jobs: git checkout upstream/lede-17.01 -- feeds.conf.default sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default cd package/lean/ - git clone https://github.com/rufengsuixing/luci-app-adguardhome - #git clone https://github.com/jerrykuku/lua-maxminddb.git - #git clone https://github.com/jerrykuku/luci-app-vssr.git - #cd luci-app-vssr/root/etc/ - #echo 'china_ssr.txt - #config/black.list - #config/white.list - #dnsmasq.oversea/oversea_list.conf - #dnsmasq.ssr/ad.conf - #dnsmasq.ssr/gfw_base.conf - #dnsmasq.ssr/gfw_list.conf' | xargs rm - #cd ../../../ rm -rf luci-theme-argon - git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git + . ../../../../3_prepare_packages.sh cd ../../ git apply ../../enable_autocore.diff sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings @@ -92,42 +62,7 @@ jobs: echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner - name: Build FriendlyWrt - run: | - cd friendlywrt-h3 - cp configs/config_h3 friendlywrt/.config - cd friendlywrt - ./scripts/feeds update -a && ./scripts/feeds install -a - sed -i '/STAMP_BUILT/d' feeds/packages/utils/runc/Makefile feeds/packages/utils/containerd/Makefile #fix compile error - make defconfig && make download -j8 - make -s -j$(nproc) || make V=s -j1 - - #- name: Patch Kernel - # run: | - # cd friendlywrt-h5 - # #cd kernel/ && git apply ../../add_fullconenat.diff && cd ../ - # git clone https://github.com/openwrt/openwrt - # cd openwrt/ - # git checkout 5387bc9cbb9ed205f08766523a296f21dfa83b56 - # rm target/linux/generic/backport-4.14/400-v4.16-leds-trigger-Introduce-a-NETDEV-trigger.patch - # rm target/linux/generic/pending-4.14/403-mtd-hook-mtdsplit-to-Kbuild.patch - # rm target/linux/generic/hack-4.14/700-swconfig_switch_drivers.patch - # ./scripts/patch-kernel.sh ../kernel target/linux/generic/backport-4.14 - # ./scripts/patch-kernel.sh ../kernel target/linux/generic/pending-4.14 - # ./scripts/patch-kernel.sh ../kernel target/linux/generic/hack-4.14 - # cd ../kernel && git checkout -- drivers/mtd/ && cd ../ - # find friendlywrt/ -type f -name .config.override -exec cp {} ../ \; - # grep -i 'FILTER_\|FLOW' ../.config.override > .config.override - # wget https://github.com/torvalds/linux/raw/master/scripts/kconfig/merge_config.sh && chmod +x merge_config.sh - # ./merge_config.sh -m .config.override kernel/arch/arm64/configs/sunxi_arm64_defconfig && mv .config kernel/arch/arm64/configs/sunxi_arm64_defconfig - - - name: Build SD img - run: | - cd friendlywrt-h3 - sed -i '130,150 {/build_friendlywrt/d}' scripts/build.sh - echo -e '\nCONFIG_TCP_CONG_ADVANCED=y' >> kernel/arch/arm/configs/sunxi_defconfig - echo -e '\nCONFIG_TCP_CONG_BBR=m' >> kernel/arch/arm/configs/sunxi_defconfig - ./build.sh nanopi_r1s_h3.mk - cd .. && sudo bash fix_ownership.sh + run: . 4_build_image.sh friendlywrt-h3 nanopi_r1s_h3.mk - name: Zip Files run: | @@ -135,14 +70,7 @@ jobs: - name: Assemble Artifact id: assemble_artifact run: | - rm -rf ./artifact/ - mkdir -p ./artifact/ - mv friendlywrt-h3/out/*img* ./artifact/ - cp friendlywrt-h3/friendlywrt/.config ./artifact/ - cd ./artifact/ - md5sum *img* > md5sum.txt - cd .. - zip -r artifact.zip ./artifact/ + . x_assemble_artifact.sh release_tag="R1S-H3-$(date +%Y-%m-%d)" echo "##[set-output name=release_tag;]$release_tag" - name: Create Release diff --git a/.github/workflows/r2s_lean.yml b/.github/workflows/r2s_lean.yml index b89a25c..f053f37 100644 --- a/.github/workflows/r2s_lean.yml +++ b/.github/workflows/r2s_lean.yml @@ -28,7 +28,7 @@ jobs: run: . 1_initialization_environment.sh - name: Clone Source - run: . 2_clone_rouce.sh + run: . 2_clone_rouce.sh master-v19.07.1 rk3328 - name: Patch Kernel run: . patch_kernel_5.4.sh @@ -50,7 +50,6 @@ jobs: git checkout master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs rm -f target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch - sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh git checkout upstream/lede-17.01 -- feeds.conf.default sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default cd package/lean/ @@ -58,7 +57,6 @@ jobs: . ../../../../3_prepare_packages.sh cd ../../ git apply ../../enable_autocore.diff - #git apply ../../fix_cpufreq.diff sed -i 's/@LINUX_5_4//' package/lean/luci-app-flowoffload/Makefile sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings @@ -70,11 +68,7 @@ jobs: echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner - name: Build FriendlyWrt - run: | - cd friendlywrt-rk3328 - sed -i 's/set -eu/set -u/' scripts/mk-friendlywrt.sh - ./build.sh nanopi_r2s.mk - cd .. && sudo bash fix_ownership.sh + run: . 4_build_image.sh friendlywrt-rk3328 nanopi_r2s.mk - name: Assemble Artifact id: assemble_artifact diff --git a/.github/workflows/r2s_lean_minimal-dev.yml b/.github/workflows/r2s_lean_minimal-dev.yml index 8d42688..d033626 100644 --- a/.github/workflows/r2s_lean_minimal-dev.yml +++ b/.github/workflows/r2s_lean_minimal-dev.yml @@ -28,7 +28,7 @@ jobs: run: . 1_initialization_environment.sh - name: Clone Source - run: . 2_clone_rouce.sh + run: . 2_clone_rouce.sh master-v19.07.1 rk3328 - name: Patch Kernel run: . patch_kernel_5.4-test.sh @@ -49,7 +49,6 @@ jobs: git checkout master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs rm -f target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch - sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh git checkout upstream/openwrt-19.07 -- feeds.conf.default cd package/ctcgfw/ rm -rf luci-app-oled/ && git clone https://github.com/NateLol/luci-app-oled @@ -72,11 +71,7 @@ jobs: chmod +x clash - name: Build FriendlyWrt - run: | - cd friendlywrt-rk3328 - sed -i 's/set -eu/set -u/' scripts/mk-friendlywrt.sh - ./build.sh nanopi_r2s.mk - cd .. && sudo bash fix_ownership.sh + run: . 4_build_image.sh friendlywrt-rk3328 nanopi_r2s.mk - name: Assemble Artifact id: assemble_artifact diff --git a/.github/workflows/r2s_lean_minimal.yml b/.github/workflows/r2s_lean_minimal.yml index faf2330..08caadc 100644 --- a/.github/workflows/r2s_lean_minimal.yml +++ b/.github/workflows/r2s_lean_minimal.yml @@ -28,7 +28,7 @@ jobs: run: . 1_initialization_environment.sh - name: Clone Source - run: . 2_clone_rouce.sh + run: . 2_clone_rouce.sh master-v19.07.1 rk3328 - name: Patch Kernel run: . patch_kernel_5.4.sh @@ -44,14 +44,12 @@ jobs: cd friendlywrt git remote add upstream https://github.com/coolsnowwolf/openwrt && git fetch upstream git checkout upstream/lede-17.01 -b tmp - git mv README.md README + git rm README.md git commit -m 'reset' git checkout master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs rm -f target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch - sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh - git checkout upstream/lede-17.01 -- feeds.conf.default - sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default + git checkout upstream/lede-17.01 -- feeds.conf.default && sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default cd package/lean/ rm -rf luci-theme-argon . ../../../../3_prepare_packages.sh @@ -74,11 +72,7 @@ jobs: run: . add_passwall.sh - name: Build FriendlyWrt - run: | - cd friendlywrt-rk3328 - sed -i 's/set -eu/set -u/' scripts/mk-friendlywrt.sh - ./build.sh nanopi_r2s.mk - cd .. && sudo bash fix_ownership.sh + run: . 4_build_image.sh friendlywrt-rk3328 nanopi_r2s.mk - name: Assemble Artifact id: assemble_artifact diff --git a/2_clone_rouce.sh b/2_clone_rouce.sh index 397aa50..22c2fc6 100644 --- a/2_clone_rouce.sh +++ b/2_clone_rouce.sh @@ -1,8 +1,8 @@ git clone https://github.com/friendlyarm/repo sudo cp repo/repo /usr/bin/ -mkdir friendlywrt-rk3328 -cd friendlywrt-rk3328 -repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master-v19.07.1 -m rk3328.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle --depth=1 +mkdir friendlywrt-$2 +cd friendlywrt-$2 +repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b $1 -m $2.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle --depth=1 repo sync -c --no-tags --no-clone-bundle -j8 cd friendlywrt/ && git fetch --unshallow git checkout `git branch -va | grep remotes/m | awk '{print $3}' | awk -F\/ '{print $2}'` diff --git a/3_prepare_packages.sh b/3_prepare_packages.sh index de987c6..26aed33 100644 --- a/3_prepare_packages.sh +++ b/3_prepare_packages.sh @@ -1,5 +1,19 @@ -git clone https://github.com/NateLol/luci-app-oled +if [[ `pwd` == *"r2s"* ]]; then + git clone https://github.com/NateLol/luci-app-oled +fi git clone https://github.com/destan19/OpenAppFilter.git git clone https://github.com/rufengsuixing/luci-app-adguardhome git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git git clone https://github.com/xiaoqingfengATGH/luci-theme-infinityfreedom + +#git clone https://github.com/jerrykuku/lua-maxminddb.git +#git clone https://github.com/jerrykuku/luci-app-vssr.git +#cd luci-app-vssr/root/etc/ +#echo 'china_ssr.txt +#config/black.list +#config/white.list +#dnsmasq.oversea/oversea_list.conf +#dnsmasq.ssr/ad.conf +#dnsmasq.ssr/gfw_base.conf +#dnsmasq.ssr/gfw_list.conf' | xargs rm +#cd ../../../ diff --git a/4_build_image.sh b/4_build_image.sh new file mode 100644 index 0000000..b87437e --- /dev/null +++ b/4_build_image.sh @@ -0,0 +1,14 @@ +cd $1 +cd friendlywrt +./scripts/feeds update -a && ./scripts/feeds install -a +sed -i '/STAMP_BUILT/d' feeds/packages/utils/runc/Makefile feeds/packages/utils/containerd/Makefile #fix compile error +cd .. +echo -e '\nCONFIG_TCP_CONG_ADVANCED=y' >> kernel/arch/arm/configs/sunxi_defconfig +echo -e '\nCONFIG_TCP_CONG_BBR=m' >> kernel/arch/arm/configs/sunxi_defconfig +sed -i 's/set -eu/set -u/' scripts/mk-friendlywrt.sh +./build.sh $2 +LOOP_DEVICE=$(losetup -f) +losetup -o 100663296 ${LOOP_DEVICE} friendlywrt-*/out/*.img +rm -rf /mnt/friendlywrt-tmp && mkdir -p /mnt/friendlywrt-tmp +mount ${LOOP_DEVICE} /mnt/friendlywrt-tmp && chown -R root:root /mnt/friendlywrt-tmp && umount /mnt/friendlywrt-tmp +losetup -d ${LOOP_DEVICE} diff --git a/fix_ownership.sh b/fix_ownership.sh index 52812fc..e665c62 100644 --- a/fix_ownership.sh +++ b/fix_ownership.sh @@ -3,4 +3,3 @@ losetup -o 100663296 ${LOOP_DEVICE} friendlywrt-*/out/*.img rm -rf /mnt/friendlywrt-tmp && mkdir -p /mnt/friendlywrt-tmp mount ${LOOP_DEVICE} /mnt/friendlywrt-tmp && chown -R root:root /mnt/friendlywrt-tmp && umount /mnt/friendlywrt-tmp losetup -d ${LOOP_DEVICE} -