From patchwork Sat Dec 7 18:00:45 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: 1205497 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="CqDRkpMj"; 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 47VchT0TGvz9sR1 for ; Sun, 8 Dec 2019 05:01:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 46B288781D; Sat, 7 Dec 2019 18:01:09 +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 y0uNUXKz+rYc; Sat, 7 Dec 2019 18:01:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 97DD987832; Sat, 7 Dec 2019 18:01:08 +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 EA61A1BF966 for ; Sat, 7 Dec 2019 18:01:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E69ED8788B for ; Sat, 7 Dec 2019 18:01:02 +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 i71+n7jhvdfz for ; Sat, 7 Dec 2019 18:01:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 26EE487865 for ; Sat, 7 Dec 2019 18:01:02 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id y17so11347111wrh.5 for ; Sat, 07 Dec 2019 10:01:02 -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=CqDRkpMjU1XyjUw47+rOVzUxZunY7s2IHJ2i+nJKhLox8jujDnNhc1KpKk5QULIFdp M8pr0cBXbJlRC01ZBtRSH2KAXSN7u6kuI4rrEqtcasbcjmzG+GssrkirjKQCys1Rl7uD RGz1laVuvFrsRuLA4SHf+SU7ZsS5KyJhJkGmCC2u+0cH1YkYWZkQECJXipxwUs8MifW5 MQTOWjqD3KW7F2yEWdiEOKPz6iz4oxiMhlPwISmNPBONLvYlMrD2++gQKJNFGTTnRJ2s sAqtKofpWEtdiVh9zgp4Ucns1CGIhHm0bejVYfnYEx31rmaLANw+lMZf6LRDYEEtK7Xq EyzQ== 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=udtDNi+85dYEJh8iBBeD9yLfqFGbfu0rcosIflhXTyOZFH+ZCIzFTSE+f2KwkgJm4/ 7e7adaNK4Xh6SNIeUf02bWiQnDDb64qR1cTzrUf789UjsMwQiSusl/d14uNPKKCXugOn rleYrh+DgOfImf8Y//2lZ+cyRSOuSvO3RZd2RJgR2sr+HSA9WXmUug1fvWhz4pGTauja wM6kkI4iKZ1Y6olH0DGLLEV6Q1I4wBjZMqCxiQvD/Mn1SgULKafjqRg2fkwBbCsUcy8x JldwafGJCBUyVCgpnYFdWxes3aXi1l3ADbwX7EROiaR5DSWXB/lCz7YDGT5iuWWf2FKB mT+Q== X-Gm-Message-State: APjAAAUOVcIinK+69a20sfM5NAzo1sw+Mj25GkaJNe5+kcWIqLolmNw2 ODIh3kVAhQr6LnvMZ+KAHz5xVT0j4Q== X-Google-Smtp-Source: APXvYqzKg3Gw9mViDeVW4xvp5wyfPD4NCBY8+4fhr9ZlkQm1udW0EriT9AO9OZMeA14mI/x42aGsGQ== X-Received: by 2002:adf:fbc1:: with SMTP id d1mr22589211wrs.267.1575741660425; Sat, 07 Dec 2019 10:01:00 -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 z4sm7558964wme.17.2019.12.07.10.00.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Dec 2019 10:00:59 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sat, 7 Dec 2019 19:00:45 +0100 Message-Id: <20191207180049.3245578-10-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191207180049.3245578-1-jeremy.rosen@smile.fr> References: <20191207180049.3245578-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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))