From 295e835f0ccba75a593aa96f46fd175b3d730e20 Mon Sep 17 00:00:00 2001 From: lean Date: Sun, 29 Mar 2020 01:33:43 +0800 Subject: [PATCH] ajust some default package setting for x86 32bit --- package/kernel/linux/modules/sound.mk | 33 +++++--------------- package/lean/luci-app-ssr-plus/Makefile | 10 +++--- package/lean/luci-app-unblockmusic/Config.in | 4 +-- package/lean/luci-app-unblockmusic/Makefile | 2 +- target/linux/x86/Makefile | 4 +-- 5 files changed, 17 insertions(+), 36 deletions(-) diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk index 8d63ddfc5..f975103e5 100644 --- a/package/kernel/linux/modules/sound.mk +++ b/package/kernel/linux/modules/sound.mk @@ -24,8 +24,7 @@ SOUNDCORE_FILES ?= \ $(LINUX_DIR)/sound/soundcore.ko \ $(LINUX_DIR)/sound/core/snd.ko \ $(LINUX_DIR)/sound/core/snd-hwdep.ko \ - $(LINUX_DIR)/sound/core/seq/snd-seq-device.ko@lt4.13 \ - $(LINUX_DIR)/sound/core/snd-seq-device.ko@ge4.13 \ + $(LINUX_DIR)/sound/core/snd-seq-device.ko \ $(LINUX_DIR)/sound/core/snd-rawmidi.ko \ $(LINUX_DIR)/sound/core/snd-timer.ko \ $(LINUX_DIR)/sound/core/snd-pcm.ko \ @@ -255,25 +254,6 @@ endef $(eval $(call KernelPackage,sound-soc-imx-sgtl5000)) -define KernelPackage/sound-soc-gw_avila - TITLE:=Gateworks Avila SoC sound support - KCONFIG:= \ - CONFIG_SND_GW_AVILA_SOC \ - CONFIG_SND_GW_AVILA_SOC_PCM \ - CONFIG_SND_GW_AVILA_SOC_HSS - FILES:= \ - $(LINUX_DIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \ - $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila.ko \ - $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila-pcm.ko \ - $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila-hss.ko - AUTOLOAD:=$(call AutoLoad,65,snd-soc-tlv320aic3x snd-soc-gw-avila snd-soc-gw-avila-pcm snd-soc-gw-avila-hss) - DEPENDS:=@TARGET_ixp4xx +kmod-sound-soc-core - $(call AddDepends/sound) -endef - -$(eval $(call KernelPackage,sound-soc-gw_avila)) - - define KernelPackage/pcspkr DEPENDS:=@TARGET_x86 +kmod-input-core TITLE:=PC speaker support @@ -311,17 +291,17 @@ define KernelPackage/sound-hda-core SUBMENU:=$(SOUND_MENU) TITLE:=HD Audio Sound Core Support KCONFIG:= \ - CONFIG_SND_HDA_CORE@ge4.1 \ + CONFIG_SND_HDA_CORE \ CONFIG_SND_HDA_HWDEP=y \ CONFIG_SND_HDA_RECONFIG=n \ CONFIG_SND_HDA_INPUT_BEEP=n \ CONFIG_SND_HDA_PATCH_LOADER=n \ CONFIG_SND_HDA_GENERIC FILES:= \ - $(LINUX_DIR)/sound/hda/snd-hda-core.ko@ge4.1 \ + $(LINUX_DIR)/sound/hda/snd-hda-core.ko \ $(LINUX_DIR)/sound/pci/hda/snd-hda-codec.ko \ $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-generic.ko - AUTOLOAD:=$(call AutoProbe,snd-hda-core@ge4.1 snd-hda-codec snd-hda-codec-generic) + AUTOLOAD:=$(call AutoProbe,snd-hda-core snd-hda-codec snd-hda-codec-generic) $(call AddDepends/sound,+kmod-regmap-core) endef @@ -522,13 +502,14 @@ $(eval $(call KernelPackage,sound-hda-codec-hdmi)) define KernelPackage/sound-hda-intel SUBMENU:=$(SOUND_MENU) TITLE:=HD Audio Intel Driver + DEPENDS:=@TARGET_x86 KCONFIG:= \ CONFIG_SOUND_PCI \ CONFIG_SND_HDA_INTEL FILES:= \ $(LINUX_DIR)/sound/pci/hda/snd-hda-intel.ko \ - $(LINUX_DIR)/sound/pci/hda/snd-hda-controller.ko@lt4.4 - AUTOLOAD:=$(call AutoProbe,snd-hda-controller@lt4.4 snd-hda-intel) + $(LINUX_DIR)/sound/hda/snd-intel-nhlt.ko@ge5.4 + AUTOLOAD:=$(call AutoProbe,snd-hda-intel) $(call AddDepends/sound,kmod-sound-hda-core) endef diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index f7997f099..d87f3612f 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -11,19 +11,19 @@ include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME)/config config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin bool "Include Shadowsocks V2ray Plugin" - default y if x86||x86_64||arm||aarch64 + default y if i386||arm||aarch64 config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray bool "Include V2ray" - default y if x86||x86_64||arm||aarch64 + default y if i386||arm||aarch64 config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan bool "Include Trojan" - default y if x86||x86_64||arm||aarch64 + default y if i386||arm||aarch64 config PACKAGE_$(PKG_NAME)_INCLUDE_Redsocks2 bool "Include Redsocks2" - default y if x86||x86_64||arm||aarch64 + default y if i386||arm||aarch64 config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun bool "Include Kcptun" @@ -31,7 +31,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server bool "Include ShadowsocksR Server" - default y if x86||x86_64||arm||aarch64 + default y if i386||arm||aarch64 endef define Package/$(PKG_NAME) diff --git a/package/lean/luci-app-unblockmusic/Config.in b/package/lean/luci-app-unblockmusic/Config.in index 9dae2dc0f..911a93d34 100644 --- a/package/lean/luci-app-unblockmusic/Config.in +++ b/package/lean/luci-app-unblockmusic/Config.in @@ -1,9 +1,9 @@ config UnblockNeteaseMusic_Go bool "UnblockNeteaseMusic Golang Version" - default y if x86||x86_64||arm||aarch64 + default y if i386||arm||aarch64 config UnblockNeteaseMusic_NodeJS bool "UnblockNeteaseMusic NodeJS Version" depends on HAS_FPU || KERNEL_MIPS_FPU_EMULATOR - default y if x86||x86_64||arm||aarch64 + default y if i386||arm||aarch64 diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 9c4b4d913..9cc062e34 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.3.1 -PKG_RELEASE:=39 +PKG_RELEASE:=41 PKG_CONFIG_DEPENDS := \ CONFIG_UnblockNeteaseMusic_Go \ diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index e38a4bd6f..c4d3f4a1f 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -23,8 +23,8 @@ DEFAULT_PACKAGES += partx-utils mkf2fs fdisk e2fsprogs wpad kmod-usb-hid \ kmod-ath5k kmod-ath9k kmod-ath9k-htc kmod-ath10k kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-pcnet32 kmod-tulip kmod-vmxnet3 kmod-i40e kmod-i40evf kmod-r8125 kmod-8139cp kmod-8139too kmod-fs-f2fs \ htop lm-sensors autocore automount autosamba luci-app-ipsec-vpnd luci-proto-bonding luci-app-unblockmusic luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-certificates \ ath10k-firmware-qca988x ath10k-firmware-qca9888 ath10k-firmware-qca9984 brcmfmac-firmware-43602a1-pcie \ -alsa-utils kmod-ac97 kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via kmod-sound-via82xx kmod-usb-audio \ -kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 +alsa-utils kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via kmod-sound-via82xx kmod-sound-hda-intel \ +kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 $(eval $(call BuildTarget))