From patchwork Sun Mar 15 02:27:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1254953 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=APtqzsSl; 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 48g3HD6sbCz9sP7 for ; Sun, 15 Mar 2020 13:27:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 034C9279FC; Sun, 15 Mar 2020 02:27:16 +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 Ypp8YHJIUw8B; Sun, 15 Mar 2020 02:27:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B27B7227B1; Sun, 15 Mar 2020 02:27:14 +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 977B91BF391 for ; Sun, 15 Mar 2020 02:27:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 94889881B7 for ; Sun, 15 Mar 2020 02:27:13 +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 v+2E53uTFDbS for ; Sun, 15 Mar 2020 02:27:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id B96BF881B3 for ; Sun, 15 Mar 2020 02:27:12 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id z8so7812554qto.12 for ; Sat, 14 Mar 2020 19:27:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=hcgcdDNupt3bso7tFZ8vJh1TwpF+V/kuwk3vNyDPzGs=; b=APtqzsSlu8BGAwEgaYu5HczxGEo7UJYWcXjWwVR+IKxfk9yi/kL+ZB2IDkxtuNMHao c5Avw8DxbHhwCgjQ4HXqNytslhdekBmf29RFwvdpRV+/PwUVqD74MPU1knnRrhbeZiDD Ug8cp3FaKIWWBflXkRTVVxc7JCmZN6hYt97/qzw/jtbxfBFRFnaeEgF7TjLiAgjN2BG4 AF8FsUnJI9FdU7iuWkPAdB6LlcMri5i6iYFIAjv0BitzyBiYv7zM/pPuc18ukNX3E1DO qBJkCVJSWe8rkZztLoY4Tk8w/DpKODnnKOBlMR9W3NuASjpt8Oq7H4agyZKv0+dzI80r KJ/w== 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; bh=hcgcdDNupt3bso7tFZ8vJh1TwpF+V/kuwk3vNyDPzGs=; b=Xn8qATHn/lg8dpVuUtAeInqzSqr45tJjptfiZ6Kv+RkbbWc1H+QtDmAP9rBtY612kJ 3D2rBMTMpGnf6NCW1q6O5ER2o3UwuUpHsmuCtqecBwo6412fw8vKOS7eDaI54V0JK/yH SU787k1vAwosMzIiuye2tpsOIcShJxb5j+l+2rl1n2Poe6yEdTzHYmq+4NGfuB96OsLc bsy5A/vmC0nxFU6nL+X8cd/zmOcDaC+6hRLKUVteUZQ3/wGKrar/THGrgKrT5Cl1Kzd6 8CgSFCtcnzA28mCfBb9UGjJ/LbadpBeLiz0waGt1TuO51XEnO8/qty71xwn9wMCCTvXH fc3A== X-Gm-Message-State: ANhLgQ2AaA5p5Q44Uejbu1c9wgwlzW+QpSCTU0NGl7Q1hgwCB7K017Av Ku49+mp3GvKuo/6l6ZATiAa03VNb X-Google-Smtp-Source: ADFU+vtIk9u97a8NGklJsUf8puJWKLghHQ9A7GJaiNSAogXPYpGOh7+H3TLR5qJFlpbf047K9O3rww== X-Received: by 2002:ac8:490c:: with SMTP id e12mr19294794qtq.294.1584239231375; Sat, 14 Mar 2020 19:27:11 -0700 (PDT) Received: from casantos.remote.csb (177.204.173.60.dynamic.adsl.gvt.net.br. [177.204.173.60]) by smtp.gmail.com with ESMTPSA id r29sm11270988qkk.85.2020.03.14.19.27.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Mar 2020 19:27:10 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 14 Mar 2020 23:27:06 -0300 Message-Id: <20200315022706.20107-1-unixmania@gmail.com> X-Mailer: git-send-email 2.18.2 Subject: [Buildroot] [PATCH] package/sysklogd: fix installation path of the daemons 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: Carlos Santos , Peter Korsgaard MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Use "--exec-prefix=/" to install syslogd and klogd at /sbin, as required by the init scripts. This also ensures that the BusyBox counterparts are not installed. Update the systemd unit files, accordingly. Signed-off-by: Carlos Santos --- CC: Peter Korsgaard Peter, this applies to 2019.11.x and later. --- package/sysklogd/klogd.service | 2 +- package/sysklogd/sysklogd.mk | 1 + package/sysklogd/syslogd.service | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/sysklogd/klogd.service b/package/sysklogd/klogd.service index c66795b449..b5dbb93d7d 100644 --- a/package/sysklogd/klogd.service +++ b/package/sysklogd/klogd.service @@ -2,7 +2,7 @@ Description=Kernel Log Daemon [Service] -ExecStart=/usr/sbin/klogd -n +ExecStart=/sbin/klogd -n StandardOutput=null Restart=on-failure diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 1bd1ec51b5..7a25d0eb6f 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -10,6 +10,7 @@ SYSKLOGD_LICENSE = GPL-2.0+ SYSKLOGD_LICENSE_FILES = COPYING # From git SYSKLOGD_AUTORECONF = YES +SYSKLOGD_CONF_OPTS = --exec-prefix=/ define SYSKLOGD_INSTALL_SAMPLE_CONFIG $(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \ diff --git a/package/sysklogd/syslogd.service b/package/sysklogd/syslogd.service index 70e4cff27e..adaac679f2 100644 --- a/package/sysklogd/syslogd.service +++ b/package/sysklogd/syslogd.service @@ -4,7 +4,7 @@ Requires=syslog.socket Wants=klogd.service [Service] -ExecStart=/usr/sbin/syslogd -m 0 -n +ExecStart=/sbin/syslogd -m 0 -n StandardOutput=null Restart=on-failure