From: Leonid Krivoshein <klark.devel@gmail.com>
To: make-initrd@lists.altlinux.org
Subject: [make-initrd] [PATCH v1 14/41] fork pipeline: waitdev: config.mk and rules.mk modified
Date: Fri, 24 Sep 2021 18:56:53 +0300
Message-ID: <0d7f6b9d-f44b-dab3-9aa5-890607533fe6@gmail.com> (raw)
---
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
reply other threads:[~2021-09-24 15:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0d7f6b9d-f44b-dab3-9aa5-890607533fe6@gmail.com \
--to=klark.devel@gmail.com \
--cc=make-initrd@lists.altlinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Make-initrd development discussion
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/make-initrd/0 make-initrd/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 make-initrd make-initrd/ http://lore.altlinux.org/make-initrd \
make-initrd@lists.altlinux.org make-initrd@lists.altlinux.ru make-initrd@lists.altlinux.com
public-inbox-index make-initrd
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.make-initrd
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git