From patchwork Thu May 18 00:52:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 50083 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7147D27BBE9; Thu, 18 May 2023 01:54:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 95F8427BBEA for ; Thu, 18 May 2023 01:54:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzRu8-00009M-DG; Wed, 17 May 2023 20:54:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzRu6-00008i-VR for guix-patches@gnu.org; Wed, 17 May 2023 20:54:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzRu6-00026E-Np for guix-patches@gnu.org; Wed, 17 May 2023 20:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzRu6-0006hk-E9 for guix-patches@gnu.org; Wed, 17 May 2023 20:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63508] [PATCH v2 1/4] gnu: eudev: Convert native-inputs to new style. References: In-Reply-To: Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 00:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63508 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63508@debbugs.gnu.org Cc: Liliana Marie Prikler , Felix Lechner Received: via spool by 63508-submit@debbugs.gnu.org id=B63508.168437118325668 (code B ref 63508); Thu, 18 May 2023 00:54:02 +0000 Received: (at 63508) by debbugs.gnu.org; 18 May 2023 00:53:03 +0000 Received: from localhost ([127.0.0.1]:51495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzRt8-0006fw-Ku for submit@debbugs.gnu.org; Wed, 17 May 2023 20:53:02 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:57944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzRt6-0006fX-Kx for 63508@debbugs.gnu.org; Wed, 17 May 2023 20:53:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=pq2XQP9Roy0aL/5 cQm6XbSluG0Mn/hEia0/M3z7on08=; h=date:subject:cc:to:from; d=lease-up.com; b=oEqBGv25A6GAr+lIXXapmhv3GIdI1JAbsoH2NRwXlmBsclcBboWh n02gOdXjCAsfquAEfwAOLS0oOhRfE+F73KP9CSfu8p2sbB574ggrBqpelYZ51yWsls1NmJ C0025s8EWDi4nrB2cQMzbQ2AdeL84pQe3KedyV7PMRzRs1vU0= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 62cde05e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 18 May 2023 00:52:59 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id e2444611; Thu, 18 May 2023 00:52:59 +0000 (UTC) Date: Wed, 17 May 2023 17:52:38 -0700 Message-Id: <29b8c15130a15487142ecf2089cba2a76ee8cb6d.1684370595.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches X-Patchwork-Original-From: Felix Lechner via Guix-patches via From: Felix Lechner Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (eudev): Convert native-inputs to new style. --- gnu/packages/linux.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) base-commit: 6e38ec447f98383e0722ac300734f8d7c8c5c7b0 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 90c1adde53..1f1b319dbf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4190,19 +4190,19 @@ (define-public eudev "hwdb" "--update"))))))) #:configure-flags (list "--enable-manpages"))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("gperf" ,gperf) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ;; For tests. - ("perl" ,perl) - ("python" ,python-wrapper) - ;; For documentation. - ("docbook-xml" ,docbook-xml-4.2) - ("docbook-xsl" ,docbook-xsl) - ("libxml2" ,libxml2) ;for $XML_CATALOG_FILES - ("xsltproc" ,libxslt))) + (list autoconf + automake + gperf + libtool + pkg-config + ;; For tests. + perl + python-wrapper + ;; For documentation. + docbook-xml-4.2 + docbook-xsl + libxml2 ;for $XML_CATALOG_FILES + libxslt)) (inputs ;; When linked against libblkid, eudev can populate /dev/disk/by-label ;; and similar; it also installs the '60-persistent-storage.rules' file, From patchwork Thu May 18 00:52:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 50084 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9572027BBE9; Thu, 18 May 2023 01:54:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 846BD27BBE2 for ; Thu, 18 May 2023 01:54:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzRu8-00009E-56; Wed, 17 May 2023 20:54:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzRu7-00008w-AL for guix-patches@gnu.org; Wed, 17 May 2023 20:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzRu7-00026T-2b for guix-patches@gnu.org; Wed, 17 May 2023 20:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzRu6-0006hs-U9 for guix-patches@gnu.org; Wed, 17 May 2023 20:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63508] [PATCH v2 2/4] gnu: eudev: Convert build arguments to gexps. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 00:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63508 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63508@debbugs.gnu.org Cc: Liliana Marie Prikler , Felix Lechner Received: via spool by 63508-submit@debbugs.gnu.org id=B63508.168437118625694 (code B ref 63508); Thu, 18 May 2023 00:54:02 +0000 Received: (at 63508) by debbugs.gnu.org; 18 May 2023 00:53:06 +0000 Received: from localhost ([127.0.0.1]:51500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzRtB-0006gL-VN for submit@debbugs.gnu.org; Wed, 17 May 2023 20:53:06 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:57944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzRt9-0006fX-0o for 63508@debbugs.gnu.org; Wed, 17 May 2023 20:53:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=D8Xf6yKzYiSFV+j ozi7bYwI1vK2K0oXLEE8lHVyfN4I=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=Sa8dTxIK/pjR+5mq96/dGFD/StrK7pTxO6+icueF bjmnvs/ZsxaVEfMEy3By6TGYQ/iHXsFNbNWr7tsmN6S/ZVkTefd+qybzHlzD3fYoB2JeMe rgjSwzNB95gmVNoWutzsm3bmjDeLrxjPbWZau0JEqDFL6vyW8txj3PbZbChxc= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id c75eedca (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 18 May 2023 00:53:01 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 95be0def; Thu, 18 May 2023 00:53:00 +0000 (UTC) Date: Wed, 17 May 2023 17:52:39 -0700 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: <29b8c15130a15487142ecf2089cba2a76ee8cb6d.1684370595.git.felix.lechner@lease-up.com> References: <29b8c15130a15487142ecf2089cba2a76ee8cb6d.1684370595.git.felix.lechner@lease-up.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches X-Patchwork-Original-From: Felix Lechner via Guix-patches via From: Felix Lechner Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (eudev): Convert build arguments to gexps. --- gnu/packages/linux.scm | 68 ++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1f1b319dbf..9058648700 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4153,42 +4153,38 @@ (define-public eudev (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'patch-file-names - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (substitute* "man/make.sh" - (("/usr/bin/xsltproc") - (string-append (assoc-ref - (or native-inputs inputs) "xsltproc") - "/bin/xsltproc"))))) - (add-after 'install 'move-static-library - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (static (assoc-ref outputs "static")) - (source (string-append out "/lib/libudev.a")) - (target (string-append static "/lib/libudev.a"))) - (mkdir-p (dirname target)) - (link source target) - (delete-file source) - ;; Remove reference to the static library from the .la file - ;; such that Libtool looks for it in the usual places. - (substitute* (string-append out "/lib/libudev.la") - (("old_library=.*") - "old_library=''\n"))))) - (add-after 'install 'build-hwdb - (lambda* (#:key outputs #:allow-other-keys) - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and - ;; similar tools to display product names. - ;; - ;; XXX: This can't be done when cross-compiling. Find another way - ;; to generate hwdb.bin for cross-built systems. - (let ((out (assoc-ref outputs "out"))) - ,@(if (%current-target-system) - '(#t) - '((invoke (string-append out "/bin/udevadm") - "hwdb" "--update"))))))) - #:configure-flags (list "--enable-manpages"))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'bootstrap 'patch-file-names + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (substitute* "man/make.sh" + (("/usr/bin/xsltproc") + (search-input-file (or native-inputs inputs) "/bin/xsltproc"))))) + (add-after 'install 'move-static-library + (lambda _ + (let ((source (string-append #$output "/lib/libudev.a")) + (target (string-append #$output:static "/lib/libudev.a"))) + (mkdir-p (dirname target)) + (link source target) + (delete-file source) + ;; Remove reference to the static library from the .la file + ;; such that Libtool looks for it in the usual places. + (substitute* (string-append #$output "/lib/libudev.la") + (("old_library=.*") + "old_library=''\n"))))) + (add-after 'install 'build-hwdb + (lambda _ + ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and + ;; similar tools to display product names. + ;; + ;; XXX: This can't be done when cross-compiling. Find another way + ;; to generate hwdb.bin for cross-built systems. + #$@(if (%current-target-system) + #~(#t) + #~((invoke (string-append #$output "/bin/udevadm") + "hwdb" "--update")))))) + #:configure-flags #~(list "--enable-manpages"))) (native-inputs (list autoconf automake From patchwork Thu May 18 00:52:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 50082 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 80E9627BBEA; Thu, 18 May 2023 01:54:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1E45E27BBE2 for ; Thu, 18 May 2023 01:54:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzRu9-0000AN-Bo; Wed, 17 May 2023 20:54:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzRu7-000096-OO for guix-patches@gnu.org; Wed, 17 May 2023 20:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzRu7-00026b-Gu for guix-patches@gnu.org; Wed, 17 May 2023 20:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzRu7-0006hz-CE for guix-patches@gnu.org; Wed, 17 May 2023 20:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63508] [PATCH v2 3/4] gnu: eudev: Use new project URL. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 00:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63508 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63508@debbugs.gnu.org Cc: Liliana Marie Prikler , Felix Lechner Received: via spool by 63508-submit@debbugs.gnu.org id=B63508.168437118625701 (code B ref 63508); Thu, 18 May 2023 00:54:03 +0000 Received: (at 63508) by debbugs.gnu.org; 18 May 2023 00:53:06 +0000 Received: from localhost ([127.0.0.1]:51502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzRtC-0006gN-Bz for submit@debbugs.gnu.org; Wed, 17 May 2023 20:53:06 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:57944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzRtA-0006fX-8l for 63508@debbugs.gnu.org; Wed, 17 May 2023 20:53:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=J2eE1ZfgDDRtxHo x8l+ZCI3W+5GGgZ9No7WsNJg8D+U=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=DZu+W/6nLB3JFDknpwbIo4lBvTfjIoFk0ya3K+Ya NXRS+kSjGzYzErFGGVoOuLedogJYXo7gbGgWNIBagqV6fwxifynMVoWhNsoRlOui+APJqy P0LgHrQy5VdxiqVqtbkf4VSCtRW3rka/7CCxSTvQ8H7dgYFzXHrVUhwh2ECKY= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 05d72d2a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 18 May 2023 00:53:02 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 431c79bd; Thu, 18 May 2023 00:53:01 +0000 (UTC) Date: Wed, 17 May 2023 17:52:40 -0700 Message-Id: <771fb5f5b89e13b43d3efe9c455410f7e712a600.1684370595.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <29b8c15130a15487142ecf2089cba2a76ee8cb6d.1684370595.git.felix.lechner@lease-up.com> References: <29b8c15130a15487142ecf2089cba2a76ee8cb6d.1684370595.git.felix.lechner@lease-up.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches X-Patchwork-Original-From: Felix Lechner via Guix-patches via From: Felix Lechner Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (eudev): Use new project URL. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9058648700..7b989a466c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4144,7 +4144,7 @@ (define-public eudev (version "3.2.11") (source (origin (method git-fetch) - (uri (git-reference (url "https://github.com/gentoo/eudev") + (uri (git-reference (url "https://github.com/eudev-project/eudev") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 From patchwork Thu May 18 00:52:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 50081 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C8E4C27BBEA; Thu, 18 May 2023 01:54:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9152327BBE9 for ; Thu, 18 May 2023 01:54:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzRu9-0000AP-J1; Wed, 17 May 2023 20:54:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzRu8-00009G-84 for guix-patches@gnu.org; Wed, 17 May 2023 20:54:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzRu8-00026m-0M for guix-patches@gnu.org; Wed, 17 May 2023 20:54:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzRu7-0006i7-S8 for guix-patches@gnu.org; Wed, 17 May 2023 20:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63508] [PATCH v2 4/4] gnu: eudev: Have udevadm look in /etc/udev/rules.d. (Closes: #63508) Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 00:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63508 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63508@debbugs.gnu.org Cc: Liliana Marie Prikler , Felix Lechner Received: via spool by 63508-submit@debbugs.gnu.org id=B63508.168437119125713 (code B ref 63508); Thu, 18 May 2023 00:54:03 +0000 Received: (at 63508) by debbugs.gnu.org; 18 May 2023 00:53:11 +0000 Received: from localhost ([127.0.0.1]:51504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzRtG-0006gd-P6 for submit@debbugs.gnu.org; Wed, 17 May 2023 20:53:11 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:57944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzRtA-0006fX-WF for 63508@debbugs.gnu.org; Wed, 17 May 2023 20:53:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=Fnqk/wYXfLS/fcx Qyc8JKVGWZckJcEy+rbWZL3R4B1U=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=Qjr56EczfLaaGvWiP1+RcZJLnUznZDz9ALJicmrZ ehz0IGJ72lhVyOJQQ87S6A2ukLooTzKyrxjj1kv//kfxPuIPgA2xSN1AZcgS1Vf1pFYfKH 0V9LRFmYdozZvHNk9WkE+CNh5vEr6wErsjvuGgy6b0mb+vEd52xWS895qyaDg= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id e0539734 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 18 May 2023 00:53:03 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 0ac46202; Thu, 18 May 2023 00:53:03 +0000 (UTC) Date: Wed, 17 May 2023 17:52:41 -0700 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: <29b8c15130a15487142ecf2089cba2a76ee8cb6d.1684370595.git.felix.lechner@lease-up.com> References: <29b8c15130a15487142ecf2089cba2a76ee8cb6d.1684370595.git.felix.lechner@lease-up.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches X-Patchwork-Original-From: Felix Lechner via Guix-patches via From: Felix Lechner Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Note for Liliana (and not part of the commit message): Hi, I hope you are not offended by this patch. The one-line substitution here makes the custom rule work, as well. The enviroment variable you proposed is probably superior but the patch is relatively complex and the resulting flexibility may not be needed. Also, I retitled the bug to sidestep the controversy around the default for now. I was surprised by your opposition and think that should be a separate discussion. Thanks! This substitution ensures that udevadm sees the rules that are actually in effect for the declared operating system. It allows administrators to use the udev-rules-service for network interfaces. Some of Guix's customizations for udev rules appear to work as it is [1] but that is not true for network interfaces (which invoke udevadm for naming purposes). [2] The author uses this snippet to select MAC-based names for all network interfaces: (udev-rules-service 'net-name-mac (udev-rule "79-net-name-mac.rules" " SUBSYSTEM==\"net\", ACTION==\"add\", NAME=\"$env{ID_NET_NAME_MAC}\" "))) Without this commit, udevadm will consult the rules that were present at build time and were installed in the store). [1] https://lists.gnu.org/archive/html/guix-devel/2023-05/msg00195.html [2] https://lists.gnu.org/archive/html/guix-devel/2023-05/msg00192.html * gnu/packages/linux.scm (eudev): Have udevadm look in /etc/udev/rules.d. (Closes: #63508) --- gnu/packages/linux.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7b989a466c..750016d572 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4156,6 +4156,11 @@ (define-public eudev (list #:phases #~(modify-phases %standard-phases + (add-before 'bootstrap 'hardcode-runtime-rules-dir + (lambda _ + (use-modules (ice-9 regex)) + (substitute* "src/udev/Makefile.am" + (((regexp-quote "$(udevrulesdir)")) "/etc/udev/rules.d")))) (add-before 'bootstrap 'patch-file-names (lambda* (#:key inputs native-inputs #:allow-other-keys) (substitute* "man/make.sh"