From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RvpKC-0007I7-78 for mharc-grub-devel@gnu.org; Fri, 10 Feb 2012 07:11:36 -0500 Received: from eggs.gnu.org ([140.186.70.92]:51337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvpK3-0007Fe-Q8 for grub-devel@gnu.org; Fri, 10 Feb 2012 07:11:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RvpJx-0007I9-Rm for grub-devel@gnu.org; Fri, 10 Feb 2012 07:11:27 -0500 Received: from mail-wi0-f169.google.com ([209.85.212.169]:55760) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvpJx-0007Hz-FJ for grub-devel@gnu.org; Fri, 10 Feb 2012 07:11:21 -0500 Received: by wibhj13 with SMTP id hj13so2481215wib.0 for ; Fri, 10 Feb 2012 04:11:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type; bh=rrQwMMYCAqWIPAzXRqLuVw29Hwz+FbsBsyrF/d+9D0s=; b=CyS+P3DCUGzdqSlrgSp6cyp16I+fN7zbLTOp6YhJWSQ9C8TySueKPLVOecDHoWr2ty NZP/LSjaMXgTQiadLTCwf9cX0ULpoYeCAVqFYiH2wSYXdxsw4ZqqQihOTeQDTo3cDJFr StDh1F/immVLPtCx3xuGVMfoJXPgmrQVFJ6IY= Received: by 10.180.78.233 with SMTP id e9mr2826750wix.0.1328875879510; Fri, 10 Feb 2012 04:11:19 -0800 (PST) Received: from [147.210.129.12] (laptop-147-210-129-12.labri.fr. [147.210.129.12]) by mx.google.com with ESMTPS id er8sm15075743wib.9.2012.02.10.04.11.18 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 10 Feb 2012 04:11:18 -0800 (PST) Message-ID: <4F350965.7010801@gmail.com> Date: Fri, 10 Feb 2012 13:11:17 +0100 From: =?UTF-8?B?R3LDqWdvaXJlIFN1dHJl?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.24) Gecko/20111114 Iceowl/1.0b2 Icedove/3.1.16 MIME-Version: 1.0 To: The development of GRUB 2 Subject: [PATCH] Unbreak help2man invocations Content-Type: multipart/mixed; boundary="------------040605010503010705020600" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.212.169 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2012 12:11:33 -0000 This is a multi-part message in MIME format. --------------040605010503010705020600 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Following Vladimir's suggestion on IRC, the attached patch fixes bug http://savannah.gnu.org/bugs/?35452. Grégoire p.s. The patch uses @PACKAGE_TARNAME@ instead of @PACKAGE@ in the name of the directory that grub-mkconfig_lib is sourced from, to preserve the definition of pkgdatadir that was in grub-mkconfig.in. But I guess that those two are always equal for GRUB. --------------040605010503010705020600 Content-Type: text/plain; name="ChangeLog.source-grub-mkconfig_lib" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="ChangeLog.source-grub-mkconfig_lib" MjAxMi0wMi0xMCAgR3LDqWdvaXJlIFN1dHJlICA8Z3JlZ29pcmUuc3V0cmVAZ21haWwuY29t PgoKCVNvdXJjZSBncnViLW1rY29uZmlnX2xpYiBmcm9tIHRoZSBidWlsZCBkaXJlY3Rvcnkg YXQgYnVpbGQgdGltZS4KCVN1Z2dlc3RlZCBieTogVmxhZGltaXIgU2VyYmluZW5rby4KCgkq IGdlbnRwbC5weSAobWFucGFnZSk6IFNldCBwa2dkYXRhZGlyIHRvICQoYnVpbGRkaXIpIG9u IGhlbHAybWFuIGNhbGwuCgkqIHV0aWwvZ3J1Yi1pbnN0YWxsLmluOiBEZWZpbmUgcGtnZGF0 YWRpciBpZiBub3QgYWxyZWFkeSBzZXQsIGFuZCBzb3VyY2UKCWdydWItbWtjb25maWdfbGli IGZyb20gdGhlcmUuCgkqIHV0aWwvZ3J1Yi1rYmRjb21wLmluOiBMaWtld2lzZS4KCSogdXRp bC9ncnViLW1rY29uZmlnLmluOiBMaWtld2lzZS4KCSogdXRpbC9ncnViLW1rbmV0ZGlyLmlu OiBMaWtld2lzZS4KCSogdXRpbC9ncnViLW1rcmVzY3VlLmluOiBMaWtld2lzZS4KCSogdXRp bC9ncnViLW1rc3RhbmRhbG9uZS5pbjogTGlrZXdpc2UuCgkqIHV0aWwvZ3J1Yi1yZWJvb3Qu aW46IExpa2V3aXNlLgoJKiB1dGlsL2dydWItc2V0LWRlZmF1bHQuaW46IExpa2V3aXNlLgoJ KiB1dGlsL3Bvd2VycGMvaWVlZTEyNzUvZ3J1Yi1ta3Jlc2N1ZS5pbjogTGlrZXdpc2UuCg== --------------040605010503010705020600 Content-Type: text/x-patch; name="patch-source-grub-mkconfig_lib.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-source-grub-mkconfig_lib.diff" === modified file 'gentpl.py' --- gentpl.py 2011-12-24 14:09:26 +0000 +++ gentpl.py 2012-02-10 11:34:46 +0000 @@ -465,7 +465,7 @@ def manpage(): r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n") r += rule("[+ name +].[+ mansection +]", "[+ name +]", """ chmod a+x [+ name +] -PATH=$(builddir):$$PATH $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +] +PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +] """) r += gvar_add("CLEANFILES", "[+ name +].[+ mansection +]") r += "endif\n" === modified file 'util/grub-install.in' --- util/grub-install.in 2012-02-08 18:26:01 +0000 +++ util/grub-install.in 2012-02-10 11:40:34 +0000 @@ -34,6 +34,9 @@ platform=@platform@ host_os=@host_os@ pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`" datadir="@datadir@" +if [ "x$pkgdatadir" = x ]; then + pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" +fi localedir="@datadir@/locale" self="`basename $0`" @@ -77,7 +80,7 @@ else disk_module=native fi -. "${datadir}/@PACKAGE@/grub-mkconfig_lib" +. "${pkgdatadir}/grub-mkconfig_lib" # Usage: usage # Print the usage. === modified file 'util/grub-kbdcomp.in' --- util/grub-kbdcomp.in 2012-02-05 10:23:47 +0000 +++ util/grub-kbdcomp.in 2012-02-10 11:40:14 +0000 @@ -7,12 +7,15 @@ exec_prefix="@exec_prefix@" bindir="@bindir@" datarootdir="@datarootdir@" datadir="@datadir@" +if [ "x$pkgdatadir" = x ]; then + pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" +fi grub_mklayout="${bindir}/`echo grub-mklayout | sed ${transform}`" ckbcomp_options="" -. "${datadir}/@PACKAGE@/grub-mkconfig_lib" +. "${pkgdatadir}/grub-mkconfig_lib" self=`basename $0` === modified file 'util/grub-mkconfig.in' --- util/grub-mkconfig.in 2012-02-08 18:26:01 +0000 +++ util/grub-mkconfig.in 2012-02-10 11:39:54 +0000 @@ -31,7 +31,9 @@ PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_VERSION=@PACKAGE_VERSION@ host_os=@host_os@ datadir="@datadir@" -pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" +if [ "x$pkgdatadir" = x ]; then + pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" +fi grub_cfg="" grub_mkconfig_dir="${sysconfdir}"/grub.d @@ -42,7 +44,7 @@ grub_script_check="${bindir}/`echo grub- GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"` -. "${datadir}/@PACKAGE@/grub-mkconfig_lib" +. "${pkgdatadir}/grub-mkconfig_lib" # Usage: usage # Print the usage. @@ -95,8 +97,6 @@ do esac done -. "${datadir}/@PACKAGE@/grub-mkconfig_lib" - if [ "x$EUID" = "x" ] ; then EUID=`id -u` fi === modified file 'util/grub-mknetdir.in' --- util/grub-mknetdir.in 2012-02-08 19:27:46 +0000 +++ util/grub-mknetdir.in 2012-02-10 11:39:45 +0000 @@ -30,6 +30,9 @@ PACKAGE_VERSION=@PACKAGE_VERSION@ host_os=@host_os@ pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" datadir="@datadir@" +if [ "x$pkgdatadir" = x ]; then + pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" +fi self=`basename $0` @@ -52,7 +55,7 @@ efi32_dir="${libdir}/$(echo ${PACKAGE_TA efi64_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi" itanium_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/ia64-efi" -. "${datadir}/@PACKAGE@/grub-mkconfig_lib" +. "${pkgdatadir}/grub-mkconfig_lib" # Usage: usage # Print the usage. === modified file 'util/grub-mkrescue.in' --- util/grub-mkrescue.in 2012-02-08 18:26:01 +0000 +++ util/grub-mkrescue.in 2012-02-10 11:40:03 +0000 @@ -30,6 +30,9 @@ PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_VERSION=@PACKAGE_VERSION@ datadir="@datadir@" +if [ "x$pkgdatadir" = x ]; then + pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" +fi pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" self=`basename $0` @@ -46,7 +49,7 @@ grub_mkimage="${bindir}/`echo grub-mkima xorriso=xorriso -. "${datadir}/@PACKAGE@/grub-mkconfig_lib" +. "${pkgdatadir}/grub-mkconfig_lib" # Usage: usage # Print the usage. === modified file 'util/grub-mkstandalone.in' --- util/grub-mkstandalone.in 2012-02-09 13:45:56 +0000 +++ util/grub-mkstandalone.in 2012-02-10 11:39:29 +0000 @@ -31,6 +31,9 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_VERSION=@PACKAGE_VERSION@ pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" datadir="@datadir@" +if [ "x$pkgdatadir" = x ]; then + pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" +fi self=`basename $0` @@ -40,7 +43,7 @@ format= grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`" source= -. "${datadir}/@PACKAGE@/grub-mkconfig_lib" +. "${pkgdatadir}/grub-mkconfig_lib" # Usage: usage # Print the usage. === modified file 'util/grub-reboot.in' --- util/grub-reboot.in 2012-02-03 20:30:05 +0000 +++ util/grub-reboot.in 2012-02-10 11:40:22 +0000 @@ -26,6 +26,9 @@ PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_VERSION=@PACKAGE_VERSION@ datarootdir="@datarootdir@" datadir="@datadir@" +if [ "x$pkgdatadir" = x ]; then + pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" +fi self=`basename $0` @@ -34,7 +37,7 @@ rootdir= bootdir= grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'` -. "${datadir}/@PACKAGE@/grub-mkconfig_lib" +. "${pkgdatadir}/grub-mkconfig_lib" # Usage: usage # Print the usage. === modified file 'util/grub-set-default.in' --- util/grub-set-default.in 2012-02-03 20:30:05 +0000 +++ util/grub-set-default.in 2012-02-10 11:40:27 +0000 @@ -26,6 +26,9 @@ PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_VERSION=@PACKAGE_VERSION@ datarootdir="@datarootdir@" datadir="@datadir@" +if [ "x$pkgdatadir" = x ]; then + pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" +fi self=`basename $0` @@ -34,7 +37,7 @@ rootdir= bootdir= grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'` -. "${datadir}/@PACKAGE@/grub-mkconfig_lib" +. "${pkgdatadir}/grub-mkconfig_lib" # Usage: usage # Print the usage. === modified file 'util/powerpc/ieee1275/grub-mkrescue.in' --- util/powerpc/ieee1275/grub-mkrescue.in 2012-02-08 18:26:01 +0000 +++ util/powerpc/ieee1275/grub-mkrescue.in 2012-02-10 11:39:39 +0000 @@ -32,12 +32,15 @@ platform=@platform@ pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` datarootdir="@datarootdir@" datadir="@datadir@" +if [ "x$pkgdatadir" = x ]; then + pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`" +fi self=`basename $0` grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`" -. "${datadir}/@PACKAGE@/grub-mkconfig_lib" +. "${pkgdatadir}/grub-mkconfig_lib" # Usage: usage # Print the usage. --------------040605010503010705020600--