From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM autolearn=ham autolearn_force=no version=3.4.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:subject:to:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=IpchXtUE+Zl138mnQrfh1N8MAhj3mq31zTjFQN000Pw=; b=kBFANwAfP84E15jfsp0bt5lnGnfeWWB6a8gvRV0UVBqNnP9EuOR8/X8bdTrim3rJ2P 3zEy3grkSXe4j+/K7j4AEOQ3tWH9wUtUtPnr2npGdp1mSxNBdVwppir3EhDhczhZgfvZ 3QT2sxa5ZJLUQB4mYxjJQm4xrw3v0DydGnvrYVtMUO33zZBsTak82D1Th2jW6zke7uvO sYBiRLCf0MzjKCgkNJsfdGhw+MY1OSJyzEhZC7FtbeVjmJplBwfgVlZCxaPTOxrHzm6p bA67sxDKcV7icfviB0mo6r6WS+6UqkCejsgET/HnpcQyoPfYF81pwnnQd8s6cJDlmWHI h3gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:subject:to:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=IpchXtUE+Zl138mnQrfh1N8MAhj3mq31zTjFQN000Pw=; b=5g+fkc1FJulDHzYpBfPVZ48A+arCREfOEhHJsyTA3+5nkkh/eqrC757EWyUoFmyVX9 4MS/f4sxnYSxvNoSBYXoTpUm5M93iU31iu+wsCe4neXmlyUjCabxCy+bEMZ8L/lSJ8nR mdMILuvD/bFCXkhO/5sy55hSOpvNc3uUUzkJbk9o6xuNs5LHVVd6tF2QJUZhxlEQMbbt A0A6dxVdGoAs1a0Ufvt8FtUUPie4bJc40ZtPmkSWD2AonSPJXu58V8lLZN279BufKHxh QCu1K3TVHe7INvQgWPdGrvBkBN2NwbSjAqhiKBkeBB3cN+pTGmNp9jXzI+OQr2fQ5x3d ZMaQ== X-Gm-Message-State: AOAM533x6rJ+KpWRrGFnyydYr2APwa45rmfj5StIx680kKEiSU/jjGUr rbFwPzr5Ah19+oGFdgSPQMSqaAYN2vA= X-Google-Smtp-Source: ABdhPJx3Nt1FTrDZjUXB+Y1rEiovsEno32YwbsNutroI2KrURwuD4W/YLz0QQFeqFR/Ad7r4cexAmQ== X-Received: by 2002:a05:6512:eaa:: with SMTP id bi42mr10180162lfb.384.1632499014011; Fri, 24 Sep 2021 08:56:54 -0700 (PDT) From: Leonid Krivoshein To: make-initrd@lists.altlinux.org Message-ID: <0d7f6b9d-f44b-dab3-9aa5-890607533fe6@gmail.com> Date: Fri, 24 Sep 2021 18:56:53 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=windows-1251; format=flowed Content-Language: ru Content-Transfer-Encoding: 7bit Subject: [make-initrd] [PATCH v1 14/41] fork pipeline: waitdev: config.mk and rules.mk modified X-BeenThere: make-initrd@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: make-initrd@lists.altlinux.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Sep 2021 15:56:57 -0000 Archived-At: List-Archive: --- 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