From 03b78f31879dccaac27cda0ba2adde707abd486a Mon Sep 17 00:00:00 2001 From: John Doe Date: Wed, 24 Mar 2021 23:33:57 +0800 Subject: [PATCH] package: re-group --- .github/workflows/lo-test.yml | 1 + extra_packages.seed | 2 ++ r1s-h3.config.seed | 5 ----- r1s.config.seed | 5 ----- r2s.config.seed | 5 ----- r4s.config.seed | 5 ----- 6 files changed, 3 insertions(+), 20 deletions(-) create mode 100644 extra_packages.seed diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index b4b9c40..3735b81 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -93,6 +93,7 @@ jobs: 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 find feeds/luci/applications -type d -name luci-app-* | rev | cut -d'/' -f1 | rev | xargs -n1 -i echo CONFIG_PACKAGE_{}=y >> .config diff --git a/extra_packages.seed b/extra_packages.seed new file mode 100644 index 0000000..2450090 --- /dev/null +++ b/extra_packages.seed @@ -0,0 +1,2 @@ +CONFIG_PACKAGE_zram-swap=y +CONFIG_PACKAGE_xl2tpd=y diff --git a/r1s-h3.config.seed b/r1s-h3.config.seed index 6d1a255..01362c7 100644 --- a/r1s-h3.config.seed +++ b/r1s-h3.config.seed @@ -55,10 +55,7 @@ CONFIG_PACKAGE_curl=y CONFIG_PACKAGE_fdisk=y CONFIG_PACKAGE_htop=y CONFIG_PACKAGE_losetup=y -CONFIG_PACKAGE_nano=y CONFIG_PACKAGE_pv=y -CONFIG_PACKAGE_resize2fs=y -CONFIG_PACKAGE_screen=y CONFIG_PACKAGE_sfdisk=y CONFIG_PACKAGE_vim-fuller=y CONFIG_PACKAGE_wget=y @@ -78,7 +75,5 @@ CONFIG_PACKAGE_kmod-fast-classifier=y CONFIG_DROPBEAR_ECC=y CONFIG_DROPBEAR_ECC_FULL=y -CONFIG_PACKAGE_zram-swap=y -CONFIG_PACKAGE_autocore-arm=y CONFIG_PACKAGE_usb-modeswitch=y diff --git a/r1s.config.seed b/r1s.config.seed index 2750dbb..5bd7063 100644 --- a/r1s.config.seed +++ b/r1s.config.seed @@ -55,10 +55,7 @@ CONFIG_PACKAGE_curl=y CONFIG_PACKAGE_fdisk=y CONFIG_PACKAGE_htop=y CONFIG_PACKAGE_losetup=y -CONFIG_PACKAGE_nano=y CONFIG_PACKAGE_pv=y -CONFIG_PACKAGE_resize2fs=y -CONFIG_PACKAGE_screen=y CONFIG_PACKAGE_sfdisk=y CONFIG_PACKAGE_vim-fuller=y CONFIG_PACKAGE_wget=y @@ -78,5 +75,3 @@ CONFIG_PACKAGE_kmod-fast-classifier=y CONFIG_DROPBEAR_ECC=y CONFIG_DROPBEAR_ECC_FULL=y -CONFIG_PACKAGE_zram-swap=y -CONFIG_PACKAGE_autocore-arm=y diff --git a/r2s.config.seed b/r2s.config.seed index d0624d0..b5ebcaf 100644 --- a/r2s.config.seed +++ b/r2s.config.seed @@ -55,10 +55,7 @@ CONFIG_PACKAGE_curl=y CONFIG_PACKAGE_fdisk=y CONFIG_PACKAGE_htop=y CONFIG_PACKAGE_losetup=y -CONFIG_PACKAGE_nano=y CONFIG_PACKAGE_pv=y -CONFIG_PACKAGE_resize2fs=y -CONFIG_PACKAGE_screen=y CONFIG_PACKAGE_sfdisk=y CONFIG_PACKAGE_vim-fuller=y CONFIG_PACKAGE_wget=y @@ -78,8 +75,6 @@ CONFIG_PACKAGE_kmod-fast-classifier=y CONFIG_DROPBEAR_ECC=y CONFIG_DROPBEAR_ECC_FULL=y -CONFIG_PACKAGE_zram-swap=y -CONFIG_PACKAGE_autocore-arm=y CONFIG_PACKAGE_kmod-rtl8821cu=y CONFIG_PACKAGE_iw=y diff --git a/r4s.config.seed b/r4s.config.seed index b411f9d..c477f53 100644 --- a/r4s.config.seed +++ b/r4s.config.seed @@ -55,10 +55,7 @@ CONFIG_PACKAGE_curl=y CONFIG_PACKAGE_fdisk=y CONFIG_PACKAGE_htop=y CONFIG_PACKAGE_losetup=y -CONFIG_PACKAGE_nano=y CONFIG_PACKAGE_pv=y -CONFIG_PACKAGE_resize2fs=y -CONFIG_PACKAGE_screen=y CONFIG_PACKAGE_sfdisk=y CONFIG_PACKAGE_vim-fuller=y CONFIG_PACKAGE_wget=y @@ -78,8 +75,6 @@ CONFIG_PACKAGE_kmod-fast-classifier=y CONFIG_DROPBEAR_ECC=y CONFIG_DROPBEAR_ECC_FULL=y -CONFIG_PACKAGE_zram-swap=y -CONFIG_PACKAGE_autocore-arm=y CONFIG_PACKAGE_kmod-rtl8821cu=y CONFIG_PACKAGE_iw=y