From patchwork Tue Sep 25 12:55:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Neumann X-Patchwork-Id: 186802 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 5E40F2C0080 for ; Tue, 25 Sep 2012 22:56:20 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4A3268BB7D; Tue, 25 Sep 2012 12:56:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E6Qr4AElgdeN; Tue, 25 Sep 2012 12:56:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E77B38BBB6; Tue, 25 Sep 2012 12:56:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 58F328F74B for ; Tue, 25 Sep 2012 12:55:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6B8798BB06 for ; Tue, 25 Sep 2012 12:55:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Mwz4HOJQQ8W4 for ; Tue, 25 Sep 2012 12:55:36 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.zonque.de (svenfoo.org [82.94.215.22]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7E7B88BB5B for ; Tue, 25 Sep 2012 12:55:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.zonque.de (Postfix) with ESMTP id D50D7C0242; Tue, 25 Sep 2012 14:55:33 +0200 (CEST) Received: from mail.zonque.de ([127.0.0.1]) by localhost (rambrand.bugwerft.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lm9cGJD1Vc_X; Tue, 25 Sep 2012 14:55:33 +0200 (CEST) Received: from localhost.localdomain (port-87-234-241-131.static.qsc.de [87.234.241.131]) (using TLSv1.1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.zonque.de (Postfix) with ESMTPSA id 80852C0220; Tue, 25 Sep 2012 14:55:33 +0200 (CEST) From: Sven Neumann To: buildroot@busybox.net Date: Tue, 25 Sep 2012 14:55:24 +0200 Message-Id: <1348577725-12647-4-git-send-email-s.neumann@raumfeld.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348577725-12647-1-git-send-email-s.neumann@raumfeld.com> References: <1348577725-12647-1-git-send-email-s.neumann@raumfeld.com> Subject: [Buildroot] [PATCH 3/4] wpa_supplicant: introduce macros for editing the .config file X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Make the substitutions on the .config file more readable by introducing macros to enable, disable certain options similar to the macros we use for editing KConfig files. Signed-off-by: Sven Neumann --- package/wpa_supplicant/wpa_supplicant.mk | 62 ++++++++++++++++++------------ 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index e8d55d3..5337e5f 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -15,49 +15,61 @@ WPA_SUPPLICANT_DBUS_NEW_SERVICE = fi.w1.wpa_supplicant1 WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) +define WPA_SUPPLICANT_CONFIG_DISABLE + $(SED) 's/^\($(1).*\)/#\1/' $(WPA_SUPPLICANT_CONFIG) +endef + +define WPA_SUPPLICANT_CONFIG_ENABLE + $(SED) 's/#\($(1).*\)/\1/' $(WPA_SUPPLICANT_CONFIG) +endef + +define WPA_SUPPLICANT_CONFIG_SET + echo '$(1)=y' >> $(WPA_SUPPLICANT_CONFIG) +endef + ifeq ($(BR2_PACKAGE_LIBNL),y) WPA_SUPPLICANT_DEPENDENCIES += libnl define WPA_SUPPLICANT_LIBNL_CONFIG - echo 'CONFIG_LIBNL32=y' >>$(WPA_SUPPLICANT_CONFIG) + $(call WPA_SUPPLICANT_CONFIG_SET,CONFIG_LIBNL32) endef else define WPA_SUPPLICANT_LIBNL_CONFIG - $(SED) 's/^\(CONFIG_DRIVER_NL80211.*\)/#\1/' $(WPA_SUPPLICANT_CONFIG) + $(call WPA_SUPPLICANT_CONFIG_DISABLE,CONFIG_DRIVER_NL80211) endef endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y) define WPA_SUPPLICANT_EAP_CONFIG - $(SED) 's/#\(CONFIG_EAP_AKA.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/#\(CONFIG_EAP_FAST.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/#\(CONFIG_EAP_GPSK.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/#\(CONFIG_EAP_IKEV2.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/#\(CONFIG_EAP_PAX.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/#\(CONFIG_EAP_PSK.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/#\(CONFIG_EAP_SAKE.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/#\(CONFIG_EAP_SIM.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/#\(CONFIG_EAP_TNC.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_EAP_AKA) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_EAP_FAST) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_EAP_GPSK) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_EAP_IKEV2) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_EAP_PAX) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_EAP_PSK) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_EAP_SAKE) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_EAP_SIM) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_EAP_TNC) endef else define WPA_SUPPLICANT_EAP_CONFIG - $(SED) 's/^\(CONFIG_EAP.*\)/#\1/' $(WPA_SUPPLICANT_CONFIG) + $(call WPA_SUPPLICANT_CONFIG_DISABLE,CONFIG_EAP) endef endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT),y) define WPA_SUPPLICANT_AP_CONFIG - echo 'CONFIG_AP=y' >>$(WPA_SUPPLICANT_CONFIG) + $(call WPA_SUPPLICANT_CONFIG_SET,CONFIG_AP) endef endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPS),y) define WPA_SUPPLICANT_WPS_CONFIG - $(SED) 's/#\(CONFIG_WPS.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_WPS) endef endif define WPA_SUPPLICANT_LIBTOMMATH_CONFIG - $(SED) 's/#\(CONFIG_INTERNAL_LIBTOMMATH.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_INTERNAL_LIBTOMMATH) endef # Try to use openssl or gnutls if it's already available @@ -65,7 +77,7 @@ ifeq ($(BR2_PACKAGE_OPENSSL),y) WPA_SUPPLICANT_DEPENDENCIES += openssl define WPA_SUPPLICANT_TLS_CONFIG $(SED) 's/#\(CONFIG_TLS=openssl\)/\1/' $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/#\(CONFIG_EAP_PWD.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_EAP_PWD) endef else ifeq ($(BR2_PACKAGE_GNUTLS),y) @@ -88,7 +100,7 @@ ifeq ($(BR2_PACKAGE_DBUS),y) ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD),y) define WPA_SUPPLICANT_DBUS_OLD_CONFIG - $(SED) 's/#\(CONFIG_CTRL_IFACE_DBUS=\)/\1/' $(WPA_SUPPLICANT_CONFIG) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_CTRL_IFACE_DBUS=) endef define WPA_SUPPLICANT_INSTALL_DBUS_OLD $(INSTALL) -D \ @@ -99,7 +111,7 @@ endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW),y) define WPA_SUPPLICANT_DBUS_NEW_CONFIG - $(SED) 's/#\(CONFIG_CTRL_IFACE_DBUS_NEW=\)/\1/' $(WPA_SUPPLICANT_CONFIG) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_CTRL_IFACE_DBUS_NEW) endef define WPA_SUPPLICANT_INSTALL_DBUS_NEW $(INSTALL) -D \ @@ -110,7 +122,7 @@ endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION),y) define WPA_SUPPLICANT_DBUS_INTROSPECTION_CONFIG - $(SED) 's/#\(CONFIG_CTRL_IFACE_DBUS_INTRO=\)/\1/' $(WPA_SUPPLICANT_CONFIG) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_CTRL_IFACE_DBUS_INTRO) endef endif @@ -124,12 +136,12 @@ endif define WPA_SUPPLICANT_CONFIGURE_CMDS cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/#\(CONFIG_IEEE80211N.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/#\(CONFIG_IEEE80211R.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/#\(CONFIG_INTERWORKING.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/#\(CONFIG_DELAYED_MIC.*\)/\1/' $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/\(CONFIG_DRIVER_ATMEL\)/#\1/' $(WPA_SUPPLICANT_CONFIG) - $(SED) 's/\(CONFIG_SMARTCARD\)/#\1/' $(WPA_SUPPLICANT_CONFIG) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_IEEE80211N) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_IEEE80211R) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_INTERWORKING) + $(call WPA_SUPPLICANT_CONFIG_ENABLE,CONFIG_DELAYED_MIC) + $(call WPA_SUPPLICANT_CONFIG_DISABLE,CONFIG_DRIVER_ATMEL) + $(call WPA_SUPPLICANT_CONFIG_DISABLE,CONFIG_SMARTCARD) $(WPA_SUPPLICANT_LIBTOMMATH_CONFIG) $(WPA_SUPPLICANT_TLS_CONFIG) $(WPA_SUPPLICANT_EAP_CONFIG)