package/mender: make xz optional

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>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Adam Duskett 2021-04-01 08:44:52 -07:00 committed by Yann E. MORIN
parent 8e80da620b
commit 0cb8b25169
2 changed files with 7 additions and 2 deletions

View File

@ -4,7 +4,6 @@ config BR2_PACKAGE_MENDER
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_XZ
help help
Mender is an open source over-the-air (OTA) software updater Mender is an open source over-the-air (OTA) software updater
for embedded Linux devices. Mender comprises a client for embedded Linux devices. Mender comprises a client

View File

@ -38,7 +38,7 @@ MENDER_LICENSE_FILES = \
vendor/github.com/mattn/go-isatty/LICENSE \ vendor/github.com/mattn/go-isatty/LICENSE \
vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md 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) 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 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) ifeq ($(BR2_PACKAGE_DBUS),y)
define MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF define MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF
$(INSTALL) -D -m 0755 $(@D)/support/dbus/io.mender.AuthenticationManager.conf \ $(INSTALL) -D -m 0755 $(@D)/support/dbus/io.mender.AuthenticationManager.conf \