From patchwork Mon Apr 13 12:34:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 21216 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 8FD1027BBE4; Mon, 13 Apr 2020 13:35:11 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID 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 ESMTP id 305BF27BBE1 for ; Mon, 13 Apr 2020 13:35:11 +0100 (BST) Received: from localhost ([::1]:43916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNyIw-0006tV-K6 for patchwork@mira.cbaines.net; Mon, 13 Apr 2020 08:35:10 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#40597] [PATCH] doc: Mention update-guix-package in guix-binary tarball, rebuild instructions. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Apr 2020 12:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40597 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40597@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158678128920011 (code B ref -1); Mon, 13 Apr 2020 12:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Apr 2020 12:34:49 +0000 Received: from localhost ([127.0.0.1]:59344 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jNyIa-0005Cg-Pc for submit@debbugs.gnu.org; Mon, 13 Apr 2020 08:34:49 -0400 Received: from lists.gnu.org ([209.51.188.17]:54101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jNyIZ-0005CZ-1R for submit@debbugs.gnu.org; Mon, 13 Apr 2020 08:34:47 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=imiV69mogbvcyGMyxfy3Eh703f/zGRXwSHzi6xiF1kQ=; b=m9eCBJX0O9zaTM//rKaVA75f774lQtV1Ce3fAreKcdghkiJ2werEZ4m+rg8aAJx225 zDp0v4UfcuklcIMINT2N4ukbDnx+STOuAfaB80OpMGKHIlLc+wQjXOdURfGw2fhbKRs3 IMc5Ux/CsvgLX4smS3v9vsFD8PMtdeb1eNDlFMpTXEh3SLNV0YdGekU9O+s1sCojTqn4 xOLDckoe13Qr30eEOTJI8WAkYktGCooIFEoF/zK+twF1yLNh9Kn/SU8h1qKdUPJbtI9q 23cJa6IaHxG5EN0Wn2snD8aDlsCr7FtTggX4NzDmDcEHiyJu6zurqDPQ0Gu5/DQArOwr Lnww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=imiV69mogbvcyGMyxfy3Eh703f/zGRXwSHzi6xiF1kQ=; b=H0P766DSdzL2EjTVh3Y2ttNomOygcghXEeO2auTRKG+6qSzFJebIJaGmGbY7BoG0rk +XUolvhA4W7txZv2qvcJ5yRg+S6wCeFPf8JiJktJCOe3eEEvnYxHHDNbLDbVWTAQaP6T D5m6otRKXKnQ4vUAr1WKGelApg/9b2aqnwcuINklItnB/PHAs86RL4YBjdGMNtgHw3E+ MpGJB9Abj65+P/45DtgU14JK0PhcgQ1djybv4mZv6IUIW8Vgf9w9s/udHCVvLN5BQCh7 xDTXLVNPJSRkqmasgglR6SbHNmMbrrJKPuNBaJuatyXPafTxGEVxUwfWZvSZaHKc+YvP ZCGA== X-Gm-Message-State: AGi0PuZTZVu3lAl1bU1yGcpxCBssHx03tgNsyaUVeftBYvEoZ3mZDB/a 3iNHS7fsLGG4IOtc04HSPqGDJiDZ X-Google-Smtp-Source: APiQypJbbNS6xdvS6KmfAnVly9oI7KBufvMYjm3G3ZH208CxcF3u5v2ukjna9ZQh9ouJq5ImHmX2+w== X-Received: by 2002:a7b:c14b:: with SMTP id z11mr3399715wmi.44.1586781280822; Mon, 13 Apr 2020 05:34:40 -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 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 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 ? 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