From patchwork Wed Jun 30 14:13:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30841 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 CDDA527BC81; Wed, 30 Jun 2021 15:15:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 581A327BC78 for ; Wed, 30 Jun 2021 15:15:14 +0100 (BST) Received: from localhost ([::1]:40370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyazh-0004tA-DJ for patchwork@mira.cbaines.net; Wed, 30 Jun 2021 10:15:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyazW-0004t2-OU for guix-patches@gnu.org; Wed, 30 Jun 2021 10:15:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyazW-0005qX-GZ for guix-patches@gnu.org; Wed, 30 Jun 2021 10:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lyazW-0003fy-91 for guix-patches@gnu.org; Wed, 30 Jun 2021 10:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49293] [PATCH] isc-dhcp: Fix dhclient-script wrapper when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Jun 2021 14:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49293 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49293@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162506245114040 (code B ref -1); Wed, 30 Jun 2021 14:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Jun 2021 14:14:11 +0000 Received: from localhost ([127.0.0.1]:58402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyayc-0003eK-VJ for submit@debbugs.gnu.org; Wed, 30 Jun 2021 10:14:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:56054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyayZ-0003eA-4w for submit@debbugs.gnu.org; Wed, 30 Jun 2021 10:14:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyayY-0004mV-Uw for guix-patches@gnu.org; Wed, 30 Jun 2021 10:14:02 -0400 Received: from baptiste.telenet-ops.be ([2a02:1800:120:4::f00:13]:37508) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyayS-00058o-48 for guix-patches@gnu.org; Wed, 30 Jun 2021 10:14:02 -0400 Received: from butterfly.local ([188.189.254.236]) by baptiste.telenet-ops.be with bizsmtp id PSDs2500556nx8C01SDsnC; Wed, 30 Jun 2021 16:13:52 +0200 Message-ID: <19e78b632e9d3dff63fae6409ccc98708907a297.camel@telenet.be> From: Maxime Devos Date: Wed, 30 Jun 2021 16:13:46 +0200 User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1625062432; bh=WO+mWYuZ/J69rKjHpvrXjfEzwtac7T67TqayiaMdT50=; h=Subject:From:To:Date; b=tr5mLDmiRt4Zs2o9aQTXQej7/symWFc8ZgCHOegPo6x4UjfPy/sEQ1wFnQRUDIG9k F1ORRmf+4GoalvcwBKHDKCXMHYl3h10F7Q7m1Bm90ZmlSqDe58gri4QgyJhfajh3HD PnZWiVdWwzwTzZZ8G21dh7Toqzd3z7D4o40u3p2PM+Nmv81gY3Ej3thJDrOgAPM0wh nPtDc7MulJY9P/psZqRbnXTq7xR+UwHrtQMHJKGkWYnxcCVEpoTscBgfvvII3KHkEI zDIpIx1pr4+2OgQ2RO7PpSy/V1R/mqrc1fWscEIBhaXFQuzxcvA1NJRJHbCI0270OG rlLVD3XVElOOA== Received-SPF: pass client-ip=2a02:1800:120:4::f00:13; envelope-from=maximedevos@telenet.be; helo=baptiste.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This causes many rebuilds, but only when cross-compiling. This should unbreak Internet access on cross-compiled pinebook images. Reported-By: Guest4977 (on IRC) From 12973e011f031f0142d1cb4ab0a6dcb1376cc449 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Wed, 30 Jun 2021 15:43:42 +0200 Subject: [PATCH] isc-dhcp: Fix dhclient-script wrapper when cross-compiling. This causes many rebuilds, but only when cross-compiling. This should unbreak Internet access on cross-compiled pinebook images. Reported-By: Guest4977 (on IRC) * gnu/gnunet/packages/admin.scm (isc-dhcp)[arguments]<#:phases>{post-install}: Use the cross-compiled bash when cross-compiling. Work-around . --- gnu/packages/admin.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 16fcdfcb8c..bb66e005a7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2021 David Larsson ;;; Copyright © 2021 WinterHound ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -1228,7 +1229,11 @@ connection alive.") "--owner=root:0" "--group=root:0"))))) (add-after 'install 'post-install - (lambda* (#:key inputs outputs #:allow-other-keys) + ;; TODO(core-updates): native-inputs isn't required anymore. + (lambda* (#:key ,@(if (%current-target-system) + '(native-inputs) + '()) + inputs outputs #:allow-other-keys) ;; Install the dhclient script for GNU/Linux and make sure ;; if finds all the programs it needs. (let* ((out (assoc-ref outputs "out")) @@ -1253,6 +1258,13 @@ connection alive.") (string-append dir "/bin:" dir "/sbin")) (list inetutils net-tools coreutils sed)))) + ;; TODO(core-updates): should not be required anymore, + ;; once has been merged. + ,@(if (%current-target-system) + '((substitute* (string-append libexec "/dhclient-script") + (((assoc-ref native-inputs "bash")) + (assoc-ref inputs "bash")))) + '()) #t)))))) (native-inputs @@ -1260,6 +1272,11 @@ connection alive.") ("file" ,file))) (inputs `(("inetutils" ,inetutils) + ;; TODO(core-updates): simply make this unconditional + ,@(if (%current-target-system) + ;; for wrap-program + `(("bash" ,(canonical-package bash-minimal))) + '()) ,@(if (hurd-target?) '() `(("net-tools" ,net-tools) ("iproute" ,iproute))) -- 2.32.0