From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1YnS3X-0002Gj-Uj for mharc-grub-devel@gnu.org; Wed, 29 Apr 2015 09:29:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnS3V-0002Ch-4y for grub-devel@gnu.org; Wed, 29 Apr 2015 09:29:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YnS3T-0004Ey-NF for grub-devel@gnu.org; Wed, 29 Apr 2015 09:29:37 -0400 Received: from mail-wg0-x22e.google.com ([2a00:1450:400c:c00::22e]:35818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnS3T-0004ET-Do for grub-devel@gnu.org; Wed, 29 Apr 2015 09:29:35 -0400 Received: by wgyo15 with SMTP id o15so28321311wgy.2 for ; Wed, 29 Apr 2015 06:29:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type; bh=IFrpdHTbXdjfNOQGezMNlYpFAYO7rj5UxJyP2mMGPM4=; b=jBqSfJXr7D+vE4bszwOlpmNtETl/9lxz70LPa1xGOQnczzWdFkhvnEOYJelWgzsQub VV6BD1IS3Up8lf5y/r/OMuvml6LFiX5RTwcKqFZ7u6cIkaVaEdpZ+bkCVPmTQ6li5KJi C3zHVLiessj3d2Kfo7+DyUfIMQxl4G14vpnf48I+M4/dCwheUP6eWUv3NHeLTN5AgF7a CGTbqHg+EjO6EKIUjJJU+EOTuZH2Rg9cmydF6FZWhqdcY+//IjiTSq3Xg0iUvIY8OOef ilicN55zUlmWE7DJwyG452LNrempJW2ttQKKMYJdoEI4lwiy1JXdkGEvQDjrSoCFcYH3 Ejrw== X-Received: by 10.180.96.138 with SMTP id ds10mr38061113wib.95.1430314174266; Wed, 29 Apr 2015 06:29:34 -0700 (PDT) Received: from ?IPv6:2620:0:105f:fd00:863a:4bff:fe50:abc4? ([2620:0:105f:fd00:863a:4bff:fe50:abc4]) by mx.google.com with ESMTPSA id i13sm21237935wic.13.2015.04.29.06.29.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Apr 2015 06:29:33 -0700 (PDT) Message-ID: <5540DCB6.8010702@gmail.com> Date: Wed, 29 Apr 2015 15:29:26 +0200 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.6.0 MIME-Version: 1.0 To: The development of GNU GRUB Subject: Re: [PATCH] grub-mkconfig: use $pkgdatadir in scripts References: <1429635515-6734-1-git-send-email-arvidjaar@gmail.com> In-Reply-To: <1429635515-6734-1-git-send-email-arvidjaar@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="eutP4BghSMO3Hd9jwNbi5TrWLGIIfKiB4" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::22e 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: Wed, 29 Apr 2015 13:29:38 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --eutP4BghSMO3Hd9jwNbi5TrWLGIIfKiB4 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Go ahead On 21.04.2015 18:58, Andrei Borzenkov wrote: > Otherwise scripts will source wrong grub-mkconfig_lib. >=20 > --- > util/grub-mkconfig.in | 3 +++ > util/grub.d/00_header.in | 2 +- > util/grub.d/10_hurd.in | 2 +- > util/grub.d/10_illumos.in | 2 +- > util/grub.d/10_kfreebsd.in | 2 +- > util/grub.d/10_linux.in | 2 +- > util/grub.d/10_netbsd.in | 2 +- > util/grub.d/10_windows.in | 2 +- > util/grub.d/10_xnu.in | 2 +- > util/grub.d/20_linux_xen.in | 2 +- > util/grub.d/30_os-prober.in | 2 +- > 11 files changed, 13 insertions(+), 10 deletions(-) >=20 > diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in > index d1fae49..3183744 100644 > --- a/util/grub-mkconfig.in > +++ b/util/grub-mkconfig.in > @@ -33,6 +33,9 @@ datadir=3D"@datadir@" > if [ "x$pkgdatadir" =3D x ]; then > pkgdatadir=3D"${datadir}/@PACKAGE@" > fi > +# export it for scripts > +export pkgdatadir > + > grub_cfg=3D"" > grub_mkconfig_dir=3D"${sysconfdir}"/grub.d > =20 > diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in > index ce2ec81..93a9023 100644 > --- a/util/grub.d/00_header.in > +++ b/util/grub.d/00_header.in > @@ -25,7 +25,7 @@ grub_lang=3D`echo $LANG | cut -d . -f 1` > export TEXTDOMAIN=3D@PACKAGE@ > export TEXTDOMAINDIR=3D"@localedir@" > =20 > -. "@datadir@/@PACKAGE@/grub-mkconfig_lib" > +. "$pkgdatadir/grub-mkconfig_lib" > =20 > # Do this as early as possible, since other commands might depend on i= t. > # (e.g. the `loadfont' command might need lvm or raid modules) > diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in > index 29b4554..59a9a48 100644 > --- a/util/grub.d/10_hurd.in > +++ b/util/grub.d/10_hurd.in > @@ -24,7 +24,7 @@ datarootdir=3D"@datarootdir@" > export TEXTDOMAIN=3D@PACKAGE@ > export TEXTDOMAINDIR=3D"@localedir@" > =20 > -. "@datadir@/@PACKAGE@/grub-mkconfig_lib" > +. "$pkgdatadir/grub-mkconfig_lib" > =20 > CLASS=3D"--class gnu --class os" > =20 > diff --git a/util/grub.d/10_illumos.in b/util/grub.d/10_illumos.in > index 0de616e..a133e1b 100644 > --- a/util/grub.d/10_illumos.in > +++ b/util/grub.d/10_illumos.in > @@ -20,7 +20,7 @@ set -e > prefix=3D"@prefix@" > exec_prefix=3D"@exec_prefix@" > datarootdir=3D"@datarootdir@" > -. "@datadir@/@PACKAGE@/grub-mkconfig_lib" > +. "$pkgdatadir/grub-mkconfig_lib" > =20 > export TEXTDOMAIN=3D@PACKAGE@ > export TEXTDOMAINDIR=3D"@localedir@" > diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in > index 65f6c32..9d8e8fd 100644 > --- a/util/grub.d/10_kfreebsd.in > +++ b/util/grub.d/10_kfreebsd.in > @@ -20,7 +20,7 @@ set -e > prefix=3D"@prefix@" > exec_prefix=3D"@exec_prefix@" > datarootdir=3D"@datarootdir@" > -. "@datadir@/@PACKAGE@/grub-mkconfig_lib" > +. "$pkgdatadir/grub-mkconfig_lib" > =20 > export TEXTDOMAIN=3D@PACKAGE@ > export TEXTDOMAINDIR=3D"@localedir@" > diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in > index a2a84dc..859b608 100644 > --- a/util/grub.d/10_linux.in > +++ b/util/grub.d/10_linux.in > @@ -21,7 +21,7 @@ prefix=3D"@prefix@" > exec_prefix=3D"@exec_prefix@" > datarootdir=3D"@datarootdir@" > =20 > -. "@datadir@/@PACKAGE@/grub-mkconfig_lib" > +. "$pkgdatadir/grub-mkconfig_lib" > =20 > export TEXTDOMAIN=3D@PACKAGE@ > export TEXTDOMAINDIR=3D"@localedir@" > diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in > index 9988a42..874f599 100644 > --- a/util/grub.d/10_netbsd.in > +++ b/util/grub.d/10_netbsd.in > @@ -20,7 +20,7 @@ set -e > prefix=3D"@prefix@" > exec_prefix=3D"@exec_prefix@" > datarootdir=3D"@datarootdir@" > -. "@datadir@/@PACKAGE@/grub-mkconfig_lib" > +. "$pkgdatadir/grub-mkconfig_lib" > =20 > export TEXTDOMAIN=3D@PACKAGE@ > export TEXTDOMAINDIR=3D"@localedir@" > diff --git a/util/grub.d/10_windows.in b/util/grub.d/10_windows.in > index 48bd955..554c561 100644 > --- a/util/grub.d/10_windows.in > +++ b/util/grub.d/10_windows.in > @@ -24,7 +24,7 @@ datarootdir=3D"@datarootdir@" > export TEXTDOMAIN=3D@PACKAGE@ > export TEXTDOMAINDIR=3D"@localedir@" > =20 > -. "@datadir@/@PACKAGE@/grub-mkconfig_lib" > +. "$pkgdatadir/grub-mkconfig_lib" > =20 > case "`uname 2>/dev/null`" in > CYGWIN*) ;; > diff --git a/util/grub.d/10_xnu.in b/util/grub.d/10_xnu.in > index 4270385..51ee2f4 100644 > --- a/util/grub.d/10_xnu.in > +++ b/util/grub.d/10_xnu.in > @@ -24,7 +24,7 @@ datarootdir=3D"@datarootdir@" > export TEXTDOMAIN=3D@PACKAGE@ > export TEXTDOMAINDIR=3D"@localedir@" > =20 > -. "@datadir@/@PACKAGE@/grub-mkconfig_lib" > +. "$pkgdatadir/grub-mkconfig_lib" > =20 > osx_entry() { > if [ x$2 =3D x32 ]; then > diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in > index de34c8d..f532fb9 100644 > --- a/util/grub.d/20_linux_xen.in > +++ b/util/grub.d/20_linux_xen.in > @@ -21,7 +21,7 @@ prefix=3D"@prefix@" > exec_prefix=3D"@exec_prefix@" > datarootdir=3D"@datarootdir@" > =20 > -. "@datadir@/@PACKAGE@/grub-mkconfig_lib" > +. "$pkgdatadir/grub-mkconfig_lib" > =20 > export TEXTDOMAIN=3D@PACKAGE@ > export TEXTDOMAINDIR=3D"@localedir@" > diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in > index 4ee6015..5fc4f0c 100644 > --- a/util/grub.d/30_os-prober.in > +++ b/util/grub.d/30_os-prober.in > @@ -24,7 +24,7 @@ datarootdir=3D"@datarootdir@" > export TEXTDOMAIN=3D@PACKAGE@ > export TEXTDOMAINDIR=3D"@localedir@" > =20 > -. "@datadir@/@PACKAGE@/grub-mkconfig_lib" > +. "$pkgdatadir/grub-mkconfig_lib" > =20 > if [ "x${GRUB_DISABLE_OS_PROBER}" =3D "xtrue" ]; then > exit 0 >=20 --eutP4BghSMO3Hd9jwNbi5TrWLGIIfKiB4 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iF4EAREKAAYFAlVA3LwACgkQmBXlbbo5nOu2TgD+Ms63zSPIb/QEN8+4/aWjSYyX JRTknhvoae/u7EfYMZwA/R16Cepkj7GfFGSbDvNLK7swVJ43H9z9j42mpwJPB+Nl =asou -----END PGP SIGNATURE----- --eutP4BghSMO3Hd9jwNbi5TrWLGIIfKiB4--