From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 1/1] package/iputils: enable systemd services
Date: Fri, 01 Nov 2019 11:34:59 +0100 [thread overview]
Message-ID: <87imo3hoks.fsf@dell.be.48ers.dk> (raw)
In-Reply-To: <20191101061802.106261-1-james.hilliard1@gmail.com> (James Hilliard's message of "Fri, 1 Nov 2019 00:18:02 -0600")
>>>>> "James" == James Hilliard <james.hilliard1@gmail.com> writes:
> These are normally enabled by systemctl preset-all.
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
> ---
> 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 <pthread.h>
> 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
next prev parent reply other threads:[~2019-11-01 10:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-01 6:18 [Buildroot] [PATCH v2 1/1] package/iputils: enable systemd services James Hilliard
2019-11-01 10:34 ` Peter Korsgaard [this message]
2019-11-02 6:00 ` Petr Vorel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87imo3hoks.fsf@dell.be.48ers.dk \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox