From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Uc8iA-0000xq-DO for mharc-grub-devel@gnu.org; Tue, 14 May 2013 02:27:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc8i6-0000wz-TL for grub-devel@gnu.org; Tue, 14 May 2013 02:27:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uc8i5-0006Mf-Kd for grub-devel@gnu.org; Tue, 14 May 2013 02:27:42 -0400 Received: from mail-ea0-x229.google.com ([2a00:1450:4013:c01::229]:32873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc8i5-0006MZ-AD for grub-devel@gnu.org; Tue, 14 May 2013 02:27:41 -0400 Received: by mail-ea0-f169.google.com with SMTP id m14so83905eaj.28 for ; Mon, 13 May 2013 23:27:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:x-enigmail-version:content-type; bh=Mi3YCIobgsbKtkCXGHhFPigalgVwT0VySe2A09HiFW8=; b=AFDo3TQzxCPA6HQ/SaN/nYcoHhXotzg+vwiB+/5K4CA0zQXScE5P3Mz8J/FHEY7Uwa TWW9zjVAI0++dAMyJtPqCHIO8JoLltPh69yBTtpyJsLkuyw+NlyydLbC93nU+erUxwUK 1uXZKLgvI149VEUa3/1K/2AJAm9BCPOtsWePHVXvmplqdzN1G85LJHALl7/Yltc/SPUD n/8kIN0CunlrWBx+gvMUvsxaD20z86wNOFauwx6oTvHpZ5KNAxljT/q85tJuM04nEoo6 ZfRi52jacVX+SGhO4c7kFzGmO5vTLDPp22qICU35CsrOlYHX41dsRM5VKpazoBOm+ZbP opIg== X-Received: by 10.14.109.131 with SMTP id s3mr87204639eeg.26.1368512860460; Mon, 13 May 2013 23:27:40 -0700 (PDT) Received: from debian.x201.phnet (vpn-global-dhcp2-86.ethz.ch. [129.132.209.86]) by mx.google.com with ESMTPSA id x41sm27295302eey.17.2013.05.13.23.27.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 May 2013 23:27:39 -0700 (PDT) Message-ID: <5191D792.6030000@gmail.com> Date: Tue, 14 May 2013 08:20:02 +0200 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.12) Gecko/20130116 Icedove/10.0.12 MIME-Version: 1.0 To: The development of GNU GRUB Subject: Re: [PATCH] emit EXTRA_DIST unconditionally so tarball does not depend on configured platform References: <1368294854-14729-1-git-send-email-arvidjaar@gmail.com> In-Reply-To: <1368294854-14729-1-git-send-email-arvidjaar@gmail.com> X-Enigmail-Version: 1.4.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enigA52EFB07DC2374D7897B8EBD" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::229 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: Tue, 14 May 2013 06:27:44 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigA52EFB07DC2374D7897B8EBD Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 11.05.2013 19:54, Andrey Borzenkov wrote: > Currently extra_dist sources are emitted under enabled platform conditi= ons. > So if module/image/... is not enabled for every platform, extra_dist fi= les > will not be included in tarball during "make dist" if module is not ena= bled > for currently configured platform. As example, attempt to build i386-pc= from > tarball created under x86_64-efi fails with: >=20 > make[3]: Entering directory `/home/bor/build/grub/grub-2.00/grub-core' > gcc -DHAVE_CONFIG_H -I. -I.. -Wall -W -I../include -I../include -DGRU= B_MACHINE_PCBIOS=3D1 -DGRUB_MACHINE=3DI386_PC -DGRUB_TARGET_CPU_I386=3D1 = -m32 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.7/include -DGR= UB_FILE=3D\"efiemu/loadcore32.c\" ... -c -o efiemu/efiemu_module-loadcor= e32.o `test -f 'efiemu/loadcore32.c' || echo './'`efiemu/loadcore32.c > efiemu/loadcore32.c:22:22: fatal error: loadcore.c: No such file or dir= ectory > compilation terminated. >=20 > Change gentpl.py to emit dist_noinst_DATA instead. Automake collects th= em > even when assignment is under false condition, so it ensures tarball al= ways > includes the same files on every platform. >=20 Go ahead. > It also changes data to emit dist__DATA instead of using EXT= RA_DIST. >=20 > Signed-off-by: Andrey Borzenkov >=20 > --- > conf/Makefile.common | 2 +- > gentpl.py | 15 +++++++-------- > 2 files changed, 8 insertions(+), 9 deletions(-) >=20 > diff --git a/conf/Makefile.common b/conf/Makefile.common > index ca1cb17..70bbf8b 100644 > --- a/conf/Makefile.common > +++ b/conf/Makefile.common > @@ -151,7 +151,7 @@ bin_PROGRAMS =3D > platform_DATA =3D > sbin_PROGRAMS =3D > check_SCRIPTS =3D > -grubconf_DATA =3D > +dist_grubconf_DATA =3D > check_PROGRAMS =3D > noinst_SCRIPTS =3D > noinst_PROGRAMS =3D > diff --git a/gentpl.py b/gentpl.py > index 22a8b0e..cc56f7d 100644 > --- a/gentpl.py > +++ b/gentpl.py > @@ -382,7 +382,7 @@ def module(platform): > r +=3D var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAG= S_MODULE) " + platform_ccasflags(platform)) > # r +=3D var_set(cname() + "_DEPENDENCIES", platform_dependencies(= platform) + " " + platform_ldadd(platform)) > =20 > - r +=3D gvar_add("EXTRA_DIST", extra_dist()) > + r +=3D gvar_add("dist_noinst_DATA", extra_dist()) > r +=3D gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES= )") > r +=3D gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")= > =20 > @@ -410,7 +410,7 @@ def kernel(platform): > r +=3D var_set(cname() + "_STRIPFLAGS", "$(AM_STRIPFLAGS) $(STRIPF= LAGS_KERNEL) " + platform_stripflags(platform)) > # r +=3D var_set(cname() + "_DEPENDENCIES", platform_dependencies(= platform) + " " + platform_ldadd(platform)) > =20 > - r +=3D gvar_add("EXTRA_DIST", extra_dist()) > + r +=3D gvar_add("dist_noinst_DATA", extra_dist()) > r +=3D gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES= )") > r +=3D gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")= > =20 > @@ -443,7 +443,7 @@ def image(platform): > r +=3D var_set(cname() + "_OBJCOPYFLAGS", "$(OBJCOPYFLAGS_IMAGE) "= + platform_objcopyflags(platform)) > # r +=3D var_set(cname() + "_DEPENDENCIES", platform_dependencies(= platform) + " " + platform_ldadd(platform)) > =20 > - r +=3D gvar_add("EXTRA_DIST", extra_dist()) > + r +=3D gvar_add("dist_noinst_DATA", extra_dist()) > r +=3D gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES= )") > r +=3D gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")= > =20 > @@ -476,7 +476,7 @@ def library(platform): > r +=3D var_add(cname() + "_CCASFLAGS", first_time("$(AM_CCASFLAGS)= $(CCASFLAGS_LIBRARY) ") + platform_ccasflags(platform)) > # r +=3D var_add(cname() + "_DEPENDENCIES", platform_dependencies(= platform) + " " + platform_ldadd(platform)) > =20 > - r +=3D gvar_add("EXTRA_DIST", extra_dist()) > + r +=3D gvar_add("dist_noinst_DATA", extra_dist()) > r +=3D first_time(gvar_add("BUILT_SOURCES", "$(nodist_" + cname() = + "_SOURCES)")) > r +=3D first_time(gvar_add("CLEANFILES", "$(nodist_" + cname() + "= _SOURCES)")) > return r > @@ -515,15 +515,14 @@ def program(platform, test=3DFalse): > r +=3D var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAG= S_PROGRAM) " + platform_ccasflags(platform)) > # r +=3D var_set(cname() + "_DEPENDENCIES", platform_dependencies(= platform) + " " + platform_ldadd(platform)) > =20 > - r +=3D gvar_add("EXTRA_DIST", extra_dist()) > + r +=3D gvar_add("dist_noinst_DATA", extra_dist()) > r +=3D gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES= )") > r +=3D gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")= > return r > =20 > def data(platform): > - r =3D gvar_add("EXTRA_DIST", platform_sources(platform)) > - r +=3D gvar_add("EXTRA_DIST", extra_dist()) > - r +=3D var_add(installdir() + "_DATA", platform_sources(platform))= > + r =3D var_add("dist_" + installdir() + "_DATA", platform_sources(= platform)) > + r +=3D gvar_add("dist_noinst_DATA", extra_dist()) > return r > =20 > def script(platform): --------------enigA52EFB07DC2374D7897B8EBD 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.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iF4EAREKAAYFAlGR15kACgkQNak7dOguQgl9uwD+MLwwOme2EVPBAOnbY2j19AmG EeR8kEuSvnk2LjnIyykA/ikTLICt2/vP+qBfJ4s+Z7MCEGODG3QwVI30oCupnpl3 =BM8o -----END PGP SIGNATURE----- --------------enigA52EFB07DC2374D7897B8EBD--