From: Michael Nosthoff <buildroot@heine.tech>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/2] package/systemd: link libqrencode independent of remote
Date: Wed, 14 Oct 2020 17:12:49 +0200 [thread overview]
Message-ID: <20201014151249.18330-2-buildroot@heine.tech> (raw)
In-Reply-To: <20201014151249.18330-1-buildroot@heine.tech>
systemds libqrencode support is independent from journal-gatewayd.
In v247 it will additionally be used in homectl for recovery key
generation.
Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
---
package/systemd/systemd.mk | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 30e28adf95..b684f538a8 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -243,14 +243,8 @@ endif
ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y)
SYSTEMD_DEPENDENCIES += libmicrohttpd
SYSTEMD_CONF_OPTS += -Dmicrohttpd=true
-ifeq ($(BR2_PACKAGE_LIBQRENCODE),y)
-SYSTEMD_CONF_OPTS += -Dqrencode=true
-SYSTEMD_DEPENDENCIES += libqrencode
else
-SYSTEMD_CONF_OPTS += -Dqrencode=false
-endif
-else
-SYSTEMD_CONF_OPTS += -Dmicrohttpd=false -Dqrencode=false
+SYSTEMD_CONF_OPTS += -Dmicrohttpd=false
endif
ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE),y)
@@ -260,6 +254,13 @@ else
SYSTEMD_CONF_OPTS += -Dremote=false
endif
+ifeq ($(BR2_PACKAGE_LIBQRENCODE),y)
+SYSTEMD_DEPENDENCIES += libqrencode
+SYSTEMD_CONF_OPTS += -Dqrencode=true
+else
+SYSTEMD_CONF_OPTS += -Dqrencode=false
+endif
+
ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
SYSTEMD_DEPENDENCIES += libselinux
SYSTEMD_CONF_OPTS += -Dselinux=true
--
2.25.1
next prev parent reply other threads:[~2020-10-14 15:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-14 15:12 [Buildroot] [PATCH 0/2] package/systemd: unify journal remote options Michael Nosthoff
2020-10-14 15:12 ` Michael Nosthoff [this message]
2020-10-14 18:43 ` [Buildroot] [PATCH 1/2] package/systemd: link libqrencode independent of remote Thomas Petazzoni
2020-10-14 15:12 ` [Buildroot] [PATCH 2/2] package/systemd: group all journal-remote tools Michael Nosthoff
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=20201014151249.18330-2-buildroot@heine.tech \
--to=buildroot@heine.tech \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.