From 3830b8441db0b9d9765b1c27e6b6008b88e83707 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 27 Aug 2021 08:02:40 +0300 Subject: [PATCH] package/mtd: make ubihealthd independent of ubifs Since version 2.1.3 ubihealthd can be enabled without of ubifs-utils. This also fixes usability of enabling BR2_PACKAGE_MTD_UBIHEALTHD. BR2_PACKAGE_MTD_UBIFS_UTILS is a blind option. The only way to enable it is to enable BR2_PACKAGE_MTD_MKFSUBIFS that selects it. ubihealthd dependency on BR2_PACKAGE_MTD_UBIFS_UTILS makes enabling it unintuitive. Cc: Markus Mayer Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Yann E. MORIN --- package/mtd/Config.in | 1 - package/mtd/mtd.mk | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/mtd/Config.in b/package/mtd/Config.in index 57ad01971d..d0ca3ba663 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -146,7 +146,6 @@ config BR2_PACKAGE_MTD_UBIFORMAT config BR2_PACKAGE_MTD_UBIHEALTHD bool "ubihealthd" default y - depends on BR2_PACKAGE_MTD_UBIFS_UTILS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # getrandom() config BR2_PACKAGE_MTD_UBIMKVOL diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index a37594b164..6385b9ee0a 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -40,6 +40,12 @@ else MTD_CONF_OPTS += --without-ubifs endif +ifeq ($(BR2_PACKAGE_MTD_UBIHEALTHD),y) +MTD_CONF_OPTS += --enable-ubihealthd +else +MTD_CONF_OPTS += --disable-ubihealthd +endif + ifeq ($(BR2_PACKAGE_MTD_TESTS),y) MTD_CONF_OPTS += --enable-tests --enable-install-tests else -- 2.30.2