From patchwork Tue Apr 12 13:03:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 6574 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BE26C54F3F for ; Tue, 12 Apr 2022 16:46:43 +0000 (UTC) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.groups.io with SMTP id smtpd.web09.10406.1649768604600401038 for ; Tue, 12 Apr 2022 06:03:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=fRL2GIyl; spf=pass (domain: gmail.com, ip: 209.85.128.42, mailfrom: alex.kiernan@gmail.com) Received: by mail-wm1-f42.google.com with SMTP id o20-20020a05600c511400b0038ebbbb2ad8so1599425wms.0 for ; Tue, 12 Apr 2022 06:03:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fmrRPesO738G9xSVfM+TNem5adEWrDFT4OJQ5xdLJfE=; b=fRL2GIylvjoOo/7sc6ptxgJnjuwXKlSxHDh0QYlfWs8E0oKpyTeh6YefdSK7l+NGs7 CvoM0222TdT9PHaKeHa/QG79nzgHH3xCpA38Z5acUgasKtt9eK0Y/t6kZwRDntNWAWx2 9pi7kQvlV3b/hp3BgojCiENGFDqr705DtRDXd6AayqVdsCo8N2gQmIytLN7CEVXh3Jwj AyhqrW+JW+AocU5J7rnDNGUjeM72T6omXbHVV7kk3hl8eIy/F95hxtgjSiSGSdmtbBcP 9hWHnKm6thrtNYHoJgkW5cimECd6mYVQ+HLB2qN921GxDnxTdo5+6ZB5JQwaCVMJrFkZ +HVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fmrRPesO738G9xSVfM+TNem5adEWrDFT4OJQ5xdLJfE=; b=zazaG0bfCjoiovjAmQC6/WeRHJ03bmoUcserQMbUAV0qpwPXaIE48lgc+aV/9eI74Q lbwvuqYmozDCfgXSuxiRK00EoNFtKtjORPMGnzSYiz+GnkZv+dDCPBrswIuYto2jRAPp ZMNEdgL37OqIKCcunv04Cd8aGQwjNgfDEdQk89mklNIR6TGKKsvakCeWsggJWGyiBYPe 5svDF1XuBML/c53obzdneeHTzv0bqYwlwyBSvRic8tk1kLxDnjvkeZkx5kyw0fRhfX+e ozhf12+J6gM90rp46frCsmHJaxDOo/+HfRF5dE/L4EVX+Bhv1j8BZGyca02+8Xc/I1+E aIqw== X-Gm-Message-State: AOAM532SZFUNUwq4EgLQjmD1b0iTWsZVOAhX+GGiGlbYYH6gPtzxewyG RWmENHPgrgkodFiLMnlNAaDmUsiXffM= X-Google-Smtp-Source: ABdhPJwLerPo053FMq6cdJY6nA81ctTgb87aYzo1uBOvCzfEOElTXLQe83ul16FPXooPPjQZHNvUbA== X-Received: by 2002:a05:600c:214:b0:38e:bb60:1e90 with SMTP id 20-20020a05600c021400b0038ebb601e90mr4068230wmi.55.1649768602446; Tue, 12 Apr 2022 06:03:22 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id r4-20020a05600c35c400b0038cbd8c41e9sm2372953wmq.12.2022.04.12.06.03.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 06:03:21 -0700 (PDT) From: Alex Kiernan X-Google-Original-From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH 1/8] wpa-supplicant: Reorder/group following style guide Date: Tue, 12 Apr 2022 14:03:08 +0100 Message-Id: <20220412130315.25917-1-alexk@zuma.ai> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 12 Apr 2022 16:46:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164265 Signed-off-by: Alex Kiernan --- .../wpa-supplicant/wpa-supplicant_2.10.bb | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb index 6e80ac7de34d..da8f0843dc1e 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb @@ -1,23 +1,14 @@ SUMMARY = "Client for Wi-Fi Protected Access (WPA)" -HOMEPAGE = "http://w1.fi/wpa_supplicant/" DESCRIPTION = "wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN). Supplicant is the IEEE 802.1X/WPA component that is used in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver." +HOMEPAGE = "http://w1.fi/wpa_supplicant/" BUGTRACKER = "http://w1.fi/security/" SECTION = "network" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=5ebcb90236d1ad640558c3d3cd3035df \ file://README;beginline=1;endline=56;md5=e3d2f6c2948991e37c1ca4960de84747 \ file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=76306a95306fee9a976b0ac1be70f705" -DEPENDS = "dbus libnl" -RRECOMMENDS:${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" -PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[gnutls] = ",,gnutls libgcrypt" -PACKAGECONFIG[openssl] = ",,openssl" - -inherit pkgconfig systemd - -SYSTEMD_SERVICE:${PN} = "wpa_supplicant.service" -SYSTEMD_AUTO_ENABLE = "disable" +DEPENDS = "dbus libnl" SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://defconfig \ @@ -28,15 +19,15 @@ SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ " SRC_URI[sha256sum] = "20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f" -CVE_PRODUCT = "wpa_supplicant" - S = "${WORKDIR}/wpa_supplicant-${PV}" -PACKAGES:prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " -FILES:wpa-supplicant-passphrase = "${bindir}/wpa_passphrase" -FILES:wpa-supplicant-cli = "${sbindir}/wpa_cli" -FILES:${PN} += "${datadir}/dbus-1/system-services/* ${systemd_system_unitdir}/*" -CONFFILES:${PN} += "${sysconfdir}/wpa_supplicant.conf" +inherit pkgconfig systemd + +PACKAGECONFIG ??= "openssl" +PACKAGECONFIG[gnutls] = ",,gnutls libgcrypt" +PACKAGECONFIG[openssl] = ",,openssl" + +CVE_PRODUCT = "wpa_supplicant" do_configure () { ${MAKE} -C wpa_supplicant clean @@ -104,5 +95,17 @@ pkg_postinst:${PN} () { if [ "x$D" = "x" ]; then killall -q -HUP dbus-daemon || true fi - } + +PACKAGES:prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " + +FILES:wpa-supplicant-passphrase = "${bindir}/wpa_passphrase" +FILES:wpa-supplicant-cli = "${sbindir}/wpa_cli" +FILES:${PN} += "${datadir}/dbus-1/system-services/* ${systemd_system_unitdir}/*" + +CONFFILES:${PN} += "${sysconfdir}/wpa_supplicant.conf" + +RRECOMMENDS:${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" + +SYSTEMD_SERVICE:${PN} = "wpa_supplicant.service" +SYSTEMD_AUTO_ENABLE = "disable" From patchwork Tue Apr 12 13:03:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 6573 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A453C54EC4 for ; Tue, 12 Apr 2022 16:46:43 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web09.10407.1649768608076510524 for ; Tue, 12 Apr 2022 06:03:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=pNKxFQHT; spf=pass (domain: gmail.com, ip: 209.85.221.49, mailfrom: alex.kiernan@gmail.com) Received: by mail-wr1-f49.google.com with SMTP id g18so11364302wrb.10 for ; Tue, 12 Apr 2022 06:03:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ysl3pj4H9SCBUbvfRvdSaXvoCHHhkz/8B5iwG1a/JdQ=; b=pNKxFQHTRpqUt2tF5Z2HFt0OrdokSfcysfV+0c5syppZZ/20jH7b4g7sTBfrclPC9f NpqVYawy3PEcRYhqG4j/pTWxVHmMxDZxpVl7LdwAVPcN00Sj7S+kZ5qC9EEnOuswt3Dn l3A4QovC+ZD53eiGr7/IIucG9rbdm5sAd069YSLndt1l9GugEQ3H0fvH8sPrN0aVey/k auUGR6OjYv8Ff71hh+lZiSPLVBAcVEEvMPI1VZHO2XEUTHQ6inRXV5Qfv885gTrOYCOx IuO2tZhX+6PxAojy3fPuNL/WAu2iquIUwLN8u74/ZCfvXCCVWXDHloS31owpRyNzCuRJ YIlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ysl3pj4H9SCBUbvfRvdSaXvoCHHhkz/8B5iwG1a/JdQ=; b=UjXh5/trn1W11QWDmx/q+EegkJ1ZvVBMKBXFFpkV6toOXELZ+0cV4zcL1ODnlnTBCC mexT+J+t99FDqjNnWyS/RAx1Nb9lnWn9rrsI5UEcO2tULkl0BRwVk6BOS45JOupNDzkQ LDzFuyzNQj2YCe74bJmQPGCHLPQuYi0qY1cJw6fojMLdOwZHRmYKMk1RVGls+5EEvW3h nO+5Aaz96KDKxQu4FI4QEnn9wG2ezYdDqH3cgvaoPnjZUVY8bExkW8NPONbKHvRtA4jH HjykfQ4CPrkhFWQLPIkyxc4AWjk7oc1V0id+HgBneIF8CqniSEDu8erSYliP+ihARpjN 0MWA== X-Gm-Message-State: AOAM532DLA5ERE/T9GpnMK2DhZXXwUNNxcDmPVxYz6xc9ylMCsEWWEGg 00qk1HD0AEgOYPQYEQ941HDxxHNVq+8= X-Google-Smtp-Source: ABdhPJxBmHPl/jTtAHSp8o2x+KUZbs+51mmluImAaUiA5iz761V1LqMsdlTFrIazh1OEc/9OU1nMiA== X-Received: by 2002:adf:b652:0:b0:207:a82d:4e89 with SMTP id i18-20020adfb652000000b00207a82d4e89mr6755846wre.320.1649768606388; Tue, 12 Apr 2022 06:03:26 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id r4-20020a05600c35c400b0038cbd8c41e9sm2372953wmq.12.2022.04.12.06.03.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 06:03:25 -0700 (PDT) From: Alex Kiernan X-Google-Original-From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH 2/8] wpa-supplicant: Avoid changing directory in do_install Date: Tue, 12 Apr 2022 14:03:09 +0100 Message-Id: <20220412130315.25917-2-alexk@zuma.ai> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412130315.25917-1-alexk@zuma.ai> References: <20220412130315.25917-1-alexk@zuma.ai> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 12 Apr 2022 16:46:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164266 Changing directory leads to anyone coming later needing to be explicit in their directory usage as the working directory is no longer ${B}. Signed-off-by: Alex Kiernan --- .../recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb index da8f0843dc1e..6c378d532d39 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb @@ -73,8 +73,7 @@ do_install () { install -d ${D}${sysconfdir}/network/if-post-down.d/ install -d ${D}${sysconfdir}/network/if-down.d/ install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant - cd ${D}${sysconfdir}/network/ && \ - ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant + ln -sf ../if-pre-up.d/wpa-supplicant ${D}${sysconfdir}/network/if-post-down.d/wpa-supplicant install -d ${D}/${sysconfdir}/dbus-1/system.d install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d From patchwork Tue Apr 12 13:03:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 6575 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F78DC54F46 for ; Tue, 12 Apr 2022 16:46:43 +0000 (UTC) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.groups.io with SMTP id smtpd.web09.10408.1649768609286446090 for ; Tue, 12 Apr 2022 06:03:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eeaYAnHc; spf=pass (domain: gmail.com, ip: 209.85.221.51, mailfrom: alex.kiernan@gmail.com) Received: by mail-wr1-f51.google.com with SMTP id c7so27713419wrd.0 for ; Tue, 12 Apr 2022 06:03:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EfRV40C6KG/+tMl0pxC9PQpj8XX/lNSSi8+XiGwqlS4=; b=eeaYAnHc9pAy8Huxq94XkwsQBWsYWVjH0PVPCoL05jPFOsF0RQj6eC2MUyh7HOmIwk fpHmW8LZsGBHFpboAz9xTSJmmVKPl5i8LJENjPtF3J+5hFS2xjE5hVEKqEkDJsWOlV/4 7ShH7QuhBdPZw5z7WnRcwLt6u4RmCoNcvyuXvF0K2md1Tg7IhmDQWN6OqfKW/afSxjMS mAka1TJ1qfYFaXbe10uzOUAhcRdra6Yv6eAkpQdackPZ8DZ3opN8isgohvbHnoE0EGxb Y6vQtinOkxCHxqCC+74XSa3iyIhY2JsQwptZINJTeNsY0C7hH5OJx3BaFVzZmENNnzN8 lWOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EfRV40C6KG/+tMl0pxC9PQpj8XX/lNSSi8+XiGwqlS4=; b=U4GvBNT3F/i+FT3yDQHFUNpMIKF9a72zw35pAbYRWjMJ5Edyb3e5N5K8o3IWKdfGxr EuTv7pMEL0P79H8eiLfBCGY3nRR8DTGMPlbRfvCs40KsvOybW53UAn5x0YEuTd6MX3/H 6eiNcb7op/iFH4NUyAfOyt7dFCC5W0IbE8wlquw5g4pNko1VY2ESwGrHbknGGzlq75AS BzQ5ZHMqndPUiN7MF8k7k93pL9ugWsEg5AG1IzbI74pdF5AKCq8PeuzbiTOYjVcqGsva OTimCqcRjCDw7pgAcnLRruiP09ik/wILP4+6iU1oblVdhtfHmPID49FJqa7QlYYHn1in fwEQ== X-Gm-Message-State: AOAM530gTHuoNPu3mf+5gjctMAMuiSBdXny9+41hSxbpRREKonHPwJ3w FVuEu4qS3BIwwNGlo0vV3/Sn9erlMYM= X-Google-Smtp-Source: ABdhPJzPCf9nOTP4uMc2PGV2kKfD/+IK2tLiK+AXF4wsIQEYI6uc1sZ0Q+Iini8yN3BAY+dAF5kyxg== X-Received: by 2002:a5d:6981:0:b0:205:e04a:e20f with SMTP id g1-20020a5d6981000000b00205e04ae20fmr28813120wru.6.1649768607277; Tue, 12 Apr 2022 06:03:27 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id r4-20020a05600c35c400b0038cbd8c41e9sm2372953wmq.12.2022.04.12.06.03.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 06:03:26 -0700 (PDT) From: Alex Kiernan X-Google-Original-From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH 3/8] wpa-supplicant: Use PACKAGE_BEFORE_PN/${PN} Date: Tue, 12 Apr 2022 14:03:10 +0100 Message-Id: <20220412130315.25917-3-alexk@zuma.ai> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412130315.25917-1-alexk@zuma.ai> References: <20220412130315.25917-1-alexk@zuma.ai> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 12 Apr 2022 16:46:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164267 Use PACKAGE_BEFORE_PN for packages which need to capture files early, switch to idiomatic ${PN} for additional packages. Signed-off-by: Alex Kiernan --- .../wpa-supplicant/wpa-supplicant_2.10.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb index 6c378d532d39..dabb3ccbefd1 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb @@ -96,15 +96,15 @@ pkg_postinst:${PN} () { fi } -PACKAGES:prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " +PACKAGE_BEFORE_PN += "${PN}-passphrase ${PN}-cli" -FILES:wpa-supplicant-passphrase = "${bindir}/wpa_passphrase" -FILES:wpa-supplicant-cli = "${sbindir}/wpa_cli" +FILES:${PN}-passphrase = "${bindir}/wpa_passphrase" +FILES:${PN}-cli = "${sbindir}/wpa_cli" FILES:${PN} += "${datadir}/dbus-1/system-services/* ${systemd_system_unitdir}/*" CONFFILES:${PN} += "${sysconfdir}/wpa_supplicant.conf" -RRECOMMENDS:${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" +RRECOMMENDS:${PN} = "${PN}-passphrase ${PN}-cli" SYSTEMD_SERVICE:${PN} = "wpa_supplicant.service" SYSTEMD_AUTO_ENABLE = "disable" From patchwork Tue Apr 12 13:03:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 6578 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85AE8C54F3E for ; Tue, 12 Apr 2022 16:46:43 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web08.10399.1649768610110557158 for ; Tue, 12 Apr 2022 06:03:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Qfn3EZwG; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kiernan@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id e21so11127589wrc.8 for ; Tue, 12 Apr 2022 06:03:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OZT8HS0GjHdBNsQD0mfR8Y+R0WM9Gx3KtxCgLa4NadQ=; b=Qfn3EZwG9Ivd/J+aFsYdETAacPuPFuCS2wf0lxBRG5+HNfz5PZhIiJ4AI1GD4zk1T/ uABqEVNSqfBk0oo1HRoQevsPBM9aMiqfUzPn5jxdIgoZBH5RZyjOmT1VJo4zd49VwroF LLHSMyqZtvuLcpNvc9u9anYjm0NB/m6um9nVHK/vRCrlwoBSFyHI/KlEe7jPKrZdIrft 3+dSCP6MPZGABhc6RBhs/yHrdL5hSNWwO0Vq6SyGRMW6yiqP3D6C86BT/1b92IY9SvuN Qc4km+VkyCuoNAJJMx8aI8apiuwLdAU80UdGWT1alcgRVLFhBWJAS+E/q2vw3kbb3A5z Sb0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OZT8HS0GjHdBNsQD0mfR8Y+R0WM9Gx3KtxCgLa4NadQ=; b=2siX1Yd3HV8W5WHfs/8wpergwkvV3MExZC/4oqcqdjJ1sOqJWLFP5+VEIP1K7GWevf UQg1SCTLNG1h38A6OivzxrfBoymraF3ID+F9jj58F3G0zkqb7kcwCVKIW6UZ0Ar3ddUn FCfbyca3C3o7mueD7HyoN5ikcTzWJTIDabddzTri7kNIorGq3LwHrn1RjCUcikCdzbpz xyUs3rklMkiHJBEnKPXKQ423yYiXueoOhqhrU3Au/qF8UiPMTtQ0rPxeILSl7mYUXJbk Ag8PHpBi16/ZD+D5D+2XSEPherIeYPNRu9oBs+rZytHPp/qv7bYxGpnFxhzh3NQCWG6Y dE+A== X-Gm-Message-State: AOAM530+BAJzCnUl0HS5X3kuiHHMFnW60F+rHsLvprlepj9zLXu4TYin +s2mFRvQ2oaeQ+T/dpWuaGyMIdvtECU= X-Google-Smtp-Source: ABdhPJxZlf2AbM+YRMGFumvG6JqFLzHFdbYB94nZbr/rfPtjfcd87SFSkXQXIk4Ubgxlkzhs1GOlVQ== X-Received: by 2002:a5d:6e85:0:b0:207:a435:d9a7 with SMTP id k5-20020a5d6e85000000b00207a435d9a7mr9715894wrz.217.1649768608354; Tue, 12 Apr 2022 06:03:28 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id r4-20020a05600c35c400b0038cbd8c41e9sm2372953wmq.12.2022.04.12.06.03.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 06:03:27 -0700 (PDT) From: Alex Kiernan X-Google-Original-From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH 4/8] wpa-supplicant: Backport libwpa/clean build fixes Date: Tue, 12 Apr 2022 14:03:11 +0100 Message-Id: <20220412130315.25917-4-alexk@zuma.ai> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412130315.25917-1-alexk@zuma.ai> References: <20220412130315.25917-1-alexk@zuma.ai> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 12 Apr 2022 16:46:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164268 Enabling CONFIG_BUILD_WPA_CLIENT_SO or CONFIG_NO_WPA_PASSPHRASE do nothing in the released 2.10 wpa-supplicant; backport the fixes for this. Also backport the fixes for `make clean` when `wpa_passphrase` is built. Signed-off-by: Alex Kiernan --- ...options-for-libwpa_client.so-and-wpa.patch | 73 +++++++++++++++++++ ...oval-of-wpa_passphrase-on-make-clean.patch | 26 +++++++ .../wpa-supplicant/wpa-supplicant_2.10.bb | 2 + 3 files changed, 101 insertions(+) create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch new file mode 100644 index 000000000000..6e930fc98df0 --- /dev/null +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch @@ -0,0 +1,73 @@ +From cb41c214b78d6df187a31950342e48a403dbd769 Mon Sep 17 00:00:00 2001 +From: Sergey Matyukevich +Date: Tue, 22 Feb 2022 11:52:19 +0300 +Subject: [PATCH 1/2] build: Re-enable options for libwpa_client.so and + wpa_passphrase + +Commit a41a29192e5d ("build: Pull common fragments into a build.rules +file") introduced a regression into wpa_supplicant build process. The +build target libwpa_client.so is not built regardless of whether the +option CONFIG_BUILD_WPA_CLIENT_SO is set or not. This happens because +this config option is used before it is imported from the configuration +file. Moving its use after including build.rules does not help: the +variable ALL is processed by build.rules and further changes are not +applied. Similarly, option CONFIG_NO_WPA_PASSPHRASE also does not work +as expected: wpa_passphrase is always built regardless of whether the +option is set or not. + +Re-enable these options by adding both build targets to _all +dependencies. + +Fixes: a41a29192e5d ("build: Pull common fragments into a build.rules file") +Signed-off-by: Sergey Matyukevich +Upstream-Status: Backport +Signed-off-by: Alex Kiernan +Signed-off-by: Alex Kiernan +--- + wpa_supplicant/Makefile | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index cb66defac7c8..c456825ae75f 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -1,24 +1,29 @@ + BINALL=wpa_supplicant wpa_cli + +-ifndef CONFIG_NO_WPA_PASSPHRASE +-BINALL += wpa_passphrase +-endif +- + ALL = $(BINALL) + ALL += systemd/wpa_supplicant.service + ALL += systemd/wpa_supplicant@.service + ALL += systemd/wpa_supplicant-nl80211@.service + ALL += systemd/wpa_supplicant-wired@.service + ALL += dbus/fi.w1.wpa_supplicant1.service +-ifdef CONFIG_BUILD_WPA_CLIENT_SO +-ALL += libwpa_client.so +-endif + + EXTRA_TARGETS=dynamic_eap_methods + + CONFIG_FILE=.config + include ../src/build.rules + ++ifdef CONFIG_BUILD_WPA_CLIENT_SO ++# add the dependency this way to allow CONFIG_BUILD_WPA_CLIENT_SO ++# being set in the config which is read by build.rules ++_all: libwpa_client.so ++endif ++ ++ifndef CONFIG_NO_WPA_PASSPHRASE ++# add the dependency this way to allow CONFIG_NO_WPA_PASSPHRASE ++# being set in the config which is read by build.rules ++_all: wpa_passphrase ++endif ++ + ifdef LIBS + # If LIBS is set with some global build system defaults, clone those for + # LIBS_c and LIBS_p to cover wpa_passphrase and wpa_cli as well. +-- +2.35.1 + diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch new file mode 100644 index 000000000000..53b0fcdf5308 --- /dev/null +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch @@ -0,0 +1,26 @@ +From d001b301ba7987f4b39453a211631b85c48f2ff8 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Thu, 3 Mar 2022 13:26:42 +0200 +Subject: [PATCH 2/2] Fix removal of wpa_passphrase on 'make clean' + +Fixes: 0430bc8267b4 ("build: Add a common-clean target") +Signed-off-by: Jouni Malinen +Upstream-Status: Backport +Signed-off-by: Alex Kiernan +Signed-off-by: Alex Kiernan +--- + wpa_supplicant/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index c456825ae75f..4b4688931b1d 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -2077,3 +2077,4 @@ clean: common-clean + rm -f libwpa_client.a + rm -f libwpa_client.so + rm -f libwpa_test1 libwpa_test2 ++ rm -f wpa_passphrase +-- +2.35.1 + diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb index dabb3ccbefd1..f72a925ac883 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb @@ -16,6 +16,8 @@ SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://wpa_supplicant.conf \ file://wpa_supplicant.conf-sane \ file://99_wpa_supplicant \ + file://0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch \ + file://0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch \ " SRC_URI[sha256sum] = "20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f" From patchwork Tue Apr 12 13:03:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 6576 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CD28C54F64 for ; Tue, 12 Apr 2022 16:46:43 +0000 (UTC) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.groups.io with SMTP id smtpd.web12.10369.1649768611104922971 for ; Tue, 12 Apr 2022 06:03:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XEySumUt; spf=pass (domain: gmail.com, ip: 209.85.221.54, mailfrom: alex.kiernan@gmail.com) Received: by mail-wr1-f54.google.com with SMTP id c10so6512698wrb.1 for ; Tue, 12 Apr 2022 06:03:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5PeIpbpa6rOiKtsPh6A4uefONVbduIipLCXNZEmg8RI=; b=XEySumUtnronBfgO4rQLkRFsv7cHwHZF10CqnmD6TyeKC/3BstwxNgPzVgLE+/PStD vNq84vcDXPWrNZYAg3CUe1DzXUudFyLhn84+qiYNayy+IJqPz2COfiVkrPugFLEwpMWc tdYjZf18uR8wOAJucs+tBCTKQ1mQGIjYR1+r0squTIrLMwqXIGcKrr4GsCirwaAnTd3F 8lQYZ5Z9joYj4tRXXtY8D050lwElMGgF1WnXeh1pA1jy29FyoWU/gmFBTyciqAtslxWg M4S0nRcnUN+bVM+3MmlgvBmL2Dmivra38Di5gTZhU0V4FXs1yreSmBBv/VsWiMqm5ZM0 0lpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5PeIpbpa6rOiKtsPh6A4uefONVbduIipLCXNZEmg8RI=; b=SajrX5hf+KTRuwi/aCiWsn4onTe6usVEwb1i2saNHyO+cC/eGUnTE1I9PdWMReiJti jKKtKsMBh9VUyBg01BUzex28aViCBno29fIPxKffbJkunuFranWh4FfXTb3A51m+OyBO XuMU9Eujv1suy1z0cDy6a4GrjS6VOHSPHnID8XnPzvnSG0lfRjcTKbDlxy1Q9BjhD6Ew ir8WJhUuR9ZaEf2fS+7W71OL+lXN9Czmy1aaAWNHv8dLR+pINVSpllOuu5Dl8Dj4wcIx 3Udq+NBbNvaXA/1YWyXsLHG9ROsAZrwaGlDZoyGg6EcPHr/UH3JaJe2T+QFBn2Vc89xt HYDw== X-Gm-Message-State: AOAM531vUlCLft9Ct4BWH+12K9lSgbFc1ys4mm8ZvEdAF3Vd5p7t3rjd O2sAN5XBchYpSxVBho+bRBnrXYBIslM= X-Google-Smtp-Source: ABdhPJxCDfLcPYwaZ1IFl18ZC8DAoyIaB5hNsOHrS2AosZDZ2nPQ3WdajFxTXcGZPMftDwPyXr92eA== X-Received: by 2002:adf:d1eb:0:b0:207:aba6:418c with SMTP id g11-20020adfd1eb000000b00207aba6418cmr4611485wrd.43.1649768609393; Tue, 12 Apr 2022 06:03:29 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id r4-20020a05600c35c400b0038cbd8c41e9sm2372953wmq.12.2022.04.12.06.03.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 06:03:28 -0700 (PDT) From: Alex Kiernan X-Google-Original-From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH 5/8] wpa-supplicant: Build static library if not DISABLE_STATIC Date: Tue, 12 Apr 2022 14:03:12 +0100 Message-Id: <20220412130315.25917-5-alexk@zuma.ai> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412130315.25917-1-alexk@zuma.ai> References: <20220412130315.25917-1-alexk@zuma.ai> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 12 Apr 2022 16:46:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164269 Build the static library if the configuration indicates we should. Signed-off-by: Alex Kiernan --- .../wpa-supplicant/wpa-supplicant_2.10.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb index f72a925ac883..43865ed96045 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb @@ -55,6 +55,9 @@ do_compile () { unset CFLAGS CPPFLAGS CXXFLAGS sed -e "s:CFLAGS\ =.*:& \$(EXTRA_CFLAGS):g" -i ${S}/src/lib.rules oe_runmake -C wpa_supplicant + if [ -z "${DISABLE_STATIC}" ]; then + oe_runmake -C wpa_supplicant libwpa_client.a + fi } do_install () { @@ -89,6 +92,14 @@ do_install () { install -d ${D}/etc/default/volatiles install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles + + install -d ${D}${includedir} + install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir} + + if [ -z "${DISABLE_STATIC}" ]; then + install -d ${D}${libdir} + install -m 0644 wpa_supplicant/libwpa_client.a ${D}${libdir} + fi } pkg_postinst:${PN} () { From patchwork Tue Apr 12 13:03:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 6581 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9169EC43217 for ; Tue, 12 Apr 2022 16:46:43 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web10.10332.1649768612903112827 for ; Tue, 12 Apr 2022 06:03:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=j09AIQPr; spf=pass (domain: gmail.com, ip: 209.85.221.43, mailfrom: alex.kiernan@gmail.com) Received: by mail-wr1-f43.google.com with SMTP id w4so27567990wrg.12 for ; Tue, 12 Apr 2022 06:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T1/PQsu30hab0de/N79H2fq3qtkvLg6cr40bqF0PHGQ=; b=j09AIQPrQNNVC8w8Iq+AmIGlY7PPbN6olfAKJpSQgTu1wy7vGdCpax9xao2P7ZXgdD o2f7UIs0zeEr1n2FJVfFULkt+77a9WDX/WytT1FhC6nYvSFdWlJdGBe5rUCJQrKNeF8+ FEkEYfWw5DTeUQroDspb2EAcoUEaGLuFg7Sj7ON3G12oomBsMW9zL7PlRHyo4b4jA6jt eCfNc+Vsli73H3ZGmIo+oZEIBIdAiUccpKpf+gTxWMEVdZM+FfUVoga5+6HJf2QsM8Dq JySgSfFu8qoE0gyJWnCD1p5Lsb73IUiQNhl5w79NlFmTBOXVAzs4MIDzdhYL6zTZ+cu1 vtsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T1/PQsu30hab0de/N79H2fq3qtkvLg6cr40bqF0PHGQ=; b=yqdxHFJNB5LpYY032jGev7QVfhEXAkc8zjhkYIx3MK3T8FNxR9L9adGOhfnp9SVFXt YQcRGUJpyqJYbgp+r3UdLLt1gM8op+1aCAbwi/7cw+wuXsCOhTiIHQXkMjUIUAaQ3sit TdE0gV1ITZ4zClPx4EFAvKlhRlF6q/O3dvsHDKdSOPvY+v5ZtjzkBhkIsx5qQCpaalIn /xur9jXXR4d6xe4inaKsSkfLuacnQpM12C8wpsk7uYMeWsgmPDNz1MhayL8ixHKMzWJQ whg6mNqqdd2sux20e8Zwb/3TOhLfUOb/vxFYMCukt4MVnx9ExevXQR7kX7trtzOz+crn MK2Q== X-Gm-Message-State: AOAM532iUWxqN9IACYiXnJoIDh701rkwDEEAzNAaSMXfnN2jP6FQUxIr 1HmG0GYRG7oJnxGdaUTcCKUefIPtcHw= X-Google-Smtp-Source: ABdhPJx1JZ7enUVMX+HlT6UgBrJfydaBJB9USc0kmBuawXOT+2Fmsg5Cg0eGFDTihq6ct6gCD4t3fA== X-Received: by 2002:a5d:48d0:0:b0:207:a861:dcc9 with SMTP id p16-20020a5d48d0000000b00207a861dcc9mr7066572wrs.490.1649768610618; Tue, 12 Apr 2022 06:03:30 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id r4-20020a05600c35c400b0038cbd8c41e9sm2372953wmq.12.2022.04.12.06.03.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 06:03:29 -0700 (PDT) From: Alex Kiernan X-Google-Original-From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH 6/8] wpa-supplicant: Use upstream defconfig Date: Tue, 12 Apr 2022 14:03:13 +0100 Message-Id: <20220412130315.25917-6-alexk@zuma.ai> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412130315.25917-1-alexk@zuma.ai> References: <20220412130315.25917-1-alexk@zuma.ai> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 12 Apr 2022 16:46:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164270 The copy of defconfig we were carrying was from 2014 and very out of date; drop it and use the upstream version with appropriate edits for our PACKAGECONFIG. Switch PACKAGECONFIG to using a default (?=) rather than weak default (??=) as per current recommendation. Signed-off-by: Alex Kiernan --- .../wpa-supplicant/wpa-supplicant/defconfig | 552 ------------------ .../wpa-supplicant/wpa-supplicant_2.10.bb | 16 +- 2 files changed, 6 insertions(+), 562 deletions(-) delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig deleted file mode 100644 index f04e398fdb5b..000000000000 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig +++ /dev/null @@ -1,552 +0,0 @@ -# Example wpa_supplicant build time configuration -# -# This file lists the configuration options that are used when building the -# hostapd binary. All lines starting with # are ignored. Configuration option -# lines must be commented out complete, if they are not to be included, i.e., -# just setting VARIABLE=n is not disabling that variable. -# -# This file is included in Makefile, so variables like CFLAGS and LIBS can also -# be modified from here. In most cases, these lines should use += in order not -# to override previous values of the variables. - - -# Uncomment following two lines and fix the paths if you have installed OpenSSL -# or GnuTLS in non-default location -#CFLAGS += -I/usr/local/openssl/include -#LIBS += -L/usr/local/openssl/lib - -# Some Red Hat versions seem to include kerberos header files from OpenSSL, but -# the kerberos files are not in the default include path. Following line can be -# used to fix build issues on such systems (krb5.h not found). -#CFLAGS += -I/usr/include/kerberos - -# Example configuration for various cross-compilation platforms - -#### sveasoft (e.g., for Linksys WRT54G) ###################################### -#CC=mipsel-uclibc-gcc -#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc -#CFLAGS += -Os -#CPPFLAGS += -I../src/include -I../../src/router/openssl/include -#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl -############################################################################### - -#### openwrt (e.g., for Linksys WRT54G) ####################################### -#CC=mipsel-uclibc-gcc -#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc -#CFLAGS += -Os -#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ -# -I../WRT54GS/release/src/include -#LIBS = -lssl -############################################################################### - - -# Driver interface for Host AP driver -CONFIG_DRIVER_HOSTAP=y - -# Driver interface for Agere driver -#CONFIG_DRIVER_HERMES=y -# Change include directories to match with the local setup -#CFLAGS += -I../../hcf -I../../include -I../../include/hcf -#CFLAGS += -I../../include/wireless - -# Driver interface for madwifi driver -# Deprecated; use CONFIG_DRIVER_WEXT=y instead. -#CONFIG_DRIVER_MADWIFI=y -# Set include directory to the madwifi source tree -#CFLAGS += -I../../madwifi - -# Driver interface for ndiswrapper -# Deprecated; use CONFIG_DRIVER_WEXT=y instead. -#CONFIG_DRIVER_NDISWRAPPER=y - -# Driver interface for Atmel driver -# CONFIG_DRIVER_ATMEL=y - -# Driver interface for old Broadcom driver -# Please note that the newer Broadcom driver ("hybrid Linux driver") supports -# Linux wireless extensions and does not need (or even work) with the old -# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver. -#CONFIG_DRIVER_BROADCOM=y -# Example path for wlioctl.h; change to match your configuration -#CFLAGS += -I/opt/WRT54GS/release/src/include - -# Driver interface for Intel ipw2100/2200 driver -# Deprecated; use CONFIG_DRIVER_WEXT=y instead. -#CONFIG_DRIVER_IPW=y - -# Driver interface for Ralink driver -#CONFIG_DRIVER_RALINK=y - -# Driver interface for generic Linux wireless extensions -# Note: WEXT is deprecated in the current Linux kernel version and no new -# functionality is added to it. nl80211-based interface is the new -# replacement for WEXT and its use allows wpa_supplicant to properly control -# the driver to improve existing functionality like roaming and to support new -# functionality. -CONFIG_DRIVER_WEXT=y - -# Driver interface for Linux drivers using the nl80211 kernel interface -CONFIG_DRIVER_NL80211=y - -# driver_nl80211.c requires libnl. If you are compiling it yourself -# you may need to point hostapd to your version of libnl. -# -#CFLAGS += -I$ -#LIBS += -L$ - -# Use libnl v2.0 (or 3.0) libraries. -#CONFIG_LIBNL20=y - -# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored) -CONFIG_LIBNL32=y - - -# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) -#CONFIG_DRIVER_BSD=y -#CFLAGS += -I/usr/local/include -#LIBS += -L/usr/local/lib -#LIBS_p += -L/usr/local/lib -#LIBS_c += -L/usr/local/lib - -# Driver interface for Windows NDIS -#CONFIG_DRIVER_NDIS=y -#CFLAGS += -I/usr/include/w32api/ddk -#LIBS += -L/usr/local/lib -# For native build using mingw -#CONFIG_NATIVE_WINDOWS=y -# Additional directories for cross-compilation on Linux host for mingw target -#CFLAGS += -I/opt/mingw/mingw32/include/ddk -#LIBS += -L/opt/mingw/mingw32/lib -#CC=mingw32-gcc -# By default, driver_ndis uses WinPcap for low-level operations. This can be -# replaced with the following option which replaces WinPcap calls with NDISUIO. -# However, this requires that WZC is disabled (net stop wzcsvc) before starting -# wpa_supplicant. -# CONFIG_USE_NDISUIO=y - -# Driver interface for development testing -#CONFIG_DRIVER_TEST=y - -# Driver interface for wired Ethernet drivers -CONFIG_DRIVER_WIRED=y - -# Driver interface for the Broadcom RoboSwitch family -#CONFIG_DRIVER_ROBOSWITCH=y - -# Driver interface for no driver (e.g., WPS ER only) -#CONFIG_DRIVER_NONE=y - -# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is -# included) -CONFIG_IEEE8021X_EAPOL=y - -# EAP-MD5 -CONFIG_EAP_MD5=y - -# EAP-MSCHAPv2 -CONFIG_EAP_MSCHAPV2=y - -# EAP-TLS -CONFIG_EAP_TLS=y - -# EAL-PEAP -CONFIG_EAP_PEAP=y - -# EAP-TTLS -CONFIG_EAP_TTLS=y - -# EAP-FAST -# Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed -# for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g., -# with openssl-0.9.8x-tls-extensions.patch, to add the needed functions. -#CONFIG_EAP_FAST=y - -# EAP-GTC -CONFIG_EAP_GTC=y - -# EAP-OTP -CONFIG_EAP_OTP=y - -# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) -#CONFIG_EAP_SIM=y - -# EAP-PSK (experimental; this is _not_ needed for WPA-PSK) -#CONFIG_EAP_PSK=y - -# EAP-pwd (secure authentication using only a password) -#CONFIG_EAP_PWD=y - -# EAP-PAX -#CONFIG_EAP_PAX=y - -# LEAP -CONFIG_EAP_LEAP=y - -# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used) -#CONFIG_EAP_AKA=y - -# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). -# This requires CONFIG_EAP_AKA to be enabled, too. -#CONFIG_EAP_AKA_PRIME=y - -# Enable USIM simulator (Milenage) for EAP-AKA -#CONFIG_USIM_SIMULATOR=y - -# EAP-SAKE -#CONFIG_EAP_SAKE=y - -# EAP-GPSK -#CONFIG_EAP_GPSK=y -# Include support for optional SHA256 cipher suite in EAP-GPSK -#CONFIG_EAP_GPSK_SHA256=y - -# EAP-TNC and related Trusted Network Connect support (experimental) -#CONFIG_EAP_TNC=y - -# Wi-Fi Protected Setup (WPS) -CONFIG_WPS=y -# Enable WSC 2.0 support -#CONFIG_WPS2=y -# Enable WPS external registrar functionality -#CONFIG_WPS_ER=y -# Disable credentials for an open network by default when acting as a WPS -# registrar. -#CONFIG_WPS_REG_DISABLE_OPEN=y -# Enable WPS support with NFC config method -#CONFIG_WPS_NFC=y - -# EAP-IKEv2 -#CONFIG_EAP_IKEV2=y - -# EAP-EKE -#CONFIG_EAP_EKE=y - -# PKCS#12 (PFX) support (used to read private key and certificate file from -# a file that usually has extension .p12 or .pfx) -CONFIG_PKCS12=y - -# Smartcard support (i.e., private key on a smartcard), e.g., with openssl -# engine. -CONFIG_SMARTCARD=y - -# PC/SC interface for smartcards (USIM, GSM SIM) -# Enable this if EAP-SIM or EAP-AKA is included -#CONFIG_PCSC=y - -# Support HT overrides (disable HT/HT40, mask MCS rates, etc.) -#CONFIG_HT_OVERRIDES=y - -# Support VHT overrides (disable VHT, mask MCS rates, etc.) -#CONFIG_VHT_OVERRIDES=y - -# Development testing -#CONFIG_EAPOL_TEST=y - -# Select control interface backend for external programs, e.g, wpa_cli: -# unix = UNIX domain sockets (default for Linux/*BSD) -# udp = UDP sockets using localhost (127.0.0.1) -# named_pipe = Windows Named Pipe (default for Windows) -# udp-remote = UDP sockets with remote access (only for tests systems/purpose) -# y = use default (backwards compatibility) -# If this option is commented out, control interface is not included in the -# build. -CONFIG_CTRL_IFACE=y - -# Include support for GNU Readline and History Libraries in wpa_cli. -# When building a wpa_cli binary for distribution, please note that these -# libraries are licensed under GPL and as such, BSD license may not apply for -# the resulting binary. -#CONFIG_READLINE=y - -# Include internal line edit mode in wpa_cli. This can be used as a replacement -# for GNU Readline to provide limited command line editing and history support. -#CONFIG_WPA_CLI_EDIT=y - -# Remove debugging code that is printing out debug message to stdout. -# This can be used to reduce the size of the wpa_supplicant considerably -# if debugging code is not needed. The size reduction can be around 35% -# (e.g., 90 kB). -#CONFIG_NO_STDOUT_DEBUG=y - -# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save -# 35-50 kB in code size. -#CONFIG_NO_WPA=y - -# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support -# This option can be used to reduce code size by removing support for -# converting ASCII passphrases into PSK. If this functionality is removed, the -# PSK can only be configured as the 64-octet hexstring (e.g., from -# wpa_passphrase). This saves about 0.5 kB in code size. -#CONFIG_NO_WPA_PASSPHRASE=y - -# Disable scan result processing (ap_mode=1) to save code size by about 1 kB. -# This can be used if ap_scan=1 mode is never enabled. -#CONFIG_NO_SCAN_PROCESSING=y - -# Select configuration backend: -# file = text file (e.g., wpa_supplicant.conf; note: the configuration file -# path is given on command line, not here; this option is just used to -# select the backend that allows configuration files to be used) -# winreg = Windows registry (see win_example.reg for an example) -CONFIG_BACKEND=file - -# Remove configuration write functionality (i.e., to allow the configuration -# file to be updated based on runtime configuration changes). The runtime -# configuration can still be changed, the changes are just not going to be -# persistent over restarts. This option can be used to reduce code size by -# about 3.5 kB. -#CONFIG_NO_CONFIG_WRITE=y - -# Remove support for configuration blobs to reduce code size by about 1.5 kB. -#CONFIG_NO_CONFIG_BLOBS=y - -# Select program entry point implementation: -# main = UNIX/POSIX like main() function (default) -# main_winsvc = Windows service (read parameters from registry) -# main_none = Very basic example (development use only) -#CONFIG_MAIN=main - -# Select wrapper for operatins system and C library specific functions -# unix = UNIX/POSIX like systems (default) -# win32 = Windows systems -# none = Empty template -#CONFIG_OS=unix - -# Select event loop implementation -# eloop = select() loop (default) -# eloop_win = Windows events and WaitForMultipleObject() loop -#CONFIG_ELOOP=eloop - -# Should we use poll instead of select? Select is used by default. -#CONFIG_ELOOP_POLL=y - -# Select layer 2 packet implementation -# linux = Linux packet socket (default) -# pcap = libpcap/libdnet/WinPcap -# freebsd = FreeBSD libpcap -# winpcap = WinPcap with receive thread -# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) -# none = Empty template -#CONFIG_L2_PACKET=linux - -# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) -CONFIG_PEERKEY=y - -# IEEE 802.11w (management frame protection), also known as PMF -# Driver support is also needed for IEEE 802.11w. -#CONFIG_IEEE80211W=y - -# Select TLS implementation -# openssl = OpenSSL (default) -# gnutls = GnuTLS -# internal = Internal TLSv1 implementation (experimental) -# none = Empty template -#CONFIG_TLS=openssl - -# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) -# can be enabled to get a stronger construction of messages when block ciphers -# are used. It should be noted that some existing TLS v1.0 -based -# implementation may not be compatible with TLS v1.1 message (ClientHello is -# sent prior to negotiating which version will be used) -#CONFIG_TLSV11=y - -# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2) -# can be enabled to enable use of stronger crypto algorithms. It should be -# noted that some existing TLS v1.0 -based implementation may not be compatible -# with TLS v1.2 message (ClientHello is sent prior to negotiating which version -# will be used) -#CONFIG_TLSV12=y - -# If CONFIG_TLS=internal is used, additional library and include paths are -# needed for LibTomMath. Alternatively, an integrated, minimal version of -# LibTomMath can be used. See beginning of libtommath.c for details on benefits -# and drawbacks of this option. -#CONFIG_INTERNAL_LIBTOMMATH=y -#ifndef CONFIG_INTERNAL_LIBTOMMATH -#LTM_PATH=/usr/src/libtommath-0.39 -#CFLAGS += -I$(LTM_PATH) -#LIBS += -L$(LTM_PATH) -#LIBS_p += -L$(LTM_PATH) -#endif -# At the cost of about 4 kB of additional binary size, the internal LibTomMath -# can be configured to include faster routines for exptmod, sqr, and div to -# speed up DH and RSA calculation considerably -#CONFIG_INTERNAL_LIBTOMMATH_FAST=y - -# Include NDIS event processing through WMI into wpa_supplicant/wpasvc. -# This is only for Windows builds and requires WMI-related header files and -# WbemUuid.Lib from Platform SDK even when building with MinGW. -#CONFIG_NDIS_EVENTS_INTEGRATED=y -#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib" - -# Add support for old DBus control interface -# (fi.epitest.hostap.WPASupplicant) -#CONFIG_CTRL_IFACE_DBUS=y - -# Add support for new DBus control interface -# (fi.w1.hostap.wpa_supplicant1) -CONFIG_CTRL_IFACE_DBUS_NEW=y - -# Add introspection support for new DBus control interface -#CONFIG_CTRL_IFACE_DBUS_INTRO=y - -# Add support for loading EAP methods dynamically as shared libraries. -# When this option is enabled, each EAP method can be either included -# statically (CONFIG_EAP_=y) or dynamically (CONFIG_EAP_=dyn). -# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to -# be loaded in the beginning of the wpa_supplicant configuration file -# (see load_dynamic_eap parameter in the example file) before being used in -# the network blocks. -# -# Note that some shared parts of EAP methods are included in the main program -# and in order to be able to use dynamic EAP methods using these parts, the -# main program must have been build with the EAP method enabled (=y or =dyn). -# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries -# unless at least one of them was included in the main build to force inclusion -# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included -# in the main build to be able to load these methods dynamically. -# -# Please also note that using dynamic libraries will increase the total binary -# size. Thus, it may not be the best option for targets that have limited -# amount of memory/flash. -#CONFIG_DYNAMIC_EAP_METHODS=y - -# IEEE Std 802.11r-2008 (Fast BSS Transition) -#CONFIG_IEEE80211R=y - -# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) -#CONFIG_DEBUG_FILE=y - -# Send debug messages to syslog instead of stdout -#CONFIG_DEBUG_SYSLOG=y -# Set syslog facility for debug messages -#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON - -# Add support for sending all debug messages (regardless of debug verbosity) -# to the Linux kernel tracing facility. This helps debug the entire stack by -# making it easy to record everything happening from the driver up into the -# same file, e.g., using trace-cmd. -#CONFIG_DEBUG_LINUX_TRACING=y - -# Enable privilege separation (see README 'Privilege separation' for details) -#CONFIG_PRIVSEP=y - -# Enable mitigation against certain attacks against TKIP by delaying Michael -# MIC error reports by a random amount of time between 0 and 60 seconds -#CONFIG_DELAYED_MIC_ERROR_REPORT=y - -# Enable tracing code for developer debugging -# This tracks use of memory allocations and other registrations and reports -# incorrect use with a backtrace of call (or allocation) location. -#CONFIG_WPA_TRACE=y -# For BSD, uncomment these. -#LIBS += -lexecinfo -#LIBS_p += -lexecinfo -#LIBS_c += -lexecinfo - -# Use libbfd to get more details for developer debugging -# This enables use of libbfd to get more detailed symbols for the backtraces -# generated by CONFIG_WPA_TRACE=y. -#CONFIG_WPA_TRACE_BFD=y -# For BSD, uncomment these. -#LIBS += -lbfd -liberty -lz -#LIBS_p += -lbfd -liberty -lz -#LIBS_c += -lbfd -liberty -lz - -CONFIG_TLS = %ssl% -CONFIG_CTRL_IFACE_DBUS=y -CONFIG_CTRL_IFACE_DBUS_NEW=y - -# wpa_supplicant depends on strong random number generation being available -# from the operating system. os_get_random() function is used to fetch random -# data when needed, e.g., for key generation. On Linux and BSD systems, this -# works by reading /dev/urandom. It should be noted that the OS entropy pool -# needs to be properly initialized before wpa_supplicant is started. This is -# important especially on embedded devices that do not have a hardware random -# number generator and may by default start up with minimal entropy available -# for random number generation. -# -# As a safety net, wpa_supplicant is by default trying to internally collect -# additional entropy for generating random data to mix in with the data fetched -# from the OS. This by itself is not considered to be very strong, but it may -# help in cases where the system pool is not initialized properly. However, it -# is very strongly recommended that the system pool is initialized with enough -# entropy either by using hardware assisted random number generator or by -# storing state over device reboots. -# -# wpa_supplicant can be configured to maintain its own entropy store over -# restarts to enhance random number generation. This is not perfect, but it is -# much more secure than using the same sequence of random numbers after every -# reboot. This can be enabled with -e command line option. The -# specified file needs to be readable and writable by wpa_supplicant. -# -# If the os_get_random() is known to provide strong random data (e.g., on -# Linux/BSD, the board in question is known to have reliable source of random -# data from /dev/urandom), the internal wpa_supplicant random pool can be -# disabled. This will save some in binary size and CPU use. However, this -# should only be considered for builds that are known to be used on devices -# that meet the requirements described above. -#CONFIG_NO_RANDOM_POOL=y - -# IEEE 802.11n (High Throughput) support (mainly for AP mode) -#CONFIG_IEEE80211N=y - -# IEEE 802.11ac (Very High Throughput) support (mainly for AP mode) -# (depends on CONFIG_IEEE80211N) -#CONFIG_IEEE80211AC=y - -# Wireless Network Management (IEEE Std 802.11v-2011) -# Note: This is experimental and not complete implementation. -#CONFIG_WNM=y - -# Interworking (IEEE 802.11u) -# This can be used to enable functionality to improve interworking with -# external networks (GAS/ANQP to learn more about the networks and network -# selection based on available credentials). -#CONFIG_INTERWORKING=y - -# Hotspot 2.0 -#CONFIG_HS20=y - -# Disable roaming in wpa_supplicant -#CONFIG_NO_ROAMING=y - -# AP mode operations with wpa_supplicant -# This can be used for controlling AP mode operations with wpa_supplicant. It -# should be noted that this is mainly aimed at simple cases like -# WPA2-Personal while more complex configurations like WPA2-Enterprise with an -# external RADIUS server can be supported with hostapd. -CONFIG_AP=y - -CONFIG_BGSCAN_SIMPLE=y - -# P2P (Wi-Fi Direct) -# This can be used to enable P2P support in wpa_supplicant. See README-P2P for -# more information on P2P operations. -#CONFIG_P2P=y - -# Enable TDLS support -#CONFIG_TDLS=y - -# Wi-Fi Direct -# This can be used to enable Wi-Fi Direct extensions for P2P using an external -# program to control the additional information exchanges in the messages. -#CONFIG_WIFI_DISPLAY=y - -# Autoscan -# This can be used to enable automatic scan support in wpa_supplicant. -# See wpa_supplicant.conf for more information on autoscan usage. -# -# Enabling directly a module will enable autoscan support. -# For exponential module: -CONFIG_AUTOSCAN_EXPONENTIAL=y -# For periodic module: -#CONFIG_AUTOSCAN_PERIODIC=y - -# Password (and passphrase, etc.) backend for external storage -# These optional mechanisms can be used to add support for storing passwords -# and other secrets in external (to wpa_supplicant) location. This allows, for -# example, operating system specific key storage to be used -# -# External password backend for testing purposes (developer use) -#CONFIG_EXT_PASSWORD_TEST=y diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb index 43865ed96045..51ec5004852b 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb @@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5ebcb90236d1ad640558c3d3cd3035df \ DEPENDS = "dbus libnl" SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ - file://defconfig \ file://wpa-supplicant.sh \ file://wpa_supplicant.conf \ file://wpa_supplicant.conf-sane \ @@ -25,7 +24,7 @@ S = "${WORKDIR}/wpa_supplicant-${PV}" inherit pkgconfig systemd -PACKAGECONFIG ??= "openssl" +PACKAGECONFIG ?= "openssl" PACKAGECONFIG[gnutls] = ",,gnutls libgcrypt" PACKAGECONFIG[openssl] = ",,openssl" @@ -33,15 +32,12 @@ CVE_PRODUCT = "wpa_supplicant" do_configure () { ${MAKE} -C wpa_supplicant clean - install -m 0755 ${WORKDIR}/defconfig wpa_supplicant/.config + sed -e '/CONFIG_TLS=/d' wpa_supplicant/.config - if echo "${PACKAGECONFIG}" | grep -qw "openssl"; then - ssl=openssl - elif echo "${PACKAGECONFIG}" | grep -qw "gnutls"; then - ssl=gnutls - fi - if [ -n "$ssl" ]; then - sed -i "s/%ssl%/$ssl/" wpa_supplicant/.config + if ${@ bb.utils.contains('PACKAGECONFIG', 'openssl', 'true', 'false', d) }; then + echo 'CONFIG_TLS=openssl' >>wpa_supplicant/.config + elif ${@ bb.utils.contains('PACKAGECONFIG', 'gnutls', 'true', 'false', d) }; then + echo 'CONFIG_TLS=gnutls' >>wpa_supplicant/.config fi # For rebuild From patchwork Tue Apr 12 13:03:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 6580 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9744DC54F65 for ; Tue, 12 Apr 2022 16:46:43 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.web12.10370.1649768613107088727 for ; Tue, 12 Apr 2022 06:03:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bzgPaG5M; spf=pass (domain: gmail.com, ip: 209.85.128.48, mailfrom: alex.kiernan@gmail.com) Received: by mail-wm1-f48.google.com with SMTP id r133-20020a1c448b000000b0038ccb70e239so1724998wma.3 for ; Tue, 12 Apr 2022 06:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a8FBMcbYrkEmYmnXOb3e7WhbZQacIOtHVl9bqRrP4R0=; b=bzgPaG5MFLEo1Vovb6Tk8+4BtyW+72vQ0PpY7pCMeLTQ1Bjc4WBLQsqPd9D9ES7fYc 8okTRJqigEpKFYWm1gjaqza1lWs9Q5UPt2E82pxWIMV9GVYq30mtzczYLgweprwuugtS 0WNKG5mW/kHpMWnLSzBAJEqeIpgKsS8tCrvID7eyQNjhgnYAmCacXv4+ohGL5wS7+WoO Y3dU9863U33MADNeToi2i2oj8e/CbR7Zzh57pW2z5yzHO0VJId5x0L5m9TikP5uRvf4d oZxDP+PPQAXgIgQq/hjMzhXHV3FTbbLTOOyHasxozfaUzr1ltZNE2IOsjerYKCnSv9rS 8MXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a8FBMcbYrkEmYmnXOb3e7WhbZQacIOtHVl9bqRrP4R0=; b=J6qBthgnH7VmXNXBJzrgtfV2sqmDZHmOLIoIuIL1g0CBwkOTvTXUvavHsqkxsBXMfm icair/UY86ZL0JVNcM6O5MahxgePqjAYN2n6zKnTO/nYtyylgL0fvn5M5qgSkeVc4gK1 X8NyNj74nHI2F+nYlAxBISkt4nL4wji5i0YArTTk09oYD222cgpA9PshEqjeTmIOGu0f DJtEGCAAUZcZEXvHcxR3mK4ksV6mSdtUiHoBDg5Xp33BqcMvnMC18Cm9ImB1tjdQSa7A usKlPOPfBrCe94BghUqHXTrywve1clqtuqMFRwPGDjePxxXYMhKERpTN5qOv/DdSw5oP n2tQ== X-Gm-Message-State: AOAM531ga+rXzjAOI/1+Z34xcCbdsEK1XxgXZ56pYMYpvPvErRObUEY+ Z7YP4ordyTixrSoNl4XQykVKxu/DU7U= X-Google-Smtp-Source: ABdhPJxNcZyeUNX/sbh0q03nor2ZxjDgA2Jm1vOPgmw+zizNqRbXIjvtCrJuZuhCDopaMSW0OPOeNQ== X-Received: by 2002:a05:600c:4e52:b0:38c:f41f:3718 with SMTP id e18-20020a05600c4e5200b0038cf41f3718mr4171087wmq.101.1649768611472; Tue, 12 Apr 2022 06:03:31 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id r4-20020a05600c35c400b0038cbd8c41e9sm2372953wmq.12.2022.04.12.06.03.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 06:03:31 -0700 (PDT) From: Alex Kiernan X-Google-Original-From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH 7/8] wpa-supplicant: Simplify build/install flow Date: Tue, 12 Apr 2022 14:03:14 +0100 Message-Id: <20220412130315.25917-7-alexk@zuma.ai> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412130315.25917-1-alexk@zuma.ai> References: <20220412130315.25917-1-alexk@zuma.ai> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 12 Apr 2022 16:46:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164271 The build/install steps for wpa-supplicant support CFLAGS and an install target, so use these rather than attempting to do it manually (which was broken by upstream splitting into build.rules and lib.rules). Note that this installs wpa_passphrase into sbindir rather than bindir. Signed-off-by: Alex Kiernan --- .../wpa-supplicant/wpa-supplicant_2.10.bb | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb index 51ec5004852b..861855e4851b 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb @@ -30,6 +30,8 @@ PACKAGECONFIG[openssl] = ",,openssl" CVE_PRODUCT = "wpa_supplicant" +EXTRA_OEMAKE = "'LIBDIR=${libdir}' 'INCDIR=${includedir}' 'BINDIR=${sbindir}'" + do_configure () { ${MAKE} -C wpa_supplicant clean sed -e '/CONFIG_TLS=/d' wpa_supplicant/.config @@ -44,12 +46,7 @@ do_configure () { rm -f wpa_supplicant/*.d wpa_supplicant/dbus/*.d } -export EXTRA_CFLAGS = "${CFLAGS}" -export BINDIR = "${sbindir}" - do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS - sed -e "s:CFLAGS\ =.*:& \$(EXTRA_CFLAGS):g" -i ${S}/src/lib.rules oe_runmake -C wpa_supplicant if [ -z "${DISABLE_STATIC}" ]; then oe_runmake -C wpa_supplicant libwpa_client.a @@ -57,12 +54,7 @@ do_compile () { } do_install () { - install -d ${D}${sbindir} - install -m 755 wpa_supplicant/wpa_supplicant ${D}${sbindir} - install -m 755 wpa_supplicant/wpa_cli ${D}${sbindir} - - install -d ${D}${bindir} - install -m 755 wpa_supplicant/wpa_passphrase ${D}${bindir} + oe_runmake -C wpa_supplicant DESTDIR="${D}" install install -d ${D}${docdir}/wpa_supplicant install -m 644 wpa_supplicant/README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant From patchwork Tue Apr 12 13:03:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 6577 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D273C55187 for ; Tue, 12 Apr 2022 16:46:43 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web10.10333.1649768614223227351 for ; Tue, 12 Apr 2022 06:03:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=I9sJ0Qg5; spf=pass (domain: gmail.com, ip: 209.85.128.50, mailfrom: alex.kiernan@gmail.com) Received: by mail-wm1-f50.google.com with SMTP id m33-20020a05600c3b2100b0038ec0218103so1577353wms.3 for ; Tue, 12 Apr 2022 06:03:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+e+e+c6giU8+/CveI638i2Svykrf/1O9VOpaoZmyWqo=; b=I9sJ0Qg5R5OSjSUJj1fTTOsJ2KaU2kP9IJ5GQKqfILpAzvtFAfxTwIxjYRzYo1cC8F DvQSU/2xaBHP4kBjTZRo+wJeHMWDGaqK3YtRtRraEZkDEiZUCU5mIAKiL/LZ/5SAyRKN /50PZnaItuSvU9p/D6EvzeNmYYf+Ck3xQVgoz3jqTCbvRjaKVqDopMMvdRAHxOXgDipe SUjM8RMjs68ij7+v+mYtevkjhPbqpxXIMINI+cuvIa+YMy21SK1XQjfTxwZUCZpU/NUK HrFYDOFc5FiJuqtdVr+V126vRhPs+Sn0JGZjlgNvui1CutnFhtSzZ/yvhK6NIY0yKjva p0sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+e+e+c6giU8+/CveI638i2Svykrf/1O9VOpaoZmyWqo=; b=u4SSjmRqyJJKIFQp38XY2zbp7alMQsWr35KLZlEkZqJNooh9b6xOTru3nu34Vp04N7 +GWqhFIPJ/7tHIalCCKn/t4fbhOsjSCDjPiF08WyYbRKsZ4Nil3mp+gn+KMSUEhHI3Pe dvb6YpPvTHlkNpEgVA1gHlew27+1W8UG5fzWPDkYyl3vDQ0dLO5gCzqA2M9jhPue3juK lvDPcN2e4VDrw9A+sEKoAeSD89mov4BgnjHiZUmqCTQ/AbAFqt5mObrrITJhtCNKN9iM EEQbLacC1O3g8t8T3jka47P8LQ7E+GO0B9CvTfjIWvG1YkchNJryCScAG4VaZt6+gfMA M9eQ== X-Gm-Message-State: AOAM531YBJ4yHrptZouqnDxVE5L+4EJv1SFI4dbHba+YkdEZd4vq9xnd /GXbH2qh4svK5TXRIvXifVgbVC0hLGM= X-Google-Smtp-Source: ABdhPJywkY81MimHZ4LFGEqIlTyJlPtwt5BWiRgwjpmijZRpCRkAlITbivoCL/uf1QzfNBVLSCWk2w== X-Received: by 2002:a05:600c:4f43:b0:38c:b270:f9af with SMTP id m3-20020a05600c4f4300b0038cb270f9afmr4093717wmq.36.1649768612358; Tue, 12 Apr 2022 06:03:32 -0700 (PDT) Received: from localhost.localdomain (cust246-dsl91-135-6.idnet.net. [91.135.6.246]) by smtp.gmail.com with ESMTPSA id r4-20020a05600c35c400b0038cbd8c41e9sm2372953wmq.12.2022.04.12.06.03.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 06:03:31 -0700 (PDT) From: Alex Kiernan X-Google-Original-From: Alex Kiernan To: openembedded-core@lists.openembedded.org Cc: Alex Kiernan Subject: [meta-oe][PATCH 8/8] wpa-supplicant: Package dynamic modules Date: Tue, 12 Apr 2022 14:03:15 +0100 Message-Id: <20220412130315.25917-8-alexk@zuma.ai> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412130315.25917-1-alexk@zuma.ai> References: <20220412130315.25917-1-alexk@zuma.ai> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 12 Apr 2022 16:46:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/164272 If CONFIG_DYNAMIC_EAP_METHODS and some modules are set to `dyn` ensure these are packaged as part of the build. Signed-off-by: Alex Kiernan --- .../wpa-supplicant/wpa-supplicant_2.10.bb | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb index 861855e4851b..e83aef70d554 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb @@ -98,14 +98,34 @@ pkg_postinst:${PN} () { } PACKAGE_BEFORE_PN += "${PN}-passphrase ${PN}-cli" +PACKAGES += "${PN}-plugins" +ALLOW_EMPTY:${PN}-plugins = "1" + +PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" +NOAUTOPACKAGEDEBUG = "1" FILES:${PN}-passphrase = "${bindir}/wpa_passphrase" FILES:${PN}-cli = "${sbindir}/wpa_cli" FILES:${PN} += "${datadir}/dbus-1/system-services/* ${systemd_system_unitdir}/*" +FILES:${PN}-dbg += "${sbindir}/.debug" CONFFILES:${PN} += "${sysconfdir}/wpa_supplicant.conf" -RRECOMMENDS:${PN} = "${PN}-passphrase ${PN}-cli" +RRECOMMENDS:${PN} = "${PN}-passphrase ${PN}-cli ${PN}-plugins" SYSTEMD_SERVICE:${PN} = "wpa_supplicant.service" SYSTEMD_AUTO_ENABLE = "disable" + +python split_wpa_supplicant_libs () { + libdir = d.expand('${libdir}/wpa_supplicant') + dbglibdir = os.path.join(libdir, '.debug') + + split_packages = do_split_packages(d, libdir, r'^(.*)\.so', '${PN}-plugin-%s', 'wpa_supplicant %s plugin', prepend=True) + split_dbg_packages = do_split_packages(d, dbglibdir, r'^(.*)\.so', '${PN}-plugin-%s-dbg', 'wpa_supplicant %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg') + + if split_packages: + pn = d.getVar('PN') + d.setVar('RRECOMMENDS:' + pn + '-plugins', ' '.join(split_packages)) + d.appendVar('RRECOMMENDS:' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) +} +PACKAGESPLITFUNCS:prepend = "split_wpa_supplicant_libs "