From patchwork Sun Nov 3 16:56:38 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: 1188596 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.136; helo=silver.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="UxZLixEU"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 475htd49t9z9sP3 for ; Mon, 4 Nov 2019 03:57:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A90FC21517; Sun, 3 Nov 2019 16:57:27 +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 jYoWfbs7Qp+V; Sun, 3 Nov 2019 16:57:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 09C1A24F04; Sun, 3 Nov 2019 16:57:15 +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 57B721BF398 for ; Sun, 3 Nov 2019 16:57:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4C5B5896F8 for ; Sun, 3 Nov 2019 16:57:11 +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 58WFRCUYka6A for ; Sun, 3 Nov 2019 16:57:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A0721896AF for ; Sun, 3 Nov 2019 16:57:09 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id a15so14415654wrf.9 for ; Sun, 03 Nov 2019 08:57:09 -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=PBm2Blv3XxfWNDZhI92SFtjtn4R8y2s7v0Dm1udLWXw=; b=UxZLixEUy6MX3sWRkoo8WO0XwT3/8CE06skQnWeHpp14bvOagSOPgO0cFqS4b4W6hV SPoYrdFQgpOoL8yfsPjz5BKKOT69TykLYwXgL04sR0PKUo6GPqIO6RApLgcb0tzGj9bR 4OgJ0hi9CdaSFS+j+44xgA87eYM1wlXgvLr0++5jyyXszhZBqOosTLd+iwch3xgWOVvm P7UU/pibX0cwss9/sK/vp/IRa405IZt70Sq9BWOipbVvCdYMdlNcWZ9oKhv0sJ25NFGN 2ZO32EYM9dyoituAJ1QK9GB/ODMEpRpox4fkQKOFzL3GKHOsFKFCjBUKGyq1aEBEWxx0 5+gQ== 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=PBm2Blv3XxfWNDZhI92SFtjtn4R8y2s7v0Dm1udLWXw=; b=NCb0vwLmmuIRU5XaXdTXGkSZYy0OmQYdFzv9J/c8ppvkHdqPb9BayXb+6Hsh6U/FN3 2UDKP+iuVlYAkAjYJ3MWeZrR0GCyiPyMVjsnvg4Hly1v32pvkxnnb7n23BxyFYMMEpJn km5m8pIpBt/FfoQEwRqifsENKWgsCbAosECKRbAZvSmF1s3kf2VOHSvm1qWbyYgBacu6 xdzxI/E2eu/WPx5vYGg4f/xeUsFDhrZmsrjKGskui1/kR2UlpAOAENXLXXT0dxTYULym n1FPMYHHHjg/mS+u10zzqZkjt79lPzEw135l6YmXEKpnE3clp4GZ2ErhBn/aVoFi+5Q/ ER/Q== X-Gm-Message-State: APjAAAWMRk/Na5utwG87ZUZk2UHQtO0kb0sk7SpozVk8T49Hl3uqYjKK WhQVr1EOkZbsXTn41yg+ZcpVnRylGQ== X-Google-Smtp-Source: APXvYqyu7oMzyosEjTO47U0nyJWgXjuVBQ5xZx19xMJKqJdN61J6AQdGaQk4X8Htrf3BnDZmSl7ebA== X-Received: by 2002:adf:f010:: with SMTP id j16mr20132354wro.317.1572800227999; Sun, 03 Nov 2019 08:57:07 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:57:07 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:38 +0100 Message-Id: <20191103165640.21819-14-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 13/15] package/sysklogd: 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" sysklogd installs two services: syslogd and klogd only syslogd is enabled, leave it that way Signed-off-by: Jérémy Rosen --- package/sysklogd/50-sysklogd.preset | 1 + package/sysklogd/sysklogd.mk | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 package/sysklogd/50-sysklogd.preset diff --git a/package/sysklogd/50-sysklogd.preset b/package/sysklogd/50-sysklogd.preset new file mode 100644 index 0000000000..2f9b19acb5 --- /dev/null +++ b/package/sysklogd/50-sysklogd.preset @@ -0,0 +1 @@ +disable klogd.service diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 266c171170..c7846d4f50 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -30,11 +30,8 @@ define SYSKLOGD_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/syslogd.service $(INSTALL) -D -m 644 $(SYSKLOGD_PKGDIR)/klogd.service \ $(TARGET_DIR)/usr/lib/systemd/system/klogd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/syslogd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/syslogd.service - ln -sf ../../../usr/lib/systemd/system/syslogd.service \ - $(TARGET_DIR)/etc/systemd/system/syslog.service + $(INSTALL) -D -m 644 package/sysklogd/50-sysklogd.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-sysklogd.preset endef $(eval $(autotools-package))