From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 15 12:55:57 2024 Received: (at submit) by debbugs.gnu.org; 15 Aug 2024 16:55:57 +0000 Received: from localhost ([127.0.0.1]:49631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedlT-0003Ic-Jk for submit@debbugs.gnu.org; Thu, 15 Aug 2024 12:55:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:51046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedlQ-0003IR-Mw for submit@debbugs.gnu.org; Thu, 15 Aug 2024 12:55:54 -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 1sedkq-0000bl-1l for guix-patches@gnu.org; Thu, 15 Aug 2024 12:55:16 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sedko-0003CN-3k; Thu, 15 Aug 2024 12:55:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=lKY2fgwsPBrLcFdyOuP8aFjBYilaAL7VdphzeWxoiMg=; b=TF2PLshCBvuqUB f6JaSRg2QWCTFi7uJKgDUF4x3kpaCWt0xNAS1XD1FHq8H6P0sj08gD9lU7B2jnm5FVLMtI5tNgh1u l9ALEfSbOVfHRe1XRBEf8lpEume/KJ7K9oexxHB9PmJdFdhYpfp3niL0j/vTJtdLtNFIRBym8e3+3 2qurO9WfHRggbgdT59S3ZkaEi5/vYglr7uYINVkUuV2gb12vdEYQ/iVYi6e9fo40PwkE0MCC7wq80 GEsFTgkoStNZ+wpuA/k/LLIpVMc2OHoEdTj9DeplX4h37tEUGCSc3LrtcvdK2dBGO61d2wrB6HUIM s6ETxH2bi+e98qnFCBdg==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-patches@gnu.org Subject: [PATCH core-updates 0/6] Restore i586-gnu (GNU/Hurd) support Date: Thu, 15 Aug 2024 18:54:59 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 X-Debbugs-Cc: Janneke Nieuwenhuizen , Josselin Poiret MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Efraim Flashner , Ekaitz Zarraga , Ludovic Courtès Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! This patch series fixes Hurd support (i586-gnu) on ‘core-updates’, as described . It does so by updating the ‘glibc-bootstrap’ tarball. I built the new tarball from the third commit and dropped it under gnu/packages/aux-files, which where the commit marked as “DRAFT” picks it up. Of course we’ll change that to a URL at ftp.gnu.org/gnu/guix/bootstrap/i586-gnu once we agree on the strategy. For convenience, I uploaded the tarball here: https://people.bordeaux.inria.fr/lcourtes/tmp/glibc-stripped-2.39-i586-pc-gnu.tar.xz https://people.bordeaux.inria.fr/lcourtes/tmp/glibc-stripped-2.39-i586-pc-gnu.tar.xz.sig nix-sha256: 0x2x6w611k6v9qdabacawamw2475p04hm3s0q95xcg063wjq4ig2 I was able to build this successfully: ./pre-inst-env guix build \ -e '(@@ (gnu packages commencement) glibc-final-with-bootstrap-bash)' \ -s i586-gnu I’ll try to build some more and see. I’d like to push this to ‘core-updates’ soon since it’s probably the last blocker before we can merge. Thoughts? Ludo’. Ludovic Courtès (6): gnu: make-bootstrap: Fix cross-compilation of ‘%glibc-stripped’. gnu: make-bootstrap: Adjust ‘%glibc-stripped’ for glibc@2.39 on the Hurd. gnu: make-bootstrap: Include libdl.a and libutil.a in ‘glibc-stripped’. DRAFT gnu: glibc-bootstrap: Update i586-gnu variant. gnu: perl-boot0: Use gexps. gnu: commencement: Build ‘perl-boot0’ without stack protector on the Hurd. gnu/packages/bootstrap.scm | 105 ++++++++++++++++---------------- gnu/packages/commencement.scm | 45 ++++++++------ gnu/packages/make-bootstrap.scm | 27 ++++---- guix/build/make-bootstrap.scm | 30 ++++++--- 4 files changed, 117 insertions(+), 90 deletions(-) base-commit: 6fe957f749bc500bce49e4fa1cfa4d8c32227f32 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 15 12:59:30 2024 Received: (at 72643) by debbugs.gnu.org; 15 Aug 2024 16:59:30 +0000 Received: from localhost ([127.0.0.1]:49658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedov-0003Pt-Fu for submit@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedot-0003Pc-N0 for 72643@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:28 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sedoE-0003QM-0R; Thu, 15 Aug 2024 12:58:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=QskDqBznHXIAEin9J3Y476wIY9KKG73eVuu68ssnE/0=; b=V7YBorbIiazyftVjYgBF jZv3m2OihPozvCDQyVfjV/4uINS0utQKZKh/sWjDj7VOH+g2PWETL/z8XEXxe+9d7p0SS63GJmeWc PFEZXhHFTKZgCnjBAq//9/tU/qjYlHCTNR3vt00e6EfOkbDtT3C2JwT+FHowrBooT2XTnX0SEKUBk S/U/nMEdC7WCKb9F4e5MvbsiAnPmfZlxeJLsFeQptAhCgKhW21hwBSigTsZlMHkvu6GY7xdZPyTo1 hAF7x+eTd8eHNH64Fd0iHXnd4s3zww62J7AMqtmmVqKnLw7wP1bzZABN8jakAVLwUZ+7/VISngFMD TE+LngbglO0seg==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 72643@debbugs.gnu.org Subject: [PATCH core-updates 1/6] =?UTF-8?q?gnu:=20make-bootstrap:=20Fix?= =?UTF-8?q?=20cross-compilation=20of=20=E2=80=98%glibc-stripped=E2=80=99.?= Date: Thu, 15 Aug 2024 18:58:29 +0200 Message-ID: <01749753fe8eb0e5889024310d6ddb12f740637d.1723740352.git.ludo@gnu.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Ludovic Courtès Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72643 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Previously, ‘guix build bootstrap-tarballs --target=aarch64-linux-gnu’ or similar would construct a cross-libc where ‘%current-target-system’ is set. This would lead to a failure in the ‘add-cross-binutils-to-PATH’ phase, which assumes that ‘%current-target-system’ is #f; indeed, ‘cross-libc’ already returns a cross libc and so ‘%current-target-system’ must be set to #f. * gnu/packages/make-bootstrap.scm (%glibc-stripped)[inputs]: Move libc to… [native-inputs]: … here. Change-Id: Ifbf5e519ba3198940f4de4a36075d5302e923172 --- gnu/packages/make-bootstrap.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index d5b6b818b3..679aa46d60 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -448,19 +448,20 @@ (define (%glibc-stripped) (make-stripped-libc (assoc-ref %outputs "out") (assoc-ref %build-inputs "libc") (assoc-ref %build-inputs "kernel-headers"))))) - (inputs `(("kernel-headers" - ,(if (or (and (%current-target-system) - (target-hurd? (%current-target-system))) - (string-suffix? "-hurd" (%current-system))) - gnumach-headers - linux-libre-headers)) - ("libc" ,(let ((target (%current-target-system))) - (if target - (glibc-for-bootstrap - (parameterize ((%current-target-system #f)) - (cross-libc target))) - glibc))))) - (native-inputs '()) + (native-inputs + `(("libc" ,(let ((target (%current-target-system))) + (if target + (glibc-for-bootstrap + (parameterize ((%current-target-system #f)) + (cross-libc target))) + glibc))))) + (inputs + `(("kernel-headers" + ,(if (or (and (%current-target-system) + (target-hurd? (%current-target-system))) + (string-suffix? "-hurd" (%current-system))) + gnumach-headers + linux-libre-headers)))) (propagated-inputs '()) ;; Only one output. -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 15 12:59:33 2024 Received: (at 72643) by debbugs.gnu.org; 15 Aug 2024 16:59:34 +0000 Received: from localhost ([127.0.0.1]:49664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedoz-0003QK-7i for submit@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedou-0003Pe-Rp for 72643@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:29 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sedoF-0003Qk-52; Thu, 15 Aug 2024 12:58:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=WNQTG/Bqr3h/iYOdMlS45H8OzAeWlMdDAEVxa0Xcbcg=; b=YTthOs6OXtM89EYmQaxU CCR4lnuc+xrp1vd0yFAW65lHvd8+yq8lXTmJ+gUqv+TO0Rub4dVvJHMfGc/ZHTZq+Du59EyEGnjDK gfNSG1ykZb5pyK3U++3c9XWuRDyOaxFdHtGQou3HEWn2wm8r1c8EOV1jZbHzbznwhajdfHLsmgTcT Eg2noT+tvMt9Quk5xMHny6XZU0YH6DHAHdrKInYf9xiDqG6WR57vBwTEtR5TW0Leadh6cmSfF78CC WaGhzVBmeKuusWwZ7/DRncU4iGxp/P9QRNgGJA5lCvkjndmVMEn53wzgHYu+U35/KZ/0DHN4YcFpg FUFG5dJgyegrOA==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 72643@debbugs.gnu.org Subject: [PATCH core-updates 2/6] =?UTF-8?q?gnu:=20make-bootstrap:=20Adjus?= =?UTF-8?q?t=20=E2=80=98%glibc-stripped=E2=80=99=20for=20glibc@2.39=20on?= =?UTF-8?q?=20the=20Hurd.?= Date: Thu, 15 Aug 2024 18:58:30 +0200 Message-ID: <6e5e8f74944fc359de973b7ef29e537cbfd1685d.1723740352.git.ludo@gnu.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72643 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Previously the second ‘copy-recursively’ call would fail with EEXIST since glibc@2.39 already provides $includedir/include/mach. * guix/build/make-bootstrap.scm (make-stripped-libc)[copy-mach-headers]: Pass #:select? to ‘copy-recursively’ to exclude files already present under INCDIR. Change-Id: I7e5a93e46eefa18299c231468c720072468fdb10 --- guix/build/make-bootstrap.scm | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm index 0d29338ce3..6cb5262f8e 100644 --- a/guix/build/make-bootstrap.scm +++ b/guix/build/make-bootstrap.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2017 Manolis Fragkiskos Ragkousis -;;; Copyright © 2015, 2019 Ludovic Courtès +;;; Copyright © 2015, 2019, 2024 Ludovic Courtès ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -84,13 +84,27 @@ (define (make-stripped-libc output libc kernel-headers) when producing a bootstrap libc." (define (copy-mach-headers output kernel-headers) - (let* ((incdir (string-append output "/include"))) + (let ((mach-headers (readlink + (string-append kernel-headers "/include/mach"))) + (incdir (string-append output "/include"))) (copy-recursively (string-append libc "/include") incdir) - (copy-recursively (string-append kernel-headers "/include/mach") - (string-append incdir "/mach")) - #t)) - + ;; As of glibc 2.39, essential Mach headers get installed by glibc + ;; itself in its own includedir, except for most of mach/machine/*.h. + ;; Copy anything that's missing from MACH-HEADERS. + (copy-recursively mach-headers + (string-append incdir "/mach") + #:select? + (let ((prefix (string-length mach-headers)) + (target (string-append incdir "/mach"))) + (lambda (file stat) + ;; Select everything but files and symlinks that + ;; already exist under TARGET. + (or (eq? 'directory (stat:type stat)) + (let ((suffix (string-drop file prefix))) + (not (file-exists? + (in-vicinity target suffix)))))))))) + (define (copy-libc+linux-headers output kernel-headers) (let* ((incdir (string-append output "/include"))) (copy-recursively (string-append libc "/include") incdir) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 15 12:59:35 2024 Received: (at 72643) by debbugs.gnu.org; 15 Aug 2024 16:59:36 +0000 Received: from localhost ([127.0.0.1]:49668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedoz-0003QM-Um for submit@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedow-0003Ph-Cr for 72643@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:31 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sedoG-0003Qt-MX; Thu, 15 Aug 2024 12:58:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=WK+2N1N5064822OhxyaSBe5mNmb9nZdyvh1DWJKQpFI=; b=T4H0kbyXWBb68B74h4V8 WLRltZ3+pU78Nh/AVCPuFHs49JDcIcpI8k0L5tX1Xf6SPMTFGj2+3nDQD2D3ueXWRBwJ9Nlh8CkK4 s14tdvTnO6QH7rXW2sASgGokzTlCnU2etT7a7rsAcfJk1n12g7XtzJ3jzMV0A1KebsN+2i3oEL+3f IfQvuoub/Hg+JurCRffh02XOlPZTlIpJ8fa3hh+5k7zvjvoRgkbcWBA0sbqBi+wRyzHptH+lMjjn9 S5g75QmOUIgeZBww0bLfHPzEFv2gtS0OZpko7ZPUDOomBGxA1QtcsmNR4mzOdSUQpkuk2C3FPo08o SoLW/RfbENFlWQ==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 72643@debbugs.gnu.org Subject: [PATCH core-updates 3/6] =?UTF-8?q?gnu:=20make-bootstrap:=20Inclu?= =?UTF-8?q?de=20libdl.a=20and=20libutil.a=20in=20=E2=80=98glibc-stripped?= =?UTF-8?q?=E2=80=99.?= Date: Thu, 15 Aug 2024 18:58:31 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72643 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) As of glibc 2.39, libdl.so and libutil.so are gone (they are part of libc proper since 2.34), but empty .a files are provided for backward compatibility with code using -ldl and -lutil. Keep them. * guix/build/make-bootstrap.scm (make-stripped-libc)[%libc-object-files-rx]: Mach libdl.a and libutil.a. Change-Id: I967c6f34a443366224293362b8a2302fe86fd5a0 --- guix/build/make-bootstrap.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm index 6cb5262f8e..287e4db2c7 100644 --- a/guix/build/make-bootstrap.scm +++ b/guix/build/make-bootstrap.scm @@ -110,9 +110,11 @@ (define (make-stripped-libc output libc kernel-headers) (copy-recursively (string-append libc "/include") incdir) (copy-linux-headers output kernel-headers))) + ;; Include *.so, *.so.*, but also empty ar archives provided for backward + ;; compatibility as of libc 2.39: libdl.a and libutil.a. (define %libc-object-files-rx "^(crt.*|ld.*|lib(c|m|dl|rt|pthread|nsl|\ util).*\\.so(\\..*)?|lib(machuser|hurduser).so.*|(libc(rt|)|libpthread)\ -_nonshared\\.a)$") +_nonshared\\.a|lib(dl|util)\\.a)$") (setvbuf (current-output-port) 'line) (let* ((libdir (string-append output "/lib"))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 15 12:59:36 2024 Received: (at 72643) by debbugs.gnu.org; 15 Aug 2024 16:59:36 +0000 Received: from localhost ([127.0.0.1]:49672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedp1-0003Qe-Un for submit@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedox-0003Pi-5D for 72643@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:31 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sedoH-0003R0-FB; Thu, 15 Aug 2024 12:58:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=mVgmWv9seh9SgDbJ94cnUruZZbyTAo8ZO5DBC2yiNcc=; b=cjJcofFe3XSVADaPJzXo zToRaZrhMlRNkqnzHQj0l/xEI7gw2f+m8A/tknu+DUslDUmzp6bPR+p0Fuz0qd+uL8eKfyOd6O0Xp I2TP79FYpnIqGQb2vRqy+V9dqiC2F2rW9w7OejJqnE7mXFoJMJuAE2XIgkFkDkUGOFXlFj2l1PuYi SgaJM151d9nE1rTq8FFhXwLA/BfRZim4pcNP7Q9SF+NzMcgijKIdG+CCKOOSfTqJnfpX2Wq+L40Vm QerLOp8cntqs3aloZhyR0ejf7cpoA706DCrJldxMtM11f4Gj+6SVeQFMEn7JLxPsTE4maAEXBfP54 8NPyuA8+UTfOCA==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 72643@debbugs.gnu.org Subject: [PATCH core-updates 4/6] DRAFT gnu: glibc-bootstrap: Update i586-gnu variant. Date: Thu, 15 Aug 2024 18:58:32 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Ludovic Courtès Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72643 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) DRAFT: Change it when glibc-bootstrap tarball is uploaded somewhere. ‘glibc-stripped-2.39-i586-pc-gnu.tar.xz’ was built from x86_64-linux from the previous commit with: ./pre-inst-env guix build --target=i586-pc-gnu \ -e '((@@ (gnu packages make-bootstrap) %glibc-bootstrap-tarball))' Fixes . * gnu/packages/bootstrap.scm (%bootstrap-glibc): Update i586-gnu variant. Change-Id: I2d770e8001896059e1f27e50f7a4ddf15e4b5812 --- gnu/packages/bootstrap.scm | 105 +++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index a36bb289cd..e79fa36cb0 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2024 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver ;;; Copyright © 2017, 2020, 2024 Efraim Flashner ;;; Copyright © 2018, 2020, 2022 Jan (janneke) Nieuwenhuizen @@ -37,7 +37,7 @@ (define-module (gnu packages bootstrap) #:select (raw-derivation derivation-input derivation->output-path)) #:use-module (guix utils) #:use-module ((guix build utils) #:select (elf-file?)) - #:use-module ((guix gexp) #:select (lower-object)) + #:use-module ((guix gexp) #:select (lower-object local-file)) #:use-module (guix monads) #:use-module (guix memoization) #:use-module (guix i18n) @@ -758,55 +758,58 @@ (define %bootstrap-glibc (inputs `(("tar" ,(bootstrap-executable "tar" (%current-system))) ("xz" ,(bootstrap-executable "xz" (%current-system))) - ("tarball" ,(bootstrap-origin - (origin - (method url-fetch) - (uri (map (cut string-append <> "/" (%current-system) - (match (%current-system) - ("armhf-linux" - "/20150101/glibc-2.20.tar.xz") - ("aarch64-linux" - "/20170217/glibc-2.25.tar.xz") - ("powerpc64le-linux" - "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz") - ("i586-gnu" - "/20200326/glibc-stripped-2.31-i586-pc-gnu.tar.xz") - ("powerpc-linux" - "/20200923/glibc-2.32.tar.xz") - ("riscv64-linux" - "/20210725/glibc-2.31.tar.xz") - (_ - "/20131110/glibc-2.18.tar.xz"))) - %bootstrap-base-urls)) - (sha256 - (match (%current-system) - ("x86_64-linux" - (base32 - "0jlqrgavvnplj1b083s20jj9iddr4lzfvwybw5xrcis9spbfzk7v")) - ("i686-linux" - (base32 - "1hgrccw1zqdc7lvgivwa54d9l3zsim5pqm0dykxg0z522h6gr05w")) - ("armhf-linux" - (base32 - "18cmgvpllqfpn6khsmivqib7ys8ymnq0hdzi3qp24prik0ykz8gn")) - ("aarch64-linux" - (base32 - "07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c")) - ("powerpc64le-linux" - (base32 - "1a1df6z8gkaq09md3jy94lixnh20599p58p0s856p10xwjaqr1iz")) - ("riscv64-linux" - (base32 - "0d9x80vm7ca1pd2whcmpm1h14zxpb58kqajlxlwffzm04xfsjnxm")) - ("i586-gnu" - (base32 - "14ddm10lpbas8bankmn5bcrlqvz1v5dnn1qjzxb19r57vd2w5952")) - ("powerpc-linux" - (base32 - "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb")) - ("mips64el-linux" - (base32 - "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg"))))))))) + ("tarball" ,(if (string=? (%current-system) "i586-gnu") + (local-file + (search-auxiliary-file "glibc-stripped-2.39-i586-pc-gnu.tar.xz")) + (bootstrap-origin + (origin + (method url-fetch) + (uri (map (cut string-append <> "/" (%current-system) + (match (%current-system) + ("armhf-linux" + "/20150101/glibc-2.20.tar.xz") + ("aarch64-linux" + "/20170217/glibc-2.25.tar.xz") + ("powerpc64le-linux" + "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz") + ("i586-gnu" + "/20200326/glibc-stripped-2.31-i586-pc-gnu.tar.xz") + ("powerpc-linux" + "/20200923/glibc-2.32.tar.xz") + ("riscv64-linux" + "/20210725/glibc-2.31.tar.xz") + (_ + "/20131110/glibc-2.18.tar.xz"))) + %bootstrap-base-urls)) + (sha256 + (match (%current-system) + ("x86_64-linux" + (base32 + "0jlqrgavvnplj1b083s20jj9iddr4lzfvwybw5xrcis9spbfzk7v")) + ("i686-linux" + (base32 + "1hgrccw1zqdc7lvgivwa54d9l3zsim5pqm0dykxg0z522h6gr05w")) + ("armhf-linux" + (base32 + "18cmgvpllqfpn6khsmivqib7ys8ymnq0hdzi3qp24prik0ykz8gn")) + ("aarch64-linux" + (base32 + "07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c")) + ("powerpc64le-linux" + (base32 + "1a1df6z8gkaq09md3jy94lixnh20599p58p0s856p10xwjaqr1iz")) + ("riscv64-linux" + (base32 + "0d9x80vm7ca1pd2whcmpm1h14zxpb58kqajlxlwffzm04xfsjnxm")) + ("i586-gnu" + (base32 + "14ddm10lpbas8bankmn5bcrlqvz1v5dnn1qjzxb19r57vd2w5952")) + ("powerpc-linux" + (base32 + "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb")) + ("mips64el-linux" + (base32 + "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg")))))))))) (synopsis "Bootstrap binaries and headers of the GNU C Library") (description synopsis) (home-page #f) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 15 12:59:40 2024 Received: (at 72643) by debbugs.gnu.org; 15 Aug 2024 16:59:40 +0000 Received: from localhost ([127.0.0.1]:49674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedp5-0003Qy-Qf for submit@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedoz-0003Pr-L4 for 72643@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:34 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sedoJ-0003RD-EB; Thu, 15 Aug 2024 12:58:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=nF2lqmueEzNjtQoVjdL2WbpoD2ChFPKNY+8o9IrWq0k=; b=rSFMEU9xL3U6jJzxKEss 9nyDfysynR94n84uHzBYXFngi0MVptXaRhzDYspHOa2PO9WZn6cJ3zyxZsLaJSkEbWv4BI1X/PHdA VbIfKs9uyvH1ga3MZbr/sfIHCzGClq5LinWnOkcT2T92qAJfAUrGpGBwF+sbXzGPnXaYPcp8jkXSW LiaO/doKVQ0b4fYqIGX92FofCNXwbGyLb39sTNb3TEH5ZOFTtFVoA+WUPmoaH9DS6gR6CODlYQlMz 9NGGMx5XtN5HfwWZGKEr7gQu37F79jShQdER1/e9T4TVkX0dQ+FoJtAiv3kdAofd9ntbPG2seFPYj RNvCnJNCRJQiAw==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 72643@debbugs.gnu.org Subject: [PATCH core-updates 5/6] gnu: perl-boot0: Use gexps. Date: Thu, 15 Aug 2024 18:58:33 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Efraim Flashner , Ekaitz Zarraga , Ludovic Courtès Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72643 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/commencement.scm (perl-boot0)[arguments]: Use gexps. Change-Id: I5c6358ce09a42bfb702d91325efa3ca81fe5494a --- gnu/packages/commencement.scm | 40 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index b31f976900..62bb2d6c96 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2464,27 +2464,27 @@ (define perl-boot0 (source (bootstrap-origin (package-source perl))) (inputs (%boot0-inputs)) (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:validate-runpath? #f + (append (list #:implicit-inputs? #f + #:guile %bootstrap-guile + #:validate-runpath? #f - ;; At the very least, this must not depend on GCC & co. - #:disallowed-references ,(list %bootstrap-binutils) - - ,@(substitute-keyword-arguments (package-arguments perl) - ((#:phases phases) - `(modify-phases ,phases - ;; Pthread support is missing in the bootstrap compiler - ;; (broken spec file), so disable it. - (add-before 'configure 'disable-pthreads - (lambda _ - (substitute* "Configure" - (("^libswanted=(.*)pthread" _ before) - (string-append "libswanted=" before))))))) - ;; Do not configure with '-Dusethreads' since pthread - ;; support is missing. - ((#:configure-flags configure-flags) - `(delete "-Dusethreads" ,configure-flags))))))) + ;; At the very least, this must not depend on GCC & co. + #:disallowed-references (list %bootstrap-binutils)) + (substitute-keyword-arguments (package-arguments perl) + ((#:phases phases) + #~(modify-phases #$phases + ;; Pthread support is missing in the bootstrap compiler + ;; (broken spec file), so disable it. + (add-before 'configure 'disable-pthreads + (lambda _ + (substitute* "Configure" + (("^libswanted=(.*)pthread" _ before) + (string-append "libswanted=" before))))))) + ;; Do not configure with '-Dusethreads' since pthread + ;; support is missing. + ((#:configure-flags configure-flags) + #~(delete "-Dusethreads" + #$configure-flags))))))) (define m4-boot0 (package -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 15 12:59:41 2024 Received: (at 72643) by debbugs.gnu.org; 15 Aug 2024 16:59:41 +0000 Received: from localhost ([127.0.0.1]:49676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedp6-0003R0-L1 for submit@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedp0-0003Ps-3Z for 72643@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:35 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sedoK-0003RM-Cj; Thu, 15 Aug 2024 12:58:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=qCVKuGOhs9JdhG+0YEM51pVhzLJ41svTwKmUzJcwDro=; b=HOvu7q01yZF8dcaiWjrE I6vDyusTHF5V0vmctOGbKLCMd1+bgiEANORRJVUpFYyvz7d5Gi2S6xkzzdeK3JoHURM2RBWNpMLMd tkvdXpppMx6lOYGBk8wZUx+O8zU9Xuub/RXUqs5Up9/JpHPvmkUvzjnL+AVb0PHKBFpaXqxO5RfaM h6dKDZuhMeIe359yxw2Hg0Rt6OGluIG5PHMfHkA/zWinKUaWr730pE8rfFtNvkm9h9Z75FjC9CWPp tk+hfnFVN+ZbY37xpemEwQKwVLaViBWBbd8VtMJ9/AYrJFzawOGRs+X/EkHHGQOJg4ECtXQyrgUPT ycnIobjkgRweQQ==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 72643@debbugs.gnu.org Subject: [PATCH core-updates 6/6] =?UTF-8?q?gnu:=20commencement:=20Build?= =?UTF-8?q?=20=E2=80=98perl-boot0=E2=80=99=20without=20stack=20protector?= =?UTF-8?q?=20on=20the=20Hurd.?= Date: Thu, 15 Aug 2024 18:58:34 +0200 Message-ID: <5c47a68d80d162e19dc31ae78d55f1f61e131e25.1723740352.git.ludo@gnu.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Efraim Flashner , Ekaitz Zarraga , Ludovic Courtès Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72643 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/commencement.scm (perl-boot0)[arguments]: Pass “-A ccflags=-fno-stack-protector” on GNU/Hurd. Change-Id: I04d4e276cdcc1bbf589273791a3f64e5a17c4152 --- gnu/packages/commencement.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 62bb2d6c96..0aec12c72b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2484,7 +2484,14 @@ (define perl-boot0 ;; support is missing. ((#:configure-flags configure-flags) #~(delete "-Dusethreads" - #$configure-flags))))))) + + ;; On i586-gnu, linking fails with "undefined + ;; reference to `__stack_chk_guard'" so avoid + ;; '-fstack-protector'. + #$(if (target-hurd?) + #~(cons* "-A" "ccflags=-fno-stack-protector" + #$configure-flags) + configure-flags)))))))) (define m4-boot0 (package -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 16 10:10:37 2024 Received: (at 72643) by debbugs.gnu.org; 16 Aug 2024 14:10:37 +0000 Received: from localhost ([127.0.0.1]:52663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sexf2-0004bx-Li for submit@debbugs.gnu.org; Fri, 16 Aug 2024 10:10:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56788) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sexf0-0004be-Bw for 72643@debbugs.gnu.org; Fri, 16 Aug 2024 10:10:35 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sexcB-0006F2-Ci; Fri, 16 Aug 2024 10:07:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=sBe08KmnrtLimhstmRBi2iTYiQNKy6PugIE9CRfRiAI=; b=E0qY3+16X16g7xTaURLb eKT1tepAWdM9aJ4awjZxqvn+md4oMBviNqWF489eTnlfwBTjn4llDF+t6FO98Vh0PYa9mcTxJ2Cc1 qQSyinSzTamdfw3vtv49pPJ43XP86fYVmqdWI803Mf+LiJszsvzWbBGCy1guiQIXmjKXSdp/fjuGt GlSA6lqBg1+yFA9V3uLPsQb5lrObf0NNDOOD5AxkW1WxSdRyWlGfvaMLuFZzbnYF8HE9fTt6qRM2s plbNhy3Pd3J7YKOLmGYZi40y7dYABVkMzS7lOgk8d5VJg9hO/G2qloTw3tAK1xTmuJ9VYBihR4VkM fJf9dbLvYqP4vQ==; From: Janneke Nieuwenhuizen To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#72643] [PATCH core-updates 0/6] Restore i586-gnu (GNU/Hurd) support In-Reply-To: ("Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s=22's?= message of "Thu, 15 Aug 2024 18:54:59 +0200") Organization: AvatarAcademy.nl References: X-Url: http://AvatarAcademy.nl Date: Fri, 16 Aug 2024 16:07:32 +0200 Message-ID: <87h6bkmuhn.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72643 Cc: 72643@debbugs.gnu.org, Efraim Flashner , Ekaitz Zarraga X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: Hi! > This patch series fixes Hurd support (i586-gnu) on =E2=80=98core-updates= =E2=80=99, > as described . It does so by > updating the =E2=80=98glibc-bootstrap=E2=80=99 tarball. [..] > I=E2=80=99d like to push this to =E2=80=98core-updates=E2=80=99 soon sinc= e it=E2=80=99s probably the > last blocker before we can merge. > > Thoughts? As mentioned on IRC, I've reconfigured my system to core-updates+this patch series and it works for me. I'm using a close variant of the `devel-hurd.tmpl' from the hurd-team branch https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/system/examples/dev= el-hurd.tmpl?h=3Dhurd-team and removed the new imagemagick dependency --8<---------------cut here---------------start------------->8--- --- a/gnu/system/examples/devel-hurd.tmpl +++ b/gnu/system/examples/devel-hurd.tmpl @@ -59,7 +59,7 @@ (define guix-packages (filter-map input->package (fold alist-delete (package-direct-inputs guix) - '("glibc-utf8-locales" "graphviz" "po4a")))) + '("glibc-utf8-locales" "graphviz" "imagemagick" "po4a"= )))) --8<---------------cut here---------------end--------------->8--- =20 Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 16 13:57:35 2024 Received: (at 72643-done) by debbugs.gnu.org; 16 Aug 2024 17:57:35 +0000 Received: from localhost ([127.0.0.1]:52823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sf1Ch-0002Ux-7N for submit@debbugs.gnu.org; Fri, 16 Aug 2024 13:57:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sf1Cf-0002Uh-Jb; Fri, 16 Aug 2024 13:57:34 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sf1Bx-0005Dh-A2; Fri, 16 Aug 2024 13:56:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=iODPqaaoI1OpPk4S58mzWhRTnIeTbH+qXzMl0yB3E/M=; b=RXxEbx43HiYNtwa8Ry6g kwAr75y1w4uuGKJQZR2DQC18QhOnDgh63mV3AKSoZy1xyvHLu4A1BoE4M10bSS9ZfUOYAHZVrZ2rd Io3ls/4exeZbWgab20m3E7QctSWq9ZyqYaHDyW53vFB90OKafdNCueUE2uS+useiK5ftHtu3OLVVN 5MqTNzqUkeGvPCGgOg4ZyZoWHVIt6CF3MCv+lBmxrmT9ZoMbJzy+E/e0ziwiQfOGbCw2vIlvQFTB6 DXd10UAAACmnWpGIl3yU+T06SDMMlw9YqzJvYcTjKd3wrvgd/ulL7ccPf9fedr/sNAQj2BoOgY0fL IFFk14OHw6JsBg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Janneke Nieuwenhuizen Subject: Re: [bug#72643] [PATCH core-updates 0/6] Restore i586-gnu (GNU/Hurd) support In-Reply-To: <87h6bkmuhn.fsf@gnu.org> (Janneke Nieuwenhuizen's message of "Fri, 16 Aug 2024 16:07:32 +0200") References: <87h6bkmuhn.fsf@gnu.org> Date: Fri, 16 Aug 2024 19:56:45 +0200 Message-ID: <87ed6o5p2a.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72643-done Cc: Ekaitz Zarraga , Josselin Poiret , 72315-done@debbugs.gnu.org, Efraim Flashner , 72643-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Janneke Nieuwenhuizen skribis: > As mentioned on IRC, I've reconfigured my system to core-updates+this > patch series and it works for me. Pushed as 817838c38bbeb4ef7dcb64af5fce168aeb51306e, thanks for testing! > I'm using a close variant of the `devel-hurd.tmpl' from the hurd-team > branch > > https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/system/examples/d= evel-hurd.tmpl?h=3Dhurd-team > > and removed the new imagemagick dependency > > --- a/gnu/system/examples/devel-hurd.tmpl > +++ b/gnu/system/examples/devel-hurd.tmpl > @@ -59,7 +59,7 @@ > (define guix-packages > (filter-map input->package > (fold alist-delete (package-direct-inputs guix) > - '("glibc-utf8-locales" "graphviz" "po4a")))) > + '("glibc-utf8-locales" "graphviz" "imagemagick" "po4= a")))) I=E2=80=99ve submitted a patch to remove it: https://issues.guix.gnu.org/72674 Regarding =E2=80=98hurd-team=E2=80=99, I admit I had forgotten about it. W= hat are the important things we should bring over to =E2=80=98master=E2=80=99 or =E2=80= =98core-updates=E2=80=99? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 18 05:03:49 2024 Received: (at 72643-done) by debbugs.gnu.org; 18 Aug 2024 09:03:49 +0000 Received: from localhost ([127.0.0.1]:55380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfbpF-0007eQ-C9 for submit@debbugs.gnu.org; Sun, 18 Aug 2024 05:03:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sfbpC-0007eA-SK; Sun, 18 Aug 2024 05:03:48 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sfboT-000600-2s; Sun, 18 Aug 2024 05:03:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=ENsTsdxXhYpIV/yIRTaRj0dyrlX8Fabi4MN2B3ZINHQ=; b=rBKGWbzfLbbkKKpozEXJ SjcFpXzoPIM8moVhMxWG9YpvBqv6R/9GGr5AhuPm6VS9XB8UmiB6/CIRehXdYmy1NIXJ9RbA33BpB JOQi3RPyriiOIqCpIo2L29A1yiBMZ/CAz6pwXrxhNkoDtf1+0pmOw3wC1DbNCLtWxxwPd1xK0holO PPwkuKtwWnAEz0bciiBkWH7JV2p8jQigOdlqO+br4aavVYGp4x7TDXczsA/IVfz5YU7Prew/1FXOz 8lZ3chnVFaE1XYcXamTImhRcoR6kkziPGntKuQuL1xTINqsaxXmiQfUr263L3eVoTzcCKxiXmdq8i GYZmIj/18ZplHg==; From: Janneke Nieuwenhuizen To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#72643] [PATCH core-updates 0/6] Restore i586-gnu (GNU/Hurd) support In-Reply-To: <87ed6o5p2a.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Fri, 16 Aug 2024 19:56:45 +0200") Organization: AvatarAcademy.nl References: <87h6bkmuhn.fsf@gnu.org> <87ed6o5p2a.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Sun, 18 Aug 2024 11:02:54 +0200 Message-ID: <87ttfifbk1.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72643-done Cc: Ekaitz Zarraga , Josselin Poiret , 72315-done@debbugs.gnu.org, Efraim Flashner , 72643-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: Hello, > Janneke Nieuwenhuizen skribis: > >> As mentioned on IRC, I've reconfigured my system to core-updates+this >> patch series and it works for me. > > Pushed as 817838c38bbeb4ef7dcb64af5fce168aeb51306e, thanks for testing! Yay! >> --- a/gnu/system/examples/devel-hurd.tmpl >> +++ b/gnu/system/examples/devel-hurd.tmpl >> @@ -59,7 +59,7 @@ >> (define guix-packages >> (filter-map input->package >> (fold alist-delete (package-direct-inputs guix) >> - '("glibc-utf8-locales" "graphviz" "po4a")))) >> + '("glibc-utf8-locales" "graphviz" "imagemagick" "po= 4a")))) > > I=E2=80=99ve submitted a patch to remove it: > > https://issues.guix.gnu.org/72674 Thanks, that's great. > Regarding =E2=80=98hurd-team=E2=80=99, I admit I had forgotten about it. = What are the > important things we should bring over to =E2=80=98master=E2=80=99 or =E2= =80=98core-updates=E2=80=99? I don't think so; most of it is not really finished. Possibly --8<---------------cut here---------------start------------->8--- d7562eae93 hurd: Support system init in /libexec/runsystem. b9b5f1ee5f hurd-boot: Support system init: Create essential device nodes. ddba840edd system: hurd: Add swap-services to hurd-default-essential-servic= es. --8<---------------cut here---------------end--------------->8--- that help booting the Hurd after installing it on real hardware from a GNU/Linux Guix installation with `guix init ... /hurd'. After `guix init', you'll have to reconfigure the GNU/Linux system, adding menu-entries from /hurd/boot/grub.cfg (at least, that's what I did using some ugly regex parsing in config.scm). But these are not so interesting, because they will support booting Hurd only once. Supporting a second boot is more tricky and only has these even less finished patches --8<---------------cut here---------------start------------->8--- fa003825ef DRAFT hurd-boot: Support second boot. 6b34e08e4d DRAFT hurd: Support second boot. --8<---------------cut here---------------end--------------->8--- These only work if the filesystem is clean -- which most of the time is not the case when you restart -- why would you restart if not for a kernel crash. That means you'll have to boot into GNU/Linux and fsck /hurd. I'm using --8<---------------cut here---------------start------------->8--- 59ae639ac6 DRAFT system: examples: Add devel-hurd.tmpl. --8<---------------cut here---------------end--------------->8--- as a convenience to build a childhurd to develop in (as opposed to just offloading to). ISTM that I've been the only user of these and they're not all that great. So yeah. Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 20 08:38:50 2024 Received: (at 72643-done) by debbugs.gnu.org; 20 Aug 2024 12:38:50 +0000 Received: from localhost ([127.0.0.1]:60035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgO8Q-0000gg-Cf for submit@debbugs.gnu.org; Tue, 20 Aug 2024 08:38:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgO8O-0000gO-Jc; Tue, 20 Aug 2024 08:38:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sgO7Y-0000Fx-N1; Tue, 20 Aug 2024 08:37:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=LR29oHwHz/EWrjdbacCYF4mmMfQVNFOxKmRvFJoV0v4=; b=Zps9M8VxVjT+hCgRb83n +qiKEnIcDvnoRGOyL/KgDVx5hr0avDriB5tP+lKSR6gS9wZ8e9Ou6pYtGWaf309b9fpyE79OugJTe RuBxplRwWw8vYar12f9iaIbYvtBgF8tRHA87xO3e0I2g1CS4qO/K3XUEHv/TrBNgBZk3dN7l0imWk SBQfbtg4lFiwaXqj3njnialpkOzbhz+yaemrz7TP/TZ2ikzcZND7Tv8FGYnvUtX65eaMbDGGYslxj CkMxiH5/l6zE05LcvUlcf/nFDuBnbXYtofiIVeqhBm8yDSCyarwwJwW+ZrJpNK5lSiUnT7Fb2QDjI CgbYbAEpK+z4Iw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Janneke Nieuwenhuizen Subject: Re: [bug#72643] [PATCH core-updates 0/6] Restore i586-gnu (GNU/Hurd) support In-Reply-To: <87ttfifbk1.fsf@gnu.org> (Janneke Nieuwenhuizen's message of "Sun, 18 Aug 2024 11:02:54 +0200") References: <87h6bkmuhn.fsf@gnu.org> <87ed6o5p2a.fsf@gnu.org> <87ttfifbk1.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Quartidi 4 Fructidor an 232 de la =?utf-8?Q?R=C3=A9v?= =?utf-8?Q?olution=2C?= jour de l'Escourgeon X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 20 Aug 2024 14:37:51 +0200 Message-ID: <87bk1ntlnk.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72643-done Cc: Ekaitz Zarraga , Josselin Poiret , 72315-done@debbugs.gnu.org, Efraim Flashner , 72643-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello, Janneke Nieuwenhuizen skribis: > ISTM that I've been the only user of these and they're not all that > great. So yeah. OK, thanks for explaining. Let=E2=80=99s keep that in mind for our future = Hurd endeavors! Ludo=E2=80=99. From unknown Fri Aug 15 14:16:47 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 18 Sep 2024 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator