diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-07 10:44:00 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-07 18:27:57 +0200 |
| commit | 1859ad34bdc0730df8f560f3f82223ad4e136694 (patch) | |
| tree | 1e8d0d41263a7697d928fe3434283134e3d06381 | |
| parent | 83edc15d8efe689e70ddfa5141d1e0198d047a33 (diff) | |
| download | ptxdist-1859ad34bdc0730df8f560f3f82223ad4e136694.tar.gz ptxdist-1859ad34bdc0730df8f560f3f82223ad4e136694.tar.xz | |
wpa_supplicant: rename config file variables
WPA_SUPPLICANT_CONFIG should be the source. kconfig and image package use
the same name. This is necessary to make automatic dependencies possible.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/wpa_supplicant.make | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rules/wpa_supplicant.make b/rules/wpa_supplicant.make index f5ad83e69..89dc6fde8 100644 --- a/rules/wpa_supplicant.make +++ b/rules/wpa_supplicant.make @@ -26,8 +26,8 @@ WPA_SUPPLICANT_SOURCE := $(SRCDIR)/$(WPA_SUPPLICANT).$(WPA_SUPPLICANT_SUFFIX) WPA_SUPPLICANT_DIR := $(BUILDDIR)/$(WPA_SUPPLICANT) WPA_SUPPLICANT_SUBDIR := $(WPA_SUPPLICANT_NAME) # Use '=' to delay $(shell ...) calls until this is needed -WPA_SUPPLICANT_DEFCONF = $(call ptx/get-alternative, config/wpasupplicant, defconfig) -WPA_SUPPLICANT_CONFIG := $(BUILDDIR)/$(WPA_SUPPLICANT)/$(WPA_SUPPLICANT_SUBDIR)/.config +WPA_SUPPLICANT_CONFIG = $(call ptx/get-alternative, config/wpasupplicant, defconfig) +WPA_SUPPLICANT_DOTCONFIG:= $(BUILDDIR)/$(WPA_SUPPLICANT)/$(WPA_SUPPLICANT_SUBDIR)/.config WPA_SUPPLICANT_LICENSE := GPL-2.0-only # ---------------------------------------------------------------------------- @@ -52,12 +52,12 @@ $(STATEDIR)/wpa_supplicant.prepare: @-cd $(WPA_SUPPLICANT_DIR)/$(WPA_SUPPLICANT_SUBDIR) && \ $(WPA_SUPPLICANT_MAKE_ENV) $(WPA_SUPPLICANT_PATH) $(MAKE) clean - @cp $(WPA_SUPPLICANT_DEFCONF) $(WPA_SUPPLICANT_CONFIG) - @$(call enable_sh,$(WPA_SUPPLICANT_CONFIG),CC=$(CROSS_CC)) + @cp $(WPA_SUPPLICANT_CONFIG) $(WPA_SUPPLICANT_DOTCONFIG) + @$(call enable_sh,$(WPA_SUPPLICANT_DOTCONFIG),CC=$(CROSS_CC)) ifdef PTXCONF_WPA_SUPPLICANT_CTRL_IFACE_DBUS - @$(call enable_sh,$(WPA_SUPPLICANT_CONFIG),CONFIG_CTRL_IFACE_DBUS=y) - @$(call enable_sh,$(WPA_SUPPLICANT_CONFIG),CONFIG_CTRL_IFACE_DBUS_NEW=y) - @$(call enable_sh,$(WPA_SUPPLICANT_CONFIG),CONFIG_CTRL_IFACE_DBUS_INTRO=y) + @$(call enable_sh,$(WPA_SUPPLICANT_DOTCONFIG),CONFIG_CTRL_IFACE_DBUS=y) + @$(call enable_sh,$(WPA_SUPPLICANT_DOTCONFIG),CONFIG_CTRL_IFACE_DBUS_NEW=y) + @$(call enable_sh,$(WPA_SUPPLICANT_DOTCONFIG),CONFIG_CTRL_IFACE_DBUS_INTRO=y) endif @$(call touch) |