From patchwork Mon May 29 16:57:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 50444 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 1EBAF27BBE2; Mon, 29 May 2023 17:58:36 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 593D327BBEA for ; Mon, 29 May 2023 17:58:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3gC8-00025m-GS; Mon, 29 May 2023 12:58:08 -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 1q3gC3-00025L-4z for guix-patches@gnu.org; Mon, 29 May 2023 12:58: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 1q3gC2-0005sN-ST for guix-patches@gnu.org; Mon, 29 May 2023 12:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3gC2-0001a8-GE for guix-patches@gnu.org; Mon, 29 May 2023 12:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63508] [PATCH v4 1/2] gnu: eudev: Use new project URL for Git repo and home page. References: In-Reply-To: Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 May 2023 16:58: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.16853794506025 (code B ref 63508); Mon, 29 May 2023 16:58:02 +0000 Received: (at 63508) by debbugs.gnu.org; 29 May 2023 16:57:30 +0000 Received: from localhost ([127.0.0.1]:59023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3gBV-0001Z7-UZ for submit@debbugs.gnu.org; Mon, 29 May 2023 12:57:30 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:49068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3gBU-0001Yy-2M for 63508@debbugs.gnu.org; Mon, 29 May 2023 12:57:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=hVRrnwy1necK4NN AG6rxeieurbmWRd776zn7JjmdSJ4=; h=date:subject:cc:to:from; d=lease-up.com; b=DaRHyDHGGxNc+XSQs4JYuobNcmwvfk+NzCa+Yw/m9nkK72c7pXV5 6lByZotoVADA98kQrp0RQsIJvPtkLfNC9jjbn4IiKU78RoVjZWvdNwiWaNZl76F4uIISO8 Qd4v0yXRbg/Vkt4gVmrg5fNLl+hoVZ55mT71pjk+2+Gm/NTtA= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id cbf830f1 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 29 May 2023 16:57:26 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id a069b5dd; Mon, 29 May 2023 16:57:26 +0000 (UTC) Date: Mon, 29 May 2023 09:57:22 -0700 Message-Id: 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): Use new project URL https://github.com/eudev-project/eudev for Git repo and home page. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ae2792825b..7a365e2e22 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4180,7 +4180,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 @@ -4242,7 +4242,7 @@ (define-public eudev (list `(,util-linux "lib") ;for blkid kmod)) (outputs '("out" "static")) - (home-page "https://wiki.gentoo.org/wiki/Project:Eudev") + (home-page "https://github.com/eudev-project/eudev") (synopsis "Userspace device management") (description "Udev is a daemon which dynamically creates and removes device nodes from /dev/, handles hotplug events and loads drivers at boot From patchwork Mon May 29 16:57:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 50443 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 6F0C327BBEC; Mon, 29 May 2023 17:58: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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 27AFB27BBE2 for ; Mon, 29 May 2023 17:58:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3gC8-00025q-LR; Mon, 29 May 2023 12:58:08 -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 1q3gC3-00025S-Bs for guix-patches@gnu.org; Mon, 29 May 2023 12:58: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 1q3gC3-0005si-3h for guix-patches@gnu.org; Mon, 29 May 2023 12:58:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3gC2-0001aF-WB for guix-patches@gnu.org; Mon, 29 May 2023 12:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63508] [PATCH v4 2/2] 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: Mon, 29 May 2023 16:58: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.16853794546043 (code B ref 63508); Mon, 29 May 2023 16:58:02 +0000 Received: (at 63508) by debbugs.gnu.org; 29 May 2023 16:57:34 +0000 Received: from localhost ([127.0.0.1]:59025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3gBa-0001ZP-8K for submit@debbugs.gnu.org; Mon, 29 May 2023 12:57:34 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:49068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3gBV-0001Yy-KR for 63508@debbugs.gnu.org; Mon, 29 May 2023 12:57:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=4L12ZmZoA0lQhr2 2HLtIQCB80Neo6GXwex5Bo85i3PE=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=rX+B1/KAEWIUhGCO2rzAT2K9a+anT0gEtop2penF EBsFbIyAvyMH07fNcaprllO8etyqpLNOIaiRkK/ulAdqKqDWxZZCF9fYI2kB6qUNM8gcTg KZ2fzzj+HyZtKp9Q8Ep1GZ4SECKaRr4oxu59Wyup12oE5XkuzXHuxplvYrVf0= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id db8d1774 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 29 May 2023 16:57:27 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 81cf9d46; Mon, 29 May 2023 16:57:27 +0000 (UTC) Date: Mon, 29 May 2023 09:57:23 -0700 Message-Id: <2d51ddd4e6865a40a15b8f7948d2479952571a4e.1685379443.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 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] 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 7a365e2e22..55255e576e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4192,6 +4192,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"