[make-initrd] [PATCH v1 14/41] fork pipeline: waitdev: config.mk and rules.mk modified

[make-initrd] [PATCH v1 14/41] fork pipeline: waitdev: config.mk and rules.mk modified

[Leonid Krivoshein]

---
  make-initrd/features/bootchain-waitdev/config.mk | 8 +++-----
  make-initrd/features/bootchain-waitdev/rules.mk  | 8 +++-----
  2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/make-initrd/features/bootchain-waitdev/config.mk 
b/make-initrd/features/bootchain-waitdev/config.mk
index 9172528..38368e9 100644
--- a/make-initrd/features/bootchain-waitdev/config.mk
+++ b/make-initrd/features/bootchain-waitdev/config.mk
@@ -1,8 +1,6 @@
-$(call feature-requires,depmod-image add-udev-rules)
+$(call feature-requires,bootchain-core add-udev-rules)
  -PIPELINE_DATADIR = $(FEATURESDIR)/pipeline/data
+BOOTCHAIN_WAITDEV_DATADIR = $(FEATURESDIR)/bootchain-waitdev/data
  -PIPELINE_RULES = \
+BOOTCHAIN_WAITDEV_RULES = \
  	*-cdrom_id.rules
-
-PIPELINE_MODULES = isofs squashfs overlay
diff --git a/make-initrd/features/bootchain-waitdev/rules.mk 
b/make-initrd/features/bootchain-waitdev/rules.mk
index 3ccd260..44c05f2 100644
--- a/make-initrd/features/bootchain-waitdev/rules.mk
+++ b/make-initrd/features/bootchain-waitdev/rules.mk
@@ -1,6 +1,4 @@
-MODULES_TRY_ADD += $(PIPELINE_MODULES)
+PUT_UDEV_RULES += $(BOOTCHAIN_WAITDEV_RULES)
  -PUT_UDEV_RULES += $(PIPELINE_RULES)
-
-PUT_FEATURE_DIRS  += $(PIPELINE_DATADIR)
-PUT_FEATURE_FILES += $(PIPELINE_FILES)
+PUT_FEATURE_DIRS  += $(BOOTCHAIN_WAITDEV_DATADIR)
+PUT_FEATURE_FILES += $(BOOTCHAIN_WAITDEV_FILES)
-- 
2.21.0