From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:37813) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNyIp-0006rd-Qp for guix-patches@gnu.org; Mon, 13 Apr 2020 08:35:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNyIo-0008Mw-QI for guix-patches@gnu.org; Mon, 13 Apr 2020 08:35:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47798) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jNyIo-0008Ms-Mt for guix-patches@gnu.org; Mon, 13 Apr 2020 08:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jNyIo-0005DF-IR for guix-patches@gnu.org; Mon, 13 Apr 2020 08:35:02 -0400 Subject: [bug#40597] [PATCH] doc: Mention update-guix-package in guix-binary tarball, rebuild instructions. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:37777) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNyIW-0006dp-CD for guix-patches@gnu.org; Mon, 13 Apr 2020 08:34:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNyIU-0008Gj-JX for guix-patches@gnu.org; Mon, 13 Apr 2020 08:34:44 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:33196) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jNyIU-0008GL-8O for guix-patches@gnu.org; Mon, 13 Apr 2020 08:34:42 -0400 Received: by mail-wm1-x335.google.com with SMTP id v8so10024289wma.0 for ; Mon, 13 Apr 2020 05:34:42 -0700 (PDT) Received: from [10.0.0.2] (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id e1sm3728261wrc.12.2020.04.13.05.34.39 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 Apr 2020 05:34:39 -0700 (PDT) From: Vincent Legoll Message-ID: <0b207bae-2f18-eb06-d51b-0f0c92eb6d15@gmail.com> Date: Mon, 13 Apr 2020 14:34:38 +0200 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------7AE309F5C52C4E49FDB5101A" Content-Language: en-US List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40597@debbugs.gnu.org This is a multi-part message in MIME format. --------------7AE309F5C52C4E49FDB5101A Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Hello, following the discussion in guix-devel, here is a small doc addition to explain how binary-tarball modifications can be built and then tested... WDYT ? -- Vincent Legoll --------------7AE309F5C52C4E49FDB5101A Content-Type: text/x-patch; charset=UTF-8; name="0001-doc-Mention-update-guix-package-in-guix-binary-tarba.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename*0="0001-doc-Mention-update-guix-package-in-guix-binary-tarba.pa"; filename*1="tch" >From dd961656d9bd98d11ba5e38be89cd1952fefc263 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 13 Apr 2020 14:25:57 +0200 Subject: [PATCH] doc: Mention update-guix-package in guix-binary tarball rebuild instructions. * doc/guix.texi (Binary Installation): Mention 'make update-guix-package'. --- doc/guix.texi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 891e2693f6..8bf4ef9b74 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -77,6 +77,7 @@ Copyright @copyright{} 2020 Jakub Kądziołka@* Copyright @copyright{} 2020 Jack Hill@* Copyright @copyright{} 2020 Naga Malleswari@* Copyright @copyright{} 2020 Brice Waegeneire@* +Copyright @copyright{} 2020 Vincent Legoll@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -736,6 +737,16 @@ guix pack -s @var{system} --localstatedir \ @xref{Invoking guix pack}, for more info on this handy tool. +If you have local modifications you want to include in the resulting +tarball, you have to run the following command in your modified Guix +source tree before doing the above: + +@example +make update-guix-package +git commit -m'NOT_FOR_UPSTREAM:allow testing a modified guix-binary' \ + gnu/packages/package-management.scm +@end example + @node Requirements @section Requirements -- 2.20.1 --------------7AE309F5C52C4E49FDB5101A--