|
@@ -50,9 +50,14 @@ else ifeq ($(BR2_TARGET_ROOTFS_CPIO_DRACUT),y)
|
|
|
|
|
|
ROOTFS_CPIO_DEPENDENCIES += host-dracut
|
|
ROOTFS_CPIO_DEPENDENCIES += host-dracut
|
|
|
|
|
|
-ROOTFS_CPIO_DRACUT_CONF_FILE = $(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE))
|
|
|
|
-ifeq ($(BR_BUILDING):$(ROOTFS_CPIO_DRACUT_CONF_FILE),y:)
|
|
|
|
-$(error No dracut config file name specified, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILE setting)
|
|
|
|
|
|
+ROOTFS_CPIO_DRACUT_CONF_FILES = $(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES))
|
|
|
|
+ifeq ($(BR_BUILDING),y)
|
|
|
|
+ifeq ($(ROOTFS_CPIO_DRACUT_CONF_FILES),)
|
|
|
|
+$(error No dracut config file name specified, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES setting)
|
|
|
|
+endif
|
|
|
|
+ifneq ($(words $(ROOTFS_CPIO_DRACUT_CONF_FILES)),$(words $(sort $(notdir $(ROOTFS_CPIO_DRACUT_CONF_FILES)))))
|
|
|
|
+$(error No two dracut config files can have the same basename, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES setting)
|
|
|
|
+endif
|
|
endif
|
|
endif
|
|
|
|
|
|
ifeq ($(BR2_LINUX_KERNEL),y)
|
|
ifeq ($(BR2_LINUX_KERNEL),y)
|
|
@@ -63,10 +68,14 @@ ROOTFS_CPIO_OPTS += --no-kernel
|
|
endif
|
|
endif
|
|
|
|
|
|
define ROOTFS_CPIO_CMD
|
|
define ROOTFS_CPIO_CMD
|
|
- mkdir -p $(ROOTFS_CPIO_DIR)/tmp
|
|
|
|
|
|
+ mkdir -p $(ROOTFS_CPIO_DIR)/tmp $(ROOTFS_CPIO_DIR)/confdir
|
|
|
|
+ $(foreach cfg,$(ROOTFS_CPIO_DRACUT_CONF_FILES), \
|
|
|
|
+ cp $(cfg) $(ROOTFS_CPIO_DIR)/confdir/$(notdir $(cfg))
|
|
|
|
+ )
|
|
$(HOST_DIR)/bin/dracut \
|
|
$(HOST_DIR)/bin/dracut \
|
|
$(ROOTFS_CPIO_OPTS) \
|
|
$(ROOTFS_CPIO_OPTS) \
|
|
- -c $(ROOTFS_CPIO_DRACUT_CONF_FILE) \
|
|
|
|
|
|
+ -c /dev/null \
|
|
|
|
+ --confdir $(ROOTFS_CPIO_DIR)/confdir \
|
|
--sysroot $(TARGET_DIR) \
|
|
--sysroot $(TARGET_DIR) \
|
|
--tmpdir $(ROOTFS_CPIO_DIR)/tmp \
|
|
--tmpdir $(ROOTFS_CPIO_DIR)/tmp \
|
|
-M \
|
|
-M \
|