From patchwork Sun Nov 3 16:56:26 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: 1188582 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="wVL4PAAR"; 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 475ht66sBMz9sP3 for ; Mon, 4 Nov 2019 03:57:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1EA1F8968F; Sun, 3 Nov 2019 16:57:00 +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 m8raz6RSRswj; Sun, 3 Nov 2019 16:56:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 128E88968A; Sun, 3 Nov 2019 16:56:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 959041BF398 for ; Sun, 3 Nov 2019 16:56:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 928738788B for ; Sun, 3 Nov 2019 16:56:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rTQ9Wh+J2nqZ for ; Sun, 3 Nov 2019 16:56:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by hemlock.osuosl.org (Postfix) with ESMTPS id 05FA287829 for ; Sun, 3 Nov 2019 16:56:57 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id z19so9491119wmk.3 for ; Sun, 03 Nov 2019 08:56:56 -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=OthcikRWjL7TriYeDhlkXr81QaPHvnkV0rXJiqyF/gQ=; b=wVL4PAARODseW7Bvzzvse45tiGZx1kkoFj0emVBsPIwU07jRDJjE2cgpFBTnUP7o+a PKKz2Jir3ACjbh35etVtTeHX3GfhN7RvFONAqw88k+aGxqWII7lcGlvP+E6Z3CLrNJD+ s1wK5oNW4uWgdWp3oR7HSADWEY8v6HovKrZjTSM6eT9ztPcenxQWnO8kwjfyfhiONwB2 +UE9mK6l1fZz4jvrx2DvBVj/Lg9k4NN3Wc7gcnZR20FXnM8/39b99kTOjVqD7d9lexFF 71W8iWBHlvgAhNMKzov4LagxmTOfjuYAMDeT32NsFsAhw4Dh3Mwi/FcXWeVUBFLoHUfR uzKw== 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=OthcikRWjL7TriYeDhlkXr81QaPHvnkV0rXJiqyF/gQ=; b=aa/JOfLH+/f0Mi2gpLQs6xN6ioq0qTIZqozXCF9uRKBqtd5UH2PvGZgysfQoHLygHT DMgkvkjCXRFQAIh6HXekimiZK1R5gkB/iPx32fPX+2Jako2gZZYRgU1vTZQIRZfiqXVp MxgHFmtLt2QTsLkSRwO1qJV6YNWAql8phNML8CKshfNyHlAmYUyxdFdOqAowZ1y2tHIu sxzRGk9AFnOWgK+7lBo6/kRrvHL1JhqZIxfOwn0NGTJ8P/2pPJZEBRVCBsu2Q2hSMS3t PgI384+gyK6Lf8wiFwSO5hjIeQpvYaNIhiJrGWp4VMxUEby0Q2QQm7Tszco10Sk5rBjW ZWzw== X-Gm-Message-State: APjAAAWNpme+qITf7mTCtkHceCdiDcSU4LEyLv2aXZ4acK2Rmll3LNbL tzvl27mOP015qib/EI8vUoWxVfVtRQ== X-Google-Smtp-Source: APXvYqyrMV5gpGJzJpUpiwz3cNL1lLVn1ZXhfWQ+U953pZaXdDljAHPzOVy+/QKL7FUnTqNlhfnVaA== X-Received: by 2002:a1c:e40b:: with SMTP id b11mr19294316wmh.152.1572800215259; Sun, 03 Nov 2019 08:56:55 -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.56.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:56:54 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:26 +0100 Message-Id: <20191103165640.21819-2-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 01/15] new recipe : host-systemd 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" Add the infrastructure to build the host version of systemd * disable all optional features, they can be re-added when needed * systemd has creative way of dealing with cross compile we build a "normal" host systemd, but install it in $HOST_DIR we use systemctl --root to correctly act on TARGET_DIR * we need to adjust RPATH using patchelf because meson can't do it correctly by itsel Signed-off-by: Jérémy Rosen --- package/Config.in.host | 1 + package/systemd/Config.in.host | 4 ++ package/systemd/systemd.mk | 92 ++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+) create mode 100644 package/systemd/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index c0ac4fbbcc..d4e31ade2d 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -69,6 +69,7 @@ menu "Host utilities" source "package/squashfs/Config.in.host" source "package/sunxi-tools/Config.in.host" source "package/swig/Config.in.host" + source "package/systemd/Config.in.host" source "package/tegrarcm/Config.in.host" source "package/ti-cgt-pru/Config.in.host" source "package/uboot-tools/Config.in.host" diff --git a/package/systemd/Config.in.host b/package/systemd/Config.in.host new file mode 100644 index 0000000000..09099752d2 --- /dev/null +++ b/package/systemd/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_SYSTEMD + bool "host systemd tools" + help + Systemd command-line tools for the host diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 94d5f703cd..1e4f706517 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -550,3 +550,95 @@ SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) $(eval $(meson-package)) + + + +# +# Host-systemd configuration +# +HOST_SYSTEMD_CONF_OPTS= \ + -Dsplit-bin=true \ + -Dsplit-usr=false \ + -Dutmp=false \ + -Dhibernate=false \ + -Dldconfig=false \ + -Dresolve=false \ + -Defi=false \ + -Dtpm=false \ + -Denvironment-d=false \ + -Dbinfmt=false \ + -Dcoredump=false \ + -Dpstore=false \ + -Dlogind=false \ + -Dhostnamed=false \ + -Dlocaled=false \ + -Dmachined=false \ + -Dportabled=false \ + -Dnetworkd=false \ + -Dtimedated=false \ + -Dtimesyncd=false \ + -Dremote=false \ + -Dcreate-log-dirs=false \ + -Dnss-myhostname=false \ + -Dnss-mymachines=false \ + -Dnss-resolve=false \ + -Dnss-systemd=false \ + -Dfirstboot=false \ + -Drandomseed=false \ + -Dbacklight=false \ + -Dvconsole=false \ + -Dquotacheck=false \ + -Dsysusers=false \ + -Dtmpfiles=false \ + -Dimportd=false \ + -Dhwdb=false \ + -Drfkill=false \ + -Dman=false \ + -Dhtml=false \ + -Dsmack=false \ + -Dpolkit=false \ + -Dblkid=false \ + -Didn=false \ + -Dadm-group=false \ + -Dwheel-group=false \ + -Dzlib=false \ + -Dgshadow=false \ + -Dima=false \ + -Dtests=false \ + -Dglib=false \ + -Dacl=false \ + -Dsysvinit-path='' \ + --prefix=/usr \ + --libdir=lib \ + --sysconfdir=/etc \ + --localstatedir=/var \ + + +HOST_SYSTEMD_DEPENDENCIES = \ + host-util-linux \ + host-patchelf \ + host-libcap \ + host-gperf \ + +# Fix RPATH After installation +# * systemd provides a install_rpath instruction to meson because the binaries need to link with +# libsystemd which is not in a standard path +# * meson can only replace the RPATH, not append to it +# * the original rpatch is thus lost. +# * the original path had been tweaked by buildroot vial LD_FLAGS to add $(HOST_DIR)/lib +# * thus re-tweak rpath after the installation for all binaries that need it +#buildroot detects incorrect RPATH, so adding new binaries should be safe (it won't compile +#unless properly integrated). +HOST_SYSTEMD_HOST_TOOLS = \ + systemd-analyze systemd-mount systemctl + +define HOST_SYSTEMD_FIX_RPATH + $(foreach f,$(HOST_SYSTEMD_HOST_TOOLS), \ + $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd $(HOST_DIR)/bin/$(f) + ) +endef + +HOST_SYSTEMD_POST_INSTALL_HOOKS += HOST_SYSTEMD_FIX_RPATH +HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR) + +$(eval $(host-meson-package)) From patchwork Sun Nov 3 16:56:27 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: 1188583 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.133; helo=hemlock.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="NrXSvJCJ"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 475ht90CnXz9sP4 for ; Mon, 4 Nov 2019 03:57:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 42AD88788B; Sun, 3 Nov 2019 16:57:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0waCwltQqK+C; Sun, 3 Nov 2019 16:57:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id CAF12878B0; Sun, 3 Nov 2019 16:57:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 7966D1BF398 for ; Sun, 3 Nov 2019 16:57:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 76A6F878B0 for ; Sun, 3 Nov 2019 16:57:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zXSsQlx-Tz1E for ; Sun, 3 Nov 2019 16:56:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by hemlock.osuosl.org (Postfix) with ESMTPS id 21A3787829 for ; Sun, 3 Nov 2019 16:56:59 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id 8so6641023wmo.0 for ; Sun, 03 Nov 2019 08:56:59 -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=P3dkj3GxWt0JiSoKJuFRQ1daZDrLE5nYGhLwFZjg01k=; b=NrXSvJCJNNw+GBp3eGAiei0BhHblhq6dUOsyNpQ2bLqH8tMIPlFKtXdKVjDcfm+0iy Sp5jm7tFwvaSePlZAlqCX3vb0GCtk4IdPQ1jtiWPvQ97E/ew/dGvtDRgRiw+PdoiQggq q1YwCQ7vXX7jCa5wzcRGfsf0ghu1FtEkeJtlpvc7OKp6qqlSlor7zfTKKeCWP79GddTf Q6pXPzB6vthrgu0T+YKXRZrR1fp+iHkG5fCEx6OPjLBX/GgmZOwfpT19aYjlrDGetGVK Hbu6QlzzIhofbli+u8iai+0htLI7ihPZ8BB8ZF335chk0QcJAdkmxDHijl/A5hplO4Vb jaJQ== 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=P3dkj3GxWt0JiSoKJuFRQ1daZDrLE5nYGhLwFZjg01k=; b=SIAcG1oo+u3d+xu753KwktP2O/d4XvctJgto/7KtJ92yMh6y1xr7tcSYBsnfl5RpvG 4sGBbf2k6zGeLoiUaRJDxGyF+QpJUIUhL6evfPQI+zU12HuFbxnOP6XF8sM3yQ8iCLaK QKPKJT7rxQhyQ9F8erim72GJq5BZT8Kxp00KPpC+t1/JxhM4zZrlCMxoJOBLO1xeH/lP 4hjh6ruMY3DnBpEn+fJhLQzJOe6+k5Wk5fs1zhu+wiYiBPUkW7y/Sz4GDV//e8A4Hpd6 j9Xq7WIn0gjweEaVAMFTnegs6N3h2B+xm2DxrfsJ9ntFjDvhBp9mhPz8obf4rl8Mg4gN 2QkA== X-Gm-Message-State: APjAAAWFs89FJJ1NlP2IloRVmPLxJ+bMNcWKNlBQoGO2OAsSFeZN83ey dthUbG1TYnhbiQfWdcVk4Hj9UkPl0Q== X-Google-Smtp-Source: APXvYqxyfbMtWZrzM+AEY+4G0afZMpTlTQ3M3lCEJxNDMQJyObsNc+sQnOd4M0Grt+8OfxxgcPMRHg== X-Received: by 2002:a1c:f018:: with SMTP id a24mr18831916wmb.77.1572800217291; Sun, 03 Nov 2019 08:56:57 -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.56.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:56:56 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:27 +0100 Message-Id: <20191103165640.21819-3-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 02/15] use host-systemctl preset all to enable units 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" since v234 upstream recommands using systemctl preset-all to enable units. * add a buildroot specific preset file * use that file to disable getty@tty1 * make systemd depend on host-systemd * remove all link-creating code that systemd does for us. This does not change how other systemd-enabled packages work. Signed-off-by: Jérémy Rosen --- package/systemd/80-buildroot.preset | 5 ++ package/systemd/Config.in | 1 + package/systemd/systemd.mk | 102 ++++------------------------ 3 files changed, 18 insertions(+), 90 deletions(-) create mode 100644 package/systemd/80-buildroot.preset diff --git a/package/systemd/80-buildroot.preset b/package/systemd/80-buildroot.preset new file mode 100644 index 0000000000..4074901cbd --- /dev/null +++ b/package/systemd/80-buildroot.preset @@ -0,0 +1,5 @@ +# Higher priority than systemd presets + +# by default systemd enables a getty on tty1 +# we don't want that because tty1 may not exist +disable getty@.service diff --git a/package/systemd/Config.in b/package/systemd/Config.in index aef39abe27..58c7696d65 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -35,6 +35,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_KMOD_TOOLS select BR2_TARGET_TZ_INFO select BR2_NEEDS_HOST_UTF8_LOCALE + select BR2_PACKAGE_HOST_SYSTEMD help systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. systemd provides diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 1e4f706517..d4680cd225 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -12,6 +12,7 @@ SYSTEMD_INSTALL_STAGING = YES SYSTEMD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ host-gperf \ + host-systemd \ kmod \ libcap \ util-linux \ @@ -51,12 +52,6 @@ endif ifeq ($(BR2_PACKAGE_AUDIT),y) SYSTEMD_DEPENDENCIES += audit SYSTEMD_CONF_OPTS += -Daudit=true -define SYSTEMD_INSTALL_SERVICE_AUDIT - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/auditd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/auditd.service -endef - else SYSTEMD_CONF_OPTS += -Daudit=false endif @@ -64,11 +59,6 @@ endif ifeq ($(BR2_PACKAGE_CRYPTSETUP),y) SYSTEMD_DEPENDENCIES += cryptsetup SYSTEMD_CONF_OPTS += -Dlibcryptsetup=true -define SYSTEMD_INSTALL_TARGET_CRYPTSETUP - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/remote-cryptsetup.target \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/remote-cryptsetup.target -endef else SYSTEMD_CONF_OPTS += -Dlibcryptsetup=false endif @@ -269,11 +259,6 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_MACHINED),y) SYSTEMD_CONF_OPTS += -Dmachined=true -define SYSTEMD_INSTALL_TARGET_MACHINED - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../lib/systemd/system/machines.target \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/machines.target -endef else SYSTEMD_CONF_OPTS += -Dmachined=false endif @@ -317,11 +302,6 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_PSTORE),y) SYSTEMD_CONF_OPTS += -Dpstore=true -define SYSTEMD_INSTALL_SERVICE_PSTORE - mkdir -p $(TARGET_DIR)/etc/systemd/system/systemd-remount-fs.service.wants - ln -sf ../../../../lib/systemd/system/systemd-pstore.service \ - $(TARGET_DIR)/etc/systemd/system/systemd-remount-fs.service.wants/systemd-pstore.service -endef else SYSTEMD_CONF_OPTS += -Dpstore=false endif @@ -336,24 +316,6 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - Network Manager -define SYSTEMD_INSTALL_SOCKET_NETWORKD - mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants - ln -sf ../../../../lib/systemd/system/systemd-networkd.socket \ - $(TARGET_DIR)/etc/systemd/system/sockets.target.wants/systemd-networkd.socket -endef -define SYSTEMD_INSTALL_SERVICE_NETWORKD - ln -sf ../../../lib/systemd/system/systemd-networkd.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.network1.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../lib/systemd/system/systemd-networkd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/systemd-networkd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants - ln -sf ../../../../lib/systemd/system/systemd-networkd-wait-online.service \ - $(TARGET_DIR)/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/network-pre.target.wants - ln -sf ../../../../lib/systemd/system/systemd-network-generator.service \ - $(TARGET_DIR)/etc/systemd/system/network-pre.target.wants/systemd-network-generator.service -endef SYSTEMD_NETWORKD_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP)) ifneq ($(SYSTEMD_NETWORKD_DHCP_IFACE),) define SYSTEMD_INSTALL_NETWORK_CONFS @@ -373,13 +335,6 @@ define SYSTEMD_INSTALL_RESOLVCONF_HOOK endef SYSTEMD_CONF_OPTS += -Dresolve=true SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager -define SYSTEMD_INSTALL_SERVICE_RESOLVED - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../lib/systemd/system/systemd-resolved.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.resolve1.service - ln -sf ../../../../lib/systemd/system/systemd-resolved.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/systemd-resolved.service -endef else SYSTEMD_CONF_OPTS += -Dresolve=false endif @@ -387,15 +342,6 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) SYSTEMD_CONF_OPTS += -Dtimesyncd=true SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - Network Time Synchronization -define SYSTEMD_INSTALL_SERVICE_TIMESYNCD - mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants - ln -sf ../../../../lib/systemd/system/systemd-timesyncd.service \ - $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service - ln -sf ../../../../lib/systemd/system/systemd-time-wait-sync.service \ - $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service - ln -sf ../../../lib/systemd/system/systemd-timesyncd.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.timesync1.service -endef else SYSTEMD_CONF_OPTS += -Dtimesyncd=false endif @@ -446,18 +392,8 @@ SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME) endif define SYSTEMD_INSTALL_INIT_HOOK - ln -fs ../lib/systemd/systemd $(TARGET_DIR)/sbin/init - ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/halt - ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/poweroff - ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/reboot - ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/shutdown - ln -fs ../../../lib/systemd/system/multi-user.target \ - $(TARGET_DIR)/etc/systemd/system/default.target - ln -fs ../../../lib/systemd/system/reboot.target \ - $(TARGET_DIR)/etc/systemd/system/ctrl-alt-del.target - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../lib/systemd/system/remote-fs.target \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/remote-fs.target + ln -fs multi-user.target \ + $(TARGET_DIR)/usr/lib/systemd/system/default.target endef define SYSTEMD_INSTALL_MACHINEID_HOOK @@ -465,9 +401,6 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK endef SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ - SYSTEMD_INSTALL_TARGET_CRYPTSETUP \ - SYSTEMD_INSTALL_TARGET_MACHINED \ - SYSTEMD_INSTALL_SOCKET_NETWORKD \ SYSTEMD_INSTALL_INIT_HOOK \ SYSTEMD_INSTALL_MACHINEID_HOOK \ SYSTEMD_INSTALL_RESOLVCONF_HOOK @@ -491,10 +424,6 @@ define SYSTEMD_USERS $(SYSTEMD_TIMESYNCD_USER) endef -define SYSTEMD_DISABLE_SERVICE_TTY1 - rm -f $(TARGET_DIR)/etc/systemd/system/getty.target.wants/getty@tty1.service -endef - ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # systemd needs getty.service for VTs and serial-getty.service for serial ttys # note that console-getty.service should be used on /dev/console as it should not have dependencies @@ -522,30 +451,23 @@ define SYSTEMD_INSTALL_SERVICE_TTY endef endif -define SYSTEMD_INSTALL_SERVICE_AUTOVT - ln -sf ../../../lib/systemd/system/getty@.service \ - $(TARGET_DIR)/lib/systemd/system/autovt@.service -endef -define SYSTEMD_INSTALL_SERVICE_BOOT_CHECK - mkdir -p $(TARGET_DIR)/etc/systemd/system/boot-complete.target.requires - ln -sf ../../../../lib/systemd/system/systemd-boot-check-no-failures.service \ - $(TARGET_DIR)/etc/systemd/system/boot-complete.target.requires/systemd-boot-check-no-failures.service +define SYSTEMD_INSTALL_PRESET + $(INSTALL) -D -m 644 package/systemd/80-buildroot.preset $(TARGET_DIR)/usr/lib/systemd/system-preset/80-buildroot.preset endef define SYSTEMD_INSTALL_INIT_SYSTEMD - $(SYSTEMD_DISABLE_SERVICE_TTY1) + $(SYSTEMD_INSTALL_PRESET) $(SYSTEMD_INSTALL_SERVICE_TTY) - $(SYSTEMD_INSTALL_SERVICE_AUTOVT) - $(SYSTEMD_INSTALL_SERVICE_RESOLVED) - $(SYSTEMD_INSTALL_SERVICE_TIMESYNCD) $(SYSTEMD_INSTALL_NETWORK_CONFS) - $(SYSTEMD_INSTALL_SERVICE_PSTORE) - $(SYSTEMD_INSTALL_SERVICE_NETWORKD) - $(SYSTEMD_INSTALL_SERVICE_AUDIT) - $(SYSTEMD_INSTALL_SERVICE_BOOT_CHECK) endef +define SYSTEMD_PRESET_ALL + $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all +endef +SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_PRESET_ALL + + SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) From patchwork Sun Nov 3 16:56:28 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: 1188585 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="ukUw9AsR"; 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 475htB1l13z9sP3 for ; Mon, 4 Nov 2019 03:57:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5ADF120BF9; Sun, 3 Nov 2019 16:57:04 +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 TRasCm89d0nJ; Sun, 3 Nov 2019 16:57:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 8768020763; Sun, 3 Nov 2019 16:57:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E641E1BF398 for ; Sun, 3 Nov 2019 16:57:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E2E7587829 for ; Sun, 3 Nov 2019 16:57:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N2zzHH6Oj-Lg for ; Sun, 3 Nov 2019 16:57:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by hemlock.osuosl.org (Postfix) with ESMTPS id C99DB8788B for ; Sun, 3 Nov 2019 16:56:59 +0000 (UTC) Received: by mail-wm1-f53.google.com with SMTP id m17so4918009wmi.5 for ; Sun, 03 Nov 2019 08:56:59 -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=TibwYXSYNDwPb+y370UXLZ/g8tgbvnsJXczGcgC54vY=; b=ukUw9AsRvAGN/LK4d0ePOeg9aY3xd+IVrKVpEB65P75/evLfI8EjWSeWxnSXABtE7N P+IgVikuaQ8UNQZ7JNxPgAxRxCfTnBPe+bwV1V1tM1s/BI5hd4uPcJwxedprogwAh7ro PVI3EZouD+ThrI1m9Dby5wM8VwzdlM+amu3J26txfTb2DW08+ikYWgwZ3MIEeIjsjXq7 J9zTerf4Nicot5XZCBW+ZUwF8DAUfMqm/t35xcDMQXWnpjN+MYcZlpX09oUEeyRbjCg8 lQMhF1Pb8kYUmT5zYD23kqmAH7/+dsGf6HjyL/6QyYkUEdXo0g3F5ViirkRcNfCZNm1x PrSw== 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=TibwYXSYNDwPb+y370UXLZ/g8tgbvnsJXczGcgC54vY=; b=BZOzYWDCZplwE7Ui9QL2TLn3HZvst2U6udKnx6WFVS2n5YX6I1yvPCZ6cPV93ZdnH2 S/+mhDxZYezKu4A1/57XFXozkq4BO9F+joY3B8cVf4Z2wCeYnfS22lk/Dc4yP8+qz1IA CRS0RZ9OIUvjo+X8lRENkhBelfx3msED3sBgsn9un8KWKeqpynB4+fGqnv6R5dxqFh8z 2vmKF6rpjipOYpZnFAZ1T3vxEggZaVDCqR3OavECz0Kc/4CZItU6QvtT6fmFO2d9SaQW WYK3RlxuGvuZRL3iCFkrt8/Rt4cYZ8xJiQYK4iuscv89w3xjrcJfdRf7zPNqL/qfDaNO yiQQ== X-Gm-Message-State: APjAAAXnQKoZcI8Cz3kSuUqWir3k6QVJbUYsUzsqqAxJ7flULvOiffJ7 udSutCD1mVCJ2LEE0h+4R7voIY0YCg== X-Google-Smtp-Source: APXvYqwKdFTdW/R2u/HlN99l8ffN65Asvh+HG1hiKboqWQs65IzHVCL3tN+Se77ROI6BNx0il3Kedg== X-Received: by 2002:a7b:c392:: with SMTP id s18mr9049333wmj.61.1572800218010; Sun, 03 Nov 2019 08:56:58 -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.56.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:56:57 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:28 +0100 Message-Id: <20191103165640.21819-4-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 03/15] fix tty handling 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" Handling of tty is a bit tricky, we need to aggressively disable what systemd does with tty1 then update for what buildroot wants to do Rework the whole tty generation to work with presets Signed-off-by: Jérémy Rosen --- ...e-default-instance-of-getty-.service.patch | 27 +++++++++++++++++++ package/systemd/80-buildroot.preset | 5 ++-- package/systemd/systemd.mk | 25 ++++++++++++----- 3 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 package/systemd/0002-remove-default-instance-of-getty-.service.patch diff --git a/package/systemd/0002-remove-default-instance-of-getty-.service.patch b/package/systemd/0002-remove-default-instance-of-getty-.service.patch new file mode 100644 index 0000000000..b412620cbd --- /dev/null +++ b/package/systemd/0002-remove-default-instance-of-getty-.service.patch @@ -0,0 +1,27 @@ +From 77384f2f107ca99fef6a9c0b9d54a3f2147a0d18 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= +Date: Thu, 31 Oct 2019 16:24:02 +0100 +Subject: [PATCH] remove default instance of getty@.service + +upstream assumes that tty1 is always a valid tty, this generally makes +sense but might not be the case for embedded devices. Having it as a +DefaultInstance makes it enabled by "systemctl preset-all" + +it is simpler for us to remove the DefaultInstance entirely and manually +link as needed +--- + units/getty@.service.m4 | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 +index 80e793bb73..7060457cb1 100644 +--- a/units/getty@.service.m4 ++++ b/units/getty@.service.m4 +@@ -57,4 +57,3 @@ UnsetEnvironment=LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETAR + + [Install] + WantedBy=getty.target +-DefaultInstance=tty1 +-- +2.24.0.rc1 + diff --git a/package/systemd/80-buildroot.preset b/package/systemd/80-buildroot.preset index 4074901cbd..5dbae39173 100644 --- a/package/systemd/80-buildroot.preset +++ b/package/systemd/80-buildroot.preset @@ -1,5 +1,4 @@ # Higher priority than systemd presets -# by default systemd enables a getty on tty1 -# we don't want that because tty1 may not exist -disable getty@.service +# This file is currently empty, but is available for demonstration and future use + diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index d4680cd225..ed039de82b 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -428,22 +428,35 @@ ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # systemd needs getty.service for VTs and serial-getty.service for serial ttys # note that console-getty.service should be used on /dev/console as it should not have dependencies # also patch the file to use the correct baud-rate, the default baudrate is 115200 so look for that +# +# systemd defaults to only have getty@tty.service enabled +# * DefaultInstance=tty1 in getty@service +# * no DefaultInstance in serial-getty@.service +# * WantedBy=getty.target in console-getty.service +# * console-getty is not enabled because of 90-systemd.preset +# We want "systemctl preset-all" to do the right thing, even when run on the target after boot +# * remove the default instance of getty@.service via a patch on systemd source +# drop-ins cannot override DefaultInstance with an empty string +# * set a new DefaultInstance for getty@.service, if needed +# * set a new DefaultInstance for serial-getty@.service, if needed +# * override the systemd-provided preset for console-getty.service if needed define SYSTEMD_INSTALL_SERVICE_TTY if [ $(BR2_TARGET_GENERIC_GETTY_PORT) = "console" ]; \ then \ TARGET="console-getty.service"; \ - LINK_NAME="console-getty.service"; \ + echo enable console-getty.service > $(TARGET_DIR)/usr/lib/systemd/system-preset/81-buildroot-tty.preset;\ elif echo $(BR2_TARGET_GENERIC_GETTY_PORT) | egrep -q 'tty[0-9]*$$'; \ then \ TARGET="getty@.service"; \ - LINK_NAME="getty@$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)).service"; \ + mkdir $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d;\ + echo [Install] > $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d/buildroot-console.conf;\ + echo DefaultInstance=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) >> $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d/buildroot-console.conf;\ else \ TARGET="serial-getty@.service"; \ - LINK_NAME="serial-getty@$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)).service"; \ + mkdir $(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d;\ + echo [Install] > $(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d/buildroot-console.conf;\ + echo DefaultInstance=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) >> $(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d/buildroot-console.conf;\ fi; \ - mkdir -p $(TARGET_DIR)/etc/systemd/system/getty.target.wants/; \ - ln -fs ../../../../lib/systemd/system/$${TARGET} \ - $(TARGET_DIR)/etc/systemd/system/getty.target.wants/$${LINK_NAME}; \ if [ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE)) -gt 0 ] ; \ then \ $(SED) 's,115200,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),' $(TARGET_DIR)/lib/systemd/system/$${TARGET}; \ From patchwork Sun Nov 3 16:56:29 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: 1188591 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="su9abUCw"; 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 475htQ718zz9sP3 for ; Mon, 4 Nov 2019 03:57:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 258A626EB6; Sun, 3 Nov 2019 16:57:17 +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 IOBPuG8-XFE2; Sun, 3 Nov 2019 16:57:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E1BBC204E9; Sun, 3 Nov 2019 16:57:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id B3B141BF398 for ; Sun, 3 Nov 2019 16:57:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 91EBE878FE for ; Sun, 3 Nov 2019 16:57:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X+TeYXrpuC1p for ; Sun, 3 Nov 2019 16:57:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 63ABE87829 for ; Sun, 3 Nov 2019 16:57:01 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id m17so4918063wmi.5 for ; Sun, 03 Nov 2019 08:57:01 -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=AwknaJ3cbSK2vlUkZi55oLyI3+VLPg5XrAxzLpP7gIA=; b=su9abUCwIXDNM3syHL1ty2Dy5Qa1WAN7v/Ejv3M0ecEdDwnTFsfnKl7iSGhzsXJo+O 05LtViLebn6cTyqbf07BItBauJhERcASBlkp3Vj7KyVJoCiavWgigZ7MHRu5aY/SaM37 8zOSY/1KjFdhue2BO4W8KCgeL8d5b2AbjTrnxfR5vhfBLJYLx9B4Yzh0fT9vlbBaOJl5 tPrFAn+jz74t/6hCr4Bk+xcpy55SIGH4rA97SR8Rr2bO8T3PYgrG5WUJ/sKZwnyrHdP9 STaUSS0Ka/ymxSTVZcGsAN0ywpiYjCLSXqXEC3kSBFsTeke0lBJNCrHYT/nByAuGBGs4 RwRw== 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=AwknaJ3cbSK2vlUkZi55oLyI3+VLPg5XrAxzLpP7gIA=; b=ZPR4ZJBe9yTMSvFERJ3Qv/kSwnlNMc0mugNJuMlRoOkZ8FhyhI8hNR6RxRkDc4jWN4 SlEVqitot2m6ZuKr7AQDic5h2aI01I8rghbwYh4DyAagRP7UfhHtK1VNpY/DVMDSYuKv lQh/3lpgKKfMciP092qq7j5C5uC1HXax0ifrrIoHNUmURjFG/wIKo+8DqMStSQ8JEJOh Fd7NaHOdxtWpOni7qfx1RDHS8EdfrEWtcEs/wpEnS7VJtSDowLhY9XjsOvrzoplZzD82 96W9rpVmLMYeMtrUH/+DnfLB0SSmqD1NWhLTXAiuOtoi8yfUjI3dBXFsHoit5CkoZy0Z mPUg== X-Gm-Message-State: APjAAAUW22hxxIN56ObQYGnfI7UdGnU8mPk64l842OGyvovwUbqDMZN3 mKJQJ7/inInt/7kNCyu6+cLmY8hPMw== X-Google-Smtp-Source: APXvYqxx0Tprynjyim3cDaXGB4RvSlbLjFR93LSVmz4ZpTNDuPpTR/IO4xSeIZMKQ0I1rUP7vchdNg== X-Received: by 2002:a1c:480a:: with SMTP id v10mr19917684wma.138.1572800218945; Sun, 03 Nov 2019 08:56:58 -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.56.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:56:58 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:29 +0100 Message-Id: <20191103165640.21819-5-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 04/15] fix trivial packages with buildroot-provided services 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 the packages in this list have the following properties * units are provided by buildroot in the package directory * the SYSTEMD_INSTALL_INIT_HOOK is exactly equivalent to what the [Install] section of the unit does The fix removes the soflinking in the .mk file Signed-off-by: Jérémy Rosen --- package/acpid/acpid.mk | 3 --- package/apache/apache.mk | 3 --- package/babeld/babeld.mk | 5 ----- package/bandwidthd/bandwidthd.mk | 5 ----- package/bind/bind.mk | 5 ----- package/brltty/brltty.mk | 4 ---- package/chrony/chrony.mk | 3 --- package/collectd/collectd.mk | 3 --- package/darkhttpd/darkhttpd.mk | 3 --- package/dcron/dcron.mk | 3 --- package/dhcp/dhcp.mk | 5 ----- package/dhcpcd/dhcpcd.mk | 3 --- package/domoticz/domoticz.mk | 3 --- package/dropbear/dropbear.mk | 3 --- package/exim/exim.mk | 3 --- package/freescale-imx/imx-uuc/imx-uuc.mk | 3 --- package/haveged/haveged.mk | 3 --- package/i2pd/i2pd.mk | 3 --- package/ifupdown-scripts/ifupdown-scripts.mk | 3 --- package/igd2-for-linux/igd2-for-linux.mk | 3 --- package/inadyn/inadyn.mk | 3 --- package/input-event-daemon/input-event-daemon.mk | 3 --- package/irqbalance/irqbalance.mk | 3 --- package/iucode-tool/iucode-tool.mk | 3 --- package/kodi/kodi.mk | 5 ----- package/mariadb/mariadb.mk | 3 --- package/mender/mender.mk | 3 --- package/mini-snmpd/mini-snmpd.mk | 3 --- package/minidlna/minidlna.mk | 5 ----- package/minissdpd/minissdpd.mk | 3 --- package/motion/motion.mk | 3 --- package/netplug/netplug.mk | 3 --- package/nginx/nginx.mk | 5 ----- package/nss-pam-ldapd/nss-pam-ldapd.mk | 3 --- package/ntp/ntp.mk | 3 --- package/olsr/olsr.mk | 3 --- package/openntpd/openntpd.mk | 3 --- package/openssh/openssh.mk | 3 --- package/openvmtools/openvmtools.mk | 3 --- package/oracle-mysql/oracle-mysql.mk | 3 --- package/postgresql/postgresql.mk | 3 --- package/proftpd/proftpd.mk | 3 --- package/psplash/psplash.mk | 6 ------ package/ptpd/ptpd.mk | 3 --- package/ptpd2/ptpd2.mk | 3 --- package/pulseaudio/pulseaudio.mk | 3 --- package/python-web2py/python-web2py.mk | 3 --- package/rabbitmq-server/rabbitmq-server.mk | 5 ----- package/redis/redis.mk | 3 --- package/rng-tools/rng-tools.mk | 3 --- package/rpcbind/rpcbind.mk | 3 --- package/rpi-userland/rpi-userland.mk | 3 --- package/rygel/rygel.mk | 3 --- package/sane-backends/sane-backends.mk | 6 ------ package/supervisor/supervisor.mk | 3 --- package/suricata/suricata.mk | 3 --- package/tcf-agent/tcf-agent.mk | 3 --- package/thttpd/thttpd.mk | 3 --- package/ti-gfx/ti-gfx.mk | 3 --- package/tinyhttpd/tinyhttpd.mk | 3 --- package/triggerhappy/triggerhappy.mk | 3 --- 61 files changed, 206 deletions(-) diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk index 20295aa5a4..ff6e62b5cd 100644 --- a/package/acpid/acpid.mk +++ b/package/acpid/acpid.mk @@ -13,9 +13,6 @@ ACPID_LICENSE_FILES = COPYING define ACPID_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/acpid/acpid.service \ $(TARGET_DIR)/usr/lib/systemd/system/acpid.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/acpid.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/acpid.service endef define ACPID_INSTALL_INIT_SYSV diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 1d62538b19..22e7be8832 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -109,9 +109,6 @@ endef define APACHE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/apache/apache.service \ $(TARGET_DIR)/usr/lib/systemd/system/apache.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/apache.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/apache.service endef $(eval $(autotools-package)) diff --git a/package/babeld/babeld.mk b/package/babeld/babeld.mk index 5fbfa65485..f864b5db26 100644 --- a/package/babeld/babeld.mk +++ b/package/babeld/babeld.mk @@ -25,11 +25,6 @@ endef define BABELD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/babeld/babeld.service \ $(TARGET_DIR)/usr/lib/systemd/system/babeld.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/babeld.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/babeld.service endef $(eval $(generic-package)) diff --git a/package/bandwidthd/bandwidthd.mk b/package/bandwidthd/bandwidthd.mk index e9bc871a6a..990d8c5d8f 100644 --- a/package/bandwidthd/bandwidthd.mk +++ b/package/bandwidthd/bandwidthd.mk @@ -34,11 +34,6 @@ endif define BANDWIDTHD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/bandwidthd/bandwidthd.service \ $(TARGET_DIR)/usr/lib/systemd/system/bandwidthd.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -sf /usr/lib/systemd/system/bandwidthd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/bandwidthd.service endef $(eval $(autotools-package)) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 08cad22d42..eece65e75f 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -111,11 +111,6 @@ endef define BIND_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(BIND_PKGDIR)/named.service \ $(TARGET_DIR)/usr/lib/systemd/system/named.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -sf /usr/lib/systemd/system/named.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/named.service endef else BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_REMOVE_SERVER diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk index 3ae8b899b8..11b8c0d35f 100644 --- a/package/brltty/brltty.mk +++ b/package/brltty/brltty.mk @@ -121,10 +121,6 @@ endef define BRLTTY_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/brltty/brltty.service \ $(TARGET_DIR)/usr/lib/systemd/system/brltty.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants - ln -fs ../../../../usr/lib/systemd/system/brltty.service \ - $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/brltty.service endef $(eval $(autotools-package)) diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index f6dcb11794..21c2d62afa 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -66,9 +66,6 @@ endef define CHRONY_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/chrony/chrony.service \ $(TARGET_DIR)/usr/lib/systemd/system/chrony.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/chrony.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/chrony.service endef $(eval $(generic-package)) diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 820547b511..e4ccdf7770 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -229,9 +229,6 @@ endef define COLLECTD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/collectd/collectd.service \ $(TARGET_DIR)/usr/lib/systemd/system/collectd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/collectd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/collectd.service endef $(eval $(autotools-package)) diff --git a/package/darkhttpd/darkhttpd.mk b/package/darkhttpd/darkhttpd.mk index df80899371..f4831a9426 100644 --- a/package/darkhttpd/darkhttpd.mk +++ b/package/darkhttpd/darkhttpd.mk @@ -21,9 +21,6 @@ endef define DARKHTTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/darkhttpd/darkhttpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/darkhttpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/darkhttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/darkhttpd.service endef define DARKHTTPD_INSTALL_INIT_SYSV diff --git a/package/dcron/dcron.mk b/package/dcron/dcron.mk index 2ee0709af5..51ebb18745 100644 --- a/package/dcron/dcron.mk +++ b/package/dcron/dcron.mk @@ -31,9 +31,6 @@ endef define DCRON_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/dcron/dcron.service \ $(TARGET_DIR)/usr/lib/systemd/system/dcron.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/dcron.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dcron.service endef $(eval $(generic-package)) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 0abb0aebd7..e0abb4ff6f 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -92,11 +92,6 @@ define DHCP_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/dhcp/dhcpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/dhcpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -sf ../../../../usr/lib/systemd/system/dhcpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dhcpd.service - mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d echo "d /var/lib/dhcp 0755 - - - -" > \ $(TARGET_DIR)/usr/lib/tmpfiles.d/dhcpd.conf diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index cd20d8f9f3..63dbbee86c 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -48,9 +48,6 @@ endef define DHCPCD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/dhcpcd/dhcpcd.service \ $(TARGET_DIR)/usr/lib/systemd/system/dhcpcd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/dhcpcd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dhcpcd.service endef endif diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index c0568c61c6..ab560ba05f 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -78,9 +78,6 @@ endef define DOMOTICZ_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/domoticz/domoticz.service \ $(TARGET_DIR)/usr/lib/systemd/system/domoticz.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/domoticz.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/domoticz.service endef $(eval $(cmake-package)) diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 7cbc16bc3d..23e5e3f600 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -90,9 +90,6 @@ DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_CUSTOM_PATH define DROPBEAR_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/dropbear/dropbear.service \ $(TARGET_DIR)/usr/lib/systemd/system/dropbear.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/dropbear.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dropbear.service endef ifeq ($(BR2_USE_MMU),y) diff --git a/package/exim/exim.mk b/package/exim/exim.mk index 014565c85b..040b292a87 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -145,9 +145,6 @@ endef define EXIM_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/exim/exim.service \ $(TARGET_DIR)/usr/lib/systemd/system/exim.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/exim.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/exim.service endef $(eval $(generic-package)) diff --git a/package/freescale-imx/imx-uuc/imx-uuc.mk b/package/freescale-imx/imx-uuc/imx-uuc.mk index 040d7bd874..2ed910cb84 100644 --- a/package/freescale-imx/imx-uuc/imx-uuc.mk +++ b/package/freescale-imx/imx-uuc/imx-uuc.mk @@ -33,9 +33,6 @@ endef define IMX_UUC_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/freescale-imx/imx-uuc/imx-uuc.service \ $(TARGET_DIR)/usr/lib/systemd/system/imx-uuc.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ - ln -fs ../../../../usr/lib/systemd/system/imx-uuc.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/imx-uuc.service endef $(eval $(generic-package)) diff --git a/package/haveged/haveged.mk b/package/haveged/haveged.mk index 05b59a1685..cc834304df 100644 --- a/package/haveged/haveged.mk +++ b/package/haveged/haveged.mk @@ -21,9 +21,6 @@ endef define HAVEGED_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/haveged/haveged.service \ $(TARGET_DIR)/usr/lib/systemd/system/haveged.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs /usr/lib/systemd/system/haveged.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/haveged.service endef $(eval $(autotools-package)) diff --git a/package/i2pd/i2pd.mk b/package/i2pd/i2pd.mk index 5fa815c21d..de975d66a4 100644 --- a/package/i2pd/i2pd.mk +++ b/package/i2pd/i2pd.mk @@ -59,9 +59,6 @@ endef define I2PD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/i2pd/i2pd.service \ $(TARGET_DIR)/usr/lib/systemd/system/i2pd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/i2pd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/i2pd.service endef $(eval $(cmake-package)) diff --git a/package/ifupdown-scripts/ifupdown-scripts.mk b/package/ifupdown-scripts/ifupdown-scripts.mk index 17364aed03..abb4575777 100644 --- a/package/ifupdown-scripts/ifupdown-scripts.mk +++ b/package/ifupdown-scripts/ifupdown-scripts.mk @@ -48,9 +48,6 @@ endef define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \ $(TARGET_DIR)/etc/systemd/system/network.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../network.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service endef $(eval $(generic-package)) diff --git a/package/igd2-for-linux/igd2-for-linux.mk b/package/igd2-for-linux/igd2-for-linux.mk index 38170b4f57..478c353997 100644 --- a/package/igd2-for-linux/igd2-for-linux.mk +++ b/package/igd2-for-linux/igd2-for-linux.mk @@ -40,9 +40,6 @@ endef define IGD2_FOR_LINUX_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/igd2-for-linux/upnpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/upnpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/upnpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/upnpd.service endef $(eval $(generic-package)) diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk index 96a37d4768..5f67849252 100644 --- a/package/inadyn/inadyn.mk +++ b/package/inadyn/inadyn.mk @@ -34,9 +34,6 @@ endef define INADYN_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/inadyn/inadyn.service \ $(TARGET_DIR)/usr/lib/systemd/system/inadyn.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/inadyn.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/inadyn.service endef $(eval $(autotools-package)) diff --git a/package/input-event-daemon/input-event-daemon.mk b/package/input-event-daemon/input-event-daemon.mk index 632c9eeecb..dbe2d4bfb2 100644 --- a/package/input-event-daemon/input-event-daemon.mk +++ b/package/input-event-daemon/input-event-daemon.mk @@ -30,9 +30,6 @@ endef define INPUT_EVENT_DAEMON_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/input-event-daemon/input-event-daemon.service \ $(TARGET_DIR)/usr/lib/systemd/system/input-event-daemon.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf /usr/lib/systemd/system/input-event-daemon.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/input-event-daemon.service endef $(eval $(generic-package)) diff --git a/package/irqbalance/irqbalance.mk b/package/irqbalance/irqbalance.mk index 8e550df3bf..59ab7c5c1d 100644 --- a/package/irqbalance/irqbalance.mk +++ b/package/irqbalance/irqbalance.mk @@ -55,9 +55,6 @@ endef define IRQBALANCE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/irqbalance/irqbalance.service \ $(TARGET_DIR)/usr/lib/systemd/system/irqbalance.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/irqbalance.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/irqbalance.service endef $(eval $(autotools-package)) diff --git a/package/iucode-tool/iucode-tool.mk b/package/iucode-tool/iucode-tool.mk index e900888d7d..bddc37295c 100644 --- a/package/iucode-tool/iucode-tool.mk +++ b/package/iucode-tool/iucode-tool.mk @@ -21,9 +21,6 @@ endef define IUCODE_TOOL_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/iucode-tool/iucode.service \ $(TARGET_DIR)/usr/lib/systemd/system/iucode.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/iucode.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/iucode.service endef $(eval $(autotools-package)) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 028bf551bc..86c5d33390 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -398,11 +398,6 @@ endef define KODI_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/kodi/kodi.service \ $(TARGET_DIR)/usr/lib/systemd/system/kodi.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/kodi.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/kodi.service endef $(eval $(cmake-package)) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 6a18db48ab..5d46502c66 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -118,9 +118,6 @@ endef define MARIADB_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/mariadb/mysqld.service \ $(TARGET_DIR)/usr/lib/systemd/system/mysqld.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/mysqld.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mysqld.service endef endif diff --git a/package/mender/mender.mk b/package/mender/mender.mk index e085d542c9..d69093d976 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -70,9 +70,6 @@ MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES define MENDER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender.service \ $(TARGET_DIR)/usr/lib/systemd/system/mender.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/mender.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mender.service endef define MENDER_INSTALL_INIT_SYSV diff --git a/package/mini-snmpd/mini-snmpd.mk b/package/mini-snmpd/mini-snmpd.mk index f2480e3168..698402bc51 100644 --- a/package/mini-snmpd/mini-snmpd.mk +++ b/package/mini-snmpd/mini-snmpd.mk @@ -13,9 +13,6 @@ MINI_SNMPD_AUTORECONF = YES define MINI_SNMPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/mini-snmpd/mini-snmpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/mini-snmpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/mini-snmpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mini-snmpd.service endef $(eval $(autotools-package)) diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index 262480cbff..c66e97b073 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -31,11 +31,6 @@ endef define MINIDLNA_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/minidlna/minidlnad.service \ $(TARGET_DIR)/usr/lib/systemd/system/minidlnad.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/minidlnad.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/minidlnad.service endef $(eval $(autotools-package)) diff --git a/package/minissdpd/minissdpd.mk b/package/minissdpd/minissdpd.mk index 31d942eac5..d97eece680 100644 --- a/package/minissdpd/minissdpd.mk +++ b/package/minissdpd/minissdpd.mk @@ -32,9 +32,6 @@ endef define MINISSDPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/minissdpd/minissdpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/minissdpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/minissdpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/minissdpd.service endef $(eval $(generic-package)) diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 165e402fc8..ae58c54935 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -71,9 +71,6 @@ endef define MOTION_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/motion/motion.service \ $(TARGET_DIR)/usr/lib/systemd/system/motion.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/motion.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/motion.service endef $(eval $(autotools-package)) diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk index 9363a71811..b5083120f1 100644 --- a/package/netplug/netplug.mk +++ b/package/netplug/netplug.mk @@ -26,9 +26,6 @@ endef define NETPLUG_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/netplug/netplug.service \ $(TARGET_DIR)/usr/lib/systemd/system/netplug.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/netplug.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/netplug.service endef $(eval $(generic-package)) diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 96f9b37bfa..83ffce5fcf 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -281,11 +281,6 @@ endef define NGINX_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/nginx/nginx.service \ $(TARGET_DIR)/usr/lib/systemd/system/nginx.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/nginx.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nginx.service endef define NGINX_INSTALL_INIT_SYSV diff --git a/package/nss-pam-ldapd/nss-pam-ldapd.mk b/package/nss-pam-ldapd/nss-pam-ldapd.mk index c094db96ac..f8358cc01d 100644 --- a/package/nss-pam-ldapd/nss-pam-ldapd.mk +++ b/package/nss-pam-ldapd/nss-pam-ldapd.mk @@ -29,9 +29,6 @@ endif define NSS_PAM_LDAPD_INSTALL_INIT_SYSTEMD $(INSTALL) -m 644 -D package/nss-pam-ldapd/nslcd.service \ $(TARGET_DIR)/usr/lib/systemd/system/nslcd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/nslcd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nslcd.service endef define NSS_PAM_LDAPD_INSTALL_INIT_SYSV diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index d53fcc5d0b..fb138a8fba 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -108,9 +108,6 @@ endef define NTP_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/ntp/ntpd.service $(TARGET_DIR)/usr/lib/systemd/system/ntpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/ntpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ntpd.service endef endif diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk index faff2533d9..766b1432c1 100644 --- a/package/olsr/olsr.mk +++ b/package/olsr/olsr.mk @@ -43,9 +43,6 @@ endef define OLSR_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/olsr/olsr.service \ $(TARGET_DIR)/usr/lib/systemd/system/olsr.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/olsr.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/olsr.service endef $(eval $(generic-package)) diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index f5a5690479..f2eaee7efd 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -24,9 +24,6 @@ OPENNTPD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -pthread" define OPENNTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/openntpd/ntpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/ntpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/ntpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ntpd.service endef define OPENNTPD_INSTALL_INIT_SYSV diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 47a724d839..0411133bdc 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -74,9 +74,6 @@ endif define OPENSSH_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/openssh/sshd.service \ $(TARGET_DIR)/usr/lib/systemd/system/sshd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/sshd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/sshd.service $(OPENSSH_INSTALL_SYSTEMD_SYSUSERS) endef diff --git a/package/openvmtools/openvmtools.mk b/package/openvmtools/openvmtools.mk index e97eaf224e..8a90aca830 100644 --- a/package/openvmtools/openvmtools.mk +++ b/package/openvmtools/openvmtools.mk @@ -79,9 +79,6 @@ endef define OPENVMTOOLS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/openvmtools/vmtoolsd.service \ $(TARGET_DIR)/usr/lib/systemd/system/vmtoolsd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/vmtoolsd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vmtoolsd.service endef $(eval $(autotools-package)) diff --git a/package/oracle-mysql/oracle-mysql.mk b/package/oracle-mysql/oracle-mysql.mk index 0275a8428f..c33ae02033 100644 --- a/package/oracle-mysql/oracle-mysql.mk +++ b/package/oracle-mysql/oracle-mysql.mk @@ -116,9 +116,6 @@ endef define ORACLE_MYSQL_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(ORACLE_MYSQL_PKGDIR)/mysqld.service \ $(TARGET_DIR)/usr/lib/systemd/system/mysqld.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/mysqld.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mysqld.service endef else diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 58f829ee00..e89063bb28 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -128,9 +128,6 @@ endef define POSTGRESQL_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/postgresql/postgresql.service \ $(TARGET_DIR)/usr/lib/systemd/system/postgresql.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/postgresql.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/postgresql.service endef $(eval $(autotools-package)) diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index da1c07b410..2c3e0a6877 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -123,9 +123,6 @@ endef define PROFTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/proftpd/proftpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/proftpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/proftpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/proftpd.service endef ifneq ($(BR2_PACKAGE_PROFTPD_BUFFER_SIZE),0) diff --git a/package/psplash/psplash.mk b/package/psplash/psplash.mk index 4a2e0de5ce..3dd2f4d579 100644 --- a/package/psplash/psplash.mk +++ b/package/psplash/psplash.mk @@ -13,15 +13,9 @@ PSPLASH_AUTORECONF = YES define PSPLASH_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/psplash/psplash-start.service \ $(TARGET_DIR)/usr/lib/systemd/system/psplash-start.service - $(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants - ln -sf ../../../../usr/lib/systemd/system/psplash-start.service \ - $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/ $(INSTALL) -D -m 644 package/psplash/psplash-quit.service \ $(TARGET_DIR)/usr/lib/systemd/system/psplash-quit.service - $(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/psplash-quit.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ endef $(eval $(autotools-package)) diff --git a/package/ptpd/ptpd.mk b/package/ptpd/ptpd.mk index dad8ccfe10..49587231e0 100644 --- a/package/ptpd/ptpd.mk +++ b/package/ptpd/ptpd.mk @@ -25,9 +25,6 @@ endef define PTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/ptpd/ptpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/ptpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/ptpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ptpd.service endef $(eval $(generic-package)) diff --git a/package/ptpd2/ptpd2.mk b/package/ptpd2/ptpd2.mk index f4a70760ad..0de336464d 100644 --- a/package/ptpd2/ptpd2.mk +++ b/package/ptpd2/ptpd2.mk @@ -32,9 +32,6 @@ endef define PTPD2_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/ptpd2/ptpd2.service \ $(TARGET_DIR)/usr/lib/systemd/system/ptpd2.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/ptpd2.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ptpd2.service endef $(eval $(autotools-package)) diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index b833d4ad27..0e78724634 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -167,9 +167,6 @@ endef define PULSEAUDIO_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/pulseaudio/pulseaudio.service \ $(TARGET_DIR)/usr/lib/systemd/system/pulseaudio.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/pulseaudio.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/pulseaudio.service endef endif diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 0b86fb148e..8706c87968 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -57,9 +57,6 @@ endef define PYTHON_WEB2PY_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/python-web2py/web2py.service \ $(TARGET_DIR)/usr/lib/systemd/system/web2py.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib//systemd/system/web2py.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/web2py.service endef # www-data user and group are used for web2py. Because these user and group diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk index 6df770793a..f9c28e6677 100644 --- a/package/rabbitmq-server/rabbitmq-server.mk +++ b/package/rabbitmq-server/rabbitmq-server.mk @@ -36,11 +36,6 @@ endef define RABBITMQ_SERVER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/rabbitmq-server/rabbitmq-server.service \ $(TARGET_DIR)/usr/lib/systemd/system/rabbitmq-server.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/rabbitmq-server.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rabbitmq-server.service endef define RABBITMQ_SERVER_INSTALL_INIT_SYSV diff --git a/package/redis/redis.mk b/package/redis/redis.mk index a321eb9347..43ff79332c 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -49,9 +49,6 @@ endef define REDIS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/redis/redis.service \ $(TARGET_DIR)/usr/lib/systemd/system/redis.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/redis.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/redis.service endef $(eval $(generic-package)) diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index fa23b3316f..cb7b2cf8a1 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -37,9 +37,6 @@ endef define RNG_TOOLS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/rng-tools/rngd.service \ $(TARGET_DIR)/usr/lib/systemd/system/rngd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/rngd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rngd.service endef $(eval $(autotools-package)) diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk index 0f5011e522..4329c9803a 100644 --- a/package/rpcbind/rpcbind.mk +++ b/package/rpcbind/rpcbind.mk @@ -26,9 +26,6 @@ define RPCBIND_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.service $(INSTALL) -m 0644 -D package/rpcbind/rpcbind.socket \ $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.socket - mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants - ln -fs ../../../../usr/lib/systemd/system/rpcbind.socket \ - $(TARGET_DIR)/etc/systemd/system/sockets.target.wants/rpcbind.socket endef define RPCBIND_INSTALL_INIT_SYSV diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 20ef2fca98..b398472d84 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -23,9 +23,6 @@ endef define RPI_USERLAND_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/rpi-userland/vcfiled.service \ $(TARGET_DIR)/usr/lib/systemd/system/vcfiled.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/vcfiled.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vcfiled.service endef endif diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk index 1bf3ab4350..5ffb6a9400 100644 --- a/package/rygel/rygel.mk +++ b/package/rygel/rygel.mk @@ -68,9 +68,6 @@ endef define RYGEL_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/rygel/rygel.service \ $(TARGET_DIR)/usr/lib/systemd/system/rygel.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/rygel.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rygel.service endef $(eval $(autotools-package)) diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk index 092123e194..52e03da518 100644 --- a/package/sane-backends/sane-backends.mk +++ b/package/sane-backends/sane-backends.mk @@ -66,14 +66,8 @@ endef define SANE_BACKENDS_INSTALL_INIT_SYSTEMD $(INSTALL) -m 0644 -D package/sane-backends/saned.socket \ $(TARGET_DIR)/usr/lib/systemd/system/saned.socket - mkdir -p $(TARGET_DIR)/etc/systemd/system/socket.target.wants - ln -sf ../../../../usr/lib/systemd/system/saned.socket \ - $(TARGET_DIR)/etc/systemd/system/socket.target.wants/saned.socket $(INSTALL) -m 0644 -D package/sane-backends/saned@.service \ $(TARGET_DIR)/usr/lib/systemd/system/saned@.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/saned@.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/saned@.service endef $(eval $(autotools-package)) diff --git a/package/supervisor/supervisor.mk b/package/supervisor/supervisor.mk index e99a9b18ce..424f46a7c2 100644 --- a/package/supervisor/supervisor.mk +++ b/package/supervisor/supervisor.mk @@ -26,9 +26,6 @@ endef define SUPERVISOR_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/supervisor/supervisord.service \ $(TARGET_DIR)/usr/lib/systemd/system/supervisord.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/supervisord.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/supervisord.service endef $(eval $(python-package)) diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index 56eb6a706f..7dc38d30cb 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -132,9 +132,6 @@ endef define SURICATA_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/suricata/suricata.service \ $(TARGET_DIR)/usr/lib/systemd/system/suricata.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/suricata.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/suricata.service endef $(eval $(autotools-package)) diff --git a/package/tcf-agent/tcf-agent.mk b/package/tcf-agent/tcf-agent.mk index 5a0a991b1d..2b8a61b66f 100644 --- a/package/tcf-agent/tcf-agent.mk +++ b/package/tcf-agent/tcf-agent.mk @@ -24,9 +24,6 @@ TCF_AGENT_CONF_OPTS = \ define TCF_AGENT_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/tcf-agent/tcf-agent.service \ $(TARGET_DIR)/usr/lib/systemd/system/tcf-agent.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/tcf-agent.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/tcf-agent.service endef define TCF_AGENT_INSTALL_INIT_SYSV diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk index 6cf86e4b95..fe96f7df65 100644 --- a/package/thttpd/thttpd.mk +++ b/package/thttpd/thttpd.mk @@ -36,9 +36,6 @@ endef define THTTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/thttpd/thttpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/thttpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ - ln -fs ../../../../usr/lib/systemd/system/thttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/thttpd.service endef $(eval $(autotools-package)) diff --git a/package/ti-gfx/ti-gfx.mk b/package/ti-gfx/ti-gfx.mk index 9fad553780..2728572776 100644 --- a/package/ti-gfx/ti-gfx.mk +++ b/package/ti-gfx/ti-gfx.mk @@ -196,9 +196,6 @@ define TI_GFX_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/scripts/ti-gfx $(INSTALL) -D -m 644 package/ti-gfx/ti-gfx.service \ $(TARGET_DIR)/usr/lib/systemd/system/ti-gfx.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/ti-gfx.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ti-gfx.service endef define TI_GFX_INSTALL_TARGET_CMDS diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk index 058f6bd186..6b3ba5f305 100644 --- a/package/tinyhttpd/tinyhttpd.mk +++ b/package/tinyhttpd/tinyhttpd.mk @@ -27,9 +27,6 @@ endef define TINYHTTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/tinyhttpd/tinyhttpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/tinyhttpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/tinyhttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/tinyhttpd.service endef $(eval $(generic-package)) diff --git a/package/triggerhappy/triggerhappy.mk b/package/triggerhappy/triggerhappy.mk index 7c4bf40476..f83a557804 100644 --- a/package/triggerhappy/triggerhappy.mk +++ b/package/triggerhappy/triggerhappy.mk @@ -41,9 +41,6 @@ endef define TRIGGERHAPPY_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/triggerhappy/triggerhappy.service \ $(TARGET_DIR)/usr/lib/systemd/system/triggerhappy.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/triggerhappy.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/triggerhappy.service endef $(eval $(generic-package)) From patchwork Sun Nov 3 16:56:30 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: 1188587 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="NitEpGO1"; 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 475htG2d4Qz9sP4 for ; Mon, 4 Nov 2019 03:57:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C2BEB896D8; Sun, 3 Nov 2019 16:57:08 +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 afzNj3IZCV_g; Sun, 3 Nov 2019 16:57:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 70F62896A7; Sun, 3 Nov 2019 16:57:06 +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 EA3C11BF95C for ; Sun, 3 Nov 2019 16:57:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E26B88A483 for ; Sun, 3 Nov 2019 16:57:04 +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 qOi5HyJr4iWi for ; Sun, 3 Nov 2019 16:57:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by whitealder.osuosl.org (Postfix) with ESMTPS id A73B88A47B for ; Sun, 3 Nov 2019 16:57:01 +0000 (UTC) Received: by mail-wm1-f44.google.com with SMTP id t26so9569122wmi.4 for ; Sun, 03 Nov 2019 08:57:01 -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=KPxEN88jy/eBnXYucFKQYp2fBLJfnvVxazMfTk2F0Wk=; b=NitEpGO1WpDma5ExCVIWLOMBXGIq+ifMd5HlXciRiF0rT96KyQ5H11U5oG/ygbfVrI v4B/kwvbkkynbK/BFzbUJeAHONu7XCD5oDaYAkIyYDZs0SH2BkK2KU4QPl5E/BMCajoB 0Ep67nfXA+7wYgpTcluY119kNFPIRguzbyUQAe8i4v4SheM5KUNp0OaLerVvyUfEMGEV bDygcso8a2byxQGYC4xRU/IXWMuFCpsTTOETQH4P69J0c4je5JAID75F8+wHQeQQaIt9 +WFrHblKN4yA4CEdU5d/D45Kd2T9DTGR1+YM0fszVoQWRlpKgJyD0zxwLDu1qziiQw0w Zxng== 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=KPxEN88jy/eBnXYucFKQYp2fBLJfnvVxazMfTk2F0Wk=; b=OpHJnue4v1nggRjXZGL+mD8sFExwKVAF+w8XHwQmFCXnzbr+JHh54J9zYAkbEnM9CF ObcMg3H1/vhHnbc4lpRgoGoRPnfyct8DufKnIie1mbVv3s5hVdDDD9w9B4p25tvxaq70 /QAFe9KY2OsIoiEfU+3exEGI2CzhlFbUoZltdxo6G1j6LpADL0Ue/u0PkrsjKonh/3l6 Ft5InuxMne9YEJdhvSHJJ8m90EJ3XMTCopzHqRPffGwlzaapkBbv7YtL+V3zYd9OVtFa TPP9btqBvpmmKv93p6lAmSc+M+l49gEcgHdBSek8Rx0+iEJfBI1iKqkFVuLnudr2bzZ/ o8Ww== X-Gm-Message-State: APjAAAV8AvzLN+2xmJ/Ynerkigdl2VmQ2R/FHKf27n74AnXvdIwaVYhS E5ZjUsYkCQBoiehjjJW/sK5eGsgmFQ== X-Google-Smtp-Source: APXvYqx5KlEuPpc/J+29aZK4lHhaimEM+g/wFDFsSw8pwjfC8al+9INICyRycrGFFiBjTqhjWtVmPw== X-Received: by 2002:a1c:2344:: with SMTP id j65mr20442124wmj.38.1572800219818; Sun, 03 Nov 2019 08:56:59 -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.56.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:56:59 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:30 +0100 Message-Id: <20191103165640.21819-6-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 05/15] fix trivial cases, upstream-provided services 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 these packages have an upstream-provided service, but buildroot enabled manually the services in exactly the same way as the [Install] section. This is not needed anymore Signed-off-by: Jérémy Rosen --- package/audit/audit.mk | 4 ---- package/avahi/avahi.mk | 8 -------- package/bluez5_utils/bluez5_utils.mk | 8 -------- package/boinc/boinc.mk | 5 ----- package/fail2ban/fail2ban.mk | 3 --- package/gerbera/gerbera.mk | 6 ------ package/lighttpd/lighttpd.mk | 6 ------ package/lldpd/lldpd.mk | 6 ------ package/mosquitto/mosquitto.mk | 3 --- package/nfs-utils/nfs-utils.mk | 16 ---------------- package/ofono/ofono.mk | 6 ------ package/pcsc-lite/pcsc-lite.mk | 6 ------ package/php/php.mk | 3 --- package/rsyslog/rsyslog.mk | 14 -------------- package/squid/squid.mk | 3 --- package/sshguard/sshguard.mk | 3 --- package/systemd-bootchart/systemd-bootchart.mk | 6 ------ package/transmission/transmission.mk | 3 --- package/upmpdcli/upmpdcli.mk | 3 --- 19 files changed, 112 deletions(-) diff --git a/package/audit/audit.mk b/package/audit/audit.mk index 1e05688f45..03967ee650 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -44,10 +44,6 @@ define AUDIT_INSTALL_INIT_SYSV endef define AUDIT_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/auditd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/auditd.service - $(INSTALL) -D -m 644 package/audit/audit_tmpfiles.conf \ $(TARGET_DIR)/usr/lib/tmpfiles.d/audit.conf endef diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index baffe3cb69..53021f6b6d 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -198,14 +198,6 @@ endef endif define AVAHI_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/avahi-daemon.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-daemon.service - - ln -fs ../../../../usr/lib/systemd/system/avahi-dnsconfd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-dnsconfd.service - $(INSTALL) -D -m 644 package/avahi/avahi_tmpfiles.conf \ $(TARGET_DIR)/usr/lib/tmpfiles.d/avahi.conf diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index e2ce2f74dc..e9b709df4d 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -118,12 +118,4 @@ else BLUEZ5_UTILS_CONF_OPTS += --disable-systemd endif -define BLUEZ5_UTILS_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants - ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \ - $(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants/bluetooth.service - ln -fs ../../../usr/lib/systemd/system/bluetooth.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.bluez.service -endef - $(eval $(autotools-package)) diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk index 5a29214f46..60aa5d1521 100644 --- a/package/boinc/boinc.mk +++ b/package/boinc/boinc.mk @@ -53,10 +53,5 @@ define BOINC_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S99boinc-client endef -define BOINC_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/boinc-client.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/boinc-client.service -endef $(eval $(autotools-package)) diff --git a/package/fail2ban/fail2ban.mk b/package/fail2ban/fail2ban.mk index 16fa63c147..a0325dffc5 100644 --- a/package/fail2ban/fail2ban.mk +++ b/package/fail2ban/fail2ban.mk @@ -25,9 +25,6 @@ endef define FAIL2BAN_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/files/fail2ban.service.in \ $(TARGET_DIR)/usr/lib/systemd/system/fail2ban.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib//systemd/system/fail2ban.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/fail2ban.service $(SED) 's,@BINDIR@,/usr/bin,g' $(TARGET_DIR)/usr/lib/systemd/system/fail2ban.service $(SED) '/^PIDFile/c\PIDFile=/run/fail2ban.pid' $(TARGET_DIR)/usr/lib/systemd/system/fail2ban.service endef diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index a177a73107..cd14649cb5 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -104,11 +104,5 @@ define GERBERA_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S99gerbera endef -# gerbera.service is installed by cmake in $(TARGET_DIR)/usr/lib/systemd/system -define GERBERA_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/gerbera.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/gerbera.service -endef $(eval $(cmake-package)) diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 449b4b4de2..d7622ad822 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -99,12 +99,6 @@ endef define LIGHTTPD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/doc/systemd/lighttpd.service \ $(TARGET_DIR)/usr/lib/systemd/system/lighttpd.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/lighttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lighttpd.service - $(INSTALL) -D -m 644 package/lighttpd/lighttpd_tmpfiles.conf \ $(TARGET_DIR)/usr/lib/tmpfiles.d/lighttpd.conf endef diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk index 5569e409dd..264323a879 100644 --- a/package/lldpd/lldpd.mk +++ b/package/lldpd/lldpd.mk @@ -65,10 +65,4 @@ define LLDPD_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S60lldpd endef -define LLDPD_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/lldpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lldpd.service -endef - $(eval $(autotools-package)) diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index 533d44a088..289fcbccd2 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -111,9 +111,6 @@ endef define MOSQUITTO_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/service/systemd/mosquitto.service.notify \ $(TARGET_DIR)/usr/lib/systemd/system/mosquitto.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/mosquitto.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mosquitto.service endef define MOSQUITTO_USERS diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index cb2caa03f0..a3484286d1 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -73,25 +73,9 @@ define NFS_UTILS_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S60nfs endef -define NFS_UTILS_INSTALL_INIT_SYSTEMD_NFSD - ln -fs ../../../../usr/lib/systemd/system/nfs-server.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nfs-server.service -endef endif define NFS_UTILS_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - $(NFS_UTILS_INSTALL_INIT_SYSTEMD_NFSD) - - ln -fs ../../../../usr/lib/systemd/system/nfs-client.target \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nfs-client.target - - mkdir -p $(TARGET_DIR)/etc/systemd/system/remote-fs.target.wants - - ln -fs ../../../../usr/lib/systemd/system/nfs-client.target \ - $(TARGET_DIR)/etc/systemd/system/remote-fs.target.wants/nfs-client.target - $(INSTALL) -D -m 0755 package/nfs-utils/nfs-utils_env.sh \ $(TARGET_DIR)/usr/libexec/nfs-utils/nfs-utils_env.sh diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk index 18248b50d1..752fc62544 100644 --- a/package/ofono/ofono.mk +++ b/package/ofono/ofono.mk @@ -31,12 +31,6 @@ define OFONO_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/ofono/S46ofono $(TARGET_DIR)/etc/init.d/S46ofono endef -define OFONO_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/systemd/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/ofono.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants -endef - ifeq ($(BR2_PACKAGE_HAS_UDEV),y) OFONO_CONF_OPTS += --enable-udev OFONO_DEPENDENCIES += udev diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk index e819a93910..08aab466fc 100644 --- a/package/pcsc-lite/pcsc-lite.mk +++ b/package/pcsc-lite/pcsc-lite.mk @@ -44,10 +44,4 @@ ifeq ($(PACKAGE_PCSC_LITE_EMBEDDED),y) PCSC_LITE_CONF_OPTS += --enable-embedded endif -define PCSC_LITE_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants - ln -sf ../../../../usr/lib/systemd/system/pcscd.socket \ - $(TARGET_DIR)/etc/systemd/system/sockets.target.wants/pcscd.socket -endef - $(eval $(autotools-package)) diff --git a/package/php/php.mk b/package/php/php.mk index b679531238..e7d26da68b 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -328,9 +328,6 @@ endef define PHP_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/sapi/fpm/php-fpm.service \ $(TARGET_DIR)/usr/lib/systemd/system/php-fpm.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/php-fpm.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/php-fpm.service endef define PHP_INSTALL_FPM_CONF diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 5bd6b59ba3..7ef56dfe7d 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -85,20 +85,6 @@ define RSYSLOG_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S01rsyslogd endef -# The rsyslog.service is installed by rsyslog, but the link is not created -# so the service is not enabled. -# We need to create another link which is due to the fact that the -# rsyslog.service contains an Alias= -# If we were to use systemctl enable to enable the service, it would -# create both, so we mimic that. -define RSYSLOG_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/rsyslog.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rsyslog.service - ln -sf ../../../usr/lib/systemd/system/rsyslog.service \ - $(TARGET_DIR)/etc/systemd/system/syslog.service -endef - define RSYSLOG_INSTALL_CONF $(INSTALL) -m 0644 -D $(@D)/platform/redhat/rsyslog.conf \ $(TARGET_DIR)/etc/rsyslog.conf diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 0d09968bd3..34a463d80d 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -85,9 +85,6 @@ endef define SQUID_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/tools/systemd/squid.service \ $(TARGET_DIR)/usr/lib/systemd/system/squid.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../..//usr/lib/systemd/system/squid.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/squid.service endef $(eval $(autotools-package)) diff --git a/package/sshguard/sshguard.mk b/package/sshguard/sshguard.mk index 0f39974d46..ceff520693 100644 --- a/package/sshguard/sshguard.mk +++ b/package/sshguard/sshguard.mk @@ -25,9 +25,6 @@ endef define SSHGUARD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/examples/sshguard.service \ $(TARGET_DIR)/usr/lib/systemd/system/sshguard.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/sshguard.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/sshguard.service endef $(eval $(autotools-package)) diff --git a/package/systemd-bootchart/systemd-bootchart.mk b/package/systemd-bootchart/systemd-bootchart.mk index 62bc79539b..bcc3dbe22a 100644 --- a/package/systemd-bootchart/systemd-bootchart.mk +++ b/package/systemd-bootchart/systemd-bootchart.mk @@ -16,10 +16,4 @@ SYSTEMD_BOOTCHART_DEPENDENCIES = systemd SYSTEMD_BOOTCHART_CONF_OPTS = --disable-man -define SYSTEMD_BOOTCHART_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants - ln -sf ../../../../lib/systemd/system/systemd-bootchart.service \ - $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/systemd-bootchart.service -endef - $(eval $(autotools-package)) diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index 00652e7f4c..8fbda5eea3 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -66,9 +66,6 @@ endef define TRANSMISSION_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/daemon/transmission-daemon.service \ $(TARGET_DIR)/usr/lib/systemd/system/transmission-daemon.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/transmission-daemon.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/transmission-daemon.service endef else diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index 6fa3ae3c5e..290cdcb1f2 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -27,9 +27,6 @@ endef define UPMPDCLI_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/systemd/upmpdcli.service \ $(TARGET_DIR)/usr/lib/systemd/system/upmpdcli.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/upmpdcli.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/upmpdcli.service endef define UPMPDCLI_INSTALL_CONF_FILE From patchwork Sun Nov 3 16:56:31 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: 1188586 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.133; helo=hemlock.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="iN45q7L1"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 475htF5tmLz9sP3 for ; Mon, 4 Nov 2019 03:57:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 569EA8944E; Sun, 3 Nov 2019 16:57:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1DQex75wUrCh; Sun, 3 Nov 2019 16:57:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BBAC888F5B; Sun, 3 Nov 2019 16:57:07 +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 3D08E1BF398 for ; Sun, 3 Nov 2019 16:57:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 311ED21553 for ; Sun, 3 Nov 2019 16:57:05 +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 tf9XRGevN4oG for ; Sun, 3 Nov 2019 16:57:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by silver.osuosl.org (Postfix) with ESMTPS id 47CC3204C4 for ; Sun, 3 Nov 2019 16:57:02 +0000 (UTC) Received: by mail-wr1-f41.google.com with SMTP id a15so14415430wrf.9 for ; Sun, 03 Nov 2019 08:57: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=6XZVEU4voEJtANtXFZCOzgJoz2GHWtPSeQqN6e2tlb8=; b=iN45q7L1jpo/0FAKaTq99UPbrYZ7Tx10l4+ezWsaaB9WjWPal7tqBWBF1FTpEICNm3 oEVTg6awN30biArcYrO+hcLMpfJJjEa7Yd/ilAMEijJDwYvQGqEnVWWMnb2Iv/0ueSaD pZX3D4NXkzqumJhH00E1mzf+iOkTYlQwIfDxQt6PgbUk4IV4OIXz9qAR+ugIT+Yptke0 vUabJxpHgla5DEwcLfdFgP+NWIUA8IOvye0myGlS6pV5/RpszLM+Dydqjc/G4BTAGcpM QKExLe1xgKRBRpHcBOlNUE42O0ICR08nld4S2AN37Gd2wBuhnTkwWVHsBW4CE3cZop1V iS+g== 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=6XZVEU4voEJtANtXFZCOzgJoz2GHWtPSeQqN6e2tlb8=; b=Do3Nh2MVL4abAch8geMPudgYN5xa46yRbT9QkZee4cUbc4Z7Wixi4+JqecP9T12el6 hobS9HVqvDm8EQ1s2iwwKRXC+7J8FEawgihyqpgOqPkqG2mJVmYx/1E1dXHO4RJkhtrF r64ePIyyquY4ik71j2zbF+lcKxyeyWPxSkdYEZcUO7fEY1HSb/3/DEmvNiFTBhxeGO1e /ygH/kLUBSA7Xsss2EKtFVsMzCz3xG3HVac28iSjcsrClqa4vjVJrlYh+YrxHG5Gl+ww a6lkBrO2OGNlWqg3TjEwNjAIuLmYRd+ppajCUy9+rDHDIxk/Nq71ng50/qo5YqdoSaVd bGvw== X-Gm-Message-State: APjAAAUVYOxWR7yV6XonrzCQ1+yGjjoOFIrQBZcnXkAhu3P59Y/sphSY JLM9TOLujjt/tzt9THWiWMNAOZBUZw== X-Google-Smtp-Source: APXvYqwt1uEf7hAVK3GEGX6LdLzmXFj+KeU0cW392lQ0acclq0Ru3ChtbmB0pAqAfNx7t95Wtu4igg== X-Received: by 2002:a5d:66c1:: with SMTP id k1mr17847506wrw.73.1572800220660; Sun, 03 Nov 2019 08:57:00 -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.56.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:56:59 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:31 +0100 Message-Id: <20191103165640.21819-7-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 06/15] package/avahi: 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" avahi was not enabled, we now need to disable it explicitely Signed-off-by: Jérémy Rosen --- package/avahi/50-avahi.preset | 3 +++ package/avahi/avahi.mk | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 package/avahi/50-avahi.preset diff --git a/package/avahi/50-avahi.preset b/package/avahi/50-avahi.preset new file mode 100644 index 0000000000..998772ea96 --- /dev/null +++ b/package/avahi/50-avahi.preset @@ -0,0 +1,3 @@ +disable avahi-daemon.service +disable avahi-daemon.socket +disable avahi-dnsconfd.service diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 53021f6b6d..2df63c5273 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -198,6 +198,8 @@ endef endif define AVAHI_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/avahi/50-avahi.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-avahi.preset $(INSTALL) -D -m 644 package/avahi/avahi_tmpfiles.conf \ $(TARGET_DIR)/usr/lib/tmpfiles.d/avahi.conf From patchwork Sun Nov 3 16:56:32 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: 1188588 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="jPoe64wu"; 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 475htH1xxSz9sP3 for ; Mon, 4 Nov 2019 03:57:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C4E56896D9; Sun, 3 Nov 2019 16:57: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 NtsNxxlr_Flo; Sun, 3 Nov 2019 16:57:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2E980896B0; Sun, 3 Nov 2019 16:57:07 +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 C006E1BF398 for ; Sun, 3 Nov 2019 16:57:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BC75C8A485 for ; Sun, 3 Nov 2019 16:57:04 +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 N-RdrWkQnFuL for ; Sun, 3 Nov 2019 16:57:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9CA5E8A483 for ; Sun, 3 Nov 2019 16:57:03 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id e6so12599985wrw.1 for ; Sun, 03 Nov 2019 08:57:03 -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=fOJHMh7qgoSRvTbTqi+prwMEZKewmSfZwa70fTYavNM=; b=jPoe64wuy/eXJJWKurPyr9YSRj6cIqZNnDqa8ycbE/zQEzFjgDXom7dXQ1KOJVmwlv 3oONOqd9feUB6pKLz05JD+goEHq+h3goJ1zzTAy72RZ8kjTV8BXy6jbFGU65Kx7R+Qkf JB1nyPsWYZda5kr6QQyd6c3ZKxGDJnMeUYRlfetsToJoSzWKwjaJ+qx3ioeYOhuMgwdD 7wE5SyKgLP8rrfGTmpgP1QcfQZ8pYdo9bQb6YmMPz4UzBL8c5mzjbaBTzm/1em6lgpe6 vALmYGaHRBAGgf4zWqX7nFP8SMjmy8dcCBI4Ug9Mus4eQjL/+ZcWQbWBHnxaYuQwao/c Wu4A== 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=fOJHMh7qgoSRvTbTqi+prwMEZKewmSfZwa70fTYavNM=; b=kc9FdrLr9Hh8wE3zjV2er3uJweH0RUwUrQXZEtL0/Vo4IVNders1IVQ6LBwIW125mZ BcHDrt7Lk9h2zdhHKJlv9ztWGchzi7IycqgKEY3jvbYI9Rvo2y4lGku4jlW921SEl5b6 Si7InXQY3u+mEYiufCELpZW8PV601Byq4V3+T2O3XnzviP0zlbJLgRpsNAGbqPJqLhPc 50ikieuxWI6Vh+38Uf9L+0Lrn/HCbXqGNBbs5lHmvEUXIlKZl6g0LpUsxcnibnLVv+Uv iRdOdculPRuV4wWJ1LJsPDmgdClt/wSqlOoe65luZ6RDOqRH8aF6KKPXYjucxaIbeibP FYxQ== X-Gm-Message-State: APjAAAWNm4ceWcTsozqaKH53vu0nlisYCftx5k9I5yvTfExoZWZhgQbx xdZPnFFnsPE/6I78HDa6vRqxzVusBg== X-Google-Smtp-Source: APXvYqxR2y2XMvBvav/sQR15+ljt5s+hY1obxE+BVZ8+4dW1iXYTxgZxkneUmotwIASY7lBKHrpK3Q== X-Received: by 2002:a5d:69d2:: with SMTP id s18mr15476298wrw.97.1572800221999; Sun, 03 Nov 2019 08:57:01 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:57:01 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:32 +0100 Message-Id: <20191103165640.21819-8-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 07/15] package/connman: 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" connman has two services * connman.service which is the real daemon * connman-wait-online.service which is a sync point for network-online.target Only the first one was enabled. This adaptation enables both. Not enabling connman-wait-online.service is probably a bug Signed-off-by: Jérémy Rosen --- package/connman/connman.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 839bc7a0e2..d70eb1ac82 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -32,12 +32,6 @@ define CONNMAN_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman endef -define CONNMAN_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/connman.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/connman.service -endef - ifeq ($(BR2_PACKAGE_CONNMAN_CLIENT),y) CONNMAN_CONF_OPTS += --enable-client CONNMAN_DEPENDENCIES += readline From patchwork Sun Nov 3 16:56:33 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: 1188589 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.133; helo=hemlock.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="FZfM4MvH"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 475htK0MXQz9sP3 for ; Mon, 4 Nov 2019 03:57:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E56E189805; Sun, 3 Nov 2019 16:57:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2rIW+2+oKWA2; Sun, 3 Nov 2019 16:57:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1D18889700; Sun, 3 Nov 2019 16:57:10 +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 E6B0D1BF398 for ; Sun, 3 Nov 2019 16:57:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E39948968E for ; Sun, 3 Nov 2019 16:57:05 +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 uwgPwHIYpNKS for ; Sun, 3 Nov 2019 16:57:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B399689684 for ; Sun, 3 Nov 2019 16:57:04 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id 11so14217603wmk.0 for ; Sun, 03 Nov 2019 08:57:04 -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=fNcJ6nC3fyEpxJRBF+uJ8QQPCIHoZntlGxID5Uxrc2s=; b=FZfM4MvHXYatfAYNJJ5366ox+oF+ZB3+jvR3DYNDbrso5Lyw+VY2Z0sIPKBzR73oOW s5Psco/ftFl0P6aHRZqkQMX91swxGXvCsui9UXxtg9tnbY0EP0HCYTJsWi9dUoZV3vZ8 VBV8jVF7Dse824JADgf/EXvlZQ+k2xvWyBjaNlGlXcrQgunLiJaeOJMCPqC0HrexOypy +kF4un1LV7/vr5GvD6QKkyuF9pB/OqB20+dB+/MVaXPpWPZZKwlMgE1LOv2j9H5WB0ye c/SfXH0kxlIwJz9e81hydAR5XWMtKViQGQLUCuDP2zGdOQDHny4+y5tpbgduW7xER1j0 LT/A== 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=fNcJ6nC3fyEpxJRBF+uJ8QQPCIHoZntlGxID5Uxrc2s=; b=f/4Yno0Zxb6prtwHUtbwZ3Mx4B2FOdJ3rWKpZTWLYuw5KXBlooS0s4J1qkqOuMBpG5 RwgQLW2S9E0RcK5doC6UTxnS9w0lQ+BKmBzS/kk/mLeY7GHhkV9uSjP6ThhJs/TUCiwg P82eeWk2COpZgUBoipyNFRD88Cir5RRd1pRyxucrjjnY9RetiZG8SZKPD+yYzuRPbuqd YrQ+ajsWyP8K513jc7cS+ozp7AovmsjPEE80XO+BnXe/0EKhnX1jHGulRyibBzSSccy6 YgFdflEQJIrgCQhuXD143bxp2rwGyr2B7oLZdgi6SmbQQs0Pi8StpufwwdkRdZwUP2uv a2qQ== X-Gm-Message-State: APjAAAVsyddCvOvTPycgOHx5/jLxiNDuCvbMmNmp1yU5BNjCAGkAkvxq 2ecF9DjhhEYHfH5v3FLH3gJVfJXv1Q== X-Google-Smtp-Source: APXvYqzZEGyYNslI6FeLrZBzxo95x5zVUXW8cuaPgPQeQ8ZJV08+AG29fXVil+3tovf9fxwLGIIlxg== X-Received: by 2002:a1c:a70e:: with SMTP id q14mr17732884wme.86.1572800222756; Sun, 03 Nov 2019 08:57:02 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:57:02 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:33 +0100 Message-Id: <20191103165640.21819-9-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 08/15] package/dante: 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" dante was not enabled, we now need to disable it explicitely Signed-off-by: Jérémy Rosen --- package/dante/50-dante.preset | 1 + package/dante/dante.mk | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 package/dante/50-dante.preset diff --git a/package/dante/50-dante.preset b/package/dante/50-dante.preset new file mode 100644 index 0000000000..9fc7ab171a --- /dev/null +++ b/package/dante/50-dante.preset @@ -0,0 +1 @@ +disable dante.service diff --git a/package/dante/dante.mk b/package/dante/dante.mk index 0bd036d37e..82b7b9629f 100644 --- a/package/dante/dante.mk +++ b/package/dante/dante.mk @@ -31,6 +31,8 @@ DANTE_POST_INSTALL_TARGET_HOOKS += DANTE_INSTALL_CONFIG_FILE define DANTE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/dante/dante.service \ $(TARGET_DIR)/usr/lib/systemd/system/dante.service + $(INSTALL) -D -m 644 package/dante/50-dante.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-dante.preset endef define DANTE_INSTALL_INIT_SYSV From patchwork Sun Nov 3 16:56:34 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: 1188590 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.133; helo=hemlock.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="UEH5mj2l"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 475htP4PPXz9sP3 for ; Mon, 4 Nov 2019 03:57:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 947F18A1AE; Sun, 3 Nov 2019 16:57:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QDTBurAMPUf3; Sun, 3 Nov 2019 16:57:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DF49388D97; Sun, 3 Nov 2019 16:57:10 +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 9F4DD1BF398 for ; Sun, 3 Nov 2019 16:57:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9C78B8A485 for ; Sun, 3 Nov 2019 16:57:06 +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 CrUJB7RtlzJD for ; Sun, 3 Nov 2019 16:57:06 +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 whitealder.osuosl.org (Postfix) with ESMTPS id B3E208A47B for ; Sun, 3 Nov 2019 16:57:05 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id q70so14189548wme.1 for ; Sun, 03 Nov 2019 08:57:05 -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=ET3qEMOgcH9AIchqnxvTR61f6zaV8BQRmX5mEiQZ1kA=; b=UEH5mj2lLEfY+A1W8/N+62Jmt8dk8rOEy39UceIRosNbWJr7oZHWp3s0ETVvmZ5th2 TLkcOZ8QScMFH72TQjx8MWDq5G8cf/jkHpxeIv02BSlzMwYXzqbh4REqL8idJf5N+7jo oQB6cMDaalNp4YoRzpl9WRyHMUQxMR/4OTgdCRvJfSIcqRhmeOsg9hSunks3plSp+7ui HBBGTZB7tvPKyfF1TQdRYSG8vfE4rB6nAvvzkaNnoKuwcH60lMFWTSL2j+Ym9zypPB8y vZw3t6GjoMMY7GmgYLX04IoVqbmOQmz/ChZkP4OFe1SXH6cTVfe5qZtdJdHNBrmZuXuB fcPg== 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=ET3qEMOgcH9AIchqnxvTR61f6zaV8BQRmX5mEiQZ1kA=; b=nNF9CkwyfqtgLd/Ndl/8eRL+8jaN0tWr5Yk0rOJOCJo8RgRlTUEAL008HPE1TbyJTA PGF25HeLMohPJTiDN0MCggauq0O/cC/XmoCopssLttSQaO2nMOon+lKzR/JQKE32mGy/ hLE0x25UbTRnM7wC14r4NbSbGKrZ4ujbrrmXrDeUt5cjZla1t4CebK/VfiIt3OwwfZUc HZ/99jh9+ODw7KHjoaya/EdxOSji+JED1QizFiFiNy1yWoMhg2nq2MOkia0nNHGn6mJF SNffH4RIf5UFAQkRz9yPpjJZwQuzed8nSlKBI11xLeSVOrrBNM1bDUENJaylmND3O8F0 drVg== X-Gm-Message-State: APjAAAV5N41jR172itrOHkwOuog8yRRq65B2LKB8JA3lb0QX/tzOlGSN U17ZDjfI+xvNRWr8i4viBcYsKGsBTw== X-Google-Smtp-Source: APXvYqwvTnHVxKY+0SoufVqEY1nnwQKR2CHJMrdFUszhs9HMoi2hd/Ds11ENviS8ao2ABMtTzUmpWg== X-Received: by 2002:a1c:a943:: with SMTP id s64mr19412682wme.170.1572800223747; Sun, 03 Nov 2019 08:57:03 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:57:03 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:34 +0100 Message-Id: <20191103165640.21819-10-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 09/15] package/linuxptp 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" linuxptp has two services * linuxptp.service : the actual daemon * linuxptp-system-clock.service : sync the linux clock to the phc clock The first was enabled, the second was not The second has an incorrect (though harmless) WantedBy : there is an explicit Wants= in linuxptp.service This keeps the compatibility, but I don't see the poit of not enabling the second service. Signed-off-by: Jérémy Rosen --- package/linuxptp/50-linuxptp.preset | 1 + package/linuxptp/linuxptp-system-clock.service | 1 - package/linuxptp/linuxptp.mk | 5 ++--- 3 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 package/linuxptp/50-linuxptp.preset diff --git a/package/linuxptp/50-linuxptp.preset b/package/linuxptp/50-linuxptp.preset new file mode 100644 index 0000000000..dd8dbb12d5 --- /dev/null +++ b/package/linuxptp/50-linuxptp.preset @@ -0,0 +1 @@ +disable linuxptp-system-clock.service diff --git a/package/linuxptp/linuxptp-system-clock.service b/package/linuxptp/linuxptp-system-clock.service index a4436a34a7..57beec4579 100644 --- a/package/linuxptp/linuxptp-system-clock.service +++ b/package/linuxptp/linuxptp-system-clock.service @@ -8,4 +8,3 @@ Restart=always [Install] WantedBy=multi-user.target -WantedBy=linuxptp.service diff --git a/package/linuxptp/linuxptp.mk b/package/linuxptp/linuxptp.mk index c304ff6d6e..5b55322b0b 100644 --- a/package/linuxptp/linuxptp.mk +++ b/package/linuxptp/linuxptp.mk @@ -42,9 +42,8 @@ define LINUXPTP_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/linuxptp.service $(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/linuxptp-system-clock.service \ $(TARGET_DIR)/usr/lib/systemd/system/linuxptp-system-clock.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/linuxptp.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/linuxptp.service + $(INSTALL) -D -m 644 package/linuxptp/50-linuxptp.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-linuxptp.preset endef $(eval $(generic-package)) From patchwork Sun Nov 3 16:56:35 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: 1188594 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.133; helo=hemlock.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="EDdvhz2c"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 475htb1c16z9sP3 for ; Mon, 4 Nov 2019 03:57:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 11B4D8A5C5; Sun, 3 Nov 2019 16:57:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id s824twMIRtuB; Sun, 3 Nov 2019 16:57:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1C00289C0C; Sun, 3 Nov 2019 16:57:12 +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 D9D0B1BF398 for ; Sun, 3 Nov 2019 16:57:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D4E1E21553 for ; Sun, 3 Nov 2019 16:57:07 +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 lTI5pIcfc7lq for ; Sun, 3 Nov 2019 16:57:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by silver.osuosl.org (Postfix) with ESMTPS id D6166204E9 for ; Sun, 3 Nov 2019 16:57:06 +0000 (UTC) Received: by mail-wr1-f53.google.com with SMTP id o28so14416397wro.7 for ; Sun, 03 Nov 2019 08:57:06 -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=NAfy6OzO8RywPzloqPZkKRMkj40QFgl+TUfNVSKsF/0=; b=EDdvhz2cE47LenoQCjU5V7wdrRr5h61niXjLKKiFdqd6F4cMaFDqNIFUJmK2SXR1si OiroQwPWpzHYOASJ54BoXkG2W9/dCtrQAr+K47A+WdDdYTyLXGZQDjrmJ177kn/1MEgO qtR/OdykUlftIblKLaAETXt5StcIGP5HajAAw+8iMRXyS/VolZz+CArQ2RQM2SvU6nwH S8jpQHlXFv87hF37G/qNuiDVThytBkksOaWcFcDrtG2cEafFZrIlIKeRQA28DERWSEr1 afdVdQUpgBD3xsF6cEhuCgq254d11jnLrkRomW/UdIHdBCFwrCLQ1W4O5Xgdzp7VvC6M GVaw== 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=NAfy6OzO8RywPzloqPZkKRMkj40QFgl+TUfNVSKsF/0=; b=jGv5FyJojvUItT7vlAJNOVeuyBXLTh2+QU1l/JjQNXkdnFToIzh7aefsMM2QDr6/7y NvM8ljRKwFjovURA/jCcIcnow73JqZjm+oEJIjOIRaoVXBN9hLikTjdnQ9wSfUnr6AOP jf0U3BkKaxNf9gQRAEqkaNnGSsqdTN+wwu2X+hwYKZcK/3ZfApfn1XwcMk4LfrfyhwV1 OGOTMrnlA7QKWSXYOCs/6387IAakt+6sDAeKvu/JgAz9uCz4Cle46I9k3M7wPk3XsE+h neDggSJi1xSqvT86HD803uN+jnz5OnRAfvvFwVKI6DKfxGh4XTKrG143tEcbUbw6Q1g4 MEgg== X-Gm-Message-State: APjAAAUV30TgWiYZUtBJoP+KSbH8sZC7F7pXA/bt+3y3wKUPhm/B299q 1Co7jJ2tuV0Yd/oY0PXWuX2i7fDXZg== X-Google-Smtp-Source: APXvYqyND5abDMurUVd8ebsavntiEA0HAtlkpFCYzH4t0ZERzb4RWsEpwftHQbkoLtwk7ViI0lV82g== X-Received: by 2002:a5d:6203:: with SMTP id y3mr19828389wru.142.1572800225195; Sun, 03 Nov 2019 08:57:05 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:57:04 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:35 +0100 Message-Id: <20191103165640.21819-11-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 10/15] package/docker-engine: 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" docker-engine has two services: * docker.service, if enabled: docker will start at boot * docker.socket, if enabled: docker will start at first connection buildroot currently enables only the service this patch keeps it that way. Signed-off-by: Jérémy Rosen --- package/docker-engine/50-docker-engine.preset | 1 + package/docker-engine/docker-engine.mk | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 package/docker-engine/50-docker-engine.preset diff --git a/package/docker-engine/50-docker-engine.preset b/package/docker-engine/50-docker-engine.preset new file mode 100644 index 0000000000..0d8cf35345 --- /dev/null +++ b/package/docker-engine/50-docker-engine.preset @@ -0,0 +1 @@ +disable docker.socket diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 6a225ee5f0..8540cda9af 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -68,9 +68,8 @@ define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/docker.service $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.socket \ $(TARGET_DIR)/usr/lib/systemd/system/docker.socket - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ - ln -fs ../../../../usr/lib/systemd/system/docker.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/docker.service + $(INSTALL) -D -m 644 package/docker-engine/50-docker-engine.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-docker-engine.preset endef define DOCKER_ENGINE_INSTALL_INIT_SYSV From patchwork Sun Nov 3 16:56:36 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: 1188595 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.133; helo=hemlock.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="WLNKEybE"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 475htc3gldz9sP4 for ; Mon, 4 Nov 2019 03:57:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5855A89F60; Sun, 3 Nov 2019 16:57:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vavt4sunsPye; Sun, 3 Nov 2019 16:57:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 27E5A89EFE; Sun, 3 Nov 2019 16:57:13 +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 6AD081BF398 for ; Sun, 3 Nov 2019 16:57:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 63A24204C4 for ; Sun, 3 Nov 2019 16:57:08 +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 JHkvCC-ayPOR for ; Sun, 3 Nov 2019 16:57:07 +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 silver.osuosl.org (Postfix) with ESMTPS id A50B52094C for ; Sun, 3 Nov 2019 16:57:07 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id o28so14416411wro.7 for ; Sun, 03 Nov 2019 08:57:07 -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=5Fe2tbp+MFxK2zFHMe6Yx79VTxLLFU2DxyuXG4+q1DE=; b=WLNKEybEb6MXH4KcdQ1o7o3UT77Gr72eFTKxtZvNfLwR3zOiVD9StqkFFE3mpF/NyQ PFWHaTy1FkDz51qJVIevhiB9ocbf+ajkjtLrqt9xuxtpaNP88D/kB3W9eM+Gj/FTp2QB Xw78yoPXFV/FrEvAr9slpiXr1u2s+Hnkx9wJa6JE2/JR2nqCuZ3ucDwyaat/VJc3VEEg //8PPoMh0Yvvrfsb+t/vIBTsqsf7ysMEltdcgbhBculwqJ29D5Gc9Zem/dRzSNOgRW66 tJvT80GMsZYhmrVBifInOn5fZPwCpTM889xJxA1mjtgDUB39nhRck4hCLCfZIxlhJiXr gdcw== 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=5Fe2tbp+MFxK2zFHMe6Yx79VTxLLFU2DxyuXG4+q1DE=; b=X37sc0OYeoUwQ5Sh8Bqb3aM8AVKNHDaiiPaARnwC6QfeaybM3MaoSVOflEgeMHogbH 0Tx5oR1cHspCidWdXdnnpXxJTsGvis3d1iUhUGfEOBp8RwXB7anYqJP0jDdFZ1aFhM8A Fx55qtI03XGaGp4OEqoEfbqg0d99jndeL3QjhgZca4flCp4BOviOPG/fzj3orwvPqhIk eF4o52R0iFKwj0ygaq8IPHCL0i80btt8nPyZ0+vtt96N3yuf42/8MuyIEPqELeO62T7F hJv+Et3qbuNcD3MPAueIvDKkQwOVsItWZom4+mtAp4RCAVZQGiSsNAnsRGb4dLvHwaYf OnIQ== X-Gm-Message-State: APjAAAXAk/5yofGm5r4AmA7hHVuxSdNla7HaVgi44Wo2UIS4i62igOQx VLsYU+kwAeyjNLF/ZWDUyuaIqUaAFg== X-Google-Smtp-Source: APXvYqz8HZxC9zZhgodLQCOR84MGcaHlz568sMxMZCquQ3beQZucQz7AIK4pszB3CvdFQpEVYaVDKw== X-Received: by 2002:adf:f905:: with SMTP id b5mr19628265wrr.122.1572800226008; Sun, 03 Nov 2019 08:57:06 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:57:05 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:36 +0100 Message-Id: <20191103165640.21819-12-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 11/15] package/network-manager: 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" NM has three services * NetworkManger.service : the main daemon * NetworkManger-dispatcher.service : a daemon handling network callbacks * NetworkManager-wait-online.service : sync of other services with network-online Only the first two were activated. We now also enable wait-online. Not enabling it was probably a bug. Note that buildroot adds an alias dbus-org.freedesktop.NetworkManager Adding an alias that is not known upstream is not clean, but I left it for backward compatibility Signed-off-by: Jérémy Rosen --- package/network-manager/network-manager.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 6412d3a241..67e6a76774 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -88,16 +88,9 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSV endef define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf /usr/lib/systemd/system/NetworkManager.service \ $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service - ln -sf /usr/lib/systemd/system/NetworkManager.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service - - ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service endef $(eval $(autotools-package)) From patchwork Sun Nov 3 16:56:37 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: 1188592 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="17GZsUk2"; 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 475htX5Pjlz9sP3 for ; Mon, 4 Nov 2019 03:57:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 415402094C; Sun, 3 Nov 2019 16:57:23 +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 klBOLhwBZyML; Sun, 3 Nov 2019 16:57:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 6D4372442C; Sun, 3 Nov 2019 16:57: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 068591BF398 for ; Sun, 3 Nov 2019 16:57:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F19BD8A488 for ; Sun, 3 Nov 2019 16:57:10 +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 vjFA5IvSl-cH for ; Sun, 3 Nov 2019 16:57:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by whitealder.osuosl.org (Postfix) with ESMTPS id C4F648A47B for ; Sun, 3 Nov 2019 16:57:08 +0000 (UTC) Received: by mail-wm1-f50.google.com with SMTP id q70so14189655wme.1 for ; Sun, 03 Nov 2019 08:57: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=NDD0gdTK0oZ78+FygdoBpcpIPL9qWDXTSwcoOY4Uoto=; b=17GZsUk22+WsDLCqRN8/nTtvFZyY6q+0pzA1Wyiu4+EzWwZZNDGymuK0oyCojNKmMr SfoFvZDeBSS8Vkoa/aUhNcDGPAVB1vuDGvIKgJPkxxXiiVZ9TJRSm/i4h4b/VmE1UFxG jA5/hxGpPlDVg0n2AkvIZWZUBh1vxdsPgqOcacd2igQh59RF/NRHnKhy1OR9iXJi9Uvw 4vWfS+BLQGSvVn4/a1lEYZBC2LjUvKBG1v7GHxkgfYUVkPgTUcbAFUhORWVWYDMA3icW eAHm5lhv49Z9SGfgFVAbmeEmPS1mFDQdrvZIP+QfkC69281V/9ygqRHwL+0vDBtmnLid MBeg== 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=NDD0gdTK0oZ78+FygdoBpcpIPL9qWDXTSwcoOY4Uoto=; b=Ju9eetNYozWsaUYSDprYW8Nb5iMA1X2Lp8Ota18O7zV09H8HFISSsKaLfxGEkkkQYH GqrXoWngmr99AvSgECi77RALQXsNheAJX57VX4JUrMuvMPyqSEUslXbIR8mCIGG2+6Oj WdM3R704Zw8z5qei2WaHxgz9V/JUyRXsVDtM6XyzWYYYXbN+rdi/eWVePt6FmAQakUYZ 5VtHeYGSaYbMR/GzzXdZBfHrO8MW/X0OsGfoeeOj1DMkMJp8aPBlNuaB1a2i93cWZTAa A5Ik+NCsORzhktVxx/IGJiWSDifzJUuxJ1gaqMgZoDIOFqJwVRb8Q5t9eUsze4zfgMm4 pv1g== X-Gm-Message-State: APjAAAWa45UkHUAm+QjOPs5JGfWRD071bQdAMAs7pCJ8gkAm4uGbSLtQ G/jG7SPzU549UdgA2S0LfDhROkKhRg== X-Google-Smtp-Source: APXvYqyr7UI6p627M2OC+1RURiXzdE1diKKmPlW3xOIG8MiOXVmIjSbq/3aGB8nWrHyAzpBfRgGJWw== X-Received: by 2002:a1c:9e58:: with SMTP id h85mr12149872wme.77.1572800227117; 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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:57:06 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Sun, 3 Nov 2019 17:56:37 +0100 Message-Id: <20191103165640.21819-13-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 12/15] 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 keeps them that way. Signed-off-by: Jérémy Rosen --- package/wpa_supplicant/50-wpa_supplicant.preset | 5 +++++ package/wpa_supplicant/wpa_supplicant.mk | 2 ++ 2 files changed, 7 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..ddd339d82f --- /dev/null +++ b/package/wpa_supplicant/50-wpa_supplicant.preset @@ -0,0 +1,5 @@ +disable wpa_supplicant.service +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..42b12b1fb4 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 package/wpa_supplicant/50-wpa_supplicant.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-wpa_supplicant.preset endef $(eval $(generic-package)) 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)) From patchwork Sun Nov 3 16:56:39 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: 1188597 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="udbPwqSG"; 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 475htj44ysz9sP3 for ; Mon, 4 Nov 2019 03:57:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1231C20BF9; Sun, 3 Nov 2019 16:57:32 +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 x8MnNby8pUyc; Sun, 3 Nov 2019 16:57:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9A6D52634F; Sun, 3 Nov 2019 16:57:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id F08EA1BF398 for ; Sun, 3 Nov 2019 16:57:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B058489C5E for ; Sun, 3 Nov 2019 16:57:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id P5Z2xqhDUmLs for ; Sun, 3 Nov 2019 16:57:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id A392C897CB for ; Sun, 3 Nov 2019 16:57:10 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id t26so9569364wmi.4 for ; Sun, 03 Nov 2019 08:57:10 -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=VbNPsy1q3co5+ilGSmBehQE75probLTqjc1yRl5Y6dQ=; b=udbPwqSGfCt92MujHV08Xet3EJPxiVWBMaX3l7oXZZlCFpdB2Cbr/KrItxS6TncsRu JWI0tajuP6P3ZA/TUXzKFsQhQ+zE7v8prhIg/CedxMj468nbgu59KRAX4lY1iF2eH36P xRhrySkbGhMNfRuWiJpFgqg5AJdyQmfUuM+3CvTyUpR8IUH07gRmylqSl9I8o1oFRlkQ 2E2TRLpqIibaoIIRtR0wVKQ2PHHR7zzQ8QgAYs2YKAJJHcRDQBwmN8SZZkuuz6bllj69 qsIRn4p41IOZijvs5nLULR19puW7fdayffx38dqxGPohver3tMBpcIcJlwktM0Rx/hbr 629w== 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=VbNPsy1q3co5+ilGSmBehQE75probLTqjc1yRl5Y6dQ=; b=bLDZN1dkZB2PKHvcd/r5ueDDmjC36zdVfCIzQwsmvqO2+5T/pDuSsNSacaZMEn8fk5 ATGKXjOttVnkcM+1pIW4r3rOvSFmR4QorOzfq8iJD1/aQKchES4CjNIH9yTl+vXQjJda pAGddHcf8iZRG/Tgev27I0oA7rc+h0F/8YrCvVIkIV4rpPfslV3UNjns9K0B54xhpldl j5J1YV9YyFf0e4KyRqKqS4qUWxOBFuQdT98vA6vLT9qZr3YhJrIBnuHuh67MmLHvL1z+ Ce2Dze4guuRjVNPz5WDdgme0zAxZKjRBc101EXnWAC6v2o5qIlaXsIw3BksBbMV8qhDK 8cjQ== X-Gm-Message-State: APjAAAWhL0JLEh6DExMBeTXQnX7r0hEPq+fLnKzFvdAFA+j1StzHfsKN t6421oXI18slLlq76zlUz6LgFZRVjw== X-Google-Smtp-Source: APXvYqwxG6jL3Qx/5RNn2+VSg4kD4XkaqkDgFb9SKM16gk3wXDOjERHRY2AJIX1FWxbiFtPnlrdaYg== X-Received: by 2002:a1c:bc89:: with SMTP id m131mr20372715wmf.14.1572800228797; Sun, 03 Nov 2019 08:57:08 -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:39 +0100 Message-Id: <20191103165640.21819-15-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 14/15] package/targetcli-fb: 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" the service was not enabled, we now need to disable it explicitely Signed-off-by: Jérémy Rosen --- package/targetcli-fb/50-targetcli-fb.preset | 1 + package/targetcli-fb/targetcli-fb.mk | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 package/targetcli-fb/50-targetcli-fb.preset diff --git a/package/targetcli-fb/50-targetcli-fb.preset b/package/targetcli-fb/50-targetcli-fb.preset new file mode 100644 index 0000000000..572ee4fb93 --- /dev/null +++ b/package/targetcli-fb/50-targetcli-fb.preset @@ -0,0 +1 @@ +disable target.service.service diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 75643446d2..5e50643bc9 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -21,6 +21,8 @@ endef define TARGETCLI_FB_INSTALL_INIT_SYSTEMD $(INSTALL) -m 0644 -D package/targetcli-fb/target.service \ $(TARGET_DIR)/usr/lib/systemd/system/target.service + $(INSTALL) -D -m 644 package/targetcli-fb/50-targetcli-fb.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-targetcli-fb.preset endef # Targetcli stores its configuration in /etc/target/saveconfig.json 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))