From 52e1b88c389a0d92a1c9e75559061025fe1c1f91 Mon Sep 17 00:00:00 2001 From: Hyy2001X <1804430051@qq.com> Date: Wed, 7 Sep 2022 21:08:41 +0800 Subject: [PATCH] =?UTF-8?q?x86=5F64:=20=E8=B0=83=E6=95=B4=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/AutoBuild-x86_64.yml | 3 +-- Configs/x86_64 | 13 +++++++++---- Scripts/AutoBuild_DiyScript.sh | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/AutoBuild-x86_64.yml b/.github/workflows/AutoBuild-x86_64.yml index 0874e2b..588b3a3 100644 --- a/.github/workflows/AutoBuild-x86_64.yml +++ b/.github/workflows/AutoBuild-x86_64.yml @@ -66,7 +66,6 @@ jobs: uses: easimon/maximize-build-space@master with: root-reserve-mb: 5120 - swap-size-mb: 512 remove-dotnet: 'true' remove-android: 'true' remove-haskell: 'true' @@ -179,7 +178,7 @@ jobs: - name: Build OpenWrt run: | cd openwrt - make -j$(nproc) || make -j1 V=s + make -j4 || make -j1 V=s [ "$?" == 0 ] && echo "Compile_Result=true" >> $GITHUB_ENV || echo "Compile_Result=false" >> $GITHUB_ENV - name: Checkout Firmware diff --git a/Configs/x86_64 b/Configs/x86_64 index f4c47c4..d071394 100755 --- a/Configs/x86_64 +++ b/Configs/x86_64 @@ -29,9 +29,18 @@ CONFIG_PACKAGE_6rd=y CONFIG_PACKAGE_6to4=y # 固件 +CONFIG_PACKAGE_rtl8821ae-firmware=y CONFIG_PACKAGE_rtl8821cu-firmware=y +CONFIG_PACKAGE_rtl8821ce-firmware=y CONFIG_PACKAGE_iwlwifi-firmware-ax200=y CONFIG_PACKAGE_iwlwifi-firmware-ax210=y +CONFIG_PACKAGE_iwlwifi-firmware-iwl7260=y +CONFIG_PACKAGE_iwlwifi-firmware-iwl7265=y +CONFIG_PACKAGE_iwlwifi-firmware-iwl7265d=y +CONFIG_PACKAGE_iwlwifi-firmware-iwl8260c=y +CONFIG_PACKAGE_iwlwifi-firmware-iwl8265=y +CONFIG_PACKAGE_iwlwifi-firmware-iwl9000=y +CONFIG_PACKAGE_iwlwifi-firmware-iwl9260=y CONFIG_PACKAGE_i915-firmware=y # 内核模块 @@ -41,8 +50,6 @@ CONFIG_PACKAGE_kmod-fs-cifs=y CONFIG_PACKAGE_kmod-fs-nfs-v3=y CONFIG_PACKAGE_kmod-fs-nfs-v4=y CONFIG_PACKAGE_kmod-drm-i915=y -CONFIG_PACKAGE_kmod-kvm-intel=y -CONFIG_PACKAGE_kmod-kvm-x86=y CONFIG_PACKAGE_kmod-md-raid456=y # USB 驱动程序 @@ -79,8 +86,6 @@ CONFIG_PACKAGE_kmod-usbip=y CONFIG_PACKAGE_kmod-usbmon=y # Wireless 驱动程序 -CONFIG_PACKAGE_kmod-mt76=y -CONFIG_PACKAGE_kmod-mt7915e=y CONFIG_PACKAGE_kmod-mt7921e=y CONFIG_PACKAGE_kmod-mt7921u=y CONFIG_PACKAGE_kmod-rtl8821ae=y diff --git a/Scripts/AutoBuild_DiyScript.sh b/Scripts/AutoBuild_DiyScript.sh index aa6d21d..b382635 100755 --- a/Scripts/AutoBuild_DiyScript.sh +++ b/Scripts/AutoBuild_DiyScript.sh @@ -13,7 +13,7 @@ Firmware_Diy_Core() { Short_Fw_Date=true x86_Full_Images=false Fw_Format=false - Regex_Skip="packages|buildinfo|sha256sums|manifest|kernel|rootfs|factory|itb|profile|ext4" + Regex_Skip="packages|buildinfo|sha256sums|manifest|kernel|rootfs|factory|itb|profile|ext4|json" AutoBuild_Features=true }