kiddin9 3 年之前
父節點
當前提交
0c0a9f9bb4

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

@@ -9,6 +9,5 @@ CONFIG_PACKAGE_kmod-mac80211=y
 
 # Applications
 CONFIG_PACKAGE_luci-app-cpufreq=y
-CONFIG_PACKAGE_luci-app-zerotier=n
 
 CONFIG_PACKAGE_my-autocore-arm=y

+ 2 - 0
devices/Rpi-4B/diy.sh

@@ -3,6 +3,8 @@
 sed -i 's,ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305,ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256,g' package/feeds/kiddin9/luci-app-bypass/root/usr/share/ssrplus/gentrojanconfig
 sed -i 's,TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256,TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256,g' package/feeds/kiddin9/luci-app-bypass/root/usr/share/ssrplus/gentrojanconfig
 
+sed -i -e '/autocore-arm/d' -e 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-cpufreq my-autocore-arm/' target/linux/rockchip/Makefile
+
 echo '
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_AES_ARM64=y

+ 0 - 1
devices/nanopi-r2c/.config

@@ -8,7 +8,6 @@ CONFIG_TARGET_ROOTFS_EXT4FS=n
 
 # Applications
 CONFIG_PACKAGE_luci-app-cpufreq=y
-CONFIG_PACKAGE_luci-app-zerotier=n
 
 # 其他需要安装的软件包:
 CONFIG_PACKAGE_my-autocore-arm=y

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

@@ -22,7 +22,8 @@ sed -i "s,'eth1' 'eth0','eth0' 'eth1',g" target/linux/rockchip/armv8/base-files/
 
 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$,usb-net-rtl8152-vendor,g' -e target/linux/rockchip/image/armv8.mk
+sed -i -e '/autocore-arm/d' -e 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-cpufreq my-autocore-arm kmod-hwmon-pwmfan/' target/linux/rockchip/Makefile
 
 echo '
 CONFIG_ARM64_CRYPTO=y

+ 0 - 1
devices/nanopi-r2s/.config

@@ -8,7 +8,6 @@ CONFIG_TARGET_ROOTFS_EXT4FS=n
 
 # Applications
 CONFIG_PACKAGE_luci-app-cpufreq=y
-CONFIG_PACKAGE_luci-app-zerotier=n
 
 # 其他需要安装的软件包:
 CONFIG_PACKAGE_my-autocore-arm=y

+ 1 - 0
devices/nanopi-r2s/diy.sh

@@ -23,6 +23,7 @@ sed -i "s,'eth1' 'eth0','eth0' 'eth1',g" target/linux/rockchip/armv8/base-files/
 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 -e '/autocore-arm/d' -e 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-cpufreq my-autocore-arm kmod-hwmon-pwmfan/' target/linux/rockchip/Makefile
 
 echo '
 CONFIG_ARM64_CRYPTO=y

+ 1 - 0
devices/nanopi-r4s/diy.sh

@@ -18,6 +18,7 @@ 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
+sed -i -e '/autocore-arm/d' -e 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-cpufreq my-autocore-arm kmod-hwmon-pwmfan/' target/linux/rockchip/Makefile
 
 echo '
 CONFIG_ARM64_CRYPTO=y

+ 1 - 0
devices/x86_64/diy.sh

@@ -4,6 +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
 
 echo '
 CONFIG_CRYPTO_CHACHA20_X86_64=y