From 62c02b78206d520d1fb3e8ccd6cc198354f3f5b9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 14 Oct 2018 22:00:54 +0200 Subject: [PATCH] mdadm: convert to generic-package There is absolutely no reason for mdadm.mk to use autotools-package: this package does not have any configure script at all, and its Makefile is not generated using automake. Therefore, convert it to use the generic-package infrastructure. Compared to the previous code, we are now using $(TARGET_CONFIGURE_OPTS), which passes our CPPFLAGS. This overrides the CPPFLAGS from mdadm's Makefile, so we repeat the only CPPFLAGS flag passed in the Makefile, -DBINDIR. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/mdadm/mdadm.mk | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 207b0be60d..6efade981d 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -10,14 +10,19 @@ MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm MDADM_LICENSE = GPL-2.0+ MDADM_LICENSE_FILES = COPYING -MDADM_MAKE_OPTS = \ - CFLAGS="$(TARGET_CFLAGS) -DNO_COROSYNC -DNO_DLM" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm - -MDADM_INSTALL_TARGET_OPTS = \ - DESTDIR=$(TARGET_DIR)/usr -C $(MDADM_DIR) install-mdadm +define MDADM_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -DNO_COROSYNC -DNO_DLM" \ + CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/usr/sbin\\\"" \ + CHECK_RUN_DIR=0 \ + mdadm +endef -define MDADM_CONFIGURE_CMDS - # Do nothing +define MDADM_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + DESTDIR=$(TARGET_DIR)/usr \ + install-mdadm endef -$(eval $(autotools-package)) +$(eval $(generic-package)) -- 2.30.2