From patchwork Thu Dec 12 07:53: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: 1208191 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="zN85VsRI"; 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 47YQzv0ttTz9sPc for ; Thu, 12 Dec 2019 18:54:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 716E688728; Thu, 12 Dec 2019 07:54:16 +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 w+BM5Cw+2+VD; Thu, 12 Dec 2019 07:54:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3B36C8871F; Thu, 12 Dec 2019 07:54:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B9AE21BF293 for ; Thu, 12 Dec 2019 07:54:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B670E88164 for ; Thu, 12 Dec 2019 07:54:07 +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 TLdolSk2hvL7 for ; Thu, 12 Dec 2019 07:54:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by whitealder.osuosl.org (Postfix) with ESMTPS id 45A2987EB8 for ; Thu, 12 Dec 2019 07:54:06 +0000 (UTC) Received: by mail-wr1-f44.google.com with SMTP id b6so1642217wrq.0 for ; Wed, 11 Dec 2019 23:54: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=V5zlF2V9p8MIloKU0My4U7T1kKKQigYsYx3L4PD3Ab8=; b=zN85VsRIWZtbZw2/qLBof5bDFj7/8gdE4Y6GWpnfJQ9ub1hXAm2s+X+3Aiyt5WKhAE y4WIrHC5NxgeTB9G1KCptWYbs0zOZBOOSy2qpR600GZU4nKOV+rbaudR1kbGH3C4F9Jr 043vfdTvOuY+68xPin/zKa6qEax3ESuMfj52/g8Vg4b+ci5DVZBqqXPP4Xn9HvFEYG9x s4vwpImxsUWVjGEYA7u5HIj12kvam3yQuChbeNkv3/ctAX9U7f3nBgV9tb1BMu54eaSl EV57xTQwQuLKwL6VuOYewRZsugTzyMloTuUTjimdRhSqIZOyK52gPMWkAs2vtq6aJofw obhQ== 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=V5zlF2V9p8MIloKU0My4U7T1kKKQigYsYx3L4PD3Ab8=; b=fLylWEufUn/SCBB1RyVapkihyP4/vJEuEoN7lo2RzPAk+jCUsGsfGxThttKPdXj2G5 +wNyJxqGf1YMHd3OYT2W0NhmJs9zXU0TZons80CfsZTSshlLulA5K49scQ0XDn27LZNr lYxcVatewk8rz8n0Yx5QhqhMtBjogVoq500fmZvjcaif3C4aprpenOlmGcahrFByK74q as3xuawH9afP7Qpa53/ayx+zNftUTzsRnAdN+zXUse5shC42VB2nU+H6Txjrf8JM17IX waRoyTEn423xas6PyHDQvsmM2CzwqlwmH7c1jEpNql/RG13FyTj3jg7rcZYs8xpNZ0UT k4ew== X-Gm-Message-State: APjAAAVCUqUKXm41/9GTpCrf7JJU5SS1Yn6etP4osDYehsOCF0kfeJvc e0lHHLQWq+VHJz2J5XkZrX5xAAcAaA== X-Google-Smtp-Source: APXvYqy+7QGoId2hZvE0OBucinYuNohCJxn8BSCca5lkdBVamKXezyDs79cXqkV2ZoinPsFDF4j7yw== X-Received: by 2002:adf:f8c4:: with SMTP id f4mr4479230wrq.243.1576137244231; Wed, 11 Dec 2019 23:54:04 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id y20sm4909753wmi.25.2019.12.11.23.54.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:03 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:48 +0100 Message-Id: <20191212075400.1499536-2-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 01/13] new recipe : host-systemd X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add the infrastructure to build the host version of systemd * disable all optional features, they can be re-added when needed * systemd has creative way of dealing with cross compile we build a "normal" host systemd, but install it in $HOST_DIR we use systemctl --root to correctly act on TARGET_DIR * we need to adjust RPATH using patchelf because meson can't do it correctly by itsel Signed-off-by: Jérémy Rosen --- package/Config.in.host | 1 + package/systemd/Config.in | 1 - package/systemd/Config.in.host | 3 ++ package/systemd/systemd.mk | 98 ++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 1 deletion(-) 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 b/package/systemd/Config.in index 8f1d6fc0c0..81761b33a4 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -199,7 +199,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/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..ad16b58ceb 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -204,6 +204,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 @@ -551,3 +556,96 @@ SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV) $(eval $(meson-package)) + +# +# 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 rpatch is thus lost. +# * the original path had been tweaked by buildroot vial LD_FLAGS to add $(HOST_DIR)/lib +# * thus re-tweak rpath after the installation for all binaries that need it +#buildroot detects incorrect RPATH, so adding new binaries should be safe (it won't compile +#unless properly integrated). +HOST_SYSTEMD_HOST_TOOLS = \ + systemd-analyze systemd-mount systemctl 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)) From patchwork Thu Dec 12 07:53: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: 1208190 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="0nZX1gmT"; 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 47YQzq6NH0z9sNH for ; Thu, 12 Dec 2019 18:54:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 309F186F23; Thu, 12 Dec 2019 07:54:14 +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 RaPvz9LoOWip; Thu, 12 Dec 2019 07:54:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D3CFB86F13; Thu, 12 Dec 2019 07:54: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 30F2D1BF293 for ; Thu, 12 Dec 2019 07:54:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2DEFF87EB8 for ; Thu, 12 Dec 2019 07:54:08 +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 8bKssn5gMw+E for ; Thu, 12 Dec 2019 07:54:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by whitealder.osuosl.org (Postfix) with ESMTPS id D00D988000 for ; Thu, 12 Dec 2019 07:54:06 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id p17so1349408wmb.0 for ; Wed, 11 Dec 2019 23:54: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=PmNjxbfY3bIj76uUkWV2koQd5lNRMe/xutI1Brw0sqE=; b=0nZX1gmTlVDIhIyL2NiK77+CbKk+PpbjOehd/TVq8lLydR4y96U8LUBS6eB8vwdy/Q FwVHJ1QY/QY8seXL4OdZ2sQuQwS2QskgUlkjIkd7LIImB5binc/qAIukcwD78+NxAo1B tHj9OUQXPo9HBFobD9a/X4pJ+58/IVhOBq4KTrwkhIPls1uo+NgxD9jJSymx21aZ39fE InIFlwiCuuFVlOPSe/fq/T4Fq0kaGlot7EPQ8yDXrU637OJ4ZjI/7eX5NjzimFilcLtL mFqTDefFvkiPA5kK4MBu0/15kewuKrOkypvQghNR4GYW6atwzp0fPryWPHj7RGtFJfDJ DvsQ== 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=PmNjxbfY3bIj76uUkWV2koQd5lNRMe/xutI1Brw0sqE=; b=E4oYGwZ0b8e2nUrJ/wZ8/VrsVRe8hrcmaH7cX9Mo8lqfWsnuhScrbH3wBhyC9HWDTP Cm0Zquxl5Ed4jLgAO1S3GNoD9hJJ+dJmWybHQqUto3tivS0Pak3FmzDTf+FraEbdbu/c UbxuvHewqYnTYxo337Ep6XEgK2LaWXwKvWLtjYEZh7xUUEpagZKC5Vy9DwbcPQP/3Mz0 EF2ACYoKd46ZGfMOnqVIoD2yeczX22+NzfP4yjg/ZB3p3oIAMFG6oa2q0Ie6dgZ+uRDW qENdE8tmRI3EQtPFkH0XN3HbO53f5KS8K1CyjFWSQnSQv3o9HerdauMs8kerXfDx5uKi eW0A== X-Gm-Message-State: APjAAAV8Egs+Kg33vVH2bNySiiGBmkDjMpuo9NiFm2BbxPDXVs870jp3 mXprxJt708qo2M4cnWa34V4Nvt1CEg== X-Google-Smtp-Source: APXvYqw5sliqtJyC6FqWbucPPjDPX/d3sQYon6xnpQM6gsYay3iWyIYotrczOdazzA1kmcqQbbPgug== X-Received: by 2002:a1c:a9c6:: with SMTP id s189mr4912526wme.151.1576137244884; Wed, 11 Dec 2019 23:54:04 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id y20sm4909753wmi.25.2019.12.11.23.54.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:04 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:49 +0100 Message-Id: <20191212075400.1499536-3-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 02/13] 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 Signed-off-by:Jérémy Rosen --- docs/manual/adding-packages-generic.txt | 4 + package/systemd/80-buildroot.preset | 5 ++ package/systemd/Config.in | 1 + package/systemd/systemd.mk | 103 +++--------------------- 4 files changed, 22 insertions(+), 91 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 81761b33a4..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 diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index ad16b58ceb..ca3fc7121f 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 @@ -275,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 @@ -323,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 @@ -342,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 @@ -379,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 @@ -393,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 @@ -452,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 @@ -471,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 @@ -497,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 @@ -528,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 Thu Dec 12 07:53: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: 1208189 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="FHJu+yws"; 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 47YQzr4vJ0z9sPf for ; Thu, 12 Dec 2019 18:54:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 001EC23C58; Thu, 12 Dec 2019 07:54:15 +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 92-AT5SAnDZb; Thu, 12 Dec 2019 07:54:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id CE50E23DB4; Thu, 12 Dec 2019 07:54:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id EE2FD1BF293 for ; Thu, 12 Dec 2019 07:54:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E8316886B1 for ; Thu, 12 Dec 2019 07:54:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fLsvIGA6Kc1k for ; Thu, 12 Dec 2019 07:54:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by hemlock.osuosl.org (Postfix) with ESMTPS id 83B9D88699 for ; Thu, 12 Dec 2019 07:54:07 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id c14so1590934wrn.7 for ; Wed, 11 Dec 2019 23:54: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=3FIUsI4ciUFYthTbSaJfMcf+91x7YYdtPADkyRVEANA=; b=FHJu+ywsLwoR9l2ek3sZxMBfSoqkwD/UeI4L9jwx4I0VsecC+1BxYXAR4+khbTpsvu xOtbGn6ULDSjb92Sbq7sgOe7FAVByCLHIxVaaXNic6fSAh5ee8hZoHi/FtQbUMoYxYgp 74AMHS36jXEP4801D2U5E+CexQxYavbVrV9z2+nXUQ1I8JXu2azsLTM5USKZyq45YqKe 7qjKqgSYs8T7eJ+SnKF68337OxWIcGembafTcWepxtBbiKYKFDgOEOBspnWzVdKqjYln mc5BunSDYWx4e+qx7/flGgZY6ips6zlKsYGSc4c/3PUsnwRatQLWbsetvM2INvNwZGW5 WbTQ== 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=3FIUsI4ciUFYthTbSaJfMcf+91x7YYdtPADkyRVEANA=; b=DCEXp2GTjOYbnqqhSM6Ozm56U6xNbO7YyR1DNgQ2l4MT3YDBTWn5g7WRbhADGAscfg /4tsxZhr/8rIMZ/Qc1c31l3tuq15y2ekS+NL5Wt1LFLBEQk6kjDLTV3vhhULwoUVS4Iv aXilNJUbmq+FA0KiM4JSGbgBZ457v8E6DpHPBmpIV6lTE+YJp4V7OR057iL088F79K3S jkSbHCNZHeL9/EGr+GZU4NUEyLdRv8NJNXQGlRAmCRLI04eZCmGiA3z3oMrHyX8nMqHy LyAnRSsGtR8LtD4rDhyTBKV0FmczzG8ue/0agE9fvrl29vl6gyJHeL8FuiqMm9W2vakZ vRNA== X-Gm-Message-State: APjAAAVvznTkRvaMZ+H1PByvhXzrnUXyMIisZ0C45Y3PLXfH+1srJeKT xE9EjZM9iSF8TWrBR/Ku0cSUkwxI2Q== X-Google-Smtp-Source: APXvYqxVfXkLPFfgoNrbcUJk4JpowoyZL7ULnU4UkNjhOWkrXrArLwN8nMIMhxmpojjpLKc7bS1GCg== X-Received: by 2002:a5d:4752:: with SMTP id o18mr4457557wrs.330.1576137245538; Wed, 11 Dec 2019 23:54:05 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id y20sm4909753wmi.25.2019.12.11.23.54.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:05 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:50 +0100 Message-Id: <20191212075400.1499536-4-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 03/13] 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 ca3fc7121f..33653a3b6b 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 Thu Dec 12 07:53: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: 1208194 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="uiZdO8Zo"; 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 47YR030jLbz9sPc for ; Thu, 12 Dec 2019 18:54:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 71A8E2408D; Thu, 12 Dec 2019 07:54:25 +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 DUf0WBCSI+Fy; Thu, 12 Dec 2019 07:54:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 5F1DD240DF; Thu, 12 Dec 2019 07:54:18 +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 73BAE1BF293 for ; Thu, 12 Dec 2019 07:54:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7033D88000 for ; Thu, 12 Dec 2019 07:54:12 +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 qbJofDBJRo97 for ; Thu, 12 Dec 2019 07:54:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id E3B4E87EB8 for ; Thu, 12 Dec 2019 07:54:08 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id p17so1334079wmi.3 for ; Wed, 11 Dec 2019 23:54: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=eUci/WP7VQjKcLFI2xEQm0+hBgFq8P8L35OzesFa7js=; b=uiZdO8ZoU02ZzH10eYhxHMNVLVc3osvdMtLuzx7m6FGLWZl53ZxcFdEszstDmYRshO mOxNEmMsQYwj6ROZUP9mZSk77He/O8YyoqcIiEATKF7oOnKYs6rIyjCjT4Ak0UFNCnEd V5wVxL6zMJeddauttI0ci9Gb0Hj7by+0sZ90Rph73SJWlU/QBWkm1t/Qf4NzMt6HHzkv R3pUPk4h1TxZcRnvQQ6JjkCtCal78uJxkqGzs1dCGPHILB5iNkduFcfsfPwywA9eMVgx bokE4UklUj0flezCxBQjLls/3ugectDqZi7FBxGqfepaz6zDxQs+MQKuO9iqUBP7k2h/ mr9A== 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=OjtJK8uWySN7mJ0xnRU23oOKQdeFLrGweS2k3+29+F08XDAINbDu646YeXhWvhuw5U BWSa1xuywj71t5o0y67zerOVhcxqx8ABMT5dkjFruWqMGTnEypHkhfCNGplED/T+aoNn irCaSMK5hwMK2g4hNkUJg7QZmZDtE2pHan2hb49Z0O3cSZzr/jR9T+vVg/Tds9SsFl9C GjwLn+cr8L+9auJvBWXm+jAlvLZTGKs7hAywEBqlqooDg5JU5rb47hrM4MaqzBCEMO4y 3MAREhwB5zWyWlBUja8qpK8Tl5pWcE5FLt6OfIlYZi09apDuO323RgK/HT0rHO0JM9DH VXTg== X-Gm-Message-State: APjAAAUFGA3FI9q4e1uAsiN4JXFOeUQd9UPcXXuXQJ39P7RME3/1Ee9b YrJZOPQDqKhzwJuKrDIMQj+mW0QSuQ== X-Google-Smtp-Source: APXvYqwffER6AxVWJIX/pIGcci3K4fL8dKzKlBMI9b5LAR1ey8Blz52p0FLrxkkD9HBeqVviKUqd1A== X-Received: by 2002:a1c:1b88:: with SMTP id b130mr4664232wmb.4.1576137246407; Wed, 11 Dec 2019 23:54:06 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id y20sm4909753wmi.25.2019.12.11.23.54.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:05 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:51 +0100 Message-Id: <20191212075400.1499536-5-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 04/13] fix trivial packages with buildroot-provided services X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" All the packages in this list have the following properties * units are provided by buildroot in the package directory * the SYSTEMD_INSTALL_INIT_HOOK is exactly equivalent to what the [Install] section of the unit does The fix removes the soflinking in the .mk file Signed-off-by:Jérémy Rosen 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 Thu Dec 12 07:53: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: 1208193 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="SyBMdKRB"; 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 47YR016smMz9sNH for ; Thu, 12 Dec 2019 18:54:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3FC56881E0; Thu, 12 Dec 2019 07:54:20 +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 zLtbi-xNcHlC; Thu, 12 Dec 2019 07:54:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BE27287F59; Thu, 12 Dec 2019 07:54:16 +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 157931BF293 for ; Thu, 12 Dec 2019 07:54:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 123D388164 for ; Thu, 12 Dec 2019 07:54:11 +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 JivneiQDJ2rM for ; Thu, 12 Dec 2019 07:54:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2333B88000 for ; Thu, 12 Dec 2019 07:54:09 +0000 (UTC) Received: by mail-wm1-f53.google.com with SMTP id a5so1240137wmb.0 for ; Wed, 11 Dec 2019 23:54: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=P/Avnbm6Dhfc5zerx2kEfl235E7Fy9a1Y06IylrmBww=; b=SyBMdKRB0K1uSimFdGxCYOSvkhWJJGE9X/UWkAoQP4UFCDvcnoUdY387SOuUgtavI9 L8cv6nDCZG6Ie0M50sjOgStfE5Q+xdCnOL55Tzs612muvUV8SbhlLaUMcKX9s+K+CxFn rc467nniwk2mQvh6izXDkG8szuE7vCGUmktRqFY5AP2ghUYfAf7mnCRsU9HwoiV98r3U If825+TaCA2D1X9WF+7gTB/aqPDC0RF9wZrGePIgvdGjBObE5AlTucJGu0aCOE0MXGSz +ur+nchmRHvld5f9L9SLQlX1mlU+mhyh4wM90iITC4m3ei2jfCZZoc+9aKfr4p9A9ZjB JIbQ== 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=YakJUgltsX1dtKDDYpu0eFJZNgUrTLjpkpzvmQ4eIHw2rxMXfXkCjaK0mpaUC99Jxg CGMrYD+fHI7eUlozT3/iAhHI7ORXFBIue7VjbbQyYC86pdpi7ggSCwbkX2lonNL9ZOsJ 7ILRcbfVNkDNd13qIYUGYF7fQDUJXxZ/K/mUL4hgxKpwpC7ZzGiItPW6SJVuJV3sigle gx2dh3l5uvw7ytkPBIRChE8aPFoN2FXSTK/m4DYwtTET+m7hMFDRicY5+KJLkNlv/rfd KXGB9Z4xaT4krTEkIfyxC/jhQY3yjG1hobtrVLgrTL2AZTlic9dI0pINzVH50KNKMZin jXhw== X-Gm-Message-State: APjAAAV/o1LI9xsQOQ1Fq74l0or7qzHw/6lDHCUxrG5r8oBhwlt7LNLu GoaeMTZ3UijQgvFX8R1CE4ykfUEGUw== X-Google-Smtp-Source: APXvYqwKpkmaTpl1KPezX0zRUcuQhkaQUQ+IxPTkPGt/MwnUZcbveuFQpTiQrcIB68fAGzX4MSs2mA== X-Received: by 2002:a05:600c:54b:: with SMTP id k11mr4764542wmc.63.1576137247119; Wed, 11 Dec 2019 23:54:07 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id y20sm4909753wmi.25.2019.12.11.23.54.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:06 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:52 +0100 Message-Id: <20191212075400.1499536-6-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 05/13] fix trivial cases, upstream-provided services X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= , "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 Thu Dec 12 07:53:53 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: 1208196 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="o/8w2vN8"; 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 47YR052rYLz9sPc for ; Thu, 12 Dec 2019 18:54:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 77EE88821F; Thu, 12 Dec 2019 07:54:27 +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 smb1peK0+z3b; Thu, 12 Dec 2019 07:54:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 4837D881E8; Thu, 12 Dec 2019 07:54:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id EF90E1BF293 for ; Thu, 12 Dec 2019 07:54:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E394588792 for ; Thu, 12 Dec 2019 07:54:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jqzC1iFm0IeS for ; Thu, 12 Dec 2019 07:54:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 89B3A886D9 for ; Thu, 12 Dec 2019 07:54:09 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id p9so1227041wmc.2 for ; Wed, 11 Dec 2019 23:54: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=zgwvsat9zet+yO6g/UYANGnJzjThDXpckHvIIn5EjOg=; b=o/8w2vN8rYwPnQ64pYrFKEolz5zLrnm/0x6veDQ6iaXGhyw+kPCY5kBKHVYHnUP5pL JxkWGRfd5uScD7ZL10ZY1Vonaxz908DaUlbt1L0MdYcBkPJOUec3HBWLzWynspqKPTFG DL2JtSSDV72RaOaStNdJS9NfyJYOeg1YtoBQ6KBo8ErlyQG3q6lAutOX+2/jNyHwJqqa LFjpbQJ7vKR4csIRivro7lcakKFH8r83u9faw8n4UVbxYCfj5sp1QHqJAp/mdFmgwEWz hX6LaMEjFjEkHGfrttD+yMb+iakczGq2yWC0Atmpyd6USS/OEdt7/GJsea2GyWuBxtlf lp9w== 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=h5pmzuBYn6zhKisQNWoKfo+CndskDeep1AsJL68oaOYajktpMnt0jFfYC5hCzEOVu3 pOTIXJn6LQHN+ldhJMIQoLqhnhXxXxKHvycqy03WXWycT5KU+pxCSFKSETuwd9Gl5gln RK+qAEqTeywpzCDZaXQGbcYquxcezBDfMGBk/gAqKqURPekgNoMmUPlRvy+hvMIkfHEO tTg7AGNNTpoCV8ioMwxjlZJ26G6/13adJ2f4YADgO9QhuTp5uFMPztR1+R61FXF4qn4o /xc2OrvxoAFPQ+K6QBmEoK4CUqTWFEgjjNkVMGFJ5dLVndr4Hg0GvW3woTtbruREj1vn ZW0w== X-Gm-Message-State: APjAAAV3s46YAmECwcURSe13IZX6w05bDN71et3aD+p2bO+MZJfgimSS ijWCIJNPt7y621+Sh/tkcg8mmhdfaw== X-Google-Smtp-Source: APXvYqwLkL5J2BDmqgMww1h1rAXI18GT2uItrdlm6jjmzsoGwOXYwXSfuD9FSdbtnSQkvB0DDN/BSg== X-Received: by 2002:a1c:9cce:: with SMTP id f197mr4587383wme.133.1576137247699; Wed, 11 Dec 2019 23:54:07 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id y20sm4909753wmi.25.2019.12.11.23.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:07 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:53 +0100 Message-Id: <20191212075400.1499536-7-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 06/13] package/connman: adapt to preset-all X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= , "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 Thu Dec 12 07:53:54 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: 1208197 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="lGJESBS3"; 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 47YR063GPBz9sNH for ; Thu, 12 Dec 2019 18:54:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2F83F88236; Thu, 12 Dec 2019 07:54:28 +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 djX1wU+x1CJV; Thu, 12 Dec 2019 07:54:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 87E58881C0; Thu, 12 Dec 2019 07:54:17 +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 80E3E1BF293 for ; Thu, 12 Dec 2019 07:54:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 794CF23DB4 for ; Thu, 12 Dec 2019 07:54: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 EC2B33GyIEzO for ; Thu, 12 Dec 2019 07:54:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by silver.osuosl.org (Postfix) with ESMTPS id 6478323C58 for ; Thu, 12 Dec 2019 07:54:10 +0000 (UTC) Received: by mail-wm1-f42.google.com with SMTP id b11so1214435wmj.4 for ; Wed, 11 Dec 2019 23:54: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=7JCZJKRt/63DVK7QULN14KD4j3GfrrBkyjKv09RsKRg=; b=lGJESBS3mdsO9pCJPOq7AvdpxI5COZhEBKVduYkZhQpmoBqr8uF2V1dB8J214Yco3s u0FR4SS3HutmjMe3aXGy89uTV9/nAVJXHp8A189gZrtrgOzi7W/F76wZdWGxrC+WjaoA DioS1rqiEtF93GMlt/MPBhEcivgDtSl7Gg2yh2S0KxpniZygWquEXPI0X07QYIQk+bDd 1SMgrBIBq76c2W0gRa0uHT/zd17Zd1dqbiia4LWanE72gMn+Ua831sTcjIzIqR7KpWKw fXKx0V8qoptcwZYoznXQVwg6GJJq+QeNpR5asFLmyOj7dWa133Ks12c90tKr0mEFxjnK QgwA== 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=hscQ/5O9dzBqqWaCYBoE78iPRcl1qJPCCyta84pcj5Al5b4+5wiF+cTsccLwZztNlU 8aayQQbQVaUrOtbQzoHMe6RhcsQ5pzt2Ku+voqb8SqQcP3JPoFbLnCNJh2aD27e4PWUD zqwZuuSz27IaD3Ngxu7DEMvOxi/gKsQzhj2XdqvFLLGm1L64l6oYAVlfb77Ui7yvoQtd xDIGEZXscXS28P5bmtbQOWd0l/oFms93I22vhYotKMrZIhWrKYvJ/8nf/REQA2c3Z7c1 nizusqX2WTkKZ060kRoFNiFwo+Ptb2xsfOnWzoz35vhrfiI37l2jQxeoJ4fob8QRjSQU sDRw== X-Gm-Message-State: APjAAAW9EasecRC8VvHej81+rLQM3/mjOjH4a3S+NYd4gmGb2XpB2zxZ O5zjelDaVxWn2xYwyuANu+abvpQhWA== X-Google-Smtp-Source: APXvYqw4yftfsVzbZcRhPsIHJfKNRH2aoyuaQNHXbV3pWocRs4aoeejMxxaIM0oMfgo+aQz3Z5j/VA== X-Received: by 2002:a7b:c851:: with SMTP id c17mr4985584wml.71.1576137248652; Wed, 11 Dec 2019 23:54:08 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id y20sm4909753wmi.25.2019.12.11.23.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:07 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:54 +0100 Message-Id: <20191212075400.1499536-8-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 07/13] package/linuxptp adapt to preset-all X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= , "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 Thu Dec 12 07:53:55 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: 1208200 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="bQZaNP2s"; 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 47YR0J0rTPz9sNH for ; Thu, 12 Dec 2019 18:54:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9D691881ED; Thu, 12 Dec 2019 07:54:36 +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 lI8ggmaLOtV1; Thu, 12 Dec 2019 07:54:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A17E888209; Thu, 12 Dec 2019 07:54:22 +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 BCBFF1BF9BA for ; Thu, 12 Dec 2019 07:54:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AC9EF23C58 for ; Thu, 12 Dec 2019 07:54:14 +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 8Yn+4YFKZcNR for ; Thu, 12 Dec 2019 07:54: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 7DE2E23E84 for ; Thu, 12 Dec 2019 07:54:11 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id t14so1327555wmi.5 for ; Wed, 11 Dec 2019 23:54: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=hEyH/k/KNlzwmUHAXfDipzZRPK1ZUltq3SqS2M0npNE=; b=bQZaNP2sdjGWeDj3VtXezsGzwHkTNmr1bq5VYjI+BRHXyss4KBp0hBOjqheRLD2riB jTmloHJjvdMZuoYJrxWeD8sq3XZ0Zhx+K0t91+qw55Bu/eFHDFtlhNPC6XkpSRwTPZgo tf8+0QrKQ7i+NMUEzHDamiytP9qFki8IpHpxZmy2GUDDj1X9TcrTy5GzO9SelSRadCEa 0wP0AvaeuJILc1D/HV2xX/Me3Sem7o8xXSKf2tuhQ/d9XWjh3/GovobRieErnYNLwu0X HiyeGAjlANMvOq7yd5E3isoGsJzTAIcDjcqwck67g5z9os+CwgC3Gf+C8xwHNpmVkdsD Hvtg== 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=WDxIpd8QzFMfx9nzjHONhBHEhBQklqWRzU+Y01tN5JdOf5sdIgU8twBaC5m7NhlfoO 1Qpi3ds4Pr7F6cyT5HSN9/BZ95lpOCh88PaoEGPGvkxdKeeAX5efRLZBmqRhF9ajFaaR BaMyeYIMTzAL27JDB8Q16vgjPXUIM5RMFMRCAh76alhzFyqzIgxLmusNchsJhZA2hSUe oejzofPX25s4iur1Jgj7L8h4Zo6CoriLL7jMbw4l5689BKg+rSaOKr+W1/oQlXkGtci4 0/rT1DOUyTz5ic2k9xDmBYQsi9r516LwG+X6yfCVC7BP0y9Tcyp7wRGtFDLyOUTFH0m5 TiMQ== X-Gm-Message-State: APjAAAWpBn7OvbMECWgs+KyHu/Y0yoFuMfeXfmkSzG64RikmXWrd8WUq 4SFpX0PVjhtQfANNCGqT7XdAmCGi3w== X-Google-Smtp-Source: APXvYqzblN2SjdmU1KTWfX4T24Un0ZCg/pugfDFg6WClZ5wl+I2IuqDBqVqeyZFjqg1gCWElThg0eQ== X-Received: by 2002:a05:600c:305:: with SMTP id q5mr4949821wmd.167.1576137249683; Wed, 11 Dec 2019 23:54:09 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id y20sm4909753wmi.25.2019.12.11.23.54.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:08 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:55 +0100 Message-Id: <20191212075400.1499536-9-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 08/13] package/network-manager: adapt to preset-all X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= , "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 Thu Dec 12 07:53:56 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: 1208199 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="Ow2Ze2hK"; 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 47YR0F4svKz9sNH for ; Thu, 12 Dec 2019 18:54:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E79AE881EC; Thu, 12 Dec 2019 07:54:35 +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 L8p2IUzK-y0t; Thu, 12 Dec 2019 07:54:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 199E388215; Thu, 12 Dec 2019 07:54:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id EDEAD1BF9BD for ; Thu, 12 Dec 2019 07:54:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E1D85886B1 for ; Thu, 12 Dec 2019 07:54:15 +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 kNNEYnTxtSBj for ; Thu, 12 Dec 2019 07:54:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 246B088702 for ; Thu, 12 Dec 2019 07:54:12 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id d73so1233958wmd.1 for ; Wed, 11 Dec 2019 23:54:12 -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=Ow2Ze2hKyX62U3BUaeqkxBm/N+cCeBFQB9N80yLywSO44xfHOnuolRSnSNci1fnLQV s3oABaqSKmSJCXqk4J++1bUdTPmPE3tlv8vFxcn+eL7ba1AXSz588E2e+OpGN9Y4jwND cUgwCxoGrTlf2biurqWDKsRl29iQERBhSBTguRuf0hHFVlXkxgzy2nhczqdDjbULj8al HcNryZWwIFhjIjc9x83IttMqfrp5DbUX9AKL8c/LsluhJhqgZ8fpREzzgx3P1ZBXcOoN sDmojzJ8ptOblL3TGNZ/aU3If1glCxpSUa8cu3/Qlu1hGTfYLdBL4lIJ7VP0HLGe+sb/ 2DBg== 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=hwZ3Cmh3lKewGnaky0m/Xps2nsN0eGT7sqUqX3uSQsJhSTtpSniNz6Ep+SSbcsQ3H/ gcPCiLk+qhwmwH+Zm25wqRdtcHJOqb8i+J2sriEASYQqzIzMfIl1OwhRR/SIhUYbWs6j mxRfgyPr4MZCBNYjUU+afhhiyD9lzVY6ZSRIOi3t/633XhRBq+CPNGVdEPAZcTHBXCbx +312khlmC7z+0V4V0+1IGbR125cWiz89fg3Wp0I3ylXgjEUpCtqGsJBMviG0PTypbUmE 4MGa1xkdMCbGp+EjONPB8BjbGKb08HsENH4ms+ORt2KVQi9/+spuNkePymdA00k+boQz sILg== X-Gm-Message-State: APjAAAWMHpSCapQu6E5DeHEF5CHhUTj2/naJ6W3N72CHvZS8gDY3F3R2 C1e1khpBx3kPcIQ3BB4xwJHJkix1Ew== X-Google-Smtp-Source: APXvYqz1sdaD1uaLOjazshMAoh0becVJkSrjq4igrr6/SjfMOhGj7m5UG7DnuQ2pNnqf9ZsEOy09+w== X-Received: by 2002:a1c:9dd7:: with SMTP id g206mr4876403wme.61.1576137250290; Wed, 11 Dec 2019 23:54:10 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id y20sm4909753wmi.25.2019.12.11.23.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:09 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:56 +0100 Message-Id: <20191212075400.1499536-10-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 09/13] package/wpa_supplicant: adapt for preset-all X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" all services were installed but not enabled. This change 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 Thu Dec 12 07:53:57 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: 1208198 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="ArSaqcnR"; 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 47YR076kVLz9sNH for ; Thu, 12 Dec 2019 18:54:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 035D68871E; Thu, 12 Dec 2019 07:54:29 +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 wJe7zdH27pOM; Thu, 12 Dec 2019 07:54:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3E8B08879D; Thu, 12 Dec 2019 07:54:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 200F61BF293 for ; Thu, 12 Dec 2019 07:54:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 14B308878C for ; Thu, 12 Dec 2019 07:54: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 AF99Wfe-A+Ra for ; Thu, 12 Dec 2019 07:54:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by hemlock.osuosl.org (Postfix) with ESMTPS id B8F8788790 for ; Thu, 12 Dec 2019 07:54:12 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id z7so1554394wrl.13 for ; Wed, 11 Dec 2019 23:54:12 -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=ArSaqcnR8x7CMnlqSV9B5rPzLH34jwduGOzk8buHGaLjo5km3RE6iZKz3qV41Vbv8d L/WjtrMcfluC93Q6+cO4gnkub+G6PsPhl+HJSJER9mPSG6r3jKwsn8tPR2rFUdDFDQIZ WrArGKX87YX1CyEEWm9Oi+nCmZTdpkWktefxgKBHlZQXcGBoMgsT9bXbDCsvEH07upY5 Iotxbru4XVOflro89z5AwlLGlg8iGJSn3iJlZW+nbIAi+xicd5XC7qli6QvkBnxjkNCz uFs4uT2j8SexL9G5tYkdHZ0A64K7QAp485sB+7uh0SY4ec50uAhgJZV+4MihsvsECgbK sB3A== 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=Ay/g31H1F3cBR1vJ1ccOZlf5G5q+VuuEKaWZchuUNM54ICtWIs+UkrIPhNu7TPtUBw cS2YtvpOwoTmRE/s4OM/Oqz87EF5QcF6bsJvzLOifzOfk2TlWh7xgGJggy7fCixATJ3A 8/fxCpHocyqdmjBUxcg5+TvhdDWtrRkF09g95pmpSseoF9Z54eIDzV3tDv29ZFuCQ7m6 a/0V/H0CoqSTYIBDOWMLpKKHehBuI4qY+BeMmbGI6nmc55qJ+tr7fwXA0zgn8GBKsojR T4vwnWGTn7unb1yz1nMSk5jxUL0Do4mjfbRMqahJ6wW77Z75bXVvHQlmpWsITxi3IYU4 GJrA== X-Gm-Message-State: APjAAAXd3l+sME1T21hGntacgB9bhZk6O31cP4sT0iVpSw0NWwhlNNUJ B/R6G4cnpo3KWK8JogbLVJnJR3HJtw== X-Google-Smtp-Source: APXvYqxyf7opx1F9Q0u2x42K9cuvCDcwQzPQ4SxZyy2M6h9ln3FpQEG1mersTo1/9zdcu6h410R6gA== X-Received: by 2002:adf:cd0a:: with SMTP id w10mr4486075wrm.107.1576137250931; Wed, 11 Dec 2019 23:54:10 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id y20sm4909753wmi.25.2019.12.11.23.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:10 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:57 +0100 Message-Id: <20191212075400.1499536-11-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 10/13] package/sysrepo: update to new systemd X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Thu Dec 12 07:53:58 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: 1208201 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="WGof87xM"; 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 47YR0P0ggmz9sNH for ; Thu, 12 Dec 2019 18:54:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 73CB688254; Thu, 12 Dec 2019 07:54:40 +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 mXSqyuPrIeog; Thu, 12 Dec 2019 07:54:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8443E88220; Thu, 12 Dec 2019 07:54: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 E27261BF9BA for ; Thu, 12 Dec 2019 07:54:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5B32386F24 for ; Thu, 12 Dec 2019 07:54:15 +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 9UiQvuiFZXlM for ; Thu, 12 Dec 2019 07:54:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6342F848AA for ; Thu, 12 Dec 2019 07:54:13 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id t14so1327638wmi.5 for ; Wed, 11 Dec 2019 23:54:13 -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=WGof87xMQNxHUMBL6PMU9+9FqMBQt+kXirV/CA3yzT3hO9qJA+PzJLRNzAOdtFYIPk 5ZebQbsHUs6SyDMOjyxtrmT0ueGf9fYri3ll/rdc7OkY5DdibLUVIjkhXEwfMeEPD3uc Iog1swljFDCR+/Ej/CVdXX2rmZPb3lo5BDSdZzDcJPcG6eWfhH/QYmacbgC5ckR8tSSc fcHxZGRvuMWkdoO9QANTQahPJuJxoj0x5luAfAMg5NQ6A3RLSEnD3nB+kCGM52umoJbH 4tCWifX6ya2MGg3qRgtoT+aTTtgUN74gjUAAd/3e28fJsnCAietaPER2BYCisoM2XsiM aosQ== 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=fSPtAo9LgRdmo1KbJoOZosgM1vSE+tqmS/duTCyJfLs5ppmwTxFrMtRMK+vMXXqeNR 8DEIMNJquHLCgTqYELbUXr9VGyQ7CqeO7HPj5tWKkEUqPElQCgrWXaoPb4DpOyf0lXki wzBUAozhWPl5k9gasLQLXbO+DQCMWeq1aattROSJPH/O1atdJrrWhv0t+y44kxOvMcQq 6DIIjYgkIegDQxZe0Tf7jSdUqQ5ELM/i2n49sAyRqDXNziZCTik3/ao8Ddh9Mea5/NOR /yaM3SrZ9SsZoeSMH6RSCPRrFHlD4TND5EC/HHEtZu1vkBXzCSAOt7ulegIrcrcEnm/f cLJg== X-Gm-Message-State: APjAAAVXDZlOdsGQD9ttIKf7lsrjskqMgnos/FpOWEzTuNuBeNYA5Tne XMlLGoNEI+FaHcVT6YovMJZHV315mw== X-Google-Smtp-Source: APXvYqwie5pYTgQIpmFcVDBwrZYFrW8WKfNs0aI9sbvIkqdcqs3JLW6bD4owSkCSbdO5y6cpOb1CsA== X-Received: by 2002:a1c:6755:: with SMTP id b82mr4775228wmc.126.1576137251533; Wed, 11 Dec 2019 23:54:11 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id y20sm4909753wmi.25.2019.12.11.23.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:11 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:58 +0100 Message-Id: <20191212075400.1499536-12-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 11/13] package/syslog-ng: implement default 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 Thu Dec 12 07:53:59 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: 1208192 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="g6wmIrXG"; 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 47YQzz6sxvz9sNH for ; Thu, 12 Dec 2019 18:54:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1803286F32; Thu, 12 Dec 2019 07:54:22 +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 tcXhqPX4VzY3; Thu, 12 Dec 2019 07:54:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8A9E886F27; Thu, 12 Dec 2019 07:54:21 +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 9E4C31BF293 for ; Thu, 12 Dec 2019 07:54:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9B6D687F59 for ; Thu, 12 Dec 2019 07:54: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 cG0KYePiBXZo for ; Thu, 12 Dec 2019 07:54:14 +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 CDFCA87EB8 for ; Thu, 12 Dec 2019 07:54:13 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id q6so1573001wro.9 for ; Wed, 11 Dec 2019 23:54:13 -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=g6wmIrXGxgQHMWuXVB6KU5t3TM7ZtMsWrT6tT3d+xt5WbJQzlfHKfpZ0rddpbt+pfL RmOnk70frhnF78QdsAFxDfWUqqPk6m/XlmQqVTmm6L2EJDbnJTOYNyUqaRsSEGh2Y8u6 AQJZo/gvqshdMkgMTypcHFIaZCpgQNzQNQJCPma3sUAhV6TEvxxMfj9goH9LlIEpgpZG Nf14K44mX9oEI3qYd9h39rHuV7RlcZQ26SMnG6jaNdITa8CytAfm1/gmWKAFnPQ9t1Xl z+EObEw9xdtw+jdjlnrZQZtSUjl7XOuDzUDhruKjKt7/xghkTOubR1SqLn7JQkH98HlL trxQ== 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=WWa7C6lZ2xrwyBHSJBsf8Raeuot1VdudZjVf2iREm6pimsuxTsA9Kf/4yllFUMDq7T EtOjr/1j/58cn88A7T00Qvp/j0lVjIVTHMs8H9IFgeXBkX2cB732ss7wVEBMkrYKB1XB JpIzmMlne4OqG84imugwEIayjMxUXuSLQRpuLMjFP1CsVY2NU9G47I3Yo2H41fvm3e3A WA0uplKgnc89zYYxlQ1Q5mWKarOo6oHzH0nUPMRZTZFQmJFH8vsu58jTci/00TKWlyoY mVqbOwF+wFkFEzXvjCxH7rvnjxWAq9L7QX1l8K9j2STzOLsA97KoUvRO8XCdQNpJ4Cdy qAUw== X-Gm-Message-State: APjAAAXfX9kB1zW1LvmEHEpxmVGd7y2gwfIeIz2VfeBD9ryEbMNfjFq5 H6g+WxD7Q3tD8VCyyOBlY0JIhakLBQ== X-Google-Smtp-Source: APXvYqychpdiXG4ZOTdg/ETDDJ756uo6Ha8q12WwbwCPS93V1JpGDPSjEp6XOpvYPz/DOqkSH48BRQ== X-Received: by 2002:adf:c54e:: with SMTP id s14mr4820326wrf.385.1576137252128; Wed, 11 Dec 2019 23:54:12 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id y20sm4909753wmi.25.2019.12.11.23.54.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:11 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:53:59 +0100 Message-Id: <20191212075400.1499536-13-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 12/13] package/rauc: add a WantedBy section to the unit 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 Thu Dec 12 07:54:00 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: 1208195 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="waohB8by"; 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 47YR045ndBz9sNH for ; Thu, 12 Dec 2019 18:54:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 510AF886B1; Thu, 12 Dec 2019 07:54: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 zxraw+3qDsQp; Thu, 12 Dec 2019 07:54:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A354288702; Thu, 12 Dec 2019 07:54:26 +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 67B451BF293 for ; Thu, 12 Dec 2019 07:54:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 64E1787F59 for ; Thu, 12 Dec 2019 07:54:15 +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 wJjKQjfJPwah for ; Thu, 12 Dec 2019 07:54:15 +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 ACC6E87EB8 for ; Thu, 12 Dec 2019 07:54:14 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id z7so1554523wrl.13 for ; Wed, 11 Dec 2019 23:54:14 -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=waohB8byi3fNnvYMM3K0DedQJus1/VOoUiNkQbt/6qahNxBo01Vh8/F19VEukBZI7v xTb5IbnGlb/zbpEhRz2ciI6xOSSQuC9J7WkAhoseoNoWghBWx9lxP8PjLP2bYPOwyYDQ IdA0v2xpQ1iJD2KNef2mQsQq3qUmezanSZ1yVACmnOl95pmpToEP7x0xn/EPayyHiWTf mma08hSCC2OvKYdfObYk4tO6iRWQVYM6yKlBCFwjFXBdoxc7I6lSh6w5V5q13brB05QP P6Lvj8LmxfF7nT6QMwy2zt0AZw7Ai3vHOX26RGcnf4/jjB6rrKtiLssarzBmoBgdBLEz pKyA== 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=tfjPdIGIN6oaryY8oIgRKO1feqnQjE5sxAboys8e5HHRzLobQJ9la+VZqiRu+wgqL+ Lhbf6llzFkQcLcWBQjyAHs4DLf8Jhic/EXIEfXN6ZaydsaFqun26mRj9eg0yd2tBb/cB dSlypx54XoS/2bG5W7GFNUv8nDbugMChD80X9yle02ZfeGvkAYv6mLEEE6oUQwo5CrKw HfFbUyaelnbVHiZe4evovngQ03dbPq6ov3J3knN7uY4nqlFhr2Y0d0Rodm2Na5HQum29 Hk/Z7v69VAhH+7q5YDQm2PbikGiwws+XyVtVylI5piM+jKTIEwgXnEGsEAUNJkkhQJyA acMg== X-Gm-Message-State: APjAAAWnKpgzgCOyyu8H77V5GbqGxkKE4laLndGfkcZep9GHS4viafO4 MEIenjG9ERSP5yT4Odue0vOMxYKXLg== X-Google-Smtp-Source: APXvYqxAJFDEDZqnWB0cXHd+DBkU7NK84PpEVqKn1SSZKHpEUrWOfUHJMW/4YOLwIB8rli29dZnNnQ== X-Received: by 2002:adf:ef03:: with SMTP id e3mr4808070wro.216.1576137252978; Wed, 11 Dec 2019 23:54:12 -0800 (PST) Received: from localhost.localdomain (2a02-8428-0351-c201-4ead-12d2-d337-cdfb.rev.sfr.net. [2a02:8428:351:c201:4ead:12d2:d337:cdfb]) by smtp.googlemail.com with ESMTPSA id y20sm4909753wmi.25.2019.12.11.23.54.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:54:12 -0800 (PST) From: =?utf-8?b?SsOpcsOpbXkgUm9zZW4=?= To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 08:54:00 +0100 Message-Id: <20191212075400.1499536-14-jeremy.rosen@smile.fr> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191212075400.1499536-1-jeremy.rosen@smile.fr> References: <20191212075400.1499536-1-jeremy.rosen@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 13/13] package/alsa-utils: add a WantedBy section to the unit 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