From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id SpnYLdgtnF9YeQAA0tVLHw (envelope-from ) for ; Fri, 30 Oct 2020 15:14:32 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id kGxrKdgtnF/YWAAAB5/wlQ (envelope-from ) for ; Fri, 30 Oct 2020 15:14:32 +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 114039407EB for ; Fri, 30 Oct 2020 15:14:31 +0000 (UTC) Received: from localhost ([::1]:34216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYW6o-0002ev-Tm for larch@yhetil.org; Fri, 30 Oct 2020 11:14:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYW6N-0002dg-NL for guix-patches@gnu.org; Fri, 30 Oct 2020 11:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47715) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kYW6M-0006qI-1j for guix-patches@gnu.org; Fri, 30 Oct 2020 11:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kYW6L-0000ht-Sg for guix-patches@gnu.org; Fri, 30 Oct 2020 11:14:01 -0400 Subject: bug#39807: [PATCH] guix: pack: Only wrap executable files. Resent-From: Eric Bavier Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Fri, 30 Oct 2020 15:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 39807 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39807-done@debbugs.gnu.org Mail-Followup-To: 39807@debbugs.gnu.org, bavier@posteo.net, bavier@posteo.net Received: via spool by 39807-done@debbugs.gnu.org id=D39807.16040708372691 (code D ref 39807); Fri, 30 Oct 2020 15:14:01 +0000 Received: (at 39807-done) by debbugs.gnu.org; 30 Oct 2020 15:13:57 +0000 Received: from localhost ([127.0.0.1]:59259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYW6G-0000hK-Ns for submit@debbugs.gnu.org; Fri, 30 Oct 2020 11:13:57 -0400 Received: from mout01.posteo.de ([185.67.36.65]:41914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYW6D-0000h1-Mb for 39807-done@debbugs.gnu.org; Fri, 30 Oct 2020 11:13:54 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 59E9316005C for <39807-done@debbugs.gnu.org>; Fri, 30 Oct 2020 16:13:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1604070827; bh=0xFdrJKuJS8Bwu2mLxPEfaOnbElvbD1v0JdXq0kSq5E=; h=Subject:From:To:Date:From; b=ctTf0PkCsh1hjnc9WiPY/Iyhmn65isq37I3ex7dI61Yf2w0/M1HKPqb76Oqxw6f2T gmfiRnU0U2Vufatr7Kfqn2rOCZCSz/TlGNqFfEIEQcWvMpLz3AEfcao2C4E9KAwOn3 d5ObUr1NaJ6Jx2KWfeX7R1xf/2qybk+bnxLA0UIPRIAsmMEwYe5zhI4oDoUuWlZDz2 AJ6tAdw/oHYmKwADK64i6W+BMpia/HIA1gsHKt9DdGv5ISbaNtksRWQweAO4+tGtTj BfzYCuOYUeF+FIlj0SvWPssjCyP7yUS8xVPwBkjsRfLZtjXbkGNrnfRahcY79kS1R2 XXelLD+rHttqQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4CN5Rt2NsNz9rxQ for <39807-done@debbugs.gnu.org>; Fri, 30 Oct 2020 16:13:46 +0100 (CET) Message-ID: <66edab14afe77962ab4cd033a08bdea570e61000.camel@posteo.net> From: Eric Bavier Date: Fri, 30 Oct 2020 10:13:41 -0500 In-Reply-To: <87pn59qktr.fsf@gnu.org> 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> <87pn59qktr.fsf@gnu.org> Content-Type: multipart/mixed; boundary="=-MwOxOzk8vrm2SH29qbpc" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 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: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=posteo.net header.s=2017 header.b=ctTf0PkC; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); 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.19 X-TUID: b6Bsr4nyH9Pp --=-MwOxOzk8vrm2SH29qbpc Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit On Fri, 2020-10-23 at 12:48 +0200, Ludovic Courtès wrote: > 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 directory > > 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’. Pushed in a73896425e92e5162766afdf042748b18f2462af and 4184998c70f9c4af101feb28cc19c5550abffcec after some small changes to the test to more faithfully mimic the failure case that was causing wrapped git commands to fail. `~Eric --=-MwOxOzk8vrm2SH29qbpc Content-Disposition: attachment; filename="pack-test-better.patch" Content-Type: text/x-patch; name="pack-test-better.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3Rlc3RzL2d1aXgtcGFjay1yZWxvY2F0YWJsZS5zaCBiL3Rlc3RzL2d1aXgt cGFjay1yZWxvY2F0YWJsZS5zaAppbmRleCA1YWM4Y2RjNzE4Li4wMjU1MDc1ZmIxIDEwMDY0NAot LS0gYS90ZXN0cy9ndWl4LXBhY2stcmVsb2NhdGFibGUuc2gKKysrIGIvdGVzdHMvZ3VpeC1wYWNr LXJlbG9jYXRhYmxlLnNoCkBAIC0xNDUsNyArMTQ1LDcgQEAgZ3VpeCBwYWNrIC1SUiBweXRob24t bnVtcHkgcHl0aG9uLXNjaXB5IC0tbm8tZ3JhZnRzIC1uCiAjIENoZWNrIHRoYXQgcGFja2FnZXMg dGhhdCBtaXggZXhlY3V0YWJsZSBhbmQgc3VwcG9ydCBmaWxlcyAoZS5nLiBnaXQpIGluIHRoZQog IyAiYmluYXJ5IiBkaXJlY3RvcmllcyBzdGlsbCB3b3JrIGFmdGVyIHdyYXBwZWQuCiBjYXQgPiIk dGVzdF9kaXJlY3RvcnkvbWFuaWZlc3Quc2NtIiA8PCdFT0YnCi0odXNlLW1vZHVsZXMgKGd1aXgp IChndWl4IHByb2ZpbGVzKQorKHVzZS1tb2R1bGVzIChndWl4KSAoZ3VpeCBwcm9maWxlcykgKGd1 aXggc2VhcmNoLXBhdGhzKQogICAgICAgICAgICAgIChnbnUgcGFja2FnZXMgYm9vdHN0cmFwKSkK IChtYW5pZmVzdAogIChsaXN0IChtYW5pZmVzdC1lbnRyeQpAQCAtMTU0LDEyICsxNTQsMjIgQEAg Y2F0ID4iJHRlc3RfZGlyZWN0b3J5L21hbmlmZXN0LnNjbSIgPDwnRU9GJwogCQkJICBgKCgiYmlu L2hlbGxvIgogCQkJICAgICAsKHByb2dyYW0tZmlsZQogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICJoZWxsbyIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjfihiZWdpbiAo ZGlzcGxheSAobG9hZCAiLi4vbGliZXhlYy9tc2ciKSkobmV3bGluZSkpCisJCQkgICAgICAgI34o YmVnaW4KKwkJCQkgICAoYWRkLXRvLWxvYWQtcGF0aCAoZ2V0ZW52ICJIRUxMT19FWEVDX1BBVEgi KSkKKwkJCQkgICAoZGlzcGxheSAobG9hZC1mcm9tLXBhdGggIm1zZyIpKShuZXdsaW5lKSkKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjOmd1aWxlICVib290c3RyYXAtZ3VpbGUpKQot CQkJICAgICgibGliZXhlYy9tc2ciCi0JCQkgICAgICwocGxhaW4tZmlsZSAibXNnIiAiNDIiKSkp KSkpKSkKKwkJCSAgICAoImxpYmV4ZWMvaGVsbG8vbXNnIgorCQkJICAgICAsKHBsYWluLWZpbGUg Im1zZyIgIjQyIikpKSkpCisJKHNlYXJjaC1wYXRocworCSAobGlzdCAoc2VhcmNoLXBhdGgtc3Bl Y2lmaWNhdGlvbgorCQkodmFyaWFibGUgIkhFTExPX0VYRUNfUEFUSCIpCisJCShmaWxlcyAnKCJs aWJleGVjL2hlbGxvIikpCisJCShzZXBhcmF0b3IgI2YpKSkpKSkpCiBFT0YKIHRhcmJhbGw9ImBn dWl4IHBhY2sgLVJSIC1TIC9vcHQ9IC1tICR0ZXN0X2RpcmVjdG9yeS9tYW5pZmVzdC5zY21gIgog KGNkICIkdGVzdF9kaXJlY3RvcnkiOyB0YXIgeHZmICIkdGFyYmFsbCIpCi1ydW5fd2l0aG91dF9z dG9yZSAiJHRlc3RfZGlyZWN0b3J5L29wdC9iaW4vaGVsbG8iID4gIiR0ZXN0X2RpcmVjdG9yeS9v dXRwdXQiCisoIGV4cG9ydCBHVUlYX1BST0ZJTEU9JHRlc3RfZGlyZWN0b3J5L29wdAorICAuICRH VUlYX1BST0ZJTEUvZXRjL3Byb2ZpbGUKKyAgcnVuX3dpdGhvdXRfc3RvcmUgIiR0ZXN0X2RpcmVj dG9yeS9vcHQvYmluL2hlbGxvIiA+ICIkdGVzdF9kaXJlY3Rvcnkvb3V0cHV0IiApCitjYXQgIiR0 ZXN0X2RpcmVjdG9yeS9vdXRwdXQiCiB0ZXN0ICJgY2F0ICR0ZXN0X2RpcmVjdG9yeS9vdXRwdXRg IiA9ICI0MiIK --=-MwOxOzk8vrm2SH29qbpc--