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=b6p658VZBmi0fcoNyuaqxUG7O+187qlZFTun4quPtZM=; b=m2M8sV4gDMQyapz/sWQ6A0YzR1hnyLj20mla1dLTzvF4L9W7Xcrpn+SE7mePBs3pqQ 6iHoF7bdCIZPDe0RLD4/m9IqlbIEDy1u03SrVFI8YSYF8amiCqqYRedc/xwPmiDMY6TS Nxwq9qxh9+1MTm8LRqxWX6qtRsSNgeXZfA/pnI0Al1Hh4rapoi6ut6Tns1aA7OUJv89K 2/0+zM8SBZNV3XPT4MGH6f4l8B07+pqDA+yWz4lY0y9x8gGeZZFr0IAW3pBrIbGzGC0Y WeLwPHr3uhKYa6jGsjBDf8Jc2sEXOt+bvIp7yNQzug4LElyvK9oA8sZD6Tt4y8GC4RlX wpGQ== 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=b6p658VZBmi0fcoNyuaqxUG7O+187qlZFTun4quPtZM=; b=6WDnnBOqZmLJQChjXokd4J46HeeEAO1N3Bg8mlQUdiXCx3Xtc64Oadi5cIpr0wxTMx MS+Ci8MWV795maqaslQo3YsTArexajlQjuXz/hIhZjpMFa4Ktnw+hBcl8LucEekanlFf jPSiHWAHWIbRKVgx3QLS2b0+enK0FJVXaZe8uBgC0gVNjXhEUSynDwxVf6BTkBzgsF9A sRw7ucnupWhfB7ymxqNTuXWH7j0NRF+OLBC5U9uDmhEiAxE1BFBPVZzuj19JzgP2pnmQ a7hptFW+5fU2qEnJtBU2MLncJmKGGCUL+1TgeCaTY64gWb5gdDUvL2/s6xHYZi6ik6Jy n6Xg== X-Gm-Message-State: AOAM532mqqGMk/JZ/6Y4xRN/eDwl+mdBUh4UqktLTz8NUpuUUMBeSysR 8ATrFfti2Inw1bGNj9VibTjJgeP/Koo= X-Google-Smtp-Source: ABdhPJwcTPkRXBpVacUNOa6gGHNqDSfl3zEVSSzjQCEDjGDY4qTdpq370xZJ5hUbCKDxXEt6x9DsMw== X-Received: by 2002:ac2:4f02:: with SMTP id k2mr10429787lfr.266.1632499171809; Fri, 24 Sep 2021 08:59:31 -0700 (PDT) From: Leonid Krivoshein To: make-initrd@lists.altlinux.org Message-ID: <064bb18e-fb40-5d63-c514-477d4a1c5def@gmail.com> Date: Fri, 24 Sep 2021 18:59:30 +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 39/41] workaround: use PUT_FILES= instead PUT_UDEV_RULES= 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:59:35 -0000 Archived-At: List-Archive: add-udev-rules and PUT_UDEV_RULES temporary not working, see also: https://lists.altlinux.org/pipermail/make-initrd/2021-September/000589.html --- make-initrd/features/bootchain-waitdev/config.mk | 6 +++--- make-initrd/features/bootchain-waitdev/rules.mk | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/make-initrd/features/bootchain-waitdev/config.mk b/make-initrd/features/bootchain-waitdev/config.mk index 38368e9..39df0dc 100644 --- a/make-initrd/features/bootchain-waitdev/config.mk +++ b/make-initrd/features/bootchain-waitdev/config.mk @@ -1,6 +1,6 @@ -$(call feature-requires,bootchain-core add-udev-rules) +$(call feature-requires,bootchain-core) BOOTCHAIN_WAITDEV_DATADIR = $(FEATURESDIR)/bootchain-waitdev/data -BOOTCHAIN_WAITDEV_RULES = \ - *-cdrom_id.rules +BOOTCHAIN_WAITDEV_FILES = \ + /lib/udev/rules.d/60-cdrom_id.rules diff --git a/make-initrd/features/bootchain-waitdev/rules.mk b/make-initrd/features/bootchain-waitdev/rules.mk index 44c05f2..a9cd6c3 100644 --- a/make-initrd/features/bootchain-waitdev/rules.mk +++ b/make-initrd/features/bootchain-waitdev/rules.mk @@ -1,4 +1,2 @@ -PUT_UDEV_RULES += $(BOOTCHAIN_WAITDEV_RULES) - PUT_FEATURE_DIRS += $(BOOTCHAIN_WAITDEV_DATADIR) PUT_FEATURE_FILES += $(BOOTCHAIN_WAITDEV_FILES) -- 2.21.0