From d29e5d877201d39e3754bea492cddb1dcda80f86 Mon Sep 17 00:00:00 2001 From: kiddin9 <48883331+kiddin9@users.noreply.github.com> Date: Sat, 25 Jun 2022 22:46:39 +0800 Subject: [PATCH] update --- .github/workflows/Openwrt-AutoBuild.yml | 4 +-- .github/workflows/repo-dispatcher.yml | 10 ++++++++ README.md | 6 +++-- devices/armvirt_64/diy.sh | 2 +- devices/bcm27xx_bcm2709/.config | 8 ++++++ devices/bcm27xx_bcm2709/diy.sh | 31 +++++++++++++++++++++++ devices/bcm27xx_bcm2710/.config | 8 ++++++ devices/bcm27xx_bcm2710/diy.sh | 31 +++++++++++++++++++++++ devices/bcm27xx_bcm2711/.config | 3 --- devices/bcm27xx_bcm2711/diy.sh | 7 +++-- devices/bcm27xx_bcm2711/patches/rpi.patch | 14 ---------- devices/bcm53xx/diy.sh | 2 +- devices/common/kernel_5.15.sh | 4 ++- devices/common/patches/imagebuilder.patch | 3 ++- devices/ipq40xx_generic/.config | 2 ++ devices/ipq40xx_generic/diy.sh | 2 +- devices/ipq807x/diy.sh | 2 +- devices/mediatek_mt7622/diy.sh | 2 +- devices/ramips_mt7621/.config | 3 +++ devices/rockchip_armv8/diy.sh | 2 +- devices/x86_64/diy.sh | 2 +- 21 files changed, 116 insertions(+), 32 deletions(-) create mode 100644 devices/bcm27xx_bcm2709/.config create mode 100644 devices/bcm27xx_bcm2709/diy.sh create mode 100644 devices/bcm27xx_bcm2710/.config create mode 100644 devices/bcm27xx_bcm2710/diy.sh delete mode 100644 devices/bcm27xx_bcm2711/patches/rpi.patch diff --git a/.github/workflows/Openwrt-AutoBuild.yml b/.github/workflows/Openwrt-AutoBuild.yml index 9053c782ca3f..63259e785b24 100644 --- a/.github/workflows/Openwrt-AutoBuild.yml +++ b/.github/workflows/Openwrt-AutoBuild.yml @@ -66,11 +66,11 @@ jobs: if [ ${{matrix.target}} == "x86_64" ]; then echo "ARCH=linux/amd64" >> $GITHUB_ENV echo "MTARGET=x86_64" >> $GITHUB_ENV - elif [[ ${{matrix.target}} =~ (armvirt_64|ipq807x|mediatek_mt7622) ]]; then + elif [[ ${{matrix.target}} =~ (armvirt_64|ipq807x|mediatek_mt7622|bcm27xx_bcm2710) ]]; then echo "MTARGET=aarch64_cortex-a53" >> $GITHUB_ENV elif [[ ${{matrix.target}} == "ramips_mt7621" ]]; then echo "MTARGET=mipsel_24kc" >> $GITHUB_ENV - elif [[ ${{matrix.target}} == "ipq40xx_generic" ]]; then + elif [[ ${{matrix.target}} =~ (ipq40xx_generic|bcm27xx_bcm2709) ]]; then echo "MTARGET=arm_cortex-a7_neon-vfpv4" >> $GITHUB_ENV elif [[ ${{matrix.target}} == "bcm53xx" ]]; then echo "MTARGET=arm_cortex-a9" >> $GITHUB_ENV diff --git a/.github/workflows/repo-dispatcher.yml b/.github/workflows/repo-dispatcher.yml index 14e99ef79def..e1e6e8ca0e91 100644 --- a/.github/workflows/repo-dispatcher.yml +++ b/.github/workflows/repo-dispatcher.yml @@ -63,6 +63,16 @@ jobs: -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ -H "Accept: application/vnd.github.everest-preview+json" \ -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ + -d '{"event_type": "bcm27xx_bcm2710 ${{ github.event.inputs.version }}", "client_payload": {"target": "bcm27xx_bcm2710"}}' + curl \ + -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ + -H "Accept: application/vnd.github.everest-preview+json" \ + -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ + -d '{"event_type": "bcm27xx_bcm2709 ${{ github.event.inputs.version }}", "client_payload": {"target": "bcm27xx_bcm2709"}}' + curl \ + -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ + -H "Accept: application/vnd.github.everest-preview+json" \ + -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ -d '{"event_type": "armvirt_64 ${{ github.event.inputs.version }}", "client_payload": {"target": "armvirt_64"}}' curl \ -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ diff --git a/README.md b/README.md index 28c64da03f68..72df94499d4d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -#### OpenWrt with NGINX for X86/64, NanoPi R2S, NanoPi R4S, NanoPi R5S, NanoPi R2C, Phicomm N1, NanoPi NEO3, 树莓派 4B, DoorNet1, DoorNet2, 香橙派 Orange Pi R1 Plus, 香橙派 Orange Pi R1 Plus LTS, 红米AX6, 小米AX3600, 小米AX9000, 红米AX6S/小米AX3200, 红米AC2100, 小米AC2100, 小米CR6606/TR606(联通版), CR6608/TR608(移动版), CR6609/TR609(电信版), 小米4, 小米 R3G, 小米R3P, 小娱C5, newifi-d2, H1 Box, 贝壳云 P1 , 我家云 lL Pro, x96 Max, 微加云 V-Plus, 章鱼星球 ZYXQ, GT-King, Odroid N2, MXQ Pro+ +##### 在线定制专属固件: [supes.top](https://supes.top) +#### 支持设备: +##### X86/64, 友善 NanoPi R2S R4S R5S R2C NEO3, 斐讯 N1, 树莓派 4B 3B/3B+ 2B, DoorNet1, DoorNet2, 香橙派 Orange Pi R1 Plus, R1 Plus LTS, 红米AX6, 小米AX3600, 小米AX9000, 红米AX6S/小米AX3200, 红米AC2100, 小米AC2100, 斐讯K3, HIWIFI HC5962(极路由4、B70), 小米4, 小米 R3G, 小米 R3P, newifi-d2 (新路由3), 小娱C5, 竞斗云2.0(P&W R619AC), GL.iNet MT1300, 小米CR6606/TR606, CR6608/TR608, CR6609/TR609, 华硕 RT-ACRH17, RT-AC58u/RT-ACRH13, RT-AC68U, RT-AC87U, RT-AC88U, RT-AC56U, 网件 NETGEAR R6250 R7000 R7900 R8000, H1 Box, 贝壳云 P1, 我家云 lL Pro, x96 Max, 微加云 V-Plus, 章鱼星球 ZYXQ, GT-King, Odroid N2, MXQ Pro+ 等 [1]: https://img.shields.io/badge/license-GPLV2-brightgreen.svg [2]: /LICENSE [3]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg @@ -28,7 +30,7 @@ + 自建插件仓库囊括了市面上几乎所有开源插件,插件库日更,系统自动更新所有已安装插件. -+ 在线一键定制固件,可在[supes.top](https://supes.top)也可在后台系统定制升级菜单中一键定制, 同时支持github云编译和本地一键编译. ++ 在线一键定制固件,可在[supes.top](https://supes.top)在线定制专属定制, 同时支持github云编译和本地一键编译. + 后台一键OTA更新固件,省去了每次固件升级都需要找固件,下载固件,上传固件等繁琐操作. diff --git a/devices/armvirt_64/diy.sh b/devices/armvirt_64/diy.sh index a58b0f65a42b..0add5d37c10e 100644 --- a/devices/armvirt_64/diy.sh +++ b/devices/armvirt_64/diy.sh @@ -3,7 +3,7 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0")) bash $SHELL_FOLDER/../common/kernel_5.15.sh -sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += perl btrfs-progs my-autocore-arm luci-app-amlogic kmod-brcmfmac wpad-basic-wolfssl iw -luci-app-attendedsysupgrade -luci-app-gpsysupgrade fdisk lsblk kmod-usb2 kmod-usb3/' target/linux/armvirt/Makefile +sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += perl btrfs-progs autocore-arm luci-app-amlogic kmod-brcmfmac wpad-basic-wolfssl iw -luci-app-attendedsysupgrade -luci-app-gpsysupgrade fdisk lsblk kmod-usb2 kmod-usb3/' target/linux/armvirt/Makefile echo ' CONFIG_ARM64_CRYPTO=y diff --git a/devices/bcm27xx_bcm2709/.config b/devices/bcm27xx_bcm2709/.config new file mode 100644 index 000000000000..2cd1228b79d7 --- /dev/null +++ b/devices/bcm27xx_bcm2709/.config @@ -0,0 +1,8 @@ + +CONFIG_TARGET_bcm27xx=y +CONFIG_TARGET_bcm27xx_bcm2709=y +CONFIG_TARGET_bcm27xx_bcm2709_DEVICE_rpi-2=y + +CONFIG_PACKAGE_luci-ssl=n # uhttpd服务 +CONFIG_PACKAGE_luci-ssl-nginx=y # nginx + diff --git a/devices/bcm27xx_bcm2709/diy.sh b/devices/bcm27xx_bcm2709/diy.sh new file mode 100644 index 000000000000..dec9bc59c231 --- /dev/null +++ b/devices/bcm27xx_bcm2709/diy.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm fdisk lsblk luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-usb2 kmod-usb3/' target/linux/bcm27xx/Makefile + +sed -i 's/factory.img.gz //' target/linux/bcm27xx/image/Makefile + +SHELL_FOLDER=$(dirname $(readlink -f "$0")) +bash $SHELL_FOLDER/../common/kernel_5.15.sh + +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/bcm27xx/bcm2709/config-5.15 diff --git a/devices/bcm27xx_bcm2710/.config b/devices/bcm27xx_bcm2710/.config new file mode 100644 index 000000000000..391ea1f1e555 --- /dev/null +++ b/devices/bcm27xx_bcm2710/.config @@ -0,0 +1,8 @@ + +CONFIG_TARGET_bcm27xx=y +CONFIG_TARGET_bcm27xx_bcm2710=y +CONFIG_TARGET_bcm27xx_bcm2710_DEVICE_rpi-3=y + +CONFIG_PACKAGE_luci-ssl=n # uhttpd服务 +CONFIG_PACKAGE_luci-ssl-nginx=y # nginx + diff --git a/devices/bcm27xx_bcm2710/diy.sh b/devices/bcm27xx_bcm2710/diy.sh new file mode 100644 index 000000000000..4dd723f618dc --- /dev/null +++ b/devices/bcm27xx_bcm2710/diy.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm fdisk lsblk luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-usb2 kmod-usb3/' target/linux/bcm27xx/Makefile + +sed -i 's/factory.img.gz //' target/linux/bcm27xx/image/Makefile + +SHELL_FOLDER=$(dirname $(readlink -f "$0")) +bash $SHELL_FOLDER/../common/kernel_5.15.sh + +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/bcm27xx/bcm2710/config-5.15 diff --git a/devices/bcm27xx_bcm2711/.config b/devices/bcm27xx_bcm2711/.config index 662675fe48a0..53a391b679fc 100644 --- a/devices/bcm27xx_bcm2711/.config +++ b/devices/bcm27xx_bcm2711/.config @@ -6,6 +6,3 @@ CONFIG_TARGET_bcm27xx_bcm2711_DEVICE_rpi-4=y CONFIG_PACKAGE_luci-ssl=n # uhttpd服务 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx -CONFIG_PACKAGE_kmod-drm-vc4=n -CONFIG_PACKAGE_kmod-usb-net-lan78xx=n - diff --git a/devices/bcm27xx_bcm2711/diy.sh b/devices/bcm27xx_bcm2711/diy.sh index 8fb319b367e5..b01aed22888e 100644 --- a/devices/bcm27xx_bcm2711/diy.sh +++ b/devices/bcm27xx_bcm2711/diy.sh @@ -1,9 +1,12 @@ #!/bin/bash -sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm fdisk lsblk luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-usb2 kmod-usb3/' target/linux/bcm27xx/Makefile +sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm fdisk lsblk luci-app-cpufreq kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-usb2 kmod-usb3/' target/linux/bcm27xx/Makefile sed -i 's/factory.img.gz //' target/linux/bcm27xx/image/Makefile +SHELL_FOLDER=$(dirname $(readlink -f "$0")) +bash $SHELL_FOLDER/../common/kernel_5.15.sh + echo ' CONFIG_ARM64_CRYPTO=y CONFIG_CRYPTO_AES_ARM64=y @@ -25,4 +28,4 @@ CONFIG_REALTEK_PHY=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -' >> ./target/linux/bcm27xx/bcm2711/config-5.10 +' >> ./target/linux/bcm27xx/bcm2711/config-5.15 diff --git a/devices/bcm27xx_bcm2711/patches/rpi.patch b/devices/bcm27xx_bcm2711/patches/rpi.patch deleted file mode 100644 index 2994abe4deb0..000000000000 --- a/devices/bcm27xx_bcm2711/patches/rpi.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- /dev/null -+++ b/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi4_info -@@ -0,0 +1,11 @@ -+#!/bin/sh -+ -+set_rpi_info() { -+ case "$(board_name)" in -+ raspberrypi,4-model-b) -+ sed -i 's/VHT80/VHT40/g' /lib/wifi/mac80211.sh -+ ;; -+ esac -+} -+ -+boot_hook_add preinit_main set_rpi_info diff --git a/devices/bcm53xx/diy.sh b/devices/bcm53xx/diy.sh index d01665fea1bf..fee3669da23a 100644 --- a/devices/bcm53xx/diy.sh +++ b/devices/bcm53xx/diy.sh @@ -5,5 +5,5 @@ shopt -s extglob SHELL_FOLDER=$(dirname $(readlink -f "$0")) bash $SHELL_FOLDER/../common/kernel_5.15.sh -sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-cpufreq luci-app-turboacc/' target/linux/mediatek/Makefile +sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq luci-app-turboacc/' target/linux/mediatek/Makefile diff --git a/devices/common/kernel_5.15.sh b/devices/common/kernel_5.15.sh index fa606573310a..364580edaadd 100644 --- a/devices/common/kernel_5.15.sh +++ b/devices/common/kernel_5.15.sh @@ -18,12 +18,14 @@ rm -rf target/linux/generic/pending-5.15/444-mtd-nand-rawnand-add-support-for-To sh -c "curl -sfL https://github.com/coolsnowwolf/lede/commit/06fcdca1bb9c6de6ccd0450a042349892b372220.patch | patch -d './' -p1 --forward" svn export --force https://github.com/openwrt/packages/trunk/kernel feeds/packages/kernel -svn export --force https://github.com/openwrt/packages/trunk/net/xtables-addons packages/net/xtables-addons +svn export --force https://github.com/openwrt/packages/trunk/net/xtables-addons feeds/packages/net/xtables-addons svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15 rm -rf target/linux/generic/hack-5.15/{220-gc_sections*,781-dsa-register*,780-drivers-net*} curl -sfL https://raw.githubusercontent.com/openwrt/openwrt/openwrt-22.03/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk +sed -i "s/tty\(0\|1\)::askfirst/tty\1::respawn/g" target/linux/*/base-files/etc/inittab + echo " CONFIG_TESTING_KERNEL=y CONFIG_PACKAGE_kmod-ipt-coova=n diff --git a/devices/common/patches/imagebuilder.patch b/devices/common/patches/imagebuilder.patch index a02ace0a98b1..ad53e4a6c048 100644 --- a/devices/common/patches/imagebuilder.patch +++ b/devices/common/patches/imagebuilder.patch @@ -4,8 +4,9 @@ ./files/repositories.conf \ $(TMP_DIR)/.targetinfo \ $(TMP_DIR)/.packageinfo \ +- $(PKG_BUILD_DIR)/ + $(TOPDIR)/files \ - $(PKG_BUILD_DIR)/ ++ $(PKG_BUILD_DIR)/ || true -ifeq ($(CONFIG_IB_STANDALONE),) echo '## Remote package repositories' >> $(PKG_BUILD_DIR)/repositories.conf diff --git a/devices/ipq40xx_generic/.config b/devices/ipq40xx_generic/.config index a466a1ef133f..f4927c356822 100644 --- a/devices/ipq40xx_generic/.config +++ b/devices/ipq40xx_generic/.config @@ -4,6 +4,8 @@ CONFIG_TARGET_ipq40xx_generic=y CONFIG_TARGET_MULTI_PROFILE=y CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_asus_rt-ac42u=y CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_asus_rt-ac58u=y +CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_p2w_r619ac-128m=y +CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_p2w_r619ac-64m=y CONFIG_PACKAGE_luci-ssl=y # uhttpd服务 diff --git a/devices/ipq40xx_generic/diy.sh b/devices/ipq40xx_generic/diy.sh index d01665fea1bf..fee3669da23a 100644 --- a/devices/ipq40xx_generic/diy.sh +++ b/devices/ipq40xx_generic/diy.sh @@ -5,5 +5,5 @@ shopt -s extglob SHELL_FOLDER=$(dirname $(readlink -f "$0")) bash $SHELL_FOLDER/../common/kernel_5.15.sh -sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-cpufreq luci-app-turboacc/' target/linux/mediatek/Makefile +sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq luci-app-turboacc/' target/linux/mediatek/Makefile diff --git a/devices/ipq807x/diy.sh b/devices/ipq807x/diy.sh index 3a025e871992..1ca91607c93d 100644 --- a/devices/ipq807x/diy.sh +++ b/devices/ipq807x/diy.sh @@ -20,7 +20,7 @@ svn co https://github.com/Boos4721/openwrt/trunk/target/linux/ipq807x target/lin rm -rf target/linux/ipq807x/{.svn,patches-5.15/.svn} svn co https://github.com/Boos4721/openwrt/trunk/target/linux/ipq807x/patches-5.15 target/linux/ipq807x/patches-5.15 -sed -i 's/autocore-arm /my-autocore-arm /' target/linux/ipq807x/Makefile +sed -i 's/autocore-arm /autocore-arm /' target/linux/ipq807x/Makefile sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-turboacc/' target/linux/ipq807x/Makefile echo ' diff --git a/devices/mediatek_mt7622/diy.sh b/devices/mediatek_mt7622/diy.sh index 60b8bae4f044..d42263d9bc61 100644 --- a/devices/mediatek_mt7622/diy.sh +++ b/devices/mediatek_mt7622/diy.sh @@ -7,7 +7,7 @@ bash $SHELL_FOLDER/../common/kernel_5.15.sh curl -sfL https://raw.githubusercontent.com/x-wrt/x-wrt/master/target/linux/mediatek/patches-5.15/995-0001-hwnat-add-natflow-flow-offload-support.patch -o target/linux/mediatek/patches-5.15/995-0001-hwnat-add-natflow-flow-offload-support.patch -sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm luci-app-cpufreq luci-app-natflow-users natflow-boot/' target/linux/mediatek/Makefile +sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq luci-app-natflow-users natflow-boot/' target/linux/mediatek/Makefile echo ' CONFIG_ARM64_CRYPTO=y diff --git a/devices/ramips_mt7621/.config b/devices/ramips_mt7621/.config index 69677df89376..692a9543d261 100644 --- a/devices/ramips_mt7621/.config +++ b/devices/ramips_mt7621/.config @@ -11,6 +11,9 @@ CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaomi_redmi-router-ac2100=y CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaomi_mi-router-ac2100=y CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaoyu_xy-c5=y CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_d-team_newifi-d2=y +CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_glinet_gl-mt1300=y +CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_glinet_gl-mt1300=y +CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_phicomm_k2p=y CONFIG_PACKAGE_luci-ssl=y # uhttpd服务 diff --git a/devices/rockchip_armv8/diy.sh b/devices/rockchip_armv8/diy.sh index 6a0401a97304..1265b94114d7 100644 --- a/devices/rockchip_armv8/diy.sh +++ b/devices/rockchip_armv8/diy.sh @@ -16,7 +16,7 @@ mv -f tmp/r8125 feeds/kiddin9/ sed -i -e 's,kmod-r8168,kmod-r8169,g' target/linux/rockchip/image/armv8.mk -sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-arm fdisk lsblk luci-app-cpufreq kmod-drm-rockchip kmod-gpu-lima kmod-usb2 kmod-usb3/' target/linux/rockchip/Makefile +sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm fdisk lsblk luci-app-cpufreq kmod-drm-rockchip kmod-gpu-lima kmod-usb2 kmod-usb3/' target/linux/rockchip/Makefile echo ' CONFIG_ARM64_CRYPTO=y diff --git a/devices/x86_64/diy.sh b/devices/x86_64/diy.sh index ff8b45db2f8f..07c37cd119f0 100644 --- a/devices/x86_64/diy.sh +++ b/devices/x86_64/diy.sh @@ -6,7 +6,7 @@ bash $SHELL_FOLDER/../common/kernel_5.15.sh svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/x86/patches-5.15 target/linux/x86/patches-5.15 rm -rf target/linux/x86/patches-5.15/.svn -sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-x86 lm-sensors-detect kmod-alx kmod-r8125 kmod-vmxnet3 kmod-igc kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-8139cp kmod-8139too kmod-i40e kmod-drm-i915 kmod-mlx4-core kmod-mlx5-core kmod-usb2 kmod-usb3 fdisk lsblk/' target/linux/x86/Makefile +sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-x86 lm-sensors-detect kmod-alx kmod-r8125 kmod-vmxnet3 kmod-igc kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-8139cp kmod-8139too kmod-i40e kmod-drm-i915 kmod-mlx4-core kmod-mlx5-core kmod-usb2 kmod-usb3 fdisk lsblk/' target/linux/x86/Makefile mv -f tmp/r81* feeds/kiddin9/ sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk