From patchwork Mon Dec 16 10:30: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: 1210217 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="TfjZkrQu"; 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 47byH7310cz9sPK for ; Mon, 16 Dec 2019 21:31:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 00612204E6; Mon, 16 Dec 2019 10:31:11 +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 4Ce2hA4eC0k7; Mon, 16 Dec 2019 10:31:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2F300204C9; Mon, 16 Dec 2019 10:31: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 96D031BF2B5 for ; Mon, 16 Dec 2019 10:31:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8C53F86A70 for ; Mon, 16 Dec 2019 10:31:01 +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 b5KGUE6EabCw for ; Mon, 16 Dec 2019 10:31:00 +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 whitealder.osuosl.org (Postfix) with ESMTPS id C31948528B for ; Mon, 16 Dec 2019 10:30:59 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id w15so6592988wru.4 for ; Mon, 16 Dec 2019 02:30: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=yrhKR/5W6TuzFyhxw4Kei2n0MHHOq2yo9psp6qJco/A=; b=TfjZkrQu0fKsRLDhU4yVqJwiEDDdZ+MCOkjBqVxB776ttDy1RaEhQ/q2aSUcDyhc9W YSrCazp2HxcIj+y3xIFgpFuMuUpMMvJ3kxOmJnlqsQ5DYtAmGsUOVp6vK+f2cHvDgkIK n5vZQtjVHZgW+gvmzvLnTrJf96qivmo7BFXh58zsBO/7usccJk3dqIkSUNp7BSjnpeMs 1efPJ5aS69bV0/EBtkiIP0zrkWVV4E/cfPZbRjOoSm9cYE+vYjkXdoDvgq8sgJQXLbX9 hBzTsbaKeQuvRvYdXDsXCncWBoP6N3spJDUDTrY9kNe9aENVeEeGbBhFJP08UJf6Nsil ywtA== 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=yrhKR/5W6TuzFyhxw4Kei2n0MHHOq2yo9psp6qJco/A=; b=nk1/H9ENcMPLNVxXqbQsxEq6C815MbghtxQh05Bjr3Nwg5+2qWcst3xe24FsuoZmBH XAMfdZyF6JaAFwozuLh6CIZNoml4hOAORgSVUpdbU0YYhGbZLRBZO0EF7R10vfEWA/XS MQEsqnn+c5ppBoyFPhXaBsVXMDXAKphdwamRTaOk7c/3ARcs/ITpYx0EhJVtDlZmCQiz Tpn0ljScYz0ZbDXVeLzF4hRW5sHTPGmCeRLBN7UG4rDFi3whMNljErTU4oooHSMhAFtW J9m2N7gFFw/Ivq1wM1s6rqR4CReXQW4uhpkstzGrtZXMz6quS0/IHC1Gk4ma3MXVMnX5 6Iqw== X-Gm-Message-State: APjAAAX4Sf+V6GRWyrvTq4dRq/0wkeaP+LdNucxftIGh73g5EytO2LId iYEAEn7EcX9mG7wueYjJUtYV981P+w== X-Google-Smtp-Source: APXvYqx8VU8/2zcp3YjqTPQ2i0U7K5vFSkr3DTfnBgNSMWyiJYU0qpb+6QXFXc/ngs/sDvqiBDsIQA== X-Received: by 2002:a5d:46d0:: with SMTP id g16mr30731027wrs.287.1576492257713; Mon, 16 Dec 2019 02:30:57 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.30.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:30:57 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:40 +0100 Message-Id: <20191216103052.35220-2-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 01/13] package/systemd: add host variant 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 Explanation of Yann E.MORIN about the RPATH trick ------------------- The first question is: why do we use --prefix=/usr ? systemd will store its --prefix in all the executables it generates. As such, systemctl will have a hardcoded 'prefix', where it will manipulate and create files/symlinks in. When called natively, this is nice and shinny. However, for cross-setup, that does not work obviously. So, systemd has its tools know about the 'root' directory where this prefix should be related to. We can call systemctl --root=$(TARGET_DIR) and systemctl wil do the links and such in there. However, it does so by appending its known prefix to it. So, if we were to configure host-systemd as we usually do, with --prefix=$(HOST_DIR), then when we would call host systemctl --root=$(TARGET_DIR) it would look for files in $(TARGET_DIR)/$(HOST_DIR), which is wrong. Calling the host systemctl without --root is also wrong, as it would look for files in $(HOST_DIR) So, there is no satisfying official support for this case. The trick then, is to configure systemd with the prefix it would expect at runtime (on the target!), that is with /usr, but install out-of-tree. That was it for the first part of the question: why do we use --prefix. Now, the second question is: why do we need to muck up with the rpath after installation? Well, this boils down to meson (and not systemd itself). When it installs executables, meson will handily insert whatever rpath the package meson.build would tell it to use. systemd installs libs in $(prefix)/lib/systemd and as a NEEDED to those libs, so it uses an RPATH to find those libs, and meson does introduce that RPATH. However, we Buildroot also want to insert our own RPATH, because systemd uses util-linux' libs and libcap, so it needs our RPATH. However, meson can not extend the RPATH from the LDFLAGS in the environment; meson can only set the RPATH from what it knows about from the package's meson.build. That, in addition to the --prefix=/usr issue above, means that the executables installed by host-systemd have an RPATH set to /usr/lib/systemd. when we would want it to be set to $(HOST_DIR)/lib:$(HOST_DIR)/lib/systemd That;s what is done in the post-install hook: set the RPATH to the appropriate values. Signed-off-by: Jérémy Rosen --- package/Config.in.host | 1 + package/systemd/Config.in.host | 3 ++ package/systemd/systemd.mk | 94 ++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 package/systemd/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 758c268e00..62e860d7c3 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -70,6 +70,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..219f24239e --- /dev/null +++ b/package/systemd/Config.in.host @@ -0,0 +1,3 @@ +# Select this if you need host systemd tools (e.g. systemctl) +config BR2_PACKAGE_HOST_SYSTEMD + bool diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index a292a7512b..5329f91bf8 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -550,4 +550,98 @@ endef SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) + +# +# Host-systemd configuration +# +# Options tweaked for buildroot +HOST_SYSTEMD_CONF_OPTS = \ + -Dsplit-bin=true \ + -Dsplit-usr=false \ + --prefix=/usr \ + --libdir=lib \ + --sysconfdir=/etc \ + --localstatedir=/var + +# disable everything else +HOST_SYSTEMD_CONF_OPTS += \ + -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='' + +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 rpath is thus lost. +# * the original path had been tweaked by buildroot via LDFLAGS 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 udevadm + +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)) $(eval $(meson-package)) From patchwork Mon Dec 16 10:30:41 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: 1210216 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="KJO1YSpl"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47byH45frZz9sPK for ; Mon, 16 Dec 2019 21:31:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 168E087048; Mon, 16 Dec 2019 10:31: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 p1MaRXt3vvZZ; Mon, 16 Dec 2019 10:31:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8C53A86F92; Mon, 16 Dec 2019 10:31:07 +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 554E41BF2B5 for ; Mon, 16 Dec 2019 10:31:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4F61285660 for ; Mon, 16 Dec 2019 10:31:03 +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 XqcZo2A6Vfiu for ; Mon, 16 Dec 2019 10:31:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6518D854DF for ; Mon, 16 Dec 2019 10:31:01 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id w15so6593105wru.4 for ; Mon, 16 Dec 2019 02:31: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=nqMWkcmMAbO+0QSPlBkeRgfBnP2JF8Kku8PpkVOP2Qs=; b=KJO1YSplKkGcMrUdII1p3qIWO1biWj5QbvNZm2tGBcWTScBXLxARFGK371MJ3CTMUu yO6mxyz41ViaUYISbewYB4ZIHtEY2HmPna/TwMEgu39dt2kY6rHYDt/zcdcWmEzx/4dK C0VarQJfctKq0mDUP94TYrP9wVjoGAR0OHYAohgxtyYqox7yDCqi4wsCuwK9giONNqRq S2B3F4kCb0DZDd6g1HKIq+Q6iprHiGbWjCeAlrpaTUl92RptBz6dCKYkeWA/Ja0Djlod pqRJSUN+wawDJzQ+e5+oOafdw2ptnnrfcOl1WWyq7KhbpVektiJnFL08BoTwzlYlPAH1 em2A== 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=nqMWkcmMAbO+0QSPlBkeRgfBnP2JF8Kku8PpkVOP2Qs=; b=T+4vSElxmLOiWPfJ3A3Qi6IWT6PjIhTwgwdTegvftji5j5+sLHCq/x6/rr4FNrTh6E vKY974GPlOdRIlYErA4vCdqX7xXcEZAyXU5ZLq60XUoLW0p6XAmbp8digM3h4/EV+tVZ bjTp8dq58LPJSVAnUyTxtjLWxAXeE+Ajj5crK/FKnx3fop00CaFiR/yjv3jVa08ueOyn hHdXPM6aKOZaxn45JXPRCezTtlM60m52CArFYOB300T9HxonVyBXnY8R7BLN1vzZRYtX 7wQqWct4K+utQjjjI2Z2XPdipGo3JVkfPtt2kY9yOHC29wgZraHCrMKP7N28ZYyOwA21 N9oQ== X-Gm-Message-State: APjAAAVX/sRV2mgo1/IHOVSMIUTmPZMPAs3pVvRYOS1/CvbFG+wOs5A9 lQe6FN1CgsvcyNciToueYDcSOOJhZQ== X-Google-Smtp-Source: APXvYqxo+lh+Boo+ZjK1xWesTdA0PIc85ytCpEjuKofQ/UTp41VcQkwX7agauIHxpfq6FsUGrDpTHw== X-Received: by 2002:adf:f288:: with SMTP id k8mr31121099wro.301.1576492259228; Mon, 16 Dec 2019 02:30:59 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.30.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:30:58 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:41 +0100 Message-Id: <20191216103052.35220-3-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 02/13] package/systemd: 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. Most packages will not be affected by this change, but a few packages were installing units without manually enabling them. Those packages will now be automatically enabled. The fact that those packages were not enabled is almost certainly a bug, but it is a change of behaviour that needs to be reported This also means that systemd builds udevadm for the host. As a consequence we now conflict wit host-eudev instead of needing to to build the hwdb database. This patch thus removes the dependency Signed-off-by:Jérémy Rosen --- docs/manual/adding-packages-generic.txt | 4 + package/systemd/80-buildroot.preset | 5 ++ package/systemd/Config.in | 2 +- package/systemd/systemd.mk | 108 ++++-------------------- 4 files changed, 27 insertions(+), 92 deletions(-) create mode 100644 package/systemd/80-buildroot.preset diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 86300e7460..f7f3e447f1 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -550,6 +550,10 @@ different steps of the build process. is when openrc is chosen as init system and +LIBFOO_INSTALL_INIT_OPENRC+ has not been set, in such situation +LIBFOO_INSTALL_INIT_SYSV+ will be called, since openrc supports sysv init scripts. + When systemd is used as the init system, buildroot will automatically enable + all services using the +systemctl preset-all+ command in the final phase of + image building. You can add preset files to prevent a particular unit from + being automatically enabled by buildroot. * +LIBFOO_HELP_CMDS+ lists the actions to print the package help, which is included to the main +make help+ output. These commands can print 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 8f1d6fc0c0..c727082a1a 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 # for systemctl preset-all, during target-finalize help systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. systemd provides @@ -199,7 +200,6 @@ config BR2_PACKAGE_SYSTEMD_HOSTNAMED config BR2_PACKAGE_SYSTEMD_HWDB bool "enable hwdb installation" default y - select BR2_PACKAGE_HOST_EUDEV # for udevadm, during target-finalize help Enables hardware database installation to /usr/lib/udev/hwdb.d diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 5329f91bf8..057a4eb9e5 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -52,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 @@ -65,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 @@ -204,6 +193,11 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += -Dhwdb=true +define SYSTEMD_BUILD_HWDB + $(HOST_DIR)/bin/udevadm hwdb --update --root $(TARGET_DIR) +endef +SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_BUILD_HWDB + else SYSTEMD_CONF_OPTS += -Dhwdb=false endif @@ -270,11 +264,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 @@ -318,11 +307,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 @@ -337,29 +321,11 @@ 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 sed s/SYSTEMD_NETWORKD_DHCP_IFACE/$(SYSTEMD_NETWORKD_DHCP_IFACE)/ \ - package/systemd/dhcp.network > \ + $(SYSTEMD_PKGDIR)/dhcp.network > \ $(TARGET_DIR)/etc/systemd/network/dhcp.network endef endif @@ -374,13 +340,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 @@ -388,15 +347,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 @@ -447,18 +397,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 @@ -466,9 +406,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 @@ -492,10 +429,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 @@ -523,30 +456,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 $(SYSTEMD_PKGDIR)/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 Mon Dec 16 10:30:42 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: 1210218 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="Vo+T/ouR"; 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 47byH75VzFz9sPn for ; Mon, 16 Dec 2019 21:31:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CC1AF87C69; Mon, 16 Dec 2019 10:31:11 +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 2kGjxUbQONpM; Mon, 16 Dec 2019 10:31:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B922287C14; Mon, 16 Dec 2019 10:31:09 +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 197FB1BF2B5 for ; Mon, 16 Dec 2019 10:31:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 11BE5204C9 for ; Mon, 16 Dec 2019 10:31: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 iHskmwO+myxA for ; Mon, 16 Dec 2019 10:31:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by silver.osuosl.org (Postfix) with ESMTPS id 8C25520020 for ; Mon, 16 Dec 2019 10:31:02 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id g17so6589511wro.2 for ; Mon, 16 Dec 2019 02:31: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=7zhgOyKBRdm0V5B6+7+WJse2x0EThFzUsejVmKZZgU4=; b=Vo+T/ouRh+SqO2E9gNKlgCkE2vlLO+GZrXofgilhgJssUL4aclJMMNb6mnebA5aqa0 9FmN/t3oUmkcChsPUQw/at+0WtIzTDXfz8h3sWOaYLqyfo40Zvyqy0YXofI1UTfOvNED dBHORFnvNc40iifkLMi6l7xM7st8KBUcekJPAWHjbBGqO51XM99VbmSXM+7j7D74asJf SzVa2iA2LfpASgIix+ioSq9INrLWkgbGh67GJoRrgdhaGrId1LzA4PRZkn356qmDc1bS Pn9iJeMbwX0xwF7K8AM5w5xs0Y5v1H3+AuYb4nEGQsw4RUSupnonCv6bQ9RbC5VGUbSX ppgQ== 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=7zhgOyKBRdm0V5B6+7+WJse2x0EThFzUsejVmKZZgU4=; b=qXY5fTENsqaFJvg/5jRXl2SqtZNBymXKup6/R1xzU6ZV8orfl/q/1oIoPbk8eyjCU/ z4YcM7Qq+RODDSeasCAfuiKGxVq68q0qR3rh3OXo49bWDPjGZ1qiX6j9/HiZcgVGymtl fLk4CqlGTy/TVywJhdvq6dr6RjAjtvLFDl+4ur2IrDozhnfHMNXPiZpgDzBGf6WZ5NTP jg3CxqmTa0ltH2DdGXUyStYNEGusFqlMotpuYoowddF/3/25teVQ2BfHv4pTQbYa8m9o b6JQJKDPCABy0eZgCVayTWmjdoLciakDisygILtwUroKQnM+PsxyjEEJjf+3OJ82Ajy1 XhoQ== X-Gm-Message-State: APjAAAUmsbCM7VcmISmYsjZ10+hbQsWO93hQrRSuj9FjN9m+loudhuL0 phj6jKXzSk8yKiEgSY67OfVuzBCaSA== X-Google-Smtp-Source: APXvYqyb7ym7qQDmgFODoybzaTNKgXzcPQjBGaR2pg3RFMI4ahzu06j2AuKLCb6Qfg02cyTsSaxOww== X-Received: by 2002:adf:e547:: with SMTP id z7mr29985758wrm.258.1576492260338; Mon, 16 Dec 2019 02:31:00 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.30.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:30:59 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:42 +0100 Message-Id: <20191216103052.35220-4-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 03/13] package/systemd: 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 --- package/systemd/80-buildroot.preset | 5 ++--- package/systemd/systemd.mk | 25 +++++++++++++++++-------- 2 files changed, 19 insertions(+), 11 deletions(-) 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 057a4eb9e5..6adf3adca4 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -433,22 +433,33 @@ 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 drop-in in /usr/lib +# * set a new DefaultInstance for getty@.service instead, 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 + mkdir $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d;\ + printf '[Install]\nDefaultInstance=\n' > $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d/buildroot-console.conf;\ if [ $(BR2_TARGET_GENERIC_GETTY_PORT) = "console" ]; \ then \ TARGET="console-getty.service"; \ - LINK_NAME="console-getty.service"; \ + printf 'enable console-getty.service\n' > $(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"; \ + printf '[Install]\nDefaultInstance=%s\n' $(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;\ + printf '[Install]\nDefaultInstance=%s\n' $(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}; \ @@ -456,7 +467,6 @@ define SYSTEMD_INSTALL_SERVICE_TTY endef endif - define SYSTEMD_INSTALL_PRESET $(INSTALL) -D -m 644 $(SYSTEMD_PKGDIR)/80-buildroot.preset $(TARGET_DIR)/usr/lib/systemd/system-preset/80-buildroot.preset endef @@ -472,7 +482,6 @@ define SYSTEMD_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 Mon Dec 16 10:30:43 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: 1210227 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="XqzwpGz3"; 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 47byHP2Q1Tz9sQp for ; Mon, 16 Dec 2019 21:31:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 887CF85C47; Mon, 16 Dec 2019 10:31:25 +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 gE_hOd0EfT5l; Mon, 16 Dec 2019 10:31:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 501EA85691; Mon, 16 Dec 2019 10:31:21 +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 808B61BF2B5 for ; Mon, 16 Dec 2019 10:31:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6F115204DF for ; Mon, 16 Dec 2019 10:31:10 +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 XBq5VFqwWLIe for ; Mon, 16 Dec 2019 10:31:04 +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 silver.osuosl.org (Postfix) with ESMTPS id 40D7A204C4 for ; Mon, 16 Dec 2019 10:31:04 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id p17so6094856wma.1 for ; Mon, 16 Dec 2019 02:31: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=eUci/WP7VQjKcLFI2xEQm0+hBgFq8P8L35OzesFa7js=; b=XqzwpGz3x7VTvJtnwHRTliEDRpqLNYXOWvQzxqlpCCttI5ixgXccv4r9oIcz4VM6O+ OqczhEjgYtsXrs5yavLzi/1nlW+BOtytxlmcQB5Sm5N2pTXsU6rekbHNMhC812vJ0g4Y EzOxJWpYvwZ0beNiE+i3SnYwyvQXRWtU53f2OqMiCo+kkxinzkKngQQs1osMVBiMiB3G o0gNRrqblLee1GQrdHjz7RyIKIlSH6ZWI/ZS7O7YITelGVj28IGSh36ZGRVfWa3OvbPK htaOZ+r5BYIzuj5kUtLek+2naYwMDYgRBuFX4u+rvT4VlEQSSddZVdfYmm0TjY9q5Poz Qfmw== 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=eUci/WP7VQjKcLFI2xEQm0+hBgFq8P8L35OzesFa7js=; b=kewEAWh3RcjnTI9hwVnXcK0wVHRWM5Td9arXHpgGcmVyU91bLvm/Eo7s4QkZTVZXKj waNsm8XKHvxmCdyWY3jQfb2IMYLt4LD/A9T61qimErxvB6/tzdzkibf8jmONXnBRuOlU 5PNHlgyAdQidokF+Nq/nflwwx5SkzLKIElsWk64FlDY41lwJ+bkfXg4VlKfC+5UxGgMa Hm+NpdtUBhTkWjs7gl8thZ72jRgIb0OnbINmz4aCX4hRvso4V/18AyycxFS704nPHhDM tdVueqGe/FR0UwlD+JRJJ0PZ99Zvu1dei3CDL2YYSviCi8C+NLJRH92bXxePUli7m9yA QInQ== X-Gm-Message-State: APjAAAU7ugR2/lGA05ae75FLwWcrJYC45uW4IMGer8GL/xFmXKqHq+yL +zeX4gzGK5W9wdJ+2nofBSvrVHO+iw== X-Google-Smtp-Source: APXvYqwXOpRyrJRaxycDqo5lcoFffK8qV2LBevtYXNlWx9dWxQbApOBFM5lpFhEgf0gvhEXlk0i5qg== X-Received: by 2002:a7b:cbcd:: with SMTP id n13mr29397712wmi.104.1576492261844; Mon, 16 Dec 2019 02:31:01 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:31:01 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:43 +0100 Message-Id: <20191216103052.35220-5-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 04/13] package: rely on systemctl preset-all for 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 Reviewed-by: Yann E.Morin \ $(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 b01eba96c8..16967aa8c0 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 ceab5d5c0b..9ea170ff6b 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 82e3c16daf..f76a974d65 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -120,9 +120,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 fded7fa943..87fdc45268 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 7ab656fd8b..f895b78779 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 15b3c4b95e..223a9eeaec 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 fc56bb5ee0..68afa17078 100644 --- a/package/openvmtools/openvmtools.mk +++ b/package/openvmtools/openvmtools.mk @@ -72,9 +72,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 326fbcc040..8a8613a3d1 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 858cd6975e..7d8bef643b 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 1729afe165..b85de1dfed 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 c5f3051aea..274079044c 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 46e5b27d35..cce84cfa88 100644 --- a/package/rpcbind/rpcbind.mk +++ b/package/rpcbind/rpcbind.mk @@ -27,9 +27,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/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/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 266c171170..1bd1ec51b5 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -30,11 +30,6 @@ 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 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 Mon Dec 16 10:30:44 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: 1210219 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="zAYCCSgq"; 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 47byHC6gt3z9sPn for ; Mon, 16 Dec 2019 21:31:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 25E1587D0E; Mon, 16 Dec 2019 10:31:17 +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 r9qWgX1UkFOi; Mon, 16 Dec 2019 10:31:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B39C787C14; Mon, 16 Dec 2019 10:31:13 +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 CC87E1BF2B5 for ; Mon, 16 Dec 2019 10:31:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C43FB85691 for ; Mon, 16 Dec 2019 10:31:06 +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 Z-qfCLMzFhYI for ; Mon, 16 Dec 2019 10:31:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 09002854DF for ; Mon, 16 Dec 2019 10:31:05 +0000 (UTC) Received: by mail-wm1-f51.google.com with SMTP id f129so6104015wmf.2 for ; Mon, 16 Dec 2019 02:31: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=P/Avnbm6Dhfc5zerx2kEfl235E7Fy9a1Y06IylrmBww=; b=zAYCCSgqcD4QRwPWVena7IL2EKDCdO1XJJNp2Yps0xuaC/KTJRIWo6xUYlDVaaJeGH Bo/aYHLA6XckeWELdYBYwqa/4awxMwdM1UdPIU+p3BfoTdj3c2D9u7QSk6G2seKmMBsA 6rJqBORH7m56C7COPu0VhObePX+kWs0wFjmekwR7/bsJpkPvggxMUP92INyeDxyOACLu InufMzzGshfN7Wwgy4D3nTcBatrdRRQm8uxn7vTuuw3bUvOGds7ApwhXHP2MArV665op sQ1UlHFhnkS6JPBPaeTt42CjLxmYDDO0J35btcUGVMVxTLFWwqOohikO7WVcuH+7r3K/ ZEYQ== 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=P/Avnbm6Dhfc5zerx2kEfl235E7Fy9a1Y06IylrmBww=; b=YA1LEwrLz2JY40bRlZYLsKQd2o28DAy/N3wAhogOTAkrzjhDUHxhw/8vK+aHF9sK0l OevdYhkW9cQzCURP4Ps885SSNy+hhX2jra3Zh5i6KHT814mRwvvAkdEew/ancX2CuFzx E3qW7AAW1be+llhaTJ5mvIxzTPlPlpa63ifPnhMiKgm8lbnvVi0ERS9TMkkcWr6uVnFf 8eabzFEL0kseY4qAbZ4a/jmyXfq0IVA+5pIug9revGPInMFmngKPVToj9VNezUwsogyF WEQBOUjAiLmT8g2hQJsCj+GHQcmEygmKwtJhfhCK6SYxirGNPSx2zD3JVMwqG+G/+d48 DrNA== X-Gm-Message-State: APjAAAUqg3WPryaP3CIguAkhRleEsUaWxByXOYS0CYGnqY22tbvVhOVJ ibL8wU8dX/y49OD11vQc0DgI4VQu6w== X-Google-Smtp-Source: APXvYqzOSKzSD8MquVYtoCcjwEYlGH0kuJSzmXc5sV1DVa4y2tfxkK6HEn5jYt8yAYf0HuuI4CP2hw== X-Received: by 2002:a1c:81c9:: with SMTP id c192mr29831140wmd.44.1576492262927; Mon, 16 Dec 2019 02:31:02 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.31.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:31:02 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:44 +0100 Message-Id: <20191216103052.35220-6-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 05/13] package: rely on systemctl preset-all for 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=?= , "Yann E . MORIN" 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 Reviewed-by: Yann E.MORIN --- package/audit/audit.mk | 4 ---- package/avahi/avahi.mk | 8 -------- package/bluez5_utils/bluez5_utils.mk | 8 -------- package/boinc/boinc.mk | 5 ----- package/docker-engine/docker-engine.mk | 3 --- package/fail2ban/fail2ban.mk | 3 --- package/gerbera/gerbera.mk | 6 ------ package/iputils/iputils.mk | 16 ---------------- 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/samba4/samba4.mk | 7 ------- 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 --- 22 files changed, 138 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 7c5202b717..8f9249454d 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/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 6a225ee5f0..c6a0442570 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -68,9 +68,6 @@ 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 endef define DOCKER_ENGINE_INSTALL_INIT_SYSV 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 2579b8f2e4..80026e8cf8 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/iputils/iputils.mk b/package/iputils/iputils.mk index daceb192f2..5b20d4f99e 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -62,11 +62,6 @@ ifeq ($(IPUTILS_NINFOD),n) IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false else IPUTILS_CONF_OPTS += -DBUILD_NINFOD=true -define IPUTILS_INSTALL_SERVICE_NINFOD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../lib/systemd/system/ninfod.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ninfod.service -endef endif ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) @@ -118,15 +113,4 @@ define IPUTILS_PERMISSIONS endef endif -define IPUTILS_INSTALL_SERVICE_RDISC - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../lib/systemd/system/rdisc.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rdisc.service -endef - -define IPUTILS_INSTALL_INIT_SYSTEMD - $(IPUTILS_INSTALL_SERVICE_NINFOD) - $(IPUTILS_INSTALL_SERVICE_RDISC) -endef - $(eval $(meson-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 d0ffffd1d6..2c3bd18d5e 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 0765ff97c1..797e30bd43 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 1f3972c413..be35ed4456 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -338,9 +338,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 1d535fc26b..c4446c210d 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/samba4/samba4.mk b/package/samba4/samba4.mk index 201328fe4b..bf9636f6e8 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -174,13 +174,6 @@ SAMBA4_DEPENDENCIES += systemd endif define SAMBA4_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/nmb.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nmb.service - ln -sf ../../../../usr/lib/systemd/system/smb.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/smb.service - ln -sf ../../../../usr/lib/systemd/system/winbind.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/winbind.service $(INSTALL) -D -m 644 $(@D)/packaging/systemd/samba.conf.tmp \ $(TARGET_DIR)/usr/lib/tmpfiles.d/samba.conf printf "d /var/log/samba 755 root root\n" >>$(TARGET_DIR)/usr/lib/tmpfiles.d/samba.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 Mon Dec 16 10:30:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsOpbXkgUk9TRU4=?= X-Patchwork-Id: 1210220 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="kjST8D84"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47byHD2PlXz9sP6 for ; Mon, 16 Dec 2019 21:31:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9B52B872AA; Mon, 16 Dec 2019 10:31:16 +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 q7x6wtIQMnGa; Mon, 16 Dec 2019 10:31:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 830A887034; Mon, 16 Dec 2019 10:31:11 +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 3E1341BF2B5 for ; Mon, 16 Dec 2019 10:31:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3714A86A70 for ; Mon, 16 Dec 2019 10:31: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 fcjQ-WiB7Hhw for ; Mon, 16 Dec 2019 10:31:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 73A7E8528B for ; Mon, 16 Dec 2019 10:31:05 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id c9so6565622wrw.8 for ; Mon, 16 Dec 2019 02:31: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=zgwvsat9zet+yO6g/UYANGnJzjThDXpckHvIIn5EjOg=; b=kjST8D84h+NmJ3meOlmy2PKV/cLxhOle/TheXJQ7J5774piv/lgdRpriXVgyBGZkQQ OSSC2wuWAtpD7coCkgBZNImKlk/YY5Gckz9TBGIl4KErsCaZLupg/qc7XX5Vq1A3XE1n dK8YNRgrnV+vUoei+vme8hfBZUiYrLPSmV3nIAccn+ek8XOpLvACBbjiNiANkmvQ+cgM jXsZBY0yFONz36V8e9kMpfP6+3zR3o7dwgKKyWZ5BxoXvSSS18nQFl0rwG3VyUM5D17H gFIylLoPnlJ7QgBHVJzzByqvlzZqUti2LwF9LbYKOLshMEQpkD6BPGhOmnh5L2h9tUTf qqbw== 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=zgwvsat9zet+yO6g/UYANGnJzjThDXpckHvIIn5EjOg=; b=Pgsfcso+ESFZus8yn9sjTlBaitzFaurjCxMqRW3ZDyP0mVCZdSwFFca+KtwqfnBGjh TbDOaeOlpRNVzmXMiOwihi3dhsG/GbRlxGjPNp8seGD3mNAa6Muop/u+JG5mWEX4LBx1 OoUmcX7RXZnhAWxbFx5k9E23pgo1hm4zvCWwgoF5TlYI0RxbOOq9N6IOQXz2zlvLv+tM +GbWJMjmy3isL9nbZL89AeyXuAGOTiicQBBE/shODQ8LjN++B1UqXdjgzwzjFK6U2YwC TpRti/2U16q2rIt+XUedn2jn1S9h13Ssr5ZlmKnq7koqun0td/VbtD12aEsz8db9kiyz OYDA== X-Gm-Message-State: APjAAAVC8NhG/GX1sVSrnsn6tsS8w1reSPPhJqb/cNWh878pLKnfbtlB 83M+wJP4MysnEjHHPnQaWF+xZFlfrg== X-Google-Smtp-Source: APXvYqw22Vnlty6kPWt108/Z/RtF7wCB/UaxQvkHfsqUcstKt9LBra9jYgoodW2Yp9lLn3ujrNdCgg== X-Received: by 2002:a5d:46d0:: with SMTP id g16mr30731546wrs.287.1576492263780; Mon, 16 Dec 2019 02:31:03 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.31.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:31:03 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:45 +0100 Message-Id: <20191216103052.35220-7-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 06/13] package/connman: adapt to systemctl 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=?= , "Yann E . MORIN" 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 Reviewed-by: Yann E.MORIN --- package/connman/connman.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 7ca49726dd..2cbf3fe752 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_LICENSE += , GPL-2.0+ (client) CONNMAN_CONF_OPTS += --enable-client From patchwork Mon Dec 16 10:30:46 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: 1210221 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="DBH2mhA8"; 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 47byHD5NsNz9sPK for ; Mon, 16 Dec 2019 21:31:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4144087C9A; Mon, 16 Dec 2019 10:31:19 +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 27kQDZieZVIJ; Mon, 16 Dec 2019 10:31:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 65B8C87CDA; Mon, 16 Dec 2019 10:31: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 1BC261BF2B5 for ; Mon, 16 Dec 2019 10:31:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 129AE854DF for ; Mon, 16 Dec 2019 10:31:07 +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 02I6hkg4ql8g for ; Mon, 16 Dec 2019 10:31:06 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id 5945085660 for ; Mon, 16 Dec 2019 10:31:06 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id a5so6137273wmb.0 for ; Mon, 16 Dec 2019 02:31: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=7JCZJKRt/63DVK7QULN14KD4j3GfrrBkyjKv09RsKRg=; b=DBH2mhA8Nk6Mt10cN3a1cDmZM8wr+XZRUu0ZjI6youMRnMl7fPLEf9TEbSqLSYbUhL fCVbDa0145gBLwqK7CFNpHqSuzjs1cMfAbnLCa+u00loydS7XedBhr6aoxvL4omHGN+7 rco6kOIJVOPfzU1nw6bgl6gaGZmJXu+UyoDcPbjYaBvj+35cdWcYOwKfK9/apSmJ2gPk nlqELoUK17KuNF0Ov75hUthKsCuprp4rhbG1JMhGbjUZNdj7utgJSyhMmhuLOXyvYtw2 FNIV2MgW7mtd4h8TBShkMKlEHfYDWNQWMeJq3UdBWsqPpm66iznedtx0n058vD8Jye02 CTQQ== 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=7JCZJKRt/63DVK7QULN14KD4j3GfrrBkyjKv09RsKRg=; b=sok1RrBQqlvMFIGEeRcdvRu76DdQvxnmx4MVuAUgTHYH4CG/bR5tJRB8imo3CzX+jc CKJzdE1kJTjIu2ponUA3G7SjLXRSwvrKRMviPS+N0pDCIlAE+EMFLQ50eDMQf6GrKaTe 0UR03QWxk0OiPEgVCtvDE+igaOEtdD9Uz85KcANom4JBtO4q7E+BQRK5gPuBNxLMg7jd +sjTSKKpS9DaX1YTZamQvzWtGdYtjKlRDG1LTS/NRjZ2LzxRg/HqQN/NPRixc8A5bZH7 LM8YAsjOXqDEPsBSxjU6EL924NXGXiyy/TAZ5ZT+cDTUqnmYOd32SmRqLGIa+YYoKLYG x9HQ== X-Gm-Message-State: APjAAAVn+ZRcTn9oT+jhSGqfcDqFwGyKPr+odmP5gRRpTPBx0ktudWTX Hj7pmIEZYRfYaFEhim/LdVOpJAAbqA== X-Google-Smtp-Source: APXvYqxHrDtKxhf0r9xVd27otQp9uCmteuMELpcrC0TJXAdpER5kn0a6u+Z1TSFgi0mhfViKT/mO+A== X-Received: by 2002:a05:600c:224d:: with SMTP id a13mr29415706wmm.70.1576492264669; Mon, 16 Dec 2019 02:31:04 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.31.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:31:04 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:46 +0100 Message-Id: <20191216103052.35220-8-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 07/13] package/linuxptp adapt to systemctl 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=?= , "Yann E . MORIN" 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, we now enable both The second has an incorrect (though harmless) WantedBy : there is an explicit Wants= in linuxptp.service Reviewed-by: Yann E.MORIN Signed-off-by: Jérémy Rosen --- package/linuxptp/linuxptp-system-clock.service | 1 - package/linuxptp/linuxptp.mk | 3 --- 2 files changed, 4 deletions(-) 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..97e4af7be7 100644 --- a/package/linuxptp/linuxptp.mk +++ b/package/linuxptp/linuxptp.mk @@ -42,9 +42,6 @@ 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 endef $(eval $(generic-package)) From patchwork Mon Dec 16 10:30:47 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: 1210225 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="B7E8OJon"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47byHL4d8cz9sRM for ; Mon, 16 Dec 2019 21:31:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2BF0A871C0; Mon, 16 Dec 2019 10:31:23 +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 FUT-Cv8dcM+a; Mon, 16 Dec 2019 10:31:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3B43786F92; Mon, 16 Dec 2019 10:31:22 +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 036D21BF2B5 for ; Mon, 16 Dec 2019 10:31:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ECF2286A70 for ; Mon, 16 Dec 2019 10:31: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 deXAXz7UDNNf for ; Mon, 16 Dec 2019 10:31:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 629FA8528B for ; Mon, 16 Dec 2019 10:31:07 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id d16so6564434wre.10 for ; Mon, 16 Dec 2019 02:31: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=hEyH/k/KNlzwmUHAXfDipzZRPK1ZUltq3SqS2M0npNE=; b=B7E8OJonMu4Bue5PK2GSu1UizaPPXWY2oMlzm0p+h/WlBT9u7Y5/prlp30P5+XcXRV CHknTuOsAn15LDW6hAS+qxhU9K03tv+s+wtkw3xABSp8kmW27l60tlKWD6M4HTafXe9G sjacWC4JvK+cC1PfcJTnaDmCHcn8FofbQGHEc2S/OL6CkxswMJcGSyZc5WCRzT9Yttuz H6o9K5rbh/823jpzn4AVIJ4midlCIVTQQryw7cL7h5J8jP+ZOtCLEqeEHguHlWmEFc4S a6O1JZBdnIaeSYNkfDQfrFUmnjRExK6gcT3LigGrl+mA/iaJhSYDpVpSmL9z2uqpJBaJ DV3g== 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=hEyH/k/KNlzwmUHAXfDipzZRPK1ZUltq3SqS2M0npNE=; b=lbkkUn0VkaboKXJviRnrT98iDPg4cJ2bK1kG72M2KFZ+xvhQ9SQWhkQ2jqAbRodTEl BNHRiNRSEd/DOHDM2P+Da4zggbQabDbGxf0XbH3JtzWmXLoPM+fpUWzqpSxGkWuyD9d+ gRekJTwEgUHfyrrsNGzzf3hL/Z5809JpB6jBurf8MCpsFKnGNMjgUvcGODdFn83AAmTZ 1cK0NDLRwwuK7zUgRfT6uCn86mR6LSRVkRg5wKlRcpFyEC8gzM2HJxh1yQ+algz1Jv5o FBvvcwdS5D1jkWTKur6EbBYWBKcM17QTo+RgIKobnQ7PokES0toorRfCqQlzMAD8mDTu M/RQ== X-Gm-Message-State: APjAAAVoZgyEDEA20vZD/oAjkMAXMFVBhHSi1fRkrzNw+1EeNZymCv8X fF0DuLRvwRbGzK5fXHiGAaU5uZF/ng== X-Google-Smtp-Source: APXvYqwdCQ3LjwKxLrWqFKTc0YXV33p/FqOgN/RA9R9MOy+wxkvAI2FM4V9/ORtH3aWJwwVxK9mphQ== X-Received: by 2002:a5d:51c1:: with SMTP id n1mr29057543wrv.335.1576492265624; Mon, 16 Dec 2019 02:31:05 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.31.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:31:05 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:47 +0100 Message-Id: <20191216103052.35220-9-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 08/13] package/network-manager: adapt to systemctl 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=?= , "Yann E . MORIN" 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 Reviewed-by: Yann E.MORIN 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 7de2c220fe..56b768cdef 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 Mon Dec 16 10:30:48 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: 1210222 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="OBIhfWo1"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47byHF47n3z9sPn for ; Mon, 16 Dec 2019 21:31:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7BCFA872E9; Mon, 16 Dec 2019 10:31:18 +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 8j7-79x8HbgR; Mon, 16 Dec 2019 10:31:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3737387034; Mon, 16 Dec 2019 10:31:17 +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 C00381BF2B5 for ; Mon, 16 Dec 2019 10:31:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BD60E85691 for ; Mon, 16 Dec 2019 10:31: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 1YXM2nCIBMxL for ; Mon, 16 Dec 2019 10:31:08 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id 5FFF4854DF for ; Mon, 16 Dec 2019 10:31:08 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id a5so6137375wmb.0 for ; Mon, 16 Dec 2019 02:31: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=J6ZgI55WXsG3imVQiL7wnCsryzNiHbVHzxMvNjHmyyc=; b=OBIhfWo1Li4PlrsJ7OBMCBniRkfeExC40OY0bLJ6AI97YBNKw3pHjWHriYZy1oy4lb E/DqJmo5MbiOko9HZ/M3J3aDmgyyYL0GZiavxst/Ww05xDU4LrCGThK2/lsdtk3V2+jy E/pNUfGMJDKDBn1EW64p06QsSeWtWvI4rTDmT9pbyORbfve2uzLaRvaOHdIUTyAZcgci XKTUu6nVLbNoex2BAdO5/+aU93RnVmtc8SY9vz/qPyIQKInd3AY5ZX/IKNJ1o37nh9zu 0Ns3iT08ctyd0XqiVHgfO9mAw/AP7bRwF0m+IWUtBXUNaTL5QDPZvntu1i1hRcK4BSuK Qv2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J6ZgI55WXsG3imVQiL7wnCsryzNiHbVHzxMvNjHmyyc=; b=CmfbdezDcsY6Zog5I2d87PW8eB/hP6ffedbzwmg7TX1S7s0hmUhqGEJRy0khbRosdX w6ufcpOAXRKRc/PfHbrf2r32rnWEzvBvIqLpjSQdhMw+jpTCLLvP5zTQz5QbeLcCzBvT FWXE/NINxmEHjAjPrYjjmZJx3k2uK5ueZ3Np2+dPAZvoklo+KhwlzzSdnghnHGzdeWyF UXr6R3wTMvOjn/yxtwfB0tanP3aIA17A//Q4Hw2enpYlEKf5vYfr/AnLM9WZAD+c18hy BVa2UMITNRFF3c78LJhL5qoiJobtTU2U+WxR68TZhBsaEuyrSej2nVG7/8CmT/EQH5Bg eJpQ== X-Gm-Message-State: APjAAAX3mIvYflpfwkudWxRzuCIOlUSW6bHCcveQZFLM8xYSjCokGWOZ RCgwxt369gNAnyZPK3P95JxvJ4CwCA== X-Google-Smtp-Source: APXvYqyrKb5UA6+0GjlNoyzCCTxMFcnKBoSClMi9AbqkcWsYVDYkbB2vkJaWVc4UHAJPsN9rWABAXA== X-Received: by 2002:a05:600c:298:: with SMTP id 24mr8168212wmk.141.1576492266629; Mon, 16 Dec 2019 02:31:06 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.31.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:31:06 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:48 +0100 Message-Id: <20191216103052.35220-10-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 09/13] package/wpa_supplicant: adapt to systemctl preset-all X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" all services were installed but not enabled. This change enables the non-templated service but disables the templated ones Enabling the templates creates weird links which are probably an upstream bug. Signed-off-by: Jérémy Rosen --- package/wpa_supplicant/50-wpa_supplicant.preset | 4 ++++ package/wpa_supplicant/wpa_supplicant.mk | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 package/wpa_supplicant/50-wpa_supplicant.preset diff --git a/package/wpa_supplicant/50-wpa_supplicant.preset b/package/wpa_supplicant/50-wpa_supplicant.preset new file mode 100644 index 0000000000..9af8562c0e --- /dev/null +++ b/package/wpa_supplicant/50-wpa_supplicant.preset @@ -0,0 +1,4 @@ +disable wpa_supplicant@.service +disable wpa_supplicant-nl80211@.service +disable wpa_supplicant-wired@.service + diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 9dcebca9bf..4f95ea6276 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -227,6 +227,8 @@ define WPA_SUPPLICANT_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-nl80211@.service $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant-wired@.service \ $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-wired@.service + $(INSTALL) -D -m 644 $(WPA_SUPPLICANT_PKGDIR)/50-wpa_supplicant.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-wpa_supplicant.preset endef $(eval $(generic-package)) From patchwork Mon Dec 16 10:30:49 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: 1210223 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="uyqOriPq"; 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 47byHJ318Rz9sPK for ; Mon, 16 Dec 2019 21:31:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 28A7720531; Mon, 16 Dec 2019 10:31: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 D3qW2-gyBoh5; Mon, 16 Dec 2019 10:31:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2D61E204CC; Mon, 16 Dec 2019 10:31:20 +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 ED94B1BF2B5 for ; Mon, 16 Dec 2019 10:31:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EA897854DF for ; Mon, 16 Dec 2019 10:31: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 BVN3t1aP2XM5 for ; Mon, 16 Dec 2019 10:31:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 33B0785660 for ; Mon, 16 Dec 2019 10:31:09 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id y17so6583151wrh.5 for ; Mon, 16 Dec 2019 02:31: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=njCzRZ/SZcXc8U/BngRULODv9CsUMF3HTnshXRsatO8=; b=uyqOriPqe9AF5f9qFQr/zXYfG0nQsiLMjRaJj3t459VGA34RGgSNIW+2Z6qCMiyr2m lBJoosrQT0FYJqL0P+lc+m2jOzDtuRAYH4nsz3RPTKFOASHhKBVTqQM1E/AzCoFweyhw xw4nevNC/9s0PgKWYA56AcAiZRJxd377pvzea0xLEyRu8/fAcCREb26/cBq9jyuMrAd2 ag8mZpvhqMhCgYfidP3RSFv50mhBU5vh/HPvWoBr+cNvrynAlIvSY8zrkkUoNoat0rnK EoJtoPRfRak/Sa1VRXxD4FDCj3Z7IaA+7jvSAJ8XNwHVCrsW3GjkkrBlMOjD5NekemK8 xa7A== 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=njCzRZ/SZcXc8U/BngRULODv9CsUMF3HTnshXRsatO8=; b=Rch+MlP0xmsQz4WJ0l2FokeiF6dJc1HS2UoICEuZGK63oMtZqJCQ0dRjAULJNPYrkT p/CqaMc4zJ95avpU3jyxL9Kmi9eg74faCEVdCLnuGz1AaDxDOKmT7qhT7YHBDthONY6j eYehE3/NvfbgGaVv6veFFbJ3wxXCISkUhdlZIdyEneqvG+qLc8BSS+MKotYjn9RyXYl8 CITK5+SWUqgew5/M+pnK766fodKyosiuj6/VHYeg8yHhoaV5IlXOwSBm/KZB4Efw1OKO J3ILdgmf+0m2G0CH902EJ7hcHt0TNX6CqUJzsVA1YTaHLBiDsG6q1YomHb/lfUjvBeep Ntxw== X-Gm-Message-State: APjAAAVirMx/F/c3KOPQ3wx4zW3WclISBq7BAGwbKEQjJs7WAlVRRvJ4 dNo6LC83+f2Vi6HGX3mK0Hcv9k1ZuA== X-Google-Smtp-Source: APXvYqw0rI9RrAOO97weALNOX2c0BtmJG3CiyFqaLmdiUQnPTie7cJepciofa25xf3IL6TGiB9/6CA== X-Received: by 2002:adf:fe4d:: with SMTP id m13mr26897516wrs.179.1576492267427; Mon, 16 Dec 2019 02:31:07 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.31.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:31:06 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:49 +0100 Message-Id: <20191216103052.35220-11-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 10/13] package/sysrepo: adapt to systemctl 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" sysrepo provides it's own services so just remove the section Also fix sysrepo not installing the files in the correct directory Signed-off-by: Jérémy Rosen --- package/sysrepo/sysrepo.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 216e517526..f693ff70da 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -24,7 +24,7 @@ SYSREPO_CONF_OPTS = \ -DCALL_SYSREPOCFG_BIN=$(HOST_DIR)/bin/sysrepocfg \ -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) \ $(if $(BR2_INIT_SYSTEMD),-DWITH_SYSTEMD=ON) \ - $(if $(BR2_INIT_SYSTEMD),-DSYSTEMD_UNIT_DIR=usr/lib/systemd/system) + $(if $(BR2_INIT_SYSTEMD),-DSYSTEMD_UNIT_DIR=/usr/lib/systemd/system) # On ARM, this is needed to prevent unaligned memory access with an optimized # build .. https://github.com/sysrepo/sysrepo/issues/947 @@ -41,14 +41,6 @@ define SYSREPO_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S51sysrepo-plugind endef -define SYSREPO_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/sysrepod.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/sysrepo-plugind.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants -endef - HOST_SYSREPO_CONF_OPTS = \ -DGEN_PYTHON2_TESTS=OFF \ -DENABLE_TESTS=OFF \ From patchwork Mon Dec 16 10:30:50 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: 1210226 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="bPqVzG46"; 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 47byHP4GWKz9sRc for ; Mon, 16 Dec 2019 21:31:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A8BAD87C11; Mon, 16 Dec 2019 10:31:27 +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 2LWyjTXe1KPP; Mon, 16 Dec 2019 10:31:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1821D87C20; Mon, 16 Dec 2019 10:31:27 +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 C0A8A1BF2B5 for ; Mon, 16 Dec 2019 10:31:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B535A86FA6 for ; Mon, 16 Dec 2019 10:31:14 +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 aYQhpVJhfPZe for ; Mon, 16 Dec 2019 10:31:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2AE578704C for ; Mon, 16 Dec 2019 10:31:10 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id b6so6607022wrq.0 for ; Mon, 16 Dec 2019 02:31: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=RfGdAcXQUhDOr7OvrvxKM74ftVgLRA7XDl4kAJw5c3k=; b=bPqVzG46Z3q6Ht62a+zK2x7fchuaCiEHfmTxd+9+pP11GM0ra3BB7ruSCCB96PgBVV nb3RB6/bhOIBOA2a7PRZmIA2eXrBu7igTpM7EIqLtrspfSaz9CIWj/fny5vZWGPNwgXP YHuxJf0s42rFHRfqniDLofPPbtvzH9G6fFsjKvLXYZGKtZsL/2q4RriEHfXHZsudIOqS mO9O59yMam3nNK1raxNn5LppB5A+FPwzNdtweoUrAOwMBCzo38aDwDBL0ZewbVvhQI5p b5M8qB0FELkC1NiI/FJx4JIsA4ANCaQ0hffyh/Y+/1HBYmE+XQq9sAXwldvMG4t7nfrm 0HhQ== 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=RfGdAcXQUhDOr7OvrvxKM74ftVgLRA7XDl4kAJw5c3k=; b=YGdpVmQRpqZSlQKDzPp2iDMt6iZf8aDbiE2CAxbxMYPxW6X4kwdmuCEeWLMRslFMkT /TgsORDmc+yWsJMWi+0/JvKBcz26l6AS8Xg/9ac0MXC7wdR8zXBBBnmXdebbzv/C4gNO TbAmK54ttFGERaLmC28fanIws25b4VuW495ad0Kr4qtJwYaBZmQp6QL8reMAzhPuI+dl A9zQFoDL1HJtq6VH06KiBXHGv1vCsp8uSvxuSSBfz/OkIEE8ISbzFQ2HxySxzhmQtwBc MXFFXCulqEp+i7A+GVcBVDULHcINoAVr7FlCwWdvQvyeDaysfhs7RIwbhAhBqNdDtVh9 HGHA== X-Gm-Message-State: APjAAAVaJlMIHrsf+85XO47syb8dJW75vv76oCmPyQAHTcLXc42yhcIp ax7fklTxe/i2moCW6E7+cKc61aqPSg== X-Google-Smtp-Source: APXvYqxtiMz2TinTpyBl8pPbORpYs/UmXL3tJTkkXUD3tEqFW1+0kPbNB5oo0XIIWOh9yOP/5AH5Gw== X-Received: by 2002:a5d:514a:: with SMTP id u10mr28660542wrt.169.1576492268447; Mon, 16 Dec 2019 02:31:08 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.31.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:31:07 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:50 +0100 Message-Id: <20191216103052.35220-12-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 11/13] package/syslog-ng: implement systemd enablement using DefaultInstance 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" Instead of using a manual symlink we use add a DefaultInstance= to the config file This is how upstream wants us to do it and allows systemctl preset to correctly restore it if needed Signed-off-by: Jérémy Rosen --- package/syslog-ng/syslog-ng.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index fc44777d16..98b5a38deb 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -105,11 +105,8 @@ endef # By default syslog-ng installs a .service that requires a config file at # /etc/default, so provide one with the default values. define SYSLOG_NG_INSTALL_INIT_SYSTEMD - $(INSTALL) -m 0644 -D package/syslog-ng/syslog-ng@default \ - $(TARGET_DIR)/etc/default/syslog-ng@default - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/syslog-ng@.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/syslog-ng@default.service + mkdir $(TARGET_DIR)/usr/lib/systemd/system/syslog-ng@.service.d;\ + printf '[Install]\nDefaultInstance=default\n' > $(TARGET_DIR)/usr/lib/systemd/system/syslog-ng@.service.d/buildroot-default-instance.conf; endef # By default syslog-ng installs a number of sample configuration From patchwork Mon Dec 16 10:30:51 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: 1210224 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="qWWxhLLs"; 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 47byHL1hXkz9sQp for ; Mon, 16 Dec 2019 21:31:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 90236204CC; Mon, 16 Dec 2019 10:31:24 +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 ylqKvIAjiySx; Mon, 16 Dec 2019 10:31:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 80FDF204DC; Mon, 16 Dec 2019 10:31: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 B6B5A1BF2B5 for ; Mon, 16 Dec 2019 10:31:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id ACAEB204CF for ; Mon, 16 Dec 2019 10:31:11 +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 rAgW2uvoXjmk for ; Mon, 16 Dec 2019 10:31:11 +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 silver.osuosl.org (Postfix) with ESMTPS id D7E82204E0 for ; Mon, 16 Dec 2019 10:31:10 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id p17so6095216wma.1 for ; Mon, 16 Dec 2019 02:31: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=scJraqTDMH1hgx0cOkXdanlWCfHuTwp65WJdKVDDx0M=; b=qWWxhLLsxYmsEgTiXWFedRPyh9gFeJdBKXjivqTAlNYFbr1vgLnBRC9O3XKT5zkcvc bHDGKmr6iunzPjuD6DoOWMYE6Z8HFWOF8U53MFOX0O+L2OJ3/5CLpSeyp9TR6DbJNzzK j3MZ86/JMRorSmn9knrKQG/2/E9kAa+Vbc+sGF2tgT3nPVO/uduj++Cdnah8p7XtiRzc /6XUG6ptpU0TjwSwM4X95b6LBGdYC65PL938R5fTtNeuVCQLGCk/uGiTFOOWrnHloKHO jUiKYoEJ7iG/Bdzams6+15RVWTnG1I9MW+jvAviW2omC/8+IB8E9MoF6u1IERJO1bL4k QwBA== 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=scJraqTDMH1hgx0cOkXdanlWCfHuTwp65WJdKVDDx0M=; b=orFUjlip8WEwnC+pgnZw7G9mAvybs1CiYn4n9T2hned7W3al7QcueFIbIbgJfHeqrl Fvax5cDlGXMlHU5auZxIyiSZlLeLAIivMEpuTbHusALZOO5AAwB3PTcry3Z0M2mAVOEI 5mOp00NuevREupiecJcRHb0x8R6HUaBoDvTzE9u12411srwLpI7Bh/uYpLouBeJi+/L1 +lLrCPh16rbFl2vD+GdCuGU+ZibgMNawjV8B1J2tkbuR5UxO+984tAkvyEOGeY5CbKY6 5tAZIa1jTdwl/UQzOzVJKRmtfWWG4GnSfIT9L38HUHxELmGTqFfQ12Y6yoof0PCCgRnZ hB8g== X-Gm-Message-State: APjAAAV+i5O4JOIW6RVlOe4xwNOEkdanoHmc2moz++6inw6shIGgoYEQ 7kUfyBa8Mm+5V3O070hH6yLOHyB43w== X-Google-Smtp-Source: APXvYqx/vk66mFpUsWZ826LYYO60QBlOWCSn87xxvaLL0c7wZSW0PpNROko15b4sg4+FrgSgrQEGsQ== X-Received: by 2002:a7b:c246:: with SMTP id b6mr29051388wmj.75.1576492269213; Mon, 16 Dec 2019 02:31:09 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.31.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:31:08 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:51 +0100 Message-Id: <20191216103052.35220-13-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 12/13] package/rauc: add a WantedBy section to the systemd unit file 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" upstream-provided service has no WantedBy, which means that rauc won't be enabled by default Add a WantedBy instead of manually creating the symlink so the user can enable/disable the unit properly Signed-off-by: Jérémy Rosen --- package/rauc/rauc.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index f3434e9c9a..7b35154f56 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -31,9 +31,8 @@ RAUC_DEPENDENCIES += systemd endif define RAUC_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../lib/systemd/system/rauc.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rauc.service + mkdir $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d;\ + printf '[Install]\nWantedBy=multi-user.target\n' > $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf; endef HOST_RAUC_DEPENDENCIES = \ From patchwork Mon Dec 16 10:30:52 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: 1210228 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="u5TdP+B9"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47byHR1J66z9sRM for ; Mon, 16 Dec 2019 21:31:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0F9CC87590; Mon, 16 Dec 2019 10:31:26 +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 UXiOI8CXxnk3; Mon, 16 Dec 2019 10:31:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3E4F28756D; Mon, 16 Dec 2019 10:31:25 +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 7B94A1BF2B5 for ; Mon, 16 Dec 2019 10:31:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7624185660 for ; Mon, 16 Dec 2019 10:31:12 +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 omilTUaTfP98 for ; Mon, 16 Dec 2019 10:31:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id BCF32854DF for ; Mon, 16 Dec 2019 10:31:11 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id y11so6568171wrt.6 for ; Mon, 16 Dec 2019 02:31: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=SrtXBZh+z3iD7Jdf6POmYqXTbfq6MsoLeo6TonmDRlg=; b=u5TdP+B98fd4JjPGeFyOJqBF/nH+7pBq7sHqaKLdMVSQ3klYHTp1nSYkClZrexy+5z Wyskvbyn3t3b1ril6lBCJQIF7l7iJGUlkojq/QtOXtyUwjlH/jfEOxs9/4YUp5HAppPy TplpA+nUHUNc7e6g4q2AV/Vz7e+fCqGgK/KYEnipTUPsFlBvDGi3lZId96p7OoT7/T9P TdRFSl9gWBhfT7syI5Q8k4/dNHsUvarcV+ABKWXLwIxeoETCsnxqTChghsxEWk6SskIM Y0UMBpCBm7+m4StChe9B6flH6ZkmA1RcLGMrqQtzxL/lrQlK2SvNpt5Gtg64/HqnpaiE psIA== 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=SrtXBZh+z3iD7Jdf6POmYqXTbfq6MsoLeo6TonmDRlg=; b=CEMvkTD+F+4FP/MZgQJmo6NcsTy6clwfRqSlu8u1bJdnbsG+pmj4AYx+dCinTngxz/ auglnVvGMiBcBZ91+vFhyAhVhjE9yl/0AXvVQsmRjhIoL2wVDJe+OoG2A628XkAxcG0Q GWejRgzowVrk/DSnM1TqJ6wONzu06Mr0srfmZm1yk0/fLKc7nZCj13lJHbnX/nAjvmq7 BqAlCXjpu8Ab1MZVvCnd+VJZC6Ebt36c7w/qi5h1kyjP36RIoV6ImR2Gw9LhxpobYaHX 8FzQL3XP8TNG89LMTGekPKMUMJvv1TqAgUNMqj1gmr5SBHhDVR2575PrDlKbrzcIezyI l5kQ== X-Gm-Message-State: APjAAAXH7XJTOmCGjS2tA51vEHGkpSjdWzXWTLwOra/j7/kBCAQzktfM 5C57qcULVVYBwOgQ6PU0wLSDs/MZ6g== X-Google-Smtp-Source: APXvYqwl1UxxglPwP1FC03K21OvDxj7rRSQxG5uVdcy/hFpoErrdjn5jn6ZDlQQ/Hg7ZB7AubYmUIQ== X-Received: by 2002:a05:6000:12c9:: with SMTP id l9mr30887988wrx.304.1576492270130; Mon, 16 Dec 2019 02:31:10 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:4f5:d4c0:c24e:c904:189d:5967]) by smtp.googlemail.com with ESMTPSA id h8sm22313643wrx.63.2019.12.16.02.31.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 02:31:09 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Mon, 16 Dec 2019 11:30:52 +0100 Message-Id: <20191216103052.35220-14-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191216103052.35220-1-jeremy.rosen@smile.fr> References: <20191216103052.35220-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v5 13/13] package/alsa-utils: add a WantedBy section to the systemd unit file 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" This allows the user to enable/disable manually the unit. It is enabled by default Signed-off-by: Jérémy Rosen --- package/alsa-utils/alsa-utils.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 52022e32ab..84f6db3784 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -90,11 +90,10 @@ define ALSA_UTILS_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service $(INSTALL) -D -m 0644 $(@D)/alsactl/alsa-state.service \ $(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/sound.target.wants - ln -sf ../../../../lib/systemd/system/alsa-restore.service \ - $(TARGET_DIR)/etc/systemd/system/sound.target.wants/alsa-restore.service - ln -sf ../../../../lib/systemd/system/alsa-state.service \ - $(TARGET_DIR)/etc/systemd/system/sound.target.wants/alsa-state.service + mkdir $(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service.d;\ + printf '[Install]\nWantedBy=multi-user.target\n' > $(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service.d/buildroot-enable.conf;\ + mkdir $(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service.d;\ + printf '[Install]\nWantedBy=multi-user.target\n' > $(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service.d/buildroot-enable.conf; endef endif