From: Adam Duskett <aduskett@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/mender: make xz optional
Date: Thu, 1 Apr 2021 08:44:52 -0700 [thread overview]
Message-ID: <20210401154453.144605-2-aduskett@gmail.com> (raw)
In-Reply-To: <20210401154453.144605-1-aduskett@gmail.com>
According to the README.md file, xz is optional.
- Remove the dependency on the xz package.
- If the xz package is not selected, add "nolzma" to MENDER_TAGS
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/mender/Config.in | 1 -
package/mender/mender.mk | 8 +++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/package/mender/Config.in b/package/mender/Config.in
index accee4676a..5ac8bb1676 100644
--- a/package/mender/Config.in
+++ b/package/mender/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_MENDER
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_OPENSSL
- select BR2_PACKAGE_XZ
help
Mender is an open source over-the-air (OTA) software updater
for embedded Linux devices. Mender comprises a client
diff --git a/package/mender/mender.mk b/package/mender/mender.mk
index 794dd4be8c..1ebd5a2e83 100644
--- a/package/mender/mender.mk
+++ b/package/mender/mender.mk
@@ -38,7 +38,7 @@ MENDER_LICENSE_FILES = \
vendor/github.com/mattn/go-isatty/LICENSE \
vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md
-MENDER_DEPENDENCIES = host-pkgconf openssl xz
+MENDER_DEPENDENCIES = host-pkgconf openssl
MENDER_LDFLAGS = -X github.com/mendersoftware/mender/conf.Version=$(MENDER_VERSION)
@@ -81,6 +81,12 @@ endef
MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES
+ifeq ($(BR2_PACKAGE_XZ),y)
+MENDER_DEPENDENCIES += xz
+else
+MENDER_TAGS += nolzma
+endif
+
ifeq ($(BR2_PACKAGE_DBUS),y)
define MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF
$(INSTALL) -D -m 0755 $(@D)/support/dbus/io.mender.AuthenticationManager.conf \
--
2.30.2
next prev parent reply other threads:[~2021-04-01 15:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 15:44 [Buildroot] [PATCH] package/mender/mender.mk: fix license list Adam Duskett
2021-04-01 15:44 ` Adam Duskett [this message]
2021-04-03 7:29 ` [Buildroot] [PATCH] package/mender: make xz optional Yann E. MORIN
2021-04-01 15:44 ` [Buildroot] [PATCH] package/mender: add nodbus to tags if dbus is not selected Adam Duskett
2021-04-01 15:59 ` Thomas Petazzoni
2021-04-01 16:38 ` Adam Duskett
2021-04-03 7:31 ` [Buildroot] [PATCH] package/mender/mender.mk: fix license list Yann E. MORIN
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=20210401154453.144605-2-aduskett@gmail.com \
--to=aduskett@gmail.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