From 8aa7d057a797bbb60e741889de1d7cc540a1cd87 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 17 Jun 2024 18:43:25 +0000 Subject: [PATCH] package/mtd: make lzo an optional dependency Upstream fixed lzo to be an optional dependency in release 2.2.0[1] See https://github.com/sigma-star/mtd-utils/commit/ab4628e756ab73d8193ed62b591417dad561b298 Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle --- package/mtd/Config.in | 2 -- package/mtd/mtd.mk | 11 +++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/mtd/Config.in b/package/mtd/Config.in index 3ba48da645..9e5bb1735b 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -12,12 +12,10 @@ if BR2_PACKAGE_MTD config BR2_PACKAGE_MTD_JFFS_UTILS bool - select BR2_PACKAGE_LZO select BR2_PACKAGE_ZLIB config BR2_PACKAGE_MTD_UBIFS_UTILS bool - select BR2_PACKAGE_LZO select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_ZLIB diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index faf4c55eda..f790ef5ec4 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -20,17 +20,24 @@ MTD_DEPENDENCIES += libexecinfo MTD_LDFLAGS += -lexecinfo endif +ifeq ($(BR2_PACKAGE_LZO),y) +MTD_DEPENDENCIES += lzo +MTD_CONF_OPTS += --with-lzo +else +MTD_CONF_OPTS += --without-lzo +endif + MTD_CONF_ENV += LDFLAGS="$(MTD_LDFLAGS)" ifeq ($(BR2_PACKAGE_MTD_JFFS_UTILS),y) -MTD_DEPENDENCIES += zlib lzo host-pkgconf +MTD_DEPENDENCIES += zlib host-pkgconf MTD_CONF_OPTS += --with-jffs else MTD_CONF_OPTS += --without-jffs endif ifeq ($(BR2_PACKAGE_MTD_UBIFS_UTILS),y) -MTD_DEPENDENCIES += util-linux zlib lzo host-pkgconf +MTD_DEPENDENCIES += util-linux zlib host-pkgconf MTD_CONF_OPTS += --with-ubifs # crypto needs linux/hash_info.h ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12)$(BR2_PACKAGE_OPENSSL),yy)