mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-14 17:00:18 +00:00
treewide: fix syntax errors exposed after kconfig update
After commit e82a4d9cfb ("config: regenerate *_shipped sources") the mconf parser became more strict as a side effect and started to spew a series of warnings when evaluating our generated kconfig sources: tmp/.config-package.in:705:warning: ignoring unsupported character '@' The root cause of these warnings is a wrong use of the @SYMBOL dependency syntax in various Makefile. Fix the corresponding Makefiles by turning `@SYM||@SYM2` expressions into the proper `@(SYM||SYM2)` form. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
parent
75dcaf3d23
commit
74739c4228
@ -44,7 +44,7 @@ define Package/kexec
|
|||||||
$(call Package/kexec-tools/Default)
|
$(call Package/kexec-tools/Default)
|
||||||
TITLE:=Kernel boots kernel
|
TITLE:=Kernel boots kernel
|
||||||
DEPENDS:=\
|
DEPENDS:=\
|
||||||
@armeb||@arm||@i386||@x86_64||@powerpc64||@mipsel||@mips \
|
@(armeb||arm||i386||x86_64||powerpc64||mipsel||mips) \
|
||||||
+KEXEC_ZLIB:zlib +KEXEC_LZMA:liblzma @KERNEL_KEXEC
|
+KEXEC_ZLIB:zlib +KEXEC_LZMA:liblzma @KERNEL_KEXEC
|
||||||
endef
|
endef
|
||||||
|
|
||||||
@ -55,7 +55,7 @@ endef
|
|||||||
define Package/kdump
|
define Package/kdump
|
||||||
$(call Package/kexec-tools/Default)
|
$(call Package/kexec-tools/Default)
|
||||||
TITLE:=Kernel crash analysis
|
TITLE:=Kernel crash analysis
|
||||||
DEPENDS:=+kexec @i386||@x86_64||@arm @KERNEL_CRASH_DUMP
|
DEPENDS:=+kexec @(i386||x86_64||arm) @KERNEL_CRASH_DUMP
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/kdump/description
|
define Package/kdump/description
|
||||||
|
@ -32,15 +32,15 @@ include $(INCLUDE_DIR)/package.mk
|
|||||||
define Package/broadcom-wl/Default
|
define Package/broadcom-wl/Default
|
||||||
SECTION:=kernel
|
SECTION:=kernel
|
||||||
CATEGORY:=Kernel modules
|
CATEGORY:=Kernel modules
|
||||||
DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mini
|
DEPENDS:=@(PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mini)
|
||||||
SUBMENU:=Proprietary BCM43xx WiFi driver
|
SUBMENU:=Proprietary BCM43xx WiFi driver
|
||||||
SUBMENUDEP:=@TARGET_brcm47xx||TARGET_brcm63xx
|
SUBMENUDEP:=(TARGET_brcm47xx||TARGET_brcm63xx)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define KernelPackage/brcm-wl/Default
|
define KernelPackage/brcm-wl/Default
|
||||||
$(call Package/broadcom-wl/Default)
|
$(call Package/broadcom-wl/Default)
|
||||||
SECTION:=kernel
|
SECTION:=kernel
|
||||||
DEPENDS:=@TARGET_brcm47xx||TARGET_brcm63xx +wireless-tools
|
DEPENDS:=@(TARGET_brcm47xx||TARGET_brcm63xx) +wireless-tools
|
||||||
TITLE:=Kernel driver for BCM43xx chipsets
|
TITLE:=Kernel driver for BCM43xx chipsets
|
||||||
FILES:=$(PKG_BUILD_DIR)/driver$(1)/wl.ko $(PKG_BUILD_DIR)/glue/wl_glue.ko
|
FILES:=$(PKG_BUILD_DIR)/driver$(1)/wl.ko $(PKG_BUILD_DIR)/glue/wl_glue.ko
|
||||||
AUTOLOAD:=$(call AutoProbe,wl)
|
AUTOLOAD:=$(call AutoProbe,wl)
|
||||||
|
@ -72,7 +72,7 @@ $(eval $(call KernelPackage,usb-phy-nop))
|
|||||||
|
|
||||||
define KernelPackage/usb-phy-qcom-dwc3
|
define KernelPackage/usb-phy-qcom-dwc3
|
||||||
TITLE:=DWC3 USB QCOM PHY driver
|
TITLE:=DWC3 USB QCOM PHY driver
|
||||||
DEPENDS:=@TARGET_ipq40xx||@TARGET_ipq806x +kmod-usb-dwc3-of-simple
|
DEPENDS:=@(TARGET_ipq40xx||TARGET_ipq806x) +kmod-usb-dwc3-of-simple
|
||||||
KCONFIG:= CONFIG_PHY_QCOM_DWC3
|
KCONFIG:= CONFIG_PHY_QCOM_DWC3
|
||||||
FILES:= \
|
FILES:= \
|
||||||
$(LINUX_DIR)/drivers/phy/phy-qcom-dwc3.ko@lt4.13 \
|
$(LINUX_DIR)/drivers/phy/phy-qcom-dwc3.ko@lt4.13 \
|
||||||
@ -480,7 +480,7 @@ $(eval $(call KernelPackage,usb-dwc3))
|
|||||||
|
|
||||||
define KernelPackage/usb-dwc3-of-simple
|
define KernelPackage/usb-dwc3-of-simple
|
||||||
TITLE:=DWC3 USB simple OF driver
|
TITLE:=DWC3 USB simple OF driver
|
||||||
DEPENDS:=@!LINUX_4_19 @TARGET_ipq40xx||@TARGET_ipq806x +kmod-usb-dwc3
|
DEPENDS:=@!LINUX_4_19 @(TARGET_ipq40xx||TARGET_ipq806x) +kmod-usb-dwc3
|
||||||
KCONFIG:= CONFIG_USB_DWC3_OF_SIMPLE
|
KCONFIG:= CONFIG_USB_DWC3_OF_SIMPLE
|
||||||
FILES:= $(LINUX_DIR)/drivers/usb/dwc3/dwc3-of-simple.ko
|
FILES:= $(LINUX_DIR)/drivers/usb/dwc3/dwc3-of-simple.ko
|
||||||
AUTOLOAD:=$(call AutoLoad,53,dwc3-of-simple,1)
|
AUTOLOAD:=$(call AutoLoad,53,dwc3-of-simple,1)
|
||||||
@ -498,7 +498,7 @@ $(eval $(call KernelPackage,usb-dwc3-of-simple))
|
|||||||
|
|
||||||
define KernelPackage/usb-dwc3-qcom
|
define KernelPackage/usb-dwc3-qcom
|
||||||
TITLE:=DWC3 Qualcomm USB driver
|
TITLE:=DWC3 Qualcomm USB driver
|
||||||
DEPENDS:=@LINUX_4_19 @TARGET_ipq40xx||@TARGET_ipq806x +kmod-usb-dwc3
|
DEPENDS:=@LINUX_4_19 @(TARGET_ipq40xx||TARGET_ipq806x) +kmod-usb-dwc3
|
||||||
KCONFIG:= CONFIG_USB_DWC3_QCOM
|
KCONFIG:= CONFIG_USB_DWC3_QCOM
|
||||||
FILES:= $(LINUX_DIR)/drivers/usb/dwc3/dwc3-qcom.ko
|
FILES:= $(LINUX_DIR)/drivers/usb/dwc3/dwc3-qcom.ko
|
||||||
AUTOLOAD:=$(call AutoLoad,53,dwc3-qcom,1)
|
AUTOLOAD:=$(call AutoLoad,53,dwc3-qcom,1)
|
||||||
|
@ -275,7 +275,7 @@ endef
|
|||||||
|
|
||||||
define KernelPackage/p54-common
|
define KernelPackage/p54-common
|
||||||
$(call KernelPackage/p54/Default)
|
$(call KernelPackage/p54/Default)
|
||||||
DEPENDS+= @PCI_SUPPORT||@USB_SUPPORT +kmod-mac80211 +kmod-lib-crc-ccitt +@DRIVER_11W_SUPPORT
|
DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT) +kmod-mac80211 +kmod-lib-crc-ccitt +@DRIVER_11W_SUPPORT
|
||||||
TITLE+= (COMMON)
|
TITLE+= (COMMON)
|
||||||
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/p54/p54common.ko
|
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/p54/p54common.ko
|
||||||
endef
|
endef
|
||||||
|
@ -131,7 +131,7 @@ define KernelPackage/ath5k
|
|||||||
$(call KernelPackage/mac80211/Default)
|
$(call KernelPackage/mac80211/Default)
|
||||||
TITLE:=Atheros 5xxx wireless cards support
|
TITLE:=Atheros 5xxx wireless cards support
|
||||||
URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath5k
|
URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath5k
|
||||||
DEPENDS+= @PCI_SUPPORT||@TARGET_ath25 +kmod-ath +@DRIVER_11W_SUPPORT
|
DEPENDS+= @(PCI_SUPPORT||TARGET_ath25) +kmod-ath +@DRIVER_11W_SUPPORT
|
||||||
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath5k/ath5k.ko
|
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath5k/ath5k.ko
|
||||||
AUTOLOAD:=$(call AutoProbe,ath5k)
|
AUTOLOAD:=$(call AutoProbe,ath5k)
|
||||||
endef
|
endef
|
||||||
|
@ -58,7 +58,7 @@ endef
|
|||||||
define Package/procd-seccomp
|
define Package/procd-seccomp
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Base system
|
CATEGORY:=Base system
|
||||||
DEPENDS:=@arm||@armeb||@mips||@mipsel||@i386||@powerpc||@x86_64 @!TARGET_uml @KERNEL_SECCOMP +libubox +libblobmsg-json
|
DEPENDS:=@(arm||armeb||mips||mipsel||i386||powerpc||x86_64) @!TARGET_uml @KERNEL_SECCOMP +libubox +libblobmsg-json
|
||||||
TITLE:=OpenWrt process seccomp helper + utrace
|
TITLE:=OpenWrt process seccomp helper + utrace
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ define Package/nvram
|
|||||||
CATEGORY:=Base system
|
CATEGORY:=Base system
|
||||||
TITLE:=Userspace port of the Broadcom NVRAM manipulation tool
|
TITLE:=Userspace port of the Broadcom NVRAM manipulation tool
|
||||||
MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
|
MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
|
||||||
DEPENDS:=@TARGET_brcm47xx||@TARGET_bcm53xx||@TARGET_ar71xx||@TARGET_ath79
|
DEPENDS:=@(TARGET_brcm47xx||TARGET_bcm53xx||TARGET_ar71xx||TARGET_ath79)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/nvram/description
|
define Package/nvram/description
|
||||||
|
@ -19,7 +19,7 @@ define Package/otrx
|
|||||||
CATEGORY:=Base system
|
CATEGORY:=Base system
|
||||||
TITLE:=Utility for opening (analyzing) TRX firmware images
|
TITLE:=Utility for opening (analyzing) TRX firmware images
|
||||||
MAINTAINER:=Rafał Miłecki <zajec5@gmail.com>
|
MAINTAINER:=Rafał Miłecki <zajec5@gmail.com>
|
||||||
DEPENDS:=@TARGET_brcm47xx||@TARGET_bcm53xx
|
DEPENDS:=@(TARGET_brcm47xx||TARGET_bcm53xx)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/otrx/description
|
define Package/otrx/description
|
||||||
|
Loading…
Reference in New Issue
Block a user