From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id oFueKZG1kl8fUAAA0tVLHw (envelope-from ) for ; Fri, 23 Oct 2020 10:50:57 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id gA3CI5G1kl9EBAAAbx9fmQ (envelope-from ) for ; Fri, 23 Oct 2020 10:50:57 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 22C159402A7 for ; Fri, 23 Oct 2020 10:50:56 +0000 (UTC) Received: from localhost ([::1]:52502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVuet-0001GC-Si for larch@yhetil.org; Fri, 23 Oct 2020 06:50:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45342) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVud4-00006Z-07 for guix-patches@gnu.org; Fri, 23 Oct 2020 06:49:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43907) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVud3-0006Da-NT for guix-patches@gnu.org; Fri, 23 Oct 2020 06:49:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kVud3-0003tE-L3 for guix-patches@gnu.org; Fri, 23 Oct 2020 06:49:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39807] [PATCH] guix: pack: Only wrap executable files. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Oct 2020 10:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39807 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Eric Bavier Cc: 39807@debbugs.gnu.org Received: via spool by 39807-submit@debbugs.gnu.org id=B39807.160345013914944 (code B ref 39807); Fri, 23 Oct 2020 10:49:01 +0000 Received: (at 39807) by debbugs.gnu.org; 23 Oct 2020 10:48:59 +0000 Received: from localhost ([127.0.0.1]:55453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVud1-0003sy-8E for submit@debbugs.gnu.org; Fri, 23 Oct 2020 06:48:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45224) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVucy-0003sf-Ui for 39807@debbugs.gnu.org; Fri, 23 Oct 2020 06:48:58 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41329) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVucs-00069s-Hl; Fri, 23 Oct 2020 06:48:50 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=55092 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kVucs-0005V8-1Q; Fri, 23 Oct 2020 06:48:50 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <3ace941f920d87da65de6e4fdc16add5b9725434.camel@posteo.net> <83416910901e77b537b64de392ee02598ccd72ff.camel@posteo.net> <87wnzk7xs0.fsf@gnu.org> <69f5446e2accd24cd1de9e3964373ab525b0875d.camel@posteo.net> <87pn5b383l.fsf@gnu.org> <48f280214fca0f8bd17aeff46c42ee76a04c90f2.camel@posteo.net> <87mu0fxo4e.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 2 Brumaire an 229 de la =?UTF-8?Q?R=C3=A9volution?= 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: Fri, 23 Oct 2020 12:48:48 +0200 In-Reply-To: (Eric Bavier's message of "Wed, 21 Oct 2020 18:51:31 -0500") Message-ID: <87pn59qktr.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: /qPy4sBaVsGm Hi Eric, Eric Bavier skribis: > From 7caaea0b21e5b97836b1a40a44efd2f38dbab7ae Mon Sep 17 00:00:00 2001 > From: Eric Bavier > Date: Wed, 21 Oct 2020 18:33:52 -0500 > Subject: [PATCH 1/2] guix: pack: Fix offset calculation for store directo= ry > mount point. > > Fixes wrapping of non-package things, where the target store directory may > differ in length from the original. > > * guix/scripts/pack.scm (wrapped-package): Define > WRAPPER_PROGRAM macro with wrapper's file name. > * gnu/packages/aux-files/run-in-namespace.c (main): Offset index by len of > that file name. LGTM! Perhaps add a link to this discussion in the commit log. > From 85bd962e929924b016a85d3a0b3dff434ebe8de3 Mon Sep 17 00:00:00 2001 > From: Eric Bavier > Date: Mon, 24 Feb 2020 23:47:02 -0600 > Subject: [PATCH 2/2] guix: pack: Only wrap executable files. > > * guix/scripts/pack.scm (wrapped-package): Build wrappers for > executable files and symlink others. > * tests/guix-pack-relocatable.sh: Test relocatable example of mixed > executable and non-executable files. LGTM too! Thanks, Ludo=E2=80=99.