From e2b0b0675aaca190fe02d38aba3c058f7bb46b6d Mon Sep 17 00:00:00 2001 From: DHDAXCW Date: Wed, 8 Nov 2023 01:15:44 +0000 Subject: [PATCH] fix? --- .github/workflows/beggar.yml | 72 +++++++---------- .github/workflows/docker.yml | 80 ++++++++----------- .github/workflows/full.yml | 3 + .github/workflows/slim.yml | 78 +++++++----------- ...{lean_beggar.config => lean-beggar.config} | 40 +++++++--- ...{lean_docker.config => lean-docker.config} | 34 ++++---- .../{lean_stable.config => lean-slim.config} | 60 +++++++------- scripts/lean.sh | 1 - 8 files changed, 171 insertions(+), 197 deletions(-) rename configs/lean/{lean_beggar.config => lean-beggar.config} (90%) rename configs/lean/{lean_docker.config => lean-docker.config} (94%) rename configs/lean/{lean_stable.config => lean-slim.config} (87%) diff --git a/.github/workflows/beggar.yml b/.github/workflows/beggar.yml index e05b124e..cd16d8e7 100644 --- a/.github/workflows/beggar.yml +++ b/.github/workflows/beggar.yml @@ -6,7 +6,7 @@ # Blog: https://p3terx.com #================================================= -name: NanoPi-R4S-乞丐 +name: GL.iNet_GL-MT6000_lede-乞丐版 on: repository_dispatch: @@ -17,9 +17,9 @@ on: # types: started env: - REPO_URL: https://github.com/DHDAXCW/lede-rockchip - REPO_BRANCH: stable - CONFIG_FILE: configs/lean/lean_beggar.config + REPO_URL: git@github.com:DHDAXCW/GL.iNet_GL-MT6000.git + REPO_BRANCH: master + CONFIG_FILE: configs/lean/lean-beggar.config DIY_SH: scripts/lean.sh KMODS_IN_FIRMWARE: true UPLOAD_RELEASE: true @@ -40,6 +40,19 @@ jobs: - name: Checkout uses: actions/checkout@v3 + - name: Initialization Environment + env: + DEBIAN_FRONTEND: noninteractive + run: | + echo -e "Total CPU cores\t: $(nproc)" + cat /proc/cpuinfo | grep 'model name' + free -h + uname -a + [ -f /proc/version ] && cat /proc/version + [ -f /etc/issue.net ] && cat /etc/issue.net + [ -f /etc/issue ] && cat /etc/issue + ulimit -a + - name: Clone Source Code run: | df -hT $PWD @@ -53,11 +66,11 @@ jobs: echo "OPENWRTROOT=$PWD" >> $GITHUB_ENV echo "OPENWRTROOT=$PWD" >> $GITHUB_OUTPUT mkdir customfeeds - git clone --depth=1 https://github.com/DHDAXCW/packages customfeeds/packages - git clone --depth=1 https://github.com/DHDAXCW/luci customfeeds/luci + git clone --depth=1 https://github.com/coolsnowwolf/packages customfeeds/packages + git clone --depth=1 https://github.com/coolsnowwolf/luci customfeeds/luci chmod +x ../scripts/*.sh ../scripts/hook-feeds.sh - + - name: Install Feeds run: | cd $OPENWRTROOT @@ -114,42 +127,17 @@ jobs: if: steps.compile.outputs.COMPILE_STATUS == 'success' id: generate run: | - cd configs/opkg - sed -i "s/subtarget/$SUBTARGET/g" distfeeds*.conf - sed -i "s/target\//$TARGET\//g" distfeeds*.conf - sed -i "s/platform/$PLATFORM/g" distfeeds*.conf cd $OPENWRTROOT - mkdir -p files/etc/uci-defaults/ - cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings - mkdir -p files/etc/opkg - cp ../configs/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server - mkdir -p files/etc/opkg/keys - cp ../configs/opkg/1035ac73cc4e59e3 files/etc/opkg/keys/1035ac73cc4e59e3 - if "$KMODS_IN_FIRMWARE" = 'true' - then - mkdir -p files/www/snapshots - cp -r bin/targets files/www/snapshots - cp ../configs/opkg/distfeeds-18.06-local.conf files/etc/opkg/distfeeds.conf - else - cp ../configs/opkg/distfeeds-18.06-remote.conf files/etc/opkg/distfeeds.conf - fi - cp files/etc/opkg/distfeeds.conf.server files/etc/opkg/distfeeds.conf.mirror - sed -i "s/http:\/\/192.168.123.100:2345\/snapshots/https:\/\/openwrt.cc\/snapshots\/$(date +"%Y-%m-%d")\/lean/g" files/etc/opkg/distfeeds.conf.mirror make package/install -j$(nproc) || make package/install -j1 V=s make target/install -j$(nproc) || make target/install -j1 V=s - pushd bin/targets/rockchip/armv8 - #rm -rf **ext4** - rm -rf openwrt-rockchip-armv8.manifest - rm -rf openwrt-rockchip-armv8-rootfs.tar.gz - rm -rf config.buildinfo - rm -rf packages-server.zip - mv openwrt-rockchip-armv8-friendlyarm_nanopi-r4s-ext4-sysupgrade.img.gz beggar-friendlyarm_nanopi-r4s-ext4-sysupgrade.img.gz - mv openwrt-rockchip-armv8-friendlyarm_nanopi-r4se-ext4-sysupgrade.img.gz beggar-friendlyarm_nanopi-r4se-ext4-sysupgrade.img.gz - mv openwrt-rockchip-armv8-friendlyarm_nanopi-r4s-squashfs-sysupgrade.img.gz beggar-friendlyarm_nanopi-r4s-squashfs-sysupgrade.img.gz - mv openwrt-rockchip-armv8-friendlyarm_nanopi-r4se-squashfs-sysupgrade.img.gz beggar-friendlyarm_nanopi-r4se-squashfs-sysupgrade.img.gz + pushd bin/targets/mediatek/filogic + rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000-preloader.bin + rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000.manifest + rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000-initramfs-kernel.bin + rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000-bl31-uboot.fip + mv openwrt-mediatek-filogic-glinet_gl-mt6000-squashfs-sysupgrade.bin $(date +"%Y.%m.%d")-beggar-openwrt-mediatek-filogic-glinet_gl-mt6000-squashfs-sysupgrade.bin popd make checksum - mv bin/targets/rockchip/armv8/sha256sums bin/targets/rockchip/armv8/beggar-sha256sums echo "GENERATE_STATUS=success" >> $GITHUB_OUTPUT - name: Generate release tag @@ -159,11 +147,7 @@ jobs: echo "release_tag=$(date +"%Y.%m.%d")-Lean1" >> $GITHUB_OUTPUT echo "release_date=$(date +"%Y.%m.%d")" >> $GITHUB_OUTPUT touch release.txt - echo "后台地址：192.168.11.1 - full = 全插件 - docker = 带docker - slim = 精简版 - beggar = 乞丐版" >> release.txt + echo "后台地址：192.168.11.1" echo "status=success" >> $GITHUB_OUTPUT - name: Upload firmware to release @@ -172,7 +156,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - name: ${{ steps.tag.outputs.release_date }} NanoPi-R4S-R4SE-linux.5.4_固件下载 + name: ${{ steps.tag.outputs.release_date }} GL.iNet_GL-MT6000_lede.linux_5.15_固件下载 tag_name: ${{ steps.tag.outputs.release_tag }} body_path: release.txt files: ${{ env.FIRMWARE }}/* diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ef77d7f5..3cbc9ad4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -6,7 +6,7 @@ # Blog: https://p3terx.com #================================================= -name: NanoPi-R4S-容器 +name: GL.iNet_GL-MT6000_lede-容器版 on: repository_dispatch: @@ -17,9 +17,9 @@ on: # types: started env: - REPO_URL: https://github.com/DHDAXCW/lede-rockchip - REPO_BRANCH: stable - CONFIG_FILE: configs/lean/lean_docker.config + REPO_URL: git@github.com:DHDAXCW/GL.iNet_GL-MT6000.git + REPO_BRANCH: master + CONFIG_FILE: configs/lean/lean-docker.config DIY_SH: scripts/lean.sh KMODS_IN_FIRMWARE: true UPLOAD_RELEASE: true @@ -40,6 +40,19 @@ jobs: - name: Checkout uses: actions/checkout@v3 + - name: Initialization Environment + env: + DEBIAN_FRONTEND: noninteractive + run: | + echo -e "Total CPU cores\t: $(nproc)" + cat /proc/cpuinfo | grep 'model name' + free -h + uname -a + [ -f /proc/version ] && cat /proc/version + [ -f /etc/issue.net ] && cat /etc/issue.net + [ -f /etc/issue ] && cat /etc/issue + ulimit -a + - name: Clone Source Code run: | df -hT $PWD @@ -53,15 +66,16 @@ jobs: echo "OPENWRTROOT=$PWD" >> $GITHUB_ENV echo "OPENWRTROOT=$PWD" >> $GITHUB_OUTPUT mkdir customfeeds - git clone --depth=1 https://github.com/DHDAXCW/packages customfeeds/packages - git clone --depth=1 https://github.com/DHDAXCW/luci customfeeds/luci + git clone --depth=1 https://github.com/coolsnowwolf/packages customfeeds/packages + git clone --depth=1 https://github.com/coolsnowwolf/luci customfeeds/luci chmod +x ../scripts/*.sh ../scripts/hook-feeds.sh - + - name: Install Feeds run: | cd $OPENWRTROOT ./scripts/feeds install -a + - name: Load Custom Configuration run: | [ -e files ] && mv files $OPENWRTROOT/files @@ -72,7 +86,7 @@ jobs: ../scripts/preset-clash-core.sh arm64 ../scripts/preset-terminal-tools.sh make defconfig - + - name: Download Package id: package run: | @@ -108,48 +122,23 @@ jobs: echo "FIRMWARE=$PWD" >> $GITHUB_ENV echo "FIRMWARE=$PWD" >> $GITHUB_OUTPUT echo "COMPILE_STATUS=success" >> $GITHUB_OUTPUT - + - name: Generate Firmware if: steps.compile.outputs.COMPILE_STATUS == 'success' id: generate run: | - cd configs/opkg - sed -i "s/subtarget/$SUBTARGET/g" distfeeds*.conf - sed -i "s/target\//$TARGET\//g" distfeeds*.conf - sed -i "s/platform/$PLATFORM/g" distfeeds*.conf cd $OPENWRTROOT - mkdir -p files/etc/uci-defaults/ - cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings - mkdir -p files/etc/opkg - cp ../configs/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server - mkdir -p files/etc/opkg/keys - cp ../configs/opkg/1035ac73cc4e59e3 files/etc/opkg/keys/1035ac73cc4e59e3 - if "$KMODS_IN_FIRMWARE" = 'true' - then - mkdir -p files/www/snapshots - cp -r bin/targets files/www/snapshots - cp ../configs/opkg/distfeeds-18.06-local.conf files/etc/opkg/distfeeds.conf - else - cp ../configs/opkg/distfeeds-18.06-remote.conf files/etc/opkg/distfeeds.conf - fi - cp files/etc/opkg/distfeeds.conf.server files/etc/opkg/distfeeds.conf.mirror - sed -i "s/http:\/\/192.168.123.100:2345\/snapshots/https:\/\/openwrt.cc\/snapshots\/$(date +"%Y-%m-%d")\/lean/g" files/etc/opkg/distfeeds.conf.mirror make package/install -j$(nproc) || make package/install -j1 V=s make target/install -j$(nproc) || make target/install -j1 V=s - pushd bin/targets/rockchip/armv8 - #rm -rf **ext4** - rm -rf openwrt-rockchip-armv8.manifest - rm -rf openwrt-rockchip-armv8-rootfs.tar.gz - rm -rf config.buildinfo - rm -rf packages-server.zip - mv openwrt-rockchip-armv8-friendlyarm_nanopi-r4s-ext4-sysupgrade.img.gz docker-friendlyarm_nanopi-r4s-ext4-sysupgrade.img.gz - mv openwrt-rockchip-armv8-friendlyarm_nanopi-r4se-ext4-sysupgrade.img.gz docker-friendlyarm_nanopi-r4se-ext4-sysupgrade.img.gz - mv openwrt-rockchip-armv8-friendlyarm_nanopi-r4s-squashfs-sysupgrade.img.gz docker-friendlyarm_nanopi-r4s-squashfs-sysupgrade.img.gz - mv openwrt-rockchip-armv8-friendlyarm_nanopi-r4se-squashfs-sysupgrade.img.gz docker-friendlyarm_nanopi-r4se-squashfs-sysupgrade.img.gz + pushd bin/targets/mediatek/filogic + rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000-preloader.bin + rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000.manifest + rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000-initramfs-kernel.bin + rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000-bl31-uboot.fip + mv openwrt-mediatek-filogic-glinet_gl-mt6000-squashfs-sysupgrade.bin $(date +"%Y.%m.%d")-docker-openwrt-mediatek-filogic-glinet_gl-mt6000-squashfs-sysupgrade.bin popd make checksum - mv bin/targets/rockchip/armv8/sha256sums bin/targets/rockchip/armv8/docker-sha256sums - echo "GENERATE_STATUS=success" >> $GITHUB_OUTPUT + echo "GENERATE_STATUS=success" >> $GITHUB_OUTPUT - name: Generate release tag id: tag @@ -158,11 +147,7 @@ jobs: echo "release_tag=$(date +"%Y.%m.%d")-Lean1" >> $GITHUB_OUTPUT echo "release_date=$(date +"%Y.%m.%d")" >> $GITHUB_OUTPUT touch release.txt - echo "后台地址：192.168.11.1 - full = 全插件 - docker = 带docker - slim = 精简版 - beggar = 乞丐版" >> release.txt + echo "后台地址：192.168.11.1" echo "status=success" >> $GITHUB_OUTPUT - name: Upload firmware to release @@ -171,7 +156,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - name: ${{ steps.tag.outputs.release_date }} NanoPi-R4S-R4SE-linux.5.4_固件下载 + name: ${{ steps.tag.outputs.release_date }} GL.iNet_GL-MT6000_lede.linux_5.15_固件下载 tag_name: ${{ steps.tag.outputs.release_tag }} body_path: release.txt files: ${{ env.FIRMWARE }}/* @@ -196,4 +181,3 @@ jobs: with: name: | bin-archive - diff --git a/.github/workflows/full.yml b/.github/workflows/full.yml index 7eef211a..d8d38ef1 100644 --- a/.github/workflows/full.yml +++ b/.github/workflows/full.yml @@ -133,6 +133,9 @@ jobs: pushd bin/targets/mediatek/filogic rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000-preloader.bin rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000.manifest + rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000-initramfs-kernel.bin + rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000-bl31-uboot.fip + mv openwrt-mediatek-filogic-glinet_gl-mt6000-squashfs-sysupgrade.bin $(date +"%Y.%m.%d")-full-openwrt-mediatek-filogic-glinet_gl-mt6000-squashfs-sysupgrade.bin popd make checksum echo "GENERATE_STATUS=success" >> $GITHUB_OUTPUT diff --git a/.github/workflows/slim.yml b/.github/workflows/slim.yml index ddf2e3d9..38f4f321 100644 --- a/.github/workflows/slim.yml +++ b/.github/workflows/slim.yml @@ -6,7 +6,7 @@ # Blog: https://p3terx.com #================================================= -name: NanoPi-R4S-精简 +name: GL.iNet_GL-MT6000_lede-精简版 on: repository_dispatch: @@ -17,9 +17,9 @@ on: # types: started env: - REPO_URL: https://github.com/DHDAXCW/lede-rockchip - REPO_BRANCH: stable - CONFIG_FILE: configs/lean/lean_stable.config + REPO_URL: git@github.com:DHDAXCW/GL.iNet_GL-MT6000.git + REPO_BRANCH: master + CONFIG_FILE: configs/lean/lean-slim.config DIY_SH: scripts/lean.sh KMODS_IN_FIRMWARE: true UPLOAD_RELEASE: true @@ -40,6 +40,19 @@ jobs: - name: Checkout uses: actions/checkout@v3 + - name: Initialization Environment + env: + DEBIAN_FRONTEND: noninteractive + run: | + echo -e "Total CPU cores\t: $(nproc)" + cat /proc/cpuinfo | grep 'model name' + free -h + uname -a + [ -f /proc/version ] && cat /proc/version + [ -f /etc/issue.net ] && cat /etc/issue.net + [ -f /etc/issue ] && cat /etc/issue + ulimit -a + - name: Clone Source Code run: | df -hT $PWD @@ -53,16 +66,16 @@ jobs: echo "OPENWRTROOT=$PWD" >> $GITHUB_ENV echo "OPENWRTROOT=$PWD" >> $GITHUB_OUTPUT mkdir customfeeds - git clone --depth=1 https://github.com/DHDAXCW/packages customfeeds/packages - git clone --depth=1 https://github.com/DHDAXCW/luci customfeeds/luci + git clone --depth=1 https://github.com/coolsnowwolf/packages customfeeds/packages + git clone --depth=1 https://github.com/coolsnowwolf/luci customfeeds/luci chmod +x ../scripts/*.sh ../scripts/hook-feeds.sh - + - name: Install Feeds run: | cd $OPENWRTROOT ./scripts/feeds install -a - + - name: Load Custom Configuration run: | [ -e files ] && mv files $OPENWRTROOT/files @@ -73,6 +86,7 @@ jobs: ../scripts/preset-clash-core.sh arm64 ../scripts/preset-terminal-tools.sh make defconfig + - name: Download Package id: package run: | @@ -108,47 +122,22 @@ jobs: echo "FIRMWARE=$PWD" >> $GITHUB_ENV echo "FIRMWARE=$PWD" >> $GITHUB_OUTPUT echo "COMPILE_STATUS=success" >> $GITHUB_OUTPUT - + - name: Generate Firmware if: steps.compile.outputs.COMPILE_STATUS == 'success' id: generate run: | - cd configs/opkg - sed -i "s/subtarget/$SUBTARGET/g" distfeeds*.conf - sed -i "s/target\//$TARGET\//g" distfeeds*.conf - sed -i "s/platform/$PLATFORM/g" distfeeds*.conf cd $OPENWRTROOT - mkdir -p files/etc/uci-defaults/ - cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings - mkdir -p files/etc/opkg - cp ../configs/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server - mkdir -p files/etc/opkg/keys - cp ../configs/opkg/1035ac73cc4e59e3 files/etc/opkg/keys/1035ac73cc4e59e3 - if "$KMODS_IN_FIRMWARE" = 'true' - then - mkdir -p files/www/snapshots - cp -r bin/targets files/www/snapshots - cp ../configs/opkg/distfeeds-18.06-local.conf files/etc/opkg/distfeeds.conf - else - cp ../configs/opkg/distfeeds-18.06-remote.conf files/etc/opkg/distfeeds.conf - fi - cp files/etc/opkg/distfeeds.conf.server files/etc/opkg/distfeeds.conf.mirror - sed -i "s/http:\/\/192.168.123.100:2345\/snapshots/https:\/\/openwrt.cc\/snapshots\/$(date +"%Y-%m-%d")\/lean/g" files/etc/opkg/distfeeds.conf.mirror make package/install -j$(nproc) || make package/install -j1 V=s make target/install -j$(nproc) || make target/install -j1 V=s - pushd bin/targets/rockchip/armv8 - #rm -rf **ext4** - rm -rf openwrt-rockchip-armv8.manifest - rm -rf openwrt-rockchip-armv8-rootfs.tar.gz - rm -rf config.buildinfo - rm -rf packages-server.zip - mv openwrt-rockchip-armv8-friendlyarm_nanopi-r4s-ext4-sysupgrade.img.gz slim-friendlyarm_nanopi-r4s-ext4-sysupgrade.img.gz - mv openwrt-rockchip-armv8-friendlyarm_nanopi-r4se-ext4-sysupgrade.img.gz slim-friendlyarm_nanopi-r4se-ext4-sysupgrade.img.gz - mv openwrt-rockchip-armv8-friendlyarm_nanopi-r4s-squashfs-sysupgrade.img.gz slim-friendlyarm_nanopi-r4s-squashfs-sysupgrade.img.gz - mv openwrt-rockchip-armv8-friendlyarm_nanopi-r4se-squashfs-sysupgrade.img.gz slim-friendlyarm_nanopi-r4se-squashfs-sysupgrade.img.gz + pushd bin/targets/mediatek/filogic + rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000-preloader.bin + rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000.manifest + rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000-initramfs-kernel.bin + rm -rf openwrt-mediatek-filogic-glinet_gl-mt6000-bl31-uboot.fip + mv openwrt-mediatek-filogic-glinet_gl-mt6000-squashfs-sysupgrade.bin $(date +"%Y.%m.%d")-slim-openwrt-mediatek-filogic-glinet_gl-mt6000-squashfs-sysupgrade.bin popd make checksum - mv bin/targets/rockchip/armv8/sha256sums bin/targets/rockchip/armv8/slim-sha256sums echo "GENERATE_STATUS=success" >> $GITHUB_OUTPUT - name: Generate release tag @@ -158,11 +147,7 @@ jobs: echo "release_tag=$(date +"%Y.%m.%d")-Lean1" >> $GITHUB_OUTPUT echo "release_date=$(date +"%Y.%m.%d")" >> $GITHUB_OUTPUT touch release.txt - echo "后台地址：192.168.11.1 - full = 全插件 - docker = 带docker - slim = 精简版 - beggar = 乞丐版" >> release.txt + echo "后台地址：192.168.11.1" echo "status=success" >> $GITHUB_OUTPUT - name: Upload firmware to release @@ -171,7 +156,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - name: ${{ steps.tag.outputs.release_date }} NanoPi-R4S-R4SE-linux.5.4_固件下载 + name: ${{ steps.tag.outputs.release_date }} GL.iNet_GL-MT6000_lede.linux_5.15_固件下载 tag_name: ${{ steps.tag.outputs.release_tag }} body_path: release.txt files: ${{ env.FIRMWARE }}/* @@ -196,4 +181,3 @@ jobs: with: name: | bin-archive - diff --git a/configs/lean/lean_beggar.config b/configs/lean/lean-beggar.config similarity index 90% rename from configs/lean/lean_beggar.config rename to configs/lean/lean-beggar.config index 5ba98515..a7d98931 100644 --- a/configs/lean/lean_beggar.config +++ b/configs/lean/lean-beggar.config @@ -1,16 +1,33 @@ -CONFIG_TARGET_rockchip=y -CONFIG_TARGET_rockchip_armv8=y -CONFIG_TARGET_MULTI_PROFILE=y -CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4s=y -CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4se=y +CONFIG_MODULES=y +CONFIG_HAVE_DOT_CONFIG=y +CONFIG_HOST_OS_LINUX=y +CONFIG_TARGET_mediatek=y +CONFIG_TARGET_mediatek_filogic=y +CONFIG_TARGET_mediatek_filogic_DEVICE_glinet_gl-mt6000=y +CONFIG_HAS_SUBTARGETS=y +CONFIG_HAS_DEVICES=y +CONFIG_TARGET_BOARD="mediatek" +CONFIG_TARGET_SUBTARGET="filogic" +CONFIG_TARGET_PROFILE="DEVICE_glinet_gl-mt6000" +CONFIG_TARGET_ARCH_PACKAGES="aarch64_cortex-a53" +CONFIG_DEFAULT_TARGET_OPTIMIZATION="-Os -pipe -mcpu=cortex-a53" +CONFIG_CPU_TYPE="cortex-a53" CONFIG_TARGET_ROOTFS_PARTSIZE=1024 -CONFIG_TARGET_ROOTFS_TARGZ=y -CONFIG_TARGET_ROOTFS_EXT4FS=y -CONFIG_TARGET_ROOTFS_SQUASHFS=y +CONFIG_PACKAGE_diffutils=y CONFIG_PACKAGE_python3=y +CONFIG_PACKAGE_kmod-libphy=y CONFIG_PACKAGE_kmod-fuse=y +CONFIG_BUSYBOX_CUSTOM=y +CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG_INFO=y +CONFIG_PACKAGE_htop=y +CONFIG_PACKAGE_autocore=y +CONFIG_PACKAGE_autocore-arm=y +CONFIG_PACKAGE_automount=y +CONFIG_PACKAGE_ipv6helper=y +CONFIG_PACKAGE_ipt2socks=y + CONFIG_PACKAGE_kmod-fs-f2fs=y CONFIG_PACKAGE_kmod-fs-nfs=y CONFIG_PACKAGE_kmod-fs-nfs-common=y @@ -54,12 +71,11 @@ CONFIG_PACKAGE_kmod-usb3=y CONFIG_PACKAGE_kmod-lib80211=y CONFIG_PACKAGE_kmod-libertas-usb=y CONFIG_PACKAGE_kmod-mac80211=y -CONFIG_PACKAGE_kmod-rtl88x2bu=y -CONFIG_PACKAGE_kmod-rtl8821cu=y -CONFIG_PACKAGE_kmod-rtlwifi=y -CONFIG_PACKAGE_kmod-rtlwifi-usb=y +CONFIG_DEFAULT_kmod-mt7915e=y +CONFIG_DEFAULT_kmod-mt7986-firmware=y CONFIG_PACKAGE_kmod-usb-net-asix-ax88179=y + CONFIG_PACKAGE_kmod-fuse=y CONFIG_PACKAGE_luci-app-mia=n CONFIG_PACKAGE_luci-app-xlnetacc=n diff --git a/configs/lean/lean_docker.config b/configs/lean/lean-docker.config similarity index 94% rename from configs/lean/lean_docker.config rename to configs/lean/lean-docker.config index d314118c..46d12914 100644 --- a/configs/lean/lean_docker.config +++ b/configs/lean/lean-docker.config @@ -1,15 +1,20 @@ -CONFIG_TARGET_rockchip=y -CONFIG_TARGET_rockchip_armv8=y -CONFIG_TARGET_MULTI_PROFILE=y -CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4s=y -CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4se=y +CONFIG_MODULES=y +CONFIG_HAVE_DOT_CONFIG=y +CONFIG_HOST_OS_LINUX=y +CONFIG_TARGET_mediatek=y +CONFIG_TARGET_mediatek_filogic=y +CONFIG_TARGET_mediatek_filogic_DEVICE_glinet_gl-mt6000=y +CONFIG_HAS_SUBTARGETS=y +CONFIG_HAS_DEVICES=y +CONFIG_TARGET_BOARD="mediatek" +CONFIG_TARGET_SUBTARGET="filogic" +CONFIG_TARGET_PROFILE="DEVICE_glinet_gl-mt6000" +CONFIG_TARGET_ARCH_PACKAGES="aarch64_cortex-a53" +CONFIG_DEFAULT_TARGET_OPTIMIZATION="-Os -pipe -mcpu=cortex-a53" +CONFIG_CPU_TYPE="cortex-a53" -CONFIG_TARGET_PER_DEVICE_ROOTFS=y -CONFIG_TARGET_ROOTFS_PARTSIZE=2048 -CONFIG_TARGET_ROOTFS_TARGZ=y -CONFIG_TARGET_ROOTFS_EXT4FS=y -CONFIG_TARGET_EXT4_JOURNAL=y -CONFIG_TARGET_ROOTFS_SQUASHFS=y +CONFIG_TARGET_ROOTFS_PARTSIZE=1024 +CONFIG_PACKAGE_diffutils=y CONFIG_PACKAGE_python3=y CONFIG_PACKAGE_kmod-libphy=y @@ -22,7 +27,6 @@ CONFIG_PACKAGE_autocore-arm=y CONFIG_PACKAGE_automount=y CONFIG_PACKAGE_ipv6helper=y CONFIG_PACKAGE_ipt2socks=y -CONFIG_PACKAGE_usbmuxd=y CONFIG_PACKAGE_kmod-fs-f2fs=y CONFIG_PACKAGE_kmod-fs-nfs=y @@ -67,10 +71,8 @@ CONFIG_PACKAGE_kmod-usb3=y CONFIG_PACKAGE_kmod-lib80211=y CONFIG_PACKAGE_kmod-libertas-usb=y CONFIG_PACKAGE_kmod-mac80211=y -CONFIG_PACKAGE_kmod-rtl8821cu=y -CONFIG_PACKAGE_kmod-rtl88x2bu=y -CONFIG_PACKAGE_kmod-rtlwifi=y -CONFIG_PACKAGE_kmod-rtlwifi-usb=y +CONFIG_DEFAULT_kmod-mt7915e=y +CONFIG_DEFAULT_kmod-mt7986-firmware=y CONFIG_PACKAGE_kmod-usb-net-asix-ax88179=y # gpu diff --git a/configs/lean/lean_stable.config b/configs/lean/lean-slim.config similarity index 87% rename from configs/lean/lean_stable.config rename to configs/lean/lean-slim.config index c718aeb6..8659e16b 100644 --- a/configs/lean/lean_stable.config +++ b/configs/lean/lean-slim.config @@ -1,19 +1,24 @@ -CONFIG_TARGET_rockchip=y -CONFIG_TARGET_rockchip_armv8=y -CONFIG_TARGET_MULTI_PROFILE=y -CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4s=y -CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4se=y +CONFIG_MODULES=y +CONFIG_HAVE_DOT_CONFIG=y +CONFIG_HOST_OS_LINUX=y +CONFIG_TARGET_mediatek=y +CONFIG_TARGET_mediatek_filogic=y +CONFIG_TARGET_mediatek_filogic_DEVICE_glinet_gl-mt6000=y +CONFIG_HAS_SUBTARGETS=y +CONFIG_HAS_DEVICES=y +CONFIG_TARGET_BOARD="mediatek" +CONFIG_TARGET_SUBTARGET="filogic" +CONFIG_TARGET_PROFILE="DEVICE_glinet_gl-mt6000" +CONFIG_TARGET_ARCH_PACKAGES="aarch64_cortex-a53" +CONFIG_DEFAULT_TARGET_OPTIMIZATION="-Os -pipe -mcpu=cortex-a53" +CONFIG_CPU_TYPE="cortex-a53" CONFIG_TARGET_ROOTFS_PARTSIZE=1024 -CONFIG_TARGET_ROOTFS_TARGZ=y -CONFIG_TARGET_ROOTFS_EXT4FS=y -CONFIG_TARGET_ROOTFS_SQUASHFS=y -CONFIG_TARGET_EXT4_JOURNAL=y CONFIG_PACKAGE_diffutils=y CONFIG_PACKAGE_python3=y CONFIG_PACKAGE_kmod-libphy=y - +CONFIG_PACKAGE_kmod-fuse=y CONFIG_BUSYBOX_CUSTOM=y CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG_INFO=y CONFIG_PACKAGE_htop=y @@ -23,7 +28,6 @@ CONFIG_PACKAGE_automount=y CONFIG_PACKAGE_ipv6helper=y CONFIG_PACKAGE_ipt2socks=y -CONFIG_PACKAGE_kmod-fuse=y CONFIG_PACKAGE_kmod-fs-f2fs=y CONFIG_PACKAGE_kmod-fs-nfs=y CONFIG_PACKAGE_kmod-fs-nfs-common=y @@ -67,10 +71,8 @@ CONFIG_PACKAGE_kmod-usb3=y CONFIG_PACKAGE_kmod-lib80211=y CONFIG_PACKAGE_kmod-libertas-usb=y CONFIG_PACKAGE_kmod-mac80211=y -CONFIG_PACKAGE_kmod-rtl8821cu=y -CONFIG_PACKAGE_kmod-rtl88x2bu=y -CONFIG_PACKAGE_kmod-rtlwifi=y -CONFIG_PACKAGE_kmod-rtlwifi-usb=y +CONFIG_DEFAULT_kmod-mt7915e=y +CONFIG_DEFAULT_kmod-mt7986-firmware=y CONFIG_PACKAGE_kmod-usb-net-asix-ax88179=y CONFIG_PACKAGE_luci-app-adbyby-plus=y @@ -102,29 +104,29 @@ CONFIG_PACKAGE_luci-app-oaf=y CONFIG_PACKAGE_luci-app-openclash=y CONFIG_PACKAGE_kmod-inet-diag=y CONFIG_PACKAGE_luci-app-poweroff=y -CONFIG_PACKAGE_luci-app-passwall2=y +CONFIG_PACKAGE_luci-app-poweroff=y +CONFIG_PACKAGE_luci-app-pushbot=y CONFIG_PACKAGE_luci-app-passwall=y -CONFIG_PACKAGE_luci-app-passwall_Transparent_Proxy=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Brook=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ChinaDNS_NG=y +CONFIG_PACKAGE_luci-app-passwall_Iptables_Transparent_Proxy=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Haproxy=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Hysteria=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_IPv6_Nat=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Kcptun=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_NaiveProxy=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_Libev_Client=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_Libev_Server=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_Rust_Client=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks_Rust_Server=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ShadowsocksR_Libev_Client=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ShadowsocksR_Libev_Server=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Simple_Obfs=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Trojan_GO=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Trojan_Plus=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_V2ray=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_V2ray_Plugin=y +CONFIG_PACKAGE_luci-app-passwall_INCLUDE_tuic_client=y CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Xray=y -CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Xray_Plugin=y +CONFIG_PACKAGE_luci-app-passwall2=y +CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Haproxy=y +CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_IPv6_Nat=y +CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_NaiveProxy=y +CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Libev_Client=y +CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Shadowsocks_Libev_Server=y +CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_ShadowsocksR_Libev_Client=y +CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_ShadowsocksR_Libev_Server=y +CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_Simple_Obfs=y +CONFIG_PACKAGE_luci-app-passwall2_INCLUDE_tuic_client=y CONFIG_PACKAGE_luci-app-qbittorrent=y CONFIG_PACKAGE_luci-app-qbittorrent_static=y CONFIG_PACKAGE_luci-app-serverchan=y diff --git a/scripts/lean.sh b/scripts/lean.sh index c862797d..dad917d5 100755 --- a/scripts/lean.sh +++ b/scripts/lean.sh @@ -34,7 +34,6 @@ svn export https://github.com/QiuSimons/OpenWrt-Add/trunk/luci-app-irqbalance # Add luci-app-ssr-plus git clone --depth=1 -b main https://github.com/fw876/helloworld -# git clone --depth=1 https://github.com/DHDAXCW/helloworld # Add luci-app-unblockneteasemusic git clone --branch master https://github.com/UnblockNeteaseMusic/luci-app-unblockneteasemusic.git