From patchwork Thu Dec 12 07:53:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsOpbXkgUk9TRU4=?= X-Patchwork-Id: 1208199 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="Ow2Ze2hK"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YR0F4svKz9sNH for ; Thu, 12 Dec 2019 18:54:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E79AE881EC; Thu, 12 Dec 2019 07:54:35 +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 L8p2IUzK-y0t; Thu, 12 Dec 2019 07:54:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 199E388215; Thu, 12 Dec 2019 07:54:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id EDEAD1BF9BD for ; Thu, 12 Dec 2019 07:54:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E1D85886B1 for ; Thu, 12 Dec 2019 07:54:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kNNEYnTxtSBj for ; Thu, 12 Dec 2019 07:54:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 246B088702 for ; Thu, 12 Dec 2019 07:54:12 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id d73so1233958wmd.1 for ; Wed, 11 Dec 2019 23:54:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J6ZgI55WXsG3imVQiL7wnCsryzNiHbVHzxMvNjHmyyc=; b=Ow2Ze2hKyX62U3BUaeqkxBm/N+cCeBFQB9N80yLywSO44xfHOnuolRSnSNci1fnLQV s3oABaqSKmSJCXqk4J++1bUdTPmPE3tlv8vFxcn+eL7ba1AXSz588E2e+OpGN9Y4jwND cUgwCxoGrTlf2biurqWDKsRl29iQERBhSBTguRuf0hHFVlXkxgzy2nhczqdDjbULj8al HcNryZWwIFhjIjc9x83IttMqfrp5DbUX9AKL8c/LsluhJhqgZ8fpREzzgx3P1ZBXcOoN sDmojzJ8ptOblL3TGNZ/aU3If1glCxpSUa8cu3/Qlu1hGTfYLdBL4lIJ7VP0HLGe+sb/ 2DBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J6ZgI55WXsG3imVQiL7wnCsryzNiHbVHzxMvNjHmyyc=; b=hwZ3Cmh3lKewGnaky0m/Xps2nsN0eGT7sqUqX3uSQsJhSTtpSniNz6Ep+SSbcsQ3H/ gcPCiLk+qhwmwH+Zm25wqRdtcHJOqb8i+J2sriEASYQqzIzMfIl1OwhRR/SIhUYbWs6j mxRfgyPr4MZCBNYjUU+afhhiyD9lzVY6ZSRIOi3t/633XhRBq+CPNGVdEPAZcTHBXCbx +312khlmC7z+0V4V0+1IGbR125cWiz89fg3Wp0I3ylXgjEUpCtqGsJBMviG0PTypbUmE 4MGa1xkdMCbGp+EjONPB8BjbGKb08HsENH4ms+ORt2KVQi9/+spuNkePymdA00k+boQz sILg== X-Gm-Message-State: APjAAAWMHpSCapQu6E5DeHEF5CHhUTj2/naJ6W3N72CHvZS8gDY3F3R2 C1e1khpBx3kPcIQ3BB4xwJHJkix1Ew== X-Google-Smtp-Source: APXvYqz1sdaD1uaLOjazshMAoh0becVJkSrjq4igrr6/SjfMOhGj7m5UG7DnuQ2pNnqf9ZsEOy09+w== X-Received: by 2002:a1c:9dd7:: with SMTP id g206mr4876403wme.61.1576137250290; Wed, 11 Dec 2019 23:54:10 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id y20sm4909753wmi.25.2019.12.11.23.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:09 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:56 +0100 Message-Id: <20191212075400.1499536-10-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 09/13] package/wpa_supplicant: adapt for preset-all X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" all services were installed but not enabled. This change enables the non-templated service but disables the templated ones Enabling the templates creates weird links which are probably an upstream bug. Signed-off-by: Jérémy Rosen --- package/wpa_supplicant/50-wpa_supplicant.preset | 4 ++++ package/wpa_supplicant/wpa_supplicant.mk | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 package/wpa_supplicant/50-wpa_supplicant.preset diff --git a/package/wpa_supplicant/50-wpa_supplicant.preset b/package/wpa_supplicant/50-wpa_supplicant.preset new file mode 100644 index 0000000000..9af8562c0e --- /dev/null +++ b/package/wpa_supplicant/50-wpa_supplicant.preset @@ -0,0 +1,4 @@ +disable wpa_supplicant@.service +disable wpa_supplicant-nl80211@.service +disable wpa_supplicant-wired@.service + diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 9dcebca9bf..4f95ea6276 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -227,6 +227,8 @@ define WPA_SUPPLICANT_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-nl80211@.service $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant-wired@.service \ $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-wired@.service + $(INSTALL) -D -m 644 $(WPA_SUPPLICANT_PKGDIR)/50-wpa_supplicant.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-wpa_supplicant.preset endef $(eval $(generic-package))