From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arun Isaac Subject: bug#37735: Ansible package build/installation failing Date: Tue, 15 Oct 2019 02:17:46 +0530 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:55441) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK7H6-0004nU-2I for bug-guix@gnu.org; Mon, 14 Oct 2019 16:49:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK7H4-0006Iw-TT for bug-guix@gnu.org; Mon, 14 Oct 2019 16:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33084) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iK7H3-0006Ik-Tg for bug-guix@gnu.org; Mon, 14 Oct 2019 16:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iK7H3-0000Xx-QB for bug-guix@gnu.org; Mon, 14 Oct 2019 16:49:01 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Jonathan Frederickson , 37735@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hi, I have a patch fixing the build. Please find attached. Could you confirm that it works as expected? Thanks. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-ansible-Work-around-issues-with-Guix-wrapper-scr.patch Content-Transfer-Encoding: quoted-printable From=200f643e80815190cd8fc800f6a3f8e813992e70cb Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 15 Oct 2019 01:53:06 +0530 Subject: [PATCH] gnu: ansible: Work around issues with Guix wrapper scripts. * gnu/packages/admin.scm (ansible)[arguments]: Remove fix-symlinks phase. A= dd replace-symlinks phase. =2D-- gnu/packages/admin.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 35dae2d056..0e4fb3947c 100644 =2D-- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -19,7 +19,7 @@ ;;; Copyright =C2=A9 2017 Ethan R. Jones ;;; Copyright =C2=A9 2017 Christopher Allan Webber ;;; Copyright =C2=A9 2017, 2018 Marius Bakke =2D;;; Copyright =C2=A9 2018 Arun Isaac +;;; Copyright =C2=A9 2018, 2019 Arun Isaac ;;; Copyright =C2=A9 2018 Pierre-Antoine Rouby ;;; Copyright =C2=A9 2018 Rutger Helling ;;; Copyright =C2=A9 2018 Pierre Neidhardt @@ -1880,21 +1880,16 @@ import re sys.argv[0] =3D re.sub(r'\\.([^/]*)-real$', r'\\1', sys.argv[0]) "))) #t)) =2D (add-after 'wrap 'fix-symlinks + (add-after 'install 'replace-symlinks (lambda* (#:key outputs #:allow-other-keys) + ;; Replace symlinks with duplicate copies of the ansible + ;; executable. (let ((out (assoc-ref outputs "out"))) (for-each (lambda (subprogram) =2D ;; The symlinks point to the ansible wrapper script. M= ake =2D ;; them point to the real executable (.ansible-real). =2D (delete-file (string-append out "/bin/.ansible-" subpr= ogram "-real")) =2D (symlink (string-append out "/bin/.ansible-real") =2D (string-append out "/bin/.ansible-" subprogra= m "-real")) =2D ;; The wrapper scripts of the symlinks invoke the ansi= ble =2D ;; wrapper script. Fix them to invoke the correct exec= utable. =2D (substitute* (string-append out "/bin/ansible-" subpro= gram) =2D (("/bin/ansible") =2D (string-append "/bin/.ansible-" subprogram "-real")= ))) + (delete-file (string-append out "/bin/ansible-" subprogr= am)) + (copy-file (string-append out "/bin/ansible") + (string-append out "/bin/ansible-" subprogram= ))) (list "config" "console" "doc" "galaxy" "inventory" "playbook" "pull" "vault"))) #t))))) =2D-=20 2.23.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl2k3vIACgkQLiXui2GA K7Njkwf+PTAtZb/6HBm0EXG85ucc5xDZn63F6FQ8ahEc0Iqcr9CcFwlNtA25+tUQ me1OBMbpEq0XNNbjgkFrHLZl1wY2GKUQE+vY/rqZXFfHon7Af/D+jNNFt2VwF79H Bn9PrZoKbU/i8YsyWihu05Ptt2drmqNdniyp6FcKdJLcW6dAgNDmk2fW/viHvrmq A10LtuPt4eql3zP4YBIq+h0EKS/hYuQ5WpHZfgoVhofoSw5bEFCda0Nyb8PtlmNf 2VapF6QCsylMD3kkez2X8NLB28eMR8XqKXFYwpV4BbG1FyClj3m2KPb1yGVXwejE pLplCp4BoVaNc0wav6Yrb6CzPaxO6w== =SKVT -----END PGP SIGNATURE----- --==-=-=--