From unknown Sun Jun 15 01:06:17 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25873: [PATCH] guix: build: make-bootstrap: Copy "falloc.h" to the new system. Resent-From: manolis837@gmail.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2017 17:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 25873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 25873@debbugs.gnu.org Cc: andreas@enge.fr, Manolis Ragkousis X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.148804324813908 (code B ref -1); Sat, 25 Feb 2017 17:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Feb 2017 17:20:48 +0000 Received: from localhost ([127.0.0.1]:55942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1chg1Y-0003cG-H3 for submit@debbugs.gnu.org; Sat, 25 Feb 2017 12:20:48 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1chg1W-0003c1-IN for submit@debbugs.gnu.org; Sat, 25 Feb 2017 12:20:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chg1Q-0005Rm-2f for submit@debbugs.gnu.org; Sat, 25 Feb 2017 12:20:41 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.1 required=5.0 tests=BAYES_50, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:45724) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chg1P-0005Rc-Ve for submit@debbugs.gnu.org; Sat, 25 Feb 2017 12:20:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chg1O-0002r1-9L for guix-patches@gnu.org; Sat, 25 Feb 2017 12:20:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chg1L-0005PQ-3s for guix-patches@gnu.org; Sat, 25 Feb 2017 12:20:38 -0500 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:36672) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1chg1K-0005P3-St for guix-patches@gnu.org; Sat, 25 Feb 2017 12:20:35 -0500 Received: by mail-wr0-x241.google.com with SMTP id o22so4768806wro.3 for ; Sat, 25 Feb 2017 09:20:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=qC2qF7FQQbnO3MFiuXcdSC2SM1NoSvR/5gOHSvi6Ki0=; b=K5a+gMyfmcazJpy537x5vAoQ/wnIyq7Aye/7ykdCp+/uZd/bfnnHVpmh/pWdVI1ZMQ 0vj9+yexpZuDL1vVw6w/6se5zeVoWUfzQGo9JJEwkn+Dgrpd4cWNhNHvukwCceYVwG/8 vYUWaUPrS28YJdeuL7HWjQaCsZ+c8Ve7au28lPBld1ZfywTjeVg48NxwrZMG1aIljqnw nCvXbKDL3dYDrYr6chSAczWH0eq8lQHnGCC4ExBDygAUtKazAmNFRkc0UcBF+SjGjF67 OZKG9Ax9tAhxvpEHZ58KIg7StlWF2U9NGUAy1gjDy56R+aLIrlWZs3XDzcIO8ZsJ7Za9 83QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qC2qF7FQQbnO3MFiuXcdSC2SM1NoSvR/5gOHSvi6Ki0=; b=f7DIc53UrBkhEvkgfW3dmQePAJey1dowX8AW7DQfQYTstxt0adfBVE5KCHjQXAFFRk cO6jy4gc6oj35+A2mDxzboeopDzY4OjCVRLzwxZx/lKJM/rl5n7p0uo9wNObmvSLfEaK /R3VK7+ZOy+gR6SSqmNRrmHKma7a102DAzSMwjRfjRJ8cKU0YT3jOxwVGecnO1UBR6bO L6cjjPqskwCv9NQf4o+6CW/Ho1dvzD6ivlpg1y17VtDnBDT3u2YVTlZZiAK/SFFnMK+W IyI/PChS3ED0mUFKjx3CgWJZwiPa2LF1fumqQJS/SyySfaFrYRKL2wrDFXmvMGkw3PzR uU4A== X-Gm-Message-State: AMke39nhVXZ+qy3bhBe9V627zS4ARYBWog/w9zmJOy4jvIRHi9sqREVYj1rhFxpwxF9nkQ== X-Received: by 10.223.167.138 with SMTP id j10mr7544839wrc.178.1488043232185; Sat, 25 Feb 2017 09:20:32 -0800 (PST) Received: from localhost.localdomain (ppp-94-65-222-197.home.otenet.gr. [94.65.222.197]) by smtp.gmail.com with ESMTPSA id y145sm7031725wmc.17.2017.02.25.09.20.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Feb 2017 09:20:31 -0800 (PST) From: manolis837@gmail.com Date: Sat, 25 Feb 2017 19:20:04 +0200 Message-Id: <20170225172004.25966-1-manolis837@gmail.com> X-Mailer: git-send-email 2.11.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -3.8 (---) 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.8 (---) From: Manolis Ragkousis In glibc-2.25 a dependency on "linux/falloc.h" was added. This also reverts commit 8f8f250bdca917b3ce38aa0902f01b19081859a4 which is no longer needed. This commit was not compatible with the glibc version Hurd is using. See * guix/build/make-bootstrap.scm (make-stripped-libc): Copy "falloc.h" to the new system. * gnu/packages/patches/glibc-bootstrap-system.patch: Remove part that touches fcntl-linux.h. Problem reported by Andreas Enge . --- gnu/packages/patches/glibc-bootstrap-system.patch | 24 +---------------------- guix/build/make-bootstrap.scm | 2 +- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/gnu/packages/patches/glibc-bootstrap-system.patch b/gnu/packages/patches/glibc-bootstrap-system.patch index 6d09efed2..2f8e7da7e 100644 --- a/gnu/packages/patches/glibc-bootstrap-system.patch +++ b/gnu/packages/patches/glibc-bootstrap-system.patch @@ -3,10 +3,6 @@ and popen(3) need to be tweaked to use the right shell. For the bootstrap glibc, we just use whatever `sh' can be found in $PATH. The final glibc instead uses the hard-coded absolute file name of `bash'. -The second part that touches fcntl-linux.h reverts a change from glibc-2.25 -which would require the statically compiled glibc used in bootstrapping to -depend on the linux kernel headers. - --- a/sysdeps/posix/system.c +++ b/sysdeps/posix/system.c @@ -134,7 +134,7 @@ do_system (const char *line) @@ -31,22 +27,4 @@ depend on the linux kernel headers. } _IO_close (child_end); ---- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h -+++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h -@@ -318,7 +318,15 @@ struct f_owner_ex - - - /* Flags for fallocate. */ -+# define FALLOC_FL_KEEP_SIZE 1 /* Don't extend size of file -+ even if offset + len is -+ greater than file size. */ -+# define FALLOC_FL_PUNCH_HOLE 2 /* Create a hole in the file. */ -+# define FALLOC_FL_COLLAPSE_RANGE 8 /* Remove a range of a file -+ without leaving a -+ hole. */ -+# define FALLOC_FL_ZERO_RANGE 16 /* Convert a range of a -+ file to zeros. */ --# include - - - /* File handle structure. */ + diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm index 21c78cc8f..43b136248 100644 --- a/guix/build/make-bootstrap.scm +++ b/guix/build/make-bootstrap.scm @@ -55,7 +55,7 @@ when producing a bootstrap libc." (string-append incdir "/linux"))) '("limits.h" "errno.h" "socket.h" "kernel.h" "sysctl.h" "param.h" "ioctl.h" "types.h" - "posix_types.h" "stddef.h")) + "posix_types.h" "stddef.h" "falloc.h")) (copy-recursively (string-append kernel-headers "/include/asm") (string-append incdir "/asm")) -- 2.11.1 From unknown Sun Jun 15 01:06:17 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25873: [PATCH] guix: build: make-bootstrap: Copy "falloc.h" to the new system. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Feb 2017 15:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: manolis837@gmail.com, 25873@debbugs.gnu.org Cc: andreas@enge.fr, Efraim Flashner Received: via spool by 25873-submit@debbugs.gnu.org id=B25873.14881232593742 (code B ref 25873); Sun, 26 Feb 2017 15:35:02 +0000 Received: (at 25873) by debbugs.gnu.org; 26 Feb 2017 15:34:19 +0000 Received: from localhost ([127.0.0.1]:56901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ci0q2-0000yH-Qx for submit@debbugs.gnu.org; Sun, 26 Feb 2017 10:34:19 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:43486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ci0q1-0000yA-Bj for 25873@debbugs.gnu.org; Sun, 26 Feb 2017 10:34:17 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 5B0EC207D7; Sun, 26 Feb 2017 10:34:15 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 26 Feb 2017 10:34:15 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.com; h=cc :content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=6xK22ie92/WqWE4Ufcayz82CjKk=; b=Njw9MI RllEy0jpcIGjaw9ZfzhvZhVmQr3B7pUxT8M0F0Fkz1qfMENC14tz336FBT9GgQEp QoW7c0elne0mYuk3kjXfLcGe0x09vXROoEBbAZ4xaLbtuQytL1M6+fjSXU/8LpDw 6UW6pQ2FfBEWCTXOiN4t4rTZ0DpHybXYm/AgE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=smtpout; bh=6xK22ie92/WqWE 4Ufcayz82CjKk=; b=FHvLLMFfWFHRDtFZwCAakOYCLrmj4YBXVmoi8Yqb9jr6BI a5e8urhRwVnrUD3KTyDWFmXXOuniPXtdXuf0ne3laxxcRoZcc3civ3yfPrybOjLy VYt9915Wh0EFp7DgL3qy5awj1cEH98guKOlmTcukK7hWSPcToyl4t+XfAw4nU= X-ME-Sender: X-Sasl-enc: 22QdeqwpYLxISZeaz+qdpG4Mkue7deqMUOfSvyN/LPpc 1488123254 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id E83527E0EC; Sun, 26 Feb 2017 10:34:14 -0500 (EST) From: Marius Bakke In-Reply-To: <20170225172004.25966-1-manolis837@gmail.com> References: <20170225172004.25966-1-manolis837@gmail.com> User-Agent: Notmuch/0.23.5 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Sun, 26 Feb 2017 16:34:13 +0100 Message-ID: <87fuj1ezka.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable manolis837@gmail.com writes: > From: Manolis Ragkousis > > In glibc-2.25 a dependency on "linux/falloc.h" was added. > This also reverts commit 8f8f250bdca917b3ce38aa0902f01b19081859a4 > which is no longer needed. This commit was not compatible with > the glibc version Hurd is using. See > > > * guix/build/make-bootstrap.scm (make-stripped-libc): Copy "falloc.h" > to the new system. > * gnu/packages/patches/glibc-bootstrap-system.patch: Remove part > that touches fcntl-linux.h. LGTM. > > Problem reported by Andreas Enge . > --- > gnu/packages/patches/glibc-bootstrap-system.patch | 24 +----------------= ------ > guix/build/make-bootstrap.scm | 2 +- > 2 files changed, 2 insertions(+), 24 deletions(-) > > diff --git a/gnu/packages/patches/glibc-bootstrap-system.patch b/gnu/pack= ages/patches/glibc-bootstrap-system.patch > index 6d09efed2..2f8e7da7e 100644 > --- a/gnu/packages/patches/glibc-bootstrap-system.patch > +++ b/gnu/packages/patches/glibc-bootstrap-system.patch > @@ -3,10 +3,6 @@ and popen(3) need to be tweaked to use the right shell. = For the bootstrap > glibc, we just use whatever `sh' can be found in $PATH. The final glibc > instead uses the hard-coded absolute file name of `bash'. >=20=20 > -The second part that touches fcntl-linux.h reverts a change from glibc-2= .25 > -which would require the statically compiled glibc used in bootstrapping = to > -depend on the linux kernel headers. > - > --- a/sysdeps/posix/system.c > +++ b/sysdeps/posix/system.c > @@ -134,7 +134,7 @@ do_system (const char *line) > @@ -31,22 +27,4 @@ depend on the linux kernel headers. > } > _IO_close (child_end); >=20=20 > ---- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h > -+++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h > -@@ -318,7 +318,15 @@ struct f_owner_ex > -=20 > -=20=20 > - /* Flags for fallocate. */ > -+# define FALLOC_FL_KEEP_SIZE 1 /* Don't extend size of file > -+ even if offset + len is > -+ greater than file size. */ > -+# define FALLOC_FL_PUNCH_HOLE 2 /* Create a hole in the file. = */ > -+# define FALLOC_FL_COLLAPSE_RANGE 8 /* Remove a range of a file > -+ without leaving a > -+ hole. */ > -+# define FALLOC_FL_ZERO_RANGE 16 /* Convert a range of a > -+ file to zeros. */ > --# include > -=20 > -=20=20 > - /* File handle structure. */ > + > diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm > index 21c78cc8f..43b136248 100644 > --- a/guix/build/make-bootstrap.scm > +++ b/guix/build/make-bootstrap.scm > @@ -55,7 +55,7 @@ when producing a bootstrap libc." > (string-append incdir "/linux"))) > '("limits.h" "errno.h" "socket.h" "kernel.h" > "sysctl.h" "param.h" "ioctl.h" "types.h" > - "posix_types.h" "stddef.h")) > + "posix_types.h" "stddef.h" "falloc.h")) >=20=20 > (copy-recursively (string-append kernel-headers "/include/asm") > (string-append incdir "/asm")) > --=20 > 2.11.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAliy9XUACgkQoqBt8qM6 VPps9AgAz2oihGORKtlyrC9LvnMVOccCRT4WeQxLdM5QBfEdCdYcSQg+q7SeujgG dIQQlLRckqVBryOPWcQv9Gy0UMbYLOvbW5tgIFlpmGsjj/DogF9+8CHR8ulivXDa +0PzRicazEiriSXoFb/0JYvlg7SsuRbfORhlJj2VrpE5364FEQxEP7LZN2v+oPEo m73726DO4G1+r/E1RPQAww/5Fd+yU3XWe+83oeYzERtZkk7jPFRZXpDt2xN//Y2O ZGdYb6Vjyo4FMn4fcbhQ7uezREklQXMmBBoSosDNj/Ov3Sg/A3r+yzFm2M3h3HrN s33JmPpJ+sCE4inLjziQwzSS1qRTVw== =TIZQ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 14 05:10:59 2017 Received: (at control) by debbugs.gnu.org; 14 Mar 2017 09:10:59 +0000 Received: from localhost ([127.0.0.1]:54804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cniTr-00035m-0D for submit@debbugs.gnu.org; Tue, 14 Mar 2017 05:10:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cniTp-00035X-5U for control@debbugs.gnu.org; Tue, 14 Mar 2017 05:10:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cniTe-0002rQ-UH for control@debbugs.gnu.org; Tue, 14 Mar 2017 05:10:51 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:33937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cniTe-0002rM-RF for control@debbugs.gnu.org; Tue, 14 Mar 2017 05:10:46 -0400 Received: from [193.50.110.133] (port=42908 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1cniTe-0005rD-7A for control@debbugs.gnu.org; Tue, 14 Mar 2017 05:10:46 -0400 Date: Tue, 14 Mar 2017 10:10:43 +0100 Message-Id: <87inncp6jw.fsf@gnu.org> To: control@debbugs.gnu.org From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: control message for bug #25873 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.4 (-----) X-Debbugs-Envelope-To: control 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: -5.4 (-----) tags 25873 fixed close 25873