From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Korsgaard Date: Fri, 01 Nov 2019 11:34:59 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/iputils: enable systemd services In-Reply-To: <20191101061802.106261-1-james.hilliard1@gmail.com> (James Hilliard's message of "Fri, 1 Nov 2019 00:18:02 -0600") References: <20191101061802.106261-1-james.hilliard1@gmail.com> Message-ID: <87imo3hoks.fsf@dell.be.48ers.dk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net >>>>> "James" == James Hilliard writes: > These are normally enabled by systemctl preset-all. > Signed-off-by: James Hilliard > Reviewed-by: Petr Vorel > --- > Changes v1 -> v2: > - simplify IPUTILS_CONF_OPTS > --- > package/iputils/iputils.mk | 22 +++++++++++++++++++++- > 1 file changed, 21 insertions(+), 1 deletion(-) > diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk > index 4a06581790..7a5357270a 100644 > --- a/package/iputils/iputils.mk > +++ b/package/iputils/iputils.mk > @@ -46,12 +46,21 @@ IPUTILS_DEPENDENCIES += linux-headers > else > IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none > # BUILD_NINFOD=true and USE_CRYPTO=none cannot be combined > -IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false > +IPUTILS_NO_NINFOD = y > endif > # ninfod requires > ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) > +IPUTILS_NO_NINFOD = y > +endif > + > +ifneq ($(IPUTILS_NO_NINFOD),y) > IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false > +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 As mentioned, it doesn't make sense to disable infod and install the service file under the same conditional. The problem is really that negative logic is confusing, so I've changed it to use positive logic (IPUTILS_NINFOD=y) and committed, thanks. -- Bye, Peter Korsgaard