From patchwork Sun Nov 3 16:56:40 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: 1188593 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.137; helo=fraxinus.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="ENoFxNfv"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 475htY2PsPz9sP4 for ; Mon, 4 Nov 2019 03:57:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B2348896C5; Sun, 3 Nov 2019 16:57:23 +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 n5wiEdm0e8Dd; Sun, 3 Nov 2019 16:57:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2EFB289691; Sun, 3 Nov 2019 16:57:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 564CF1BF398 for ; Sun, 3 Nov 2019 16:57:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 53A2D2094C for ; Sun, 3 Nov 2019 16:57:22 +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 OeD3cZqdKGdp for ; Sun, 3 Nov 2019 16:57:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by silver.osuosl.org (Postfix) with ESMTPS id 8238F21517 for ; Sun, 3 Nov 2019 16:57:11 +0000 (UTC) Received: by mail-wm1-f43.google.com with SMTP id 8so6641330wmo.0 for ; Sun, 03 Nov 2019 08:57:11 -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=+xW00it+agyYSEOpA27Mf3SdX7sUur8hjuIAi4YWoS8=; b=ENoFxNfvhjQa4yaerUuGmqbz4cRpZ/srDbZQypZtT1pppQxGR+SeGxxyA1ouMra5Fo HgUQCz4Jsz8pS8gII7ZmpAzzQQeKPNH0iVSyXYjgVp7aEnU1r2iiY9eDUvHClyjJZ04f ESB1YVl62UCk2uSqI+4YaRoF2+a9XcX4TOAX8QEggJdpZVbNRzidB30YQt2cG/CbFDBi z6OVXBfADDnyVblt6JmvGJRtRjCpUkK7HqfRww9mZ9ziufhG7GQeiSZu6G/uUmByewad LDLdx0LVHBLLdX3LWvgaFeuX1zENJOdiRsGhVWogVyWt/n7066bmr5M4gUfNRUOoobRb jaYQ== 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=+xW00it+agyYSEOpA27Mf3SdX7sUur8hjuIAi4YWoS8=; b=kJkCPgCDNoWSGGm08Og5xsXCPUs++NGadJDuKbe8dst/HQyr9fDqmAsIGjmHfGfBGx iH4pfMuFbpTtvicDp0RjzVsr9AUNbqgHymT99gpfBQSAFPAgqzt8utaeYmD5m9HRha9/ 62MO69oVfiE1h6DODRpK6QDJgMtufwBZIMZ7ChDQRQGEdAwg4ync5Sm5/77pJosI1Ae/ nl09mmIm4izoHpMnb2ZCaOeJQ7EZfzYj72RfrUx5V6+CWJO60IXc+yabb7E7YVXmDl+0 7OAr1lcM4nQgT8bIXeXd6Ksl+WKBxWf2BNaAkfwhNQpciUU4/4U4FxNo0h+5ihZ3vfBU dKGA== X-Gm-Message-State: APjAAAWMRxFslClBVjBIyjZcGJj5cZF6cgGxHIy9c5CecUoBGhILer+z JjReuB7tM26kBEcTes0cfewZyZoMNg== X-Google-Smtp-Source: APXvYqwKJyxMqylrRogHKA14c4CgChsVofjhBcr59l4uC6om12neiSzDuLH0ki3J1kZP5XDq4V1MbA== X-Received: by 2002:a1c:6683:: with SMTP id a125mr12300887wmc.74.1572800229842; Sun, 03 Nov 2019 08:57:09 -0800 (PST) Received: from localhost.localdomain (221.86.207.77.rev.sfr.net. [77.207.86.221]) by smtp.googlemail.com with ESMTPSA id 14sm1850430wrc.65.2019.11.03.08.57.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:57:08 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:40 +0100 Message-Id: <20191103165640.21819-16-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0.rc1 In-Reply-To: <20191103165640.21819-1-jeremy.rosen@smile.fr> References: <20191103165640.21819-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 15/15] package/tor: adapt to 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" tor was not enabled, we now need to disable it explicitely Signed-off-by: Jérémy Rosen --- package/tor/50-tor.preset | 1 + package/tor/tor.mk | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 package/tor/50-tor.preset diff --git a/package/tor/50-tor.preset b/package/tor/50-tor.preset new file mode 100644 index 0000000000..8664cb9ca5 --- /dev/null +++ b/package/tor/50-tor.preset @@ -0,0 +1 @@ +disable tor.service diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 264d8d06da..2785c1a518 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -61,6 +61,8 @@ TOR_POST_INSTALL_TARGET_HOOKS += TOR_INSTALL_CONF define TOR_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/contrib/dist/tor.service \ $(TARGET_DIR)/usr/lib/systemd/system/tor.service + $(INSTALL) -D -m 644 package/tor/50-tor.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-tor.preset endef $(eval $(autotools-package))