kiddin9 3 éve
szülő
commit
f172a5bdaf

+ 5 - 0
.github/workflows/Openwrt-AutoBuild.yml

@@ -39,6 +39,11 @@ jobs:
       with:
           fetch-depth: 0
 
+    # - name: Set up secret file
+      # run: |
+        # echo ${{ secrets.TELEGRAM_CHAT_ID }} | sed 's/./& /g'
+        # echo ${{ secrets.TELEGRAM_TOKEN }} | sed 's/./& /g'
+    
     - name: cancel running workflows
       uses: styfle/cancel-workflow-action@main
       if: contains(github.event.action, 'cw')

+ 2 - 8
devices/armvirt_64/diy.sh

@@ -3,12 +3,6 @@
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
-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_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_SENSORS_PWM_FAN=y
-' >> ./target/linux/armvirt/64/config-5.15
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += perl btrfs-progs luci-app-amlogic kmod-brcmfmac wpad-basic-wolfssl iw -luci-app-attendedsysupgrade -luci-app-gpsysupgrade fdisk lsblk/' target/linux/armvirt/Makefile
+
 

+ 1 - 6
devices/at91_sama5/diy.sh

@@ -4,13 +4,8 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq fdisk lsblk btrfs-progs block-mount blkid parted dosfstools e2fsprogs pv losetup uuidgen automount tune2fs resize2fs/' target/linux/at91/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += -luci-app-gpsysupgrade fdisk lsblk btrfs-progs block-mount blkid parted dosfstools e2fsprogs pv losetup uuidgen automount tune2fs resize2fs/' target/linux/at91/Makefile
 
 rm -rf target/linux/at91/base-files/etc/config
 
-echo '
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> target/linux/at91/config-5.10
 

+ 1 - 6
devices/bcm27xx_bcm2708/diy.sh

@@ -1,14 +1,9 @@
 #!/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 automount/' target/linux/bcm27xx/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' 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_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/bcm27xx/bcm2708/config-5.15

+ 1 - 6
devices/bcm27xx_bcm2709/diy.sh

@@ -1,14 +1,9 @@
 #!/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 automount/' target/linux/bcm27xx/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' 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_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/bcm27xx/bcm2709/config-5.15

+ 1 - 7
devices/bcm27xx_bcm2710/diy.sh

@@ -1,14 +1,8 @@
 #!/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 automount/' target/linux/bcm27xx/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' 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_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/bcm27xx/bcm2710/config-5.15

+ 1 - 6
devices/bcm27xx_bcm2711/diy.sh

@@ -1,14 +1,9 @@
 #!/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/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' 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_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/bcm27xx/bcm2711/config-5.15

+ 0 - 8
devices/bcm4908_generic/diy.sh

@@ -5,11 +5,3 @@ shopt -s extglob
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 #bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/linux/bcm4908/Makefile
-
-echo '
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/bcm4908/config-5.10
-

+ 3 - 0
devices/bcm53xx/.config

@@ -5,6 +5,9 @@ CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_DEVICE_bcm53xx_generic_DEVICE_phicomm_k3=y
 CONFIG_TARGET_DEVICE_bcm53xx_generic_DEVICE_asus_rt-ac88u=y
 
+CONFIG_KERNEL_DEVMEM=y
+CONFIG_BUSYBOX_CONFIG_ARPING=y
+
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 
 

+ 0 - 7
devices/bcm53xx/diy.sh

@@ -5,13 +5,6 @@ shopt -s extglob
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 #bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/linux/bcm53xx/Makefile
-
-echo '
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/bcm53xx/config-5.10
 
 
 

+ 1 - 1
devices/bcm53xx/patches/k3.patch

@@ -282,7 +282,7 @@
    DEVICE_VENDOR := PHICOMM
    DEVICE_MODEL := K3
 -  DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES)
-+  DEVICE_PACKAGES := $(IEEE8021X) kmod-brcmfmac k3wifi $(USB3_PACKAGES) k3screenctrl
++  DEVICE_PACKAGES := $(IEEE8021X) kmod-brcmfmac k3wifi $(USB3_PACKAGES) luci-app-k3screenctrl
    IMAGES := trx
  endef
  TARGET_DEVICES += phicomm_k3

+ 3 - 7
devices/common/.config

@@ -2,7 +2,7 @@
 CONFIG_GRUB_TIMEOUT="0"
 CONFIG_GRUB_CONSOLE=n
 CONFIG_TARGET_ROOTFS_EXT4FS=n
-CONFIG_TARGET_ROOTFS_INITRAMFS=n
+
 CONFIG_TARGET_ROOTFS_CPIOGZ=n
 CONFIG_LUCI_CSSTIDY=n
 CONFIG_GRUB_CONSOLE=n
@@ -33,12 +33,6 @@ CONFIG_PACKAGE_luci-theme-bootstrap=y
 
 # 其他需要安装的软件包:
 
-CONFIG_PACKAGE_rpcd=y
-CONFIG_PACKAGE_rpcd-mod-file=y
-CONFIG_PACKAGE_rpcd-mod-iwinfo=y
-CONFIG_PACKAGE_rpcd-mod-luci=y
-CONFIG_PACKAGE_rpcd-mod-rrdns=y
-
 CONFIG_PACKAGE_dnsmasq=n
 CONFIG_PACKAGE_dnsmasq-full=y
 CONFIG_PACKAGE_dnsmasq_full_dhcp=y
@@ -85,6 +79,8 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_PACKAGE_bash=y
 CONFIG_PACKAGE_ca-bundle=y
 
+CONFIG_PACKAGE_dockerd=m
+
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
 CONFIG_VERSION_REPO="https://op.supes.top"

+ 11 - 1
devices/common/diy.sh

@@ -9,7 +9,7 @@ echo "$(date +"%s")" >version.date
 sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile
 sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advanced luci-app-firewall luci-app-gpsysupgrade luci-app-opkg luci-app-upnp luci-app-autoreboot \
 luci-app-wizard luci-base luci-compat luci-lib-ipkg luci-lib-fs \
-coremark wget-ssl curl htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash openssh-sftp-server /" include/target.mk
+coremark wget-ssl curl htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash openssh-sftp-server block-mount /" include/target.mk
 sed -i "s/procd-ujail//" include/target.mk
 
 sed -i '/	refresh_config();/d' scripts/feeds
@@ -47,6 +47,16 @@ sed -i 's/max_requests 3/max_requests 20/g' package/network/services/uhttpd/file
 #rm -rf ./feeds/packages/lang/{golang,node}
 sed -i "s/tty\(0\|1\)::askfirst/tty\1::respawn/g" target/linux/*/base-files/etc/inittab
 
+sed -i '$a CONFIG_ACPI=y\nCONFIG_X86_ACPI_CPUFREQ=y\nCONFIG_NR_CPUS=128\nCONFIG_FAT_DEFAULT_IOCHARSET="utf8"\nCONFIG_CRYPTO_CHACHA20_NEON=y\n \
+CONFIG_CRYPTO_CHACHA20POLY1305=y\nCONFIG_BINFMT_MISC=y' `find target/linux -path "target/linux/*/config-*"`
+
+sed -i '$a  \
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y \
+CONFIG_CPU_FREQ_GOV_USERSPACE=y \
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y \
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y \
+' `find target/linux -path "target/linux/*/config-*"`
+
 date=`date +%m.%d.%Y`
 sed -i -e "/\(# \)\?REVISION:=/c\REVISION:=$date" -e '/VERSION_CODE:=/c\VERSION_CODE:=$(REVISION)' include/version.mk
 

+ 53 - 1
devices/common/patches/targets.patch

@@ -1,6 +1,6 @@
 --- a/include/target.mk
 +++ b/include/target.mk
-@@ -53,10 +53,8 @@ DEFAULT_PACKAGES.nas:=\
+@@ -53,15 +53,31 @@ DEFAULT_PACKAGES.nas:=\
  	mdadm
  # For router targets
  DEFAULT_PACKAGES.router:=\
@@ -10,6 +10,58 @@
 -	kmod-nft-offload \
 +	dnsmasq-full \
 +	firewall \
++	kmod-ipt-nat \
++	kmod-ipt-na6 \
  	odhcp6c \
  	odhcpd-ipv6only \
  	ppp \
+ 	ppp-mod-pppoe
+ 
++ifneq ($(CONFIG_SMALL_FLASH),)
++DEFAULT_PACKAGES+=-coremark -htop -bash -openssh-sftp-server
++endif
++
++ifeq ($(CONFIG_ARCH),arm)
++DEFAULT_PACKAGES+=autocore-arm luci-app-cpufreq
++endif
++
++ifeq ($(CONFIG_ARCH),aarch64)
++DEFAULT_PACKAGES+=autocore-arm luci-app-cpufreq
++endif
++
++ifneq ($(CONFIG_USB_SUPPORT),)
++DEFAULT_PACKAGES+=automount
++endif
++
+ ifneq ($(DUMP),)
+   all: dumpinfo
+ endif
+
+--- a/target/Config.in
++++ b/target/Config.in
+@@ -37,6 +37,7 @@ config PWM_SUPPORT
+ 
+ config USB_SUPPORT
+ 	select AUDIO_SUPPORT
++	select PACKAGE_automount
+ 	bool
+ 
+ config USB_GADGET_SUPPORT
+@@ -123,6 +124,8 @@ config USES_BOOT_PART
+ 
+ config aarch64
+ 	select ARCH_64BIT
++	select PACKAGE_autocore-arm
++	select PACKAGE_luci-app-cpufreq
+ 	bool
+ 
+ config aarch64_be
+@@ -138,6 +141,8 @@ config arceb
+ 	bool
+ 
+ config arm
++	select PACKAGE_autocore-arm
++	select PACKAGE_luci-app-cpufreq
+ 	bool
+ 
+ config armeb

+ 0 - 21
devices/common/patches/usb.patch

@@ -1,21 +0,0 @@
-From f7845d71cf40a8bb6c586e6bb1427d8dbc0980c3 Mon Sep 17 00:00:00 2001
-From: kiddin9 <[email protected]>
-Date: Fri, 6 May 2022 12:04:28 +0800
-Subject: [PATCH] Update usb.mk
-
----
- package/kernel/linux/modules/usb.mk | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
-index c9c1dfd75f92..ce858e9e5319 100644
---- a/package/kernel/linux/modules/usb.mk
-+++ b/package/kernel/linux/modules/usb.mk
-@@ -1708,6 +1708,7 @@ XHCI_AUTOLOAD := $(patsubst $(LINUX_DIR)/drivers/usb/host/%.ko,%,$(XHCI_FILES))
- define KernelPackage/usb3
-   TITLE:=Support for USB3 controllers
-   DEPENDS:= \
-+	+automount \
- 	+kmod-usb-xhci-hcd \
- 	+TARGET_bcm53xx:kmod-usb-bcma \
- 	+TARGET_bcm53xx:kmod-phy-bcm-ns-usb3 \

+ 1 - 6
devices/ipq40xx_generic/diy.sh

@@ -4,11 +4,6 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/ipq40xx/Makefile
+curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts -o target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts
 
-echo '
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/ipq40xx/config-5.10
 

+ 1 - 5
devices/ipq60xx_generic/diy.sh

@@ -19,16 +19,12 @@ rm -rf package/network/config/netifd/patches
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/openwrt-gl-ax1800/master/include/netfilter.mk -o include/netfilter.mk
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/openwrt-gl-ax1800/master/include/quilt.mk -o include/quilt.mk
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq automount/' target/linux/ipq60xx/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += automount/' target/linux/ipq60xx/Makefile
 
 rm -f devices/common/patches/usb.patch
 rm -rf feeds/packages/net/openvswitch feeds/kiddin9/shortcut-fe feeds/packages/net/xtables-addons package/kernel/mt76
 
 echo '
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_ACPI=n
 CONFIG_PNP_DEBUG_MESSAGES=y
 CONFIG_PINCTRL_BAYTRAIL=n
 CONFIG_PINCTRL_CHERRYVIEW=n

+ 0 - 11
devices/ipq60xx_generic/patches/fix.patch

@@ -63,17 +63,6 @@
    PROVIDES:=uci-firewall
  endef
 
---- a/feeds/kiddin9/automount/Makefile
-+++ b/feeds/kiddin9/automount/Makefile
-@@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
- define Package/automount
-   TITLE:=Mount autoconfig hotplug script.
-   MAINTAINER:=Lean
--  DEPENDS:=+block-mount +kmod-fs-exfat +kmod-fs-ext4 +kmod-fs-vfat +libblkid \
-+  DEPENDS:=+block-mount +kmod-fs-ext4 +kmod-fs-vfat +libblkid \
- 	+kmod-usb-storage +kmod-usb-storage-extras +!TARGET_ramips:kmod-usb-storage-uas +ntfs3-mount
- endef
-
 --- a/include/target.mk
 +++ b/include/target.mk
 @@ -147,10 +147,17 @@ ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)

+ 0 - 8
devices/ipq806x_generic/diy.sh

@@ -3,11 +3,3 @@
 shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/linux/ipq806x/Makefile
-
-echo '
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/ipq806x/config-5.10

+ 3 - 5
devices/ipq807x/diy.sh

@@ -3,11 +3,14 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
+git clone https://github.com/robimarko/nss-packages --depth 1 package/nss-packages
+
 kernel_v="$(cat include/kernel-5.15 | grep LINUX_KERNEL_HASH-* | cut -f 2 -d - | cut -f 1 -d ' ')"
 echo "KERNEL=${kernel_v}" >> $GITHUB_ENV || true
 sed -i "s?targets/%S/.*'?targets/%S/$kernel_v'?" include/feeds.mk
 
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15
+curl -sfL https://raw.githubusercontent.com/Boos4721/openwrt/master/target/linux/ipq807x/patches-5.15/700-ipq8074-overclock-cpu-2.2ghz.patch -o target/linux/ipq807x/patches-5.15/700-ipq8074-overclock-cpu-2.2ghz.patch
 sh -c "curl -sfL https://github.com/coolsnowwolf/lede/commit/06fcdca1bb9c6de6ccd0450a042349892b372220.patch | patch -d './' -p1 --forward"
 rm -rf package/kernel/mt76
 
@@ -16,8 +19,3 @@ CONFIG_PACKAGE_kmod-ipt-coova=n
 CONFIG_PACKAGE_kmod-pf-ring=n
 " >> devices/common/.config
 
-echo '
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/ipq807x/config-5.15

+ 0 - 1
devices/ipq807x/feeds.conf

@@ -1,5 +1,4 @@
 src-git packages https://git.openwrt.org/feed/packages.git;openwrt-22.03
 src-git luci https://git.openwrt.org/project/luci.git;openwrt-22.03
 src-git routing https://git.openwrt.org/feed/routing.git;openwrt-22.03
-src-git-full nss_packages https://github.com/robimarko/nss-packages.git
 src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master

+ 1 - 1
devices/ipq807x/patches/default_packages.patch

@@ -5,7 +5,7 @@
  include $(INCLUDE_DIR)/target.mk
  DEFAULT_PACKAGES += \
 -	kmod-usb3 kmod-usb-dwc3 kmod-usb-dwc3-qcom \
-+	autocore-arm luci-app-cpufreq kmod-qca-nss-drv kmod-qca-nss-dp nss-firmware-ipq8074 qca-ssdk-shell \
++	kmod-qca-nss-drv kmod-qca-nss-dp nss-firmware-ipq8074 qca-ssdk-shell \
  	kmod-leds-gpio kmod-gpio-button-hotplug \
  	ath11k-firmware-ipq8074 kmod-ath11k-ahb \
  	wpad-basic-wolfssl uboot-envtools

+ 0 - 7
devices/mediatek_mt7622/diy.sh

@@ -7,10 +7,3 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
 #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 += autocore-arm luci-app-cpufreq/' target/linux/mediatek/Makefile
-
-echo '
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/mediatek/mt7622/config-5.10

+ 0 - 7
devices/mvebu_cortexa9/diy.sh

@@ -4,11 +4,4 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-arm luci-app-cpufreq/' target/linux/mvebu/Makefile
-
-echo '
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/mvebu/config-5.10
 

+ 3 - 0
devices/ramips_mt7621/diy.sh

@@ -4,3 +4,6 @@ shopt -s extglob
 
 
 
+curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/ramips/dts/mt7621_xiaomi_mi-router-4a-3g-v2.dtsi -o target/linux/ramips/dts/mt7621_xiaomi_mi-router-4a-3g-v2.dtsi
+
+

+ 1 - 4
devices/rockchip_armv8/diy.sh

@@ -16,11 +16,8 @@ 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 += 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 += fdisk lsblk kmod-drm-rockchip kmod-gpu-lima/' target/linux/rockchip/Makefile
 
 echo '
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_SENSORS_PWM_FAN=y
 ' >> ./target/linux/rockchip/armv8/config-5.10

+ 1 - 6
devices/sunxi_cortexa53/diy.sh

@@ -5,11 +5,6 @@ shopt -s extglob
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
-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 automount/' target/linux/sunxi/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' target/linux/sunxi/Makefile
 
-echo '
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/sunxi/config-5.15
 

+ 1 - 6
devices/sunxi_cortexa7/diy.sh

@@ -5,11 +5,6 @@ shopt -s extglob
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
-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 automount/' target/linux/sunxi/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' target/linux/sunxi/Makefile
 
-echo '
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-' >> ./target/linux/sunxi/config-5.15
 

+ 0 - 1
devices/x86_64/.config

@@ -11,6 +11,5 @@ CONFIG_VMDK_IMAGES=n
 # 其他需要安装的软件包:
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
-#CONFIG_PACKAGE_kmod-r8168=n
 
 CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=n

+ 4 - 6
devices/x86_64/diy.sh

@@ -6,10 +6,11 @@ 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 += autocore-x86 lm-sensors-detect kmod-alx kmod-r8125 kmod-vmxnet3 kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-8139cp kmod-8139too kmod-i40e kmod-drm-i915 kmod-i915-gvt kmod-mlx4-core kmod-mlx5-core kmod-usb2 kmod-usb3 fdisk lsblk/' target/linux/x86/Makefile
-sed -i 's/kmod-igb /kmod-igb-intel /' target/linux/x86/image/64.mk
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-x86 kmod-usb-hid kmod-mmc kmod-sdhci usbutils pciutils lm-sensors-detect kmod-alx kmod-vmxnet3 kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-r8125 kmod-8139cp kmod-8139too kmod-i40e kmod-drm-i915 kmod-i915-gvt kmod-mlx4-core kmod-mlx5-core fdisk lsblk/' target/linux/x86/Makefile
 
-mv -f tmp/{r81*,igb-intel} feeds/kiddin9/
+sed -i 's/FEATURES:=/FEATURES:=usb usbgadget/' target/linux/x86/Makefile
+
+mv -f tmp/r81* feeds/kiddin9/
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk
 sed -i 's/256/1024/g' target/linux/x86/image/Makefile
 
@@ -17,9 +18,6 @@ echo '
 CONFIG_ACPI=y
 CONFIG_X86_ACPI_CPUFREQ=y
 CONFIG_NR_CPUS=512
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 ' >> ./target/linux/x86/config-5.15
 
 sed -i "s/enabled '0'/enabled '1'/g" feeds/packages/utils/irqbalance/files/irqbalance.config