kiddin9 3 年之前
父节点
当前提交
07b632c170

+ 40 - 26
.github/workflows/Openwrt-AutoBuild.yml

@@ -199,27 +199,52 @@ jobs:
         echo -e "$(($(nproc)+1)) thread compile"
         make -j$(($(nproc)+1)) || make -j1 V=s
         echo "::set-output name=status::success"
+        if [ "${{matrix.target}}" == "nanopi-r2s" ]; then
+            echo "开始编译R4S"
+            echo "CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4s=y" >>.config
+            make defconfig
+            make -j$(($(nproc)+1)) || make -j1 V=s || (echo "R4S编译失败" && exit 0;)
+            echo "开始编译R2C"
+            echo "CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2c=y" >>.config
+            make defconfig
+            make -j$(($(nproc)+1)) || make -j1 V=s || (echo "R2C编译失败" && exit 0;)
+            rm -rf bin/targets/*/*/packages/*.ipk
+        fi
    
     - name: Check space usage
       run: df -hT
 
+    - name: Deploy imagebuilder to server
+      uses: easingthemes/ssh-deploy@main
+      if: env.SSH_PRIVATE_KEY && ! contains(github.event.action, 'noser') && env.MTARGET
+      with:
+        SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+        ARGS: "-avzr"
+        SOURCE: openwrt/bin/targets
+        REMOTE_HOST: op.supes.top
+        REMOTE_USER: root
+        TARGET: "/www/wwwroot/op.supes.top/releases/${{ env.REPO_BRANCH }}/"
+
     - name: Organize files
       id: organize
       run: |
-        mkdir firmware kmods
-        mv -f openwrt/bin/targets/*/*/{*combined*,*sysupgrade*} ./firmware/ 2>/dev/null || true
-        cp openwrt/.config  ./firmware/${{matrix.target}}.config
-        cp openwrt/build_dir/target-*/linux-*/linux-*/.config ./firmware/${{matrix.target}}_kernel.config
+        mkdir -p firmware/${{matrix.target}} firmware/nanopi-r4s firmware/nanopi-r2c kmods
+        cp openwrt/.config  ./firmware/${{matrix.target}}/${{matrix.target}}.config
+        cp openwrt/build_dir/target-*/linux-*/linux-*/.config ./firmware/${{matrix.target}}/${{matrix.target}}_kernel.config
         kernel_v="$(cat openwrt/include/kernel-5.10 | grep LINUX_KERNEL_HASH-5.10* | cut -f 2 -d - | cut -f 1 -d ' ')"
-        mv -f openwrt/bin/targets/*/*/packages ./kmods/$kernel_v
-        cd firmware
-        echo "${{ env.VERSION }}.$(date +'%Y')" > version.txt
-        rename -v "s/^openwrt/${{ env.VERSION }}-openwrt/" * || true
-        rename -v "s/friendlyarm_//" *gz || true
-        md5=$((md5sum *squashfs-sysupgrade* || md5sum *squashfs-combined-efi*) | awk '{print $1}') 2>/dev/null
-        echo $md5 >> version.txt
-        echo v$REPO_BRANCH >> version.txt
-        echo "FIRMWARE=$PWD" >> $GITHUB_ENV
+        cp -rf openwrt/bin/targets/*/*/packages ./kmods/$kernel_v
+        cp -rf openwrt/bin/targets/*/*/*r4s*sysupgrade* ./firmware/nanopi-r4s/ || true
+        cp -rf openwrt/bin/targets/*/*/*r2c*sysupgrade* ./firmware/nanopi-r2c/ || true
+        rename -v "s/openwrt-/${{ env.VERSION }}-openwrt-/" ./firmware/*/* || true
+        rename -v "s/friendlyarm_//" ./firmware/*/*gz || true
+        cp -rf openwrt/bin/targets/*/*/*{combined,sysupgrade}* ./firmware/${{matrix.target}}/ || true
+        for i in $(ls -d firmware/*/); do
+          echo "${{ env.VERSION }}.$(date +'%Y')" > $i/version.txt
+          md5=$((md5sum $i/*squashfs-sysupgrade* || md5sum $i/*squashfs-combined-efi*) | awk '{print $1}') 2>/dev/null
+          echo $md5 >> $i/version.txt
+          echo v$REPO_BRANCH >> $i/version.txt
+        done
+        [ "${{matrix.target}}" == "nanopi-r2s" ] && rm -rf openwrt/bin/targets/*/*/*{r2c,r4s}*
         Emoji=("🎉" "🤞" "✨" "🎁" "🎈" "🎄" "🎨" "💋" "🍓" "🍕" "🍉" "💐" "🌴" "🚀" "🛸" "🗽" "⛅" "🌈" "🔥" "⛄" "🐶" "🏅" "🦄" "🐤")
         echo "EMOJI=${Emoji[$[$RANDOM % ${#Emoji[@]}]]}" >> $GITHUB_ENV
         if [ ${{matrix.target}} == "x86_64" ]; then
@@ -236,7 +261,7 @@ jobs:
         SOURCE: firmware/
         REMOTE_HOST: op.supes.top
         REMOTE_USER: root
-        TARGET: "/www/wwwroot/op.supes.top/firmware/${{matrix.target}}/"
+        TARGET: "/www/wwwroot/op.supes.top/firmware/"
 
     - name: Deploy kmods to server
       uses: easingthemes/ssh-deploy@main
@@ -249,24 +274,13 @@ jobs:
         REMOTE_USER: root
         TARGET: "/www/wwwroot/op.supes.top/packages/${{ env.MTARGET }}/kmods/"
 
-    - name: Deploy imagebuilder to server
-      uses: easingthemes/ssh-deploy@main
-      if: env.SSH_PRIVATE_KEY && ! contains(github.event.action, 'noser') && env.MTARGET
-      with:
-        SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-        ARGS: "-avzr"
-        SOURCE: openwrt/bin/
-        REMOTE_HOST: op.supes.top
-        REMOTE_USER: root
-        TARGET: "/www/wwwroot/op.supes.top/releases/${{ env.REPO_BRANCH }}/"
-
     - name: Upload firmware for artifact
       uses: actions/upload-artifact@main
       continue-on-error: true
       if: env.UPLOAD_FIRMWARE_FOR_ARTIFACT == 'true'
       with:
         name: ${{ env.VERSION }} ${{matrix.target}}
-        path: ${{ env.FIRMWARE }}
+        path: ./firmware/
 
     - name: Upload firmware to cowtransfer
       if: env.UPLOAD_FIRMWARE_TO_COWTRANSFER == 'true'

+ 0 - 2
devices/Rpi-4B/.config

@@ -5,8 +5,6 @@ CONFIG_TARGET_bcm27xx=y
 CONFIG_TARGET_bcm27xx_bcm2711=y
 CONFIG_TARGET_bcm27xx_bcm2711_DEVICE_rpi-4=y
 
-CONFIG_PACKAGE_kmod-mac80211=y
-
 # Applications
 CONFIG_PACKAGE_luci-app-cpufreq=y
 

+ 1 - 15
devices/common/.config

@@ -11,7 +11,7 @@ CONFIG_ALL_KMODS=y
 CONFIG_PACKAGE_kmod-rtl88x2bu=n
 
 CONFIG_IB=y
-CONFIG_IB_STANDALONE=n
+CONFIG_IB_STANDALONE=y
 CONFIG_JSON_OVERVIEW_IMAGE_INFO=y
 
 CONFIG_FEED_telephony=n
@@ -52,10 +52,6 @@ CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 CONFIG_NGINX_DAV=y
 CONFIG_PACKAGE_luci-base=y
 CONFIG_PACKAGE_luci-compat=y
-CONFIG_PACKAGE_luci-mod-rpc=y
-CONFIG_PACKAGE_luci-lib-ipkg=y
-CONFIG_PACKAGE_luci-lib-fs=y
-CONFIG_PACKAGE_luci-proto-relay=y
 CONFIG_LUCI_LANG_zh_Hans=y
 CONFIG_LUCI_LANG_en=y
 CONFIG_PACKAGE_coremark=y
@@ -94,21 +90,11 @@ CONFIG_PACKAGE_ca-bundle=y
 
 CONFIG_PACKAGE_kmod-r8169=n
 
-#USB net driver
-CONFIG_PACKAGE_kmod-usb-net-asix=y
-CONFIG_PACKAGE_kmod-usb-net-asix-ax88179=y
-CONFIG_PACKAGE_kmod-usb-net-rtl8152=n
-CONFIG_PACKAGE_kmod-usb-net-rtl8152-vendor=y
-CONFIG_PACKAGE_kmod-usb-net-rndis=y
-CONFIG_PACKAGE_kmod-usb-net-ipheth=y
-CONFIG_PACKAGE_kmod-usb-net-cdc-ether=y
-
 # Wireless
 CONFIG_PACKAGE_wpad-basic-wolfssl=y
 
 # USB3.0支持:
 CONFIG_PACKAGE_kmod-usb2=y
-CONFIG_PACKAGE_kmod-usb2-pci=y
 CONFIG_PACKAGE_kmod-usb3=y
 CONFIG_PACKAGE_automount=y
 

+ 3 - 2
devices/common/diy.sh

@@ -5,6 +5,7 @@ commitid="$(curl -sfL https://github.com/openwrt/openwrt/commits/master/include
 version="$(git rev-parse HEAD)"
 git checkout $commitid
 git checkout HEAD^
+[ "$(echo $(git log -1 --pretty=short) | grep "kernel: bump 5.10")" ] && git checkout $commitid
 kernel_v="$(cat include/kernel-5.10 | grep LINUX_KERNEL_HASH-5.10* | cut -f 2 -d - | cut -f 1 -d ' ')"
 sed -i "s?targets/%S/packages?packages/%A/kmods/$kernel_v?" include/feeds.mk
 mv -f target/linux package/kernel include/kernel-version.mk include/kernel-5.10 include/kernel-defaults.mk .github/
@@ -16,8 +17,8 @@ mv -f  .github/kernel-version.mk .github/kernel-5.10 .github/kernel-defaults.mk
 sed -i 's/ libelf//' tools/Makefile
 
 sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advanced luci-app-firewall luci-app-gpsysupgrade luci-app-opkg luci-app-bypass luci-app-upnp luci-app-autoreboot \
-luci-app-wizard luci-app-nginx-manager luci-app-attendedsysupgrade luci-theme-edge luci-theme-bootstrap dnsmasq-full luci-ssl-nginx luci-base luci-compat luci-mod-rpc \
-luci-lib-ipkg luci-lib-fs coremark my-default-settings wget-ssl curl htop nano iptables-mod-fullconenat zram-swap kmod-lib-zstd kmod-ipt-offload kmod-tcp-bbr bash \
+luci-app-wizard luci-app-nginx-manager luci-app-attendedsysupgrade luci-theme-edge luci-theme-bootstrap dnsmasq-full luci-ssl-nginx luci-base luci-compat \
+coremark my-default-settings wget-ssl curl htop nano iptables-mod-fullconenat zram-swap kmod-lib-zstd kmod-ipt-offload kmod-tcp-bbr bash \
 wpad-basic-wolfssl kmod-usb2 kmod-usb3 automount /" include/target.mk
 sed -i "/dnsmasq \\\/d" include/target.mk
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-cpufreq kmod-hwmon-pwmfan/' target/linux/rockchip/Makefile

+ 4 - 0
devices/common/feeds.conf

@@ -0,0 +1,4 @@
+src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
+src-git luci https://git.openwrt.org/project/luci.git;openwrt-21.02
+src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
+src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master

+ 0 - 0
devices/nanopi-r2c/default-settings


+ 2 - 47
devices/nanopi-r2c/diy.sh

@@ -1,48 +1,3 @@
 #!/bin/bash
-
-shopt -s extglob
-rm -rf package/boot/uboot-rockchip
-svn export --force https://github.com/immortalwrt/immortalwrt/branches/master/package/boot/uboot-rockchip package/boot/uboot-rockchip
-svn export --force https://github.com/immortalwrt/immortalwrt/branches/master/package/boot/arm-trusted-firmware-rockchip-vendor package/boot/arm-trusted-firmware-rockchip-vendor
-rm -rf target/linux/rockchip/!(Makefile|patches-5.10)
-svn co https://github.com/immortalwrt/immortalwrt/branches/master/target/linux/rockchip target/linux/rockchip
-rm -rf target/linux/rockchip/{.svn,patches-5.10/.svn}
-svn co https://github.com/immortalwrt/immortalwrt/branches/master/target/linux/rockchip/patches-5.10 target/linux/rockchip/patches-5.10
-rm -Rf target/linux/rockchip/patches-5.10/{006-*-NanoPi-R,007-*-R4S}.patch
-curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
-
-curl -sfL https://raw.githubusercontent.com/friendlyarm/friendlywrt/master-v21.02/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol.sh --create-dirs -o files/usr/bin/fa-fancontrol.sh
-curl -sfL https://raw.githubusercontent.com/friendlyarm/friendlywrt/master-v21.02/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol-direct.sh --create-dirs -o files/usr/bin/fa-fancontrol-direct.sh
-curl -sfL https://raw.githubusercontent.com/friendlyarm/friendlywrt/master-v21.02/target/linux/rockchip/armv8/base-files/etc/init.d/fa-fancontrol --create-dirs -o files/etc/init.d/fa-fancontrol
-chmod +x files/usr/bin/fa-*.sh files/etc/init.d/fa-fancontrol
-
-sed -i 's,-mcpu=generic,-march=armv8-a+crypto+crc -mabi=lp64,g' include/target.mk
-
-sed -i "s,'eth1' 'eth0','eth0' 'eth1',g" target/linux/rockchip/armv8/base-files/etc/board.d/02_network
-
-sed -i '/;;/i\ethtool -K eth1 rx off tx off && logger -t disable-offloading "disabed rk3328 ethernet tcp/udp offloading tx/rx"' target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
-
-sed -i 's,kmod-usb-net-rtl8152$,usb-net-rtl8152-vendor,g' -e target/linux/rockchip/image/armv8.mk
-
-echo '
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SIMD=y
-CONFIG_REALTEK_PHY=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/rockchip/armv8/config-5.10
+SHELL_FOLDER=$(dirname $(readlink -f "$0"))
+bash $SHELL_FOLDER/../nanopi-r2s/diy.sh

+ 0 - 6
devices/nanopi-r2c/files/etc/config/cpufreq

@@ -1,6 +0,0 @@
-config settings 'cpufreq'
-	option governor0 'schedutil'
-	option minfreq0 '816000'
-	option maxfreq0 '1608000'
- 	option upthreshold0 '50'
- 	option factor0 '10'

+ 0 - 0
devices/nanopi-r2s/default-settings


+ 2 - 3
devices/nanopi-r2s/diy.sh

@@ -18,11 +18,10 @@ chmod +x files/usr/bin/fa-*.sh files/etc/init.d/fa-fancontrol
 
 sed -i 's,-mcpu=generic,-march=armv8-a+crypto+crc -mabi=lp64,g' include/target.mk
 
-sed -i "s,'eth1' 'eth0','eth0' 'eth1',g" target/linux/rockchip/armv8/base-files/etc/board.d/02_network
-
 sed -i '/;;/i\ethtool -K eth1 rx off tx off && logger -t disable-offloading "disabed rk3328 ethernet tcp/udp offloading tx/rx"' target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
 
-sed -i 's,kmod-usb-net-rtl8152$,usb-net-rtl8152-vendor,g' target/linux/rockchip/image/armv8.mk
+sed -i 's,kmod-usb-net-rtl8152$,kmod-usb-net-rtl8152-vendor,g' target/linux/rockchip/image/armv8.mk
+sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/rockchip/image/armv8.mk
 
 echo '
 CONFIG_ARM64_CRYPTO=y

+ 0 - 6
devices/nanopi-r2s/files/etc/config/cpufreq

@@ -1,6 +0,0 @@
-config settings 'cpufreq'
-	option governor0 'schedutil'
-	option minfreq0 '816000'
-	option maxfreq0 '1512000'
- 	option upthreshold0 '50'
- 	option factor0 '10'

+ 15 - 0
devices/nanopi-r2s/patches/r2s_exchange_lan_wan.patch

@@ -0,0 +1,15 @@
+--- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
++++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
+@@ -8,10 +8,11 @@ rockchip_setup_interfaces()
+ 
+ 	case "$board" in
+ 	friendlyarm,nanopi-r2c|\
+-	friendlyarm,nanopi-r2s|\
+ 	friendlyarm,nanopi-r4s|\
+ 	xunlong,orangepi-r1-plus)
+ 		ucidef_set_interfaces_lan_wan 'eth1' 'eth0'
++	friendlyarm,nanopi-r2s)
++		ucidef_set_interfaces_lan_wan 'eth0' 'eth1'
+ 		;;
+ 	*)
+ 		ucidef_set_interface_lan 'eth0'

+ 0 - 0
devices/nanopi-r4s/default-settings


+ 2 - 45
devices/nanopi-r4s/diy.sh

@@ -1,46 +1,3 @@
 #!/bin/bash
-
-shopt -s extglob
-rm -rf package/boot/uboot-rockchip
-svn export --force https://github.com/immortalwrt/immortalwrt/branches/master/package/boot/uboot-rockchip package/boot/uboot-rockchip
-svn export --force https://github.com/immortalwrt/immortalwrt/branches/master/package/boot/arm-trusted-firmware-rockchip-vendor package/boot/arm-trusted-firmware-rockchip-vendor
-rm -rf target/linux/rockchip/!(Makefile|patches-5.10)
-svn co https://github.com/immortalwrt/immortalwrt/branches/master/target/linux/rockchip target/linux/rockchip
-rm -rf target/linux/rockchip/{.svn,patches-5.10/.svn}
-svn co https://github.com/immortalwrt/immortalwrt/branches/master/target/linux/rockchip/patches-5.10 target/linux/rockchip/patches-5.10
-rm -Rf target/linux/rockchip/patches-5.10/{006-*-NanoPi-R,007-*-R4S}.patch
-curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
-
-curl -sfL https://raw.githubusercontent.com/friendlyarm/friendlywrt/master-v21.02/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol.sh --create-dirs -o files/usr/bin/fa-fancontrol.sh
-curl -sfL https://raw.githubusercontent.com/friendlyarm/friendlywrt/master-v21.02/target/linux/rockchip/armv8/base-files/usr/bin/fa-fancontrol-direct.sh --create-dirs -o files/usr/bin/fa-fancontrol-direct.sh
-curl -sfL https://raw.githubusercontent.com/friendlyarm/friendlywrt/master-v21.02/target/linux/rockchip/armv8/base-files/etc/init.d/fa-fancontrol --create-dirs -o files/etc/init.d/fa-fancontrol
-chmod +x files/usr/bin/fa-*.sh files/etc/init.d/fa-fancontrol
-
-sed -i 's,-mcpu=generic,-march=armv8-a+crypto+crc -mabi=lp64,g' include/target.mk
-sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/rockchip/image/armv8.mk
-
-echo '
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SIMD=y
-CONFIG_REALTEK_PHY=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CRYPTO_DEV_ROCKCHIP=y
-CONFIG_HW_RANDOM_ROCKCHIP=y
-' >> ./target/linux/rockchip/armv8/config-5.10
-
+SHELL_FOLDER=$(dirname $(readlink -f "$0"))
+bash $SHELL_FOLDER/../nanopi-r2s/diy.sh

+ 0 - 7
devices/nanopi-r4s/files/etc/config/cpufreq

@@ -1,7 +0,0 @@
-config settings 'cpufreq'
-	option governor0 'schedutil'
-	option minfreq0 '816000'
-	option maxfreq0 '1800000'
-	option governor4 'schedutil'
-	option minfreq4 '816000'
-	option maxfreq4 '2208000'

+ 0 - 12
devices/nanopi-r4s/patches/lan_wan.patch

@@ -1,12 +0,0 @@
---- a/package/base-files/files/etc/board.d/99-default_network
-+++ b/package/base-files/files/etc/board.d/99-default_network
-@@ -8,8 +8,8 @@ board_config_update
- 
- json_is_a network object && exit 0
- 
--ucidef_set_interface_lan 'eth0'
--[ -d /sys/class/net/eth1 ] && ucidef_set_interface_wan 'eth1'
-+ucidef_set_interface_wan 'eth0'
-+[ -d /sys/class/net/eth1 ] && ucidef_set_interface_lan 'eth1'
- 
- board_config_flush

+ 0 - 31
devices/x86_64/.config

@@ -10,42 +10,11 @@ CONFIG_EFI_IMAGES=y
 CONFIG_VMDK_IMAGES=n
 
 # 其他需要安装的软件包:
-CONFIG_PACKAGE_luci-proto-bonding=y
 CONFIG_PACKAGE_my-autocore-x86=y
 
 # x86
-CONFIG_PACKAGE_qemu-ga=y
-CONFIG_PACKAGE_lm-sensors-detect=y
-CONFIG_PACKAGE_kmod-bonding=y
-CONFIG_PACKAGE_kmod-mmc-spi=y
-CONFIG_PACKAGE_kmod-sdhci=y
 CONFIG_PACKAGE_kmod-vmxnet3=y
-CONFIG_PACKAGE_kmod-igbvf=y
-CONFIG_PACKAGE_kmod-ixgbevf=y
-CONFIG_PACKAGE_kmod-ixgbe=y
-CONFIG_PACKAGE_kmod-pcnet32=y
 CONFIG_PACKAGE_kmod-r8125=y
 CONFIG_PACKAGE_kmod-r8168=y
-CONFIG_PACKAGE_kmod-8139cp=y
-CONFIG_PACKAGE_kmod-8139too=y
-CONFIG_PACKAGE_kmod-i40e=y
-CONFIG_PACKAGE_kmod-i40evf=y
-CONFIG_PACKAGE_kmod-ath10k=y
-CONFIG_PACKAGE_kmod-rt2800-usb=y
-CONFIG_PACKAGE_kmod-mlx4-core=y
-CONFIG_PACKAGE_kmod-mlx5-core=y
-CONFIG_PACKAGE_kmod-alx=y
-CONFIG_PACKAGE_kmod-tulip=y
-CONFIG_PACKAGE_kmod-tg3=y
 CONFIG_PACKAGE_kmod-igc=y
-CONFIG_PACKAGE_kmod-fs-ntfs=y
-CONFIG_PACKAGE_ath10k-firmware-qca9888=y
-CONFIG_PACKAGE_ath10k-firmware-qca988x=y
-CONFIG_PACKAGE_ath10k-firmware-qca9984=y
-CONFIG_PACKAGE_brcmfmac-firmware-43602a1-pcie=y
-CONFIG_PACKAGE_acpid=y
-CONFIG_PACKAGE_blkid=y
-CONFIG_PACKAGE_smartmontools=y
-CONFIG_PACKAGE_irqbalance=y
-CONFIG_PACKAGE_kmod-drm-ttm=y
 

+ 1 - 1
devices/x86_64/diy.sh

@@ -4,7 +4,7 @@ svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/x86/patches-5.10
 rm -rf target/linux/x86/patches-5.10/.svn
 
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-x86 lm-sensors-detect kmod-r8125 kmod-vmxnet3 mod-fs-ntfs kmod-igc/' target/linux/x86/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-x86 lm-sensors-detect kmod-r8125 kmod-vmxnet3  kmod-igc/' target/linux/x86/Makefile
 
 echo '
 CONFIG_CRYPTO_CHACHA20_X86_64=y