From patchwork Wed Oct 28 15:55:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 537455 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id EA3C11402C2 for ; Thu, 29 Oct 2015 02:56:14 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=embedded.rocks header.i=@embedded.rocks header.b=eKamQku4; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C319332EBA; Wed, 28 Oct 2015 15:56:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QAhpHEaBfIpQ; Wed, 28 Oct 2015 15:56:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 06AD32FAC9; Wed, 28 Oct 2015 15:56:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5EA5B1C0F4D for ; Wed, 28 Oct 2015 15:56:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 58D4D885E0 for ; Wed, 28 Oct 2015 15:56:05 +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 rX+mWJrNYwzG for ; Wed, 28 Oct 2015 15:56:04 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id E40CB87B4F for ; Wed, 28 Oct 2015 15:56:03 +0000 (UTC) Received: from dovecot03.posteo.de (dovecot03.posteo.de [172.16.0.13]) by mout01.posteo.de (Postfix) with ESMTPS id 3C97D20A36 for ; Wed, 28 Oct 2015 16:56:01 +0100 (CET) Received: from mail.posteo.de (localhost [127.0.0.1]) by dovecot03.posteo.de (Postfix) with ESMTPSA id 3nmDym59JZz5vN0 for ; Wed, 28 Oct 2015 16:56:00 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail.embedded.rocks (Postfix) with ESMTP id AA02CEE0C20; Wed, 28 Oct 2015 16:55:59 +0100 (CET) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:x-mailer:message-id:date:date:subject:subject:from :from:received:received; s=default; t=1446047753; x=1446652554; bh=o7QWIlGtjXS0HUYoC1DhfD8L7HwKE5ScRxvY0LqJXf8=; b=eKamQku4NW1F Ps/DTMs63QoD+phmx1duRxIp0sDp5ejgcE22HxIl0H5St33ioMP4sx+cedOk4dLC Yka0x20IyURe8zcl9GQeeuA3xOvtm5PsyzctuMFyqhO2XfJ0NSVeFSFT35DXP/IM Eq4WFdXiRP+h5p7E80gidcti+jRTT7LbCH3bZfeaauGOYtsPgfHDZSQS5tIjo69X a5v3gOU6qWKtpTSWD2y7p4DHe8UFh4TJQkbUXd1cGJfQzhTuLksLeRvWskl3XBP1 Wy1t9Ko4Z4AextwG4hIuDK7iSumRlq70uQG/0gFOnV82zI4VMjAlNfDA+WRwhJQk L81dZUhgAQ== X-Virus-Scanned: Debian amavisd-new at mail.embedded.rocks Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id tgdK-P_5zJm7; Wed, 28 Oct 2015 16:55:53 +0100 (CET) Received: from timelineX.localdomain (ip5b40a1a5.dynamic.kabel-deutschland.de [91.64.161.165]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Wed, 28 Oct 2015 16:55:53 +0100 (CET) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Wed, 28 Oct 2015 16:55:49 +0100 Message-Id: <1446047749-16623-1-git-send-email-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.6.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/wpa_supplicant: add config option to build wpa_client library X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Version 2.5 of wpa_supplicant introduces the config option CONFIG_BUILD_WPA_CLIENT_SO to enable building wpa_client as shared library. Signed-off-by: Jörg Krause --- package/wpa_supplicant/Config.in | 5 +++++ package/wpa_supplicant/wpa_supplicant.mk | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index eb42257..0b4c484 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -63,6 +63,11 @@ config BR2_PACKAGE_WPA_SUPPLICANT_CLI help Install wpa_cli command line utility +config BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO + bool "Install wpa_client shared library" + help + Installs libwpa_client.so. + config BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE bool "Install wpa_passphrase binary" help diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 839a419..e3f1434 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -15,6 +15,9 @@ 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) +# install the wpa_client library +WPA_SUPPLICANT_INSTALL_STAGING = YES + WPA_SUPPLICANT_CONFIG_EDITS = WPA_SUPPLICANT_CONFIG_SET = @@ -117,6 +120,22 @@ WPA_SUPPLICANT_DEPENDENCIES += readline WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_READLINE endif +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO),y) +WPA_SUPPLICANT_CONFIG_SET += CONFIG_BUILD_WPA_CLIENT_SO +define WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO + $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/libwpa_client.so \ + $(TARGET_DIR)/usr/lib/libwpa_client.so + $(INSTALL) -m 0644 -D $(@D)/src/common/wpa_ctrl.h \ + $(TARGET_DIR)/usr/include/wpa_ctrl.h +endef +define WPA_SUPPLICANT_INSTALL_STAGING_WPA_CLIENT_SO + $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/libwpa_client.so \ + $(STAGING_DIR)/usr/lib/libwpa_client.so + $(INSTALL) -m 0644 -D $(@D)/src/common/wpa_ctrl.h \ + $(STAGING_DIR)/usr/include/wpa_ctrl.h +endef +endif + define WPA_SUPPLICANT_CONFIGURE_CMDS cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG) sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(WPA_SUPPLICANT_CONFIG_ENABLE)) \ @@ -159,6 +178,10 @@ define WPA_SUPPLICANT_INSTALL_DBUS endef endif +define WPA_SUPPLICANT_INSTALL_STAGING_CMDS + $(WPA_SUPPLICANT_INSTALL_STAGING_WPA_CLIENT_SO) +endef + define WPA_SUPPLICANT_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_supplicant \ $(TARGET_DIR)/usr/sbin/wpa_supplicant @@ -167,6 +190,7 @@ define WPA_SUPPLICANT_INSTALL_TARGET_CMDS $(WPA_SUPPLICANT_INSTALL_CLI) $(WPA_SUPPLICANT_INSTALL_PASSPHRASE) $(WPA_SUPPLICANT_INSTALL_DBUS) + $(WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO) endef define WPA_SUPPLICANT_INSTALL_INIT_SYSTEMD