From patchwork Mon Dec 16 10:30:48 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: 1210222 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="OBIhfWo1"; 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 47byHF47n3z9sPn for ; Mon, 16 Dec 2019 21:31:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7BCFA872E9; Mon, 16 Dec 2019 10:31:18 +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 8j7-79x8HbgR; Mon, 16 Dec 2019 10:31:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3737387034; Mon, 16 Dec 2019 10:31:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C00381BF2B5 for ; Mon, 16 Dec 2019 10:31:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BD60E85691 for ; Mon, 16 Dec 2019 10:31:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1YXM2nCIBMxL for ; Mon, 16 Dec 2019 10:31:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5FFF4854DF for ; Mon, 16 Dec 2019 10:31:08 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id a5so6137375wmb.0 for ; Mon, 16 Dec 2019 02:31:08 -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=OBIhfWo1Li4PlrsJ7OBMCBniRkfeExC40OY0bLJ6AI97YBNKw3pHjWHriYZy1oy4lb E/DqJmo5MbiOko9HZ/M3J3aDmgyyYL0GZiavxst/Ww05xDU4LrCGThK2/lsdtk3V2+jy E/pNUfGMJDKDBn1EW64p06QsSeWtWvI4rTDmT9pbyORbfve2uzLaRvaOHdIUTyAZcgci XKTUu6nVLbNoex2BAdO5/+aU93RnVmtc8SY9vz/qPyIQKInd3AY5ZX/IKNJ1o37nh9zu 0Ns3iT08ctyd0XqiVHgfO9mAw/AP7bRwF0m+IWUtBXUNaTL5QDPZvntu1i1hRcK4BSuK Qv2w== 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=CmfbdezDcsY6Zog5I2d87PW8eB/hP6ffedbzwmg7TX1S7s0hmUhqGEJRy0khbRosdX w6ufcpOAXRKRc/PfHbrf2r32rnWEzvBvIqLpjSQdhMw+jpTCLLvP5zTQz5QbeLcCzBvT FWXE/NINxmEHjAjPrYjjmZJx3k2uK5ueZ3Np2+dPAZvoklo+KhwlzzSdnghnHGzdeWyF UXr6R3wTMvOjn/yxtwfB0tanP3aIA17A//Q4Hw2enpYlEKf5vYfr/AnLM9WZAD+c18hy BVa2UMITNRFF3c78LJhL5qoiJobtTU2U+WxR68TZhBsaEuyrSej2nVG7/8CmT/EQH5Bg eJpQ== X-Gm-Message-State: APjAAAX3mIvYflpfwkudWxRzuCIOlUSW6bHCcveQZFLM8xYSjCokGWOZ RCgwxt369gNAnyZPK3P95JxvJ4CwCA== X-Google-Smtp-Source: APXvYqyrKb5UA6+0GjlNoyzCCTxMFcnKBoSClMi9AbqkcWsYVDYkbB2vkJaWVc4UHAJPsN9rWABAXA== X-Received: by 2002:a05:600c:298:: with SMTP id 24mr8168212wmk.141.1576492266629; Mon, 16 Dec 2019 02:31:06 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.31.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:31:06 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:48 +0100 Message-Id: <20191216103052.35220-10-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 09/13] package/wpa_supplicant: adapt to systemctl 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))