kiddin9 2 лет назад
Родитель
Сommit
45b66b3a5b

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

@@ -15,7 +15,7 @@
  	odhcp6c \
  	odhcp6c \
  	odhcpd-ipv6only \
  	odhcpd-ipv6only \
  	ppp \
  	ppp \
-@@ -93,6 +93,22 @@ else
+@@ -93,6 +93,18 @@ else
    endif
    endif
  endif
  endif
  
  
@@ -30,10 +30,6 @@
 +ifeq ($(ARCH),aarch64)
 +ifeq ($(ARCH),aarch64)
 +DEFAULT_PACKAGES+=autocore-arm luci-app-cpufreq
 +DEFAULT_PACKAGES+=autocore-arm luci-app-cpufreq
 +endif
 +endif
-+
-+ifneq ($(CONFIG_PACKAGE_kmod-usb-core),)
-+DEFAULT_PACKAGES+=automount
-+endif
 +
 +
  # Add device specific packages (here below to allow device type set from subtarget)
  # Add device specific packages (here below to allow device type set from subtarget)
  DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))
  DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))

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

@@ -0,0 +1,11 @@
+--- a/package/kernel/linux/modules/usb.mk
++++ b/package/kernel/linux/modules/usb.mk
+@@ -14,7 +14,7 @@ USBINPUT_DIR?=input/misc
+ define KernelPackage/usb-core
+   SUBMENU:=$(USB_MENU)
+   TITLE:=Support for USB
+-  DEPENDS:=@USB_SUPPORT
++  DEPENDS:=@USB_SUPPORT +automount
+   KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n
+   FILES:= \
+ 	$(LINUX_DIR)/drivers/usb/core/usbcore.ko \

+ 0 - 1
devices/ipq40xx_generic/diy.sh

@@ -10,5 +10,4 @@ svn export --force https://github.com/openwrt/openwrt/trunk/package/firmware/ipq
 
 
 #sh -c "curl -sfL https://patch-diff.githubusercontent.com/raw/openwrt/openwrt/pull/10778.patch | git apply -p1"
 #sh -c "curl -sfL https://patch-diff.githubusercontent.com/raw/openwrt/openwrt/pull/10778.patch | git apply -p1"
 
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += kmod-usb2 kmod-usb3/' target/linux/ipq40xx/Makefile
 
 

+ 0 - 2
devices/ipq806x_generic/diy.sh

@@ -3,5 +3,3 @@
 shopt -s extglob
 shopt -s extglob
 
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
-
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += kmod-usb2 kmod-usb3/' target/linux/ipq806x/Makefile

+ 1 - 1
devices/rockchip_armv8/diy.sh

@@ -23,7 +23,7 @@ rm -rf target/linux/rockchip/armv8/base-files/etc/uci-defaults/13_opkg_update
 
 
 sed -i -e 's,kmod-r8168,kmod-r8169,g' target/linux/rockchip/image/armv8.mk
 sed -i -e 's,kmod-r8168,kmod-r8169,g' target/linux/rockchip/image/armv8.mk
 
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += kmod-usb2 kmod-usb3 fdisk lsblk kmod-drm-rockchip/' target/linux/rockchip/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-drm-rockchip/' target/linux/rockchip/Makefile
 
 
 sed -i 's/Ariaboard/光影猫/' target/linux/rockchip/image/armv8.mk
 sed -i 's/Ariaboard/光影猫/' target/linux/rockchip/image/armv8.mk
 
 

+ 1 - 1
devices/x86_64/diy.sh

@@ -14,7 +14,7 @@ curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linu
 
 
 sed -i "s/ +PACKAGE_kmod-backlight:kmod-backlight//" package/kernel/linux/modules/video.mk
 sed -i "s/ +PACKAGE_kmod-backlight:kmod-backlight//" package/kernel/linux/modules/video.mk
 
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-x86 kmod-usb-hid kmod-usb2 kmod-usb3 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-drm-amdgpu kmod-mlx4-core kmod-mlx5-core fdisk lsblk kmod-phy-broadcom/' target/linux/x86/Makefile
+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-drm-amdgpu kmod-mlx4-core kmod-mlx5-core fdisk lsblk kmod-phy-broadcom/' target/linux/x86/Makefile
 
 
 mv -f tmp/r81* feeds/kiddin9/
 mv -f tmp/r81* feeds/kiddin9/
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk

+ 1 - 1
devices/x86_generic/diy.sh

@@ -13,7 +13,7 @@ curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/package/ker
 
 
 sed -i "s/ +PACKAGE_kmod-backlight:kmod-backlight//" package/kernel/linux/modules/video.mk
 sed -i "s/ +PACKAGE_kmod-backlight:kmod-backlight//" package/kernel/linux/modules/video.mk
 
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-x86 kmod-usb2 kmod-usb3 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-drm-amdgpu kmod-mlx4-core kmod-mlx5-core fdisk lsblk/' target/linux/x86/Makefile
+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-drm-amdgpu kmod-mlx4-core kmod-mlx5-core fdisk lsblk/' target/linux/x86/Makefile
 
 
 mv -f tmp/r81* feeds/kiddin9/
 mv -f tmp/r81* feeds/kiddin9/
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/*.mk
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/*.mk