From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UbEDe-0007Lj-A1 for mharc-grub-devel@gnu.org; Sat, 11 May 2013 14:08:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UbEDc-0007LZ-LQ for grub-devel@gnu.org; Sat, 11 May 2013 14:08:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UbEDb-0007ub-Hh for grub-devel@gnu.org; Sat, 11 May 2013 14:08:28 -0400 Received: from mail-lb0-f173.google.com ([209.85.217.173]:56027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UbDzx-0003a2-2D for grub-devel@gnu.org; Sat, 11 May 2013 13:54:21 -0400 Received: by mail-lb0-f173.google.com with SMTP id t10so1148932lbi.32 for ; Sat, 11 May 2013 10:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=NyEh2izdUqDqtXV452UB3HItbliC7wbYcDB4Qu87DdI=; b=n6qirHnf/bbCXR3OYYkRGQATJab73KFY+2BLO4ReaTNsNJ/jrmBI/L/Es/ISh4JJMn 3IA4LXGNL/J+Qv9tUkXLB27auFGu4xhLW+ibQa9OAlFchHSgb4t9vCZLqIA5swJCdFQ4 +krgXJfAHgQrBxsmH0f2wiiA509Mpfy69kLefG1U0djqmJdEq6ytP1ysvaZFqZ09tohK xbPuOAOcZqX8EMtQrM8pKmKOWGRE5gUltIPSHFfcQMzFRrZC36nPhpKDCWBmov7i0+S9 oFZZLKOc6YUoFjHhNDnbyiONpeSsc2wBrmuIKPN8s/2d6sIHY3vzRdX0kb7gvSObRXAK 7X7g== X-Received: by 10.112.163.167 with SMTP id yj7mr5314712lbb.107.1368294859929; Sat, 11 May 2013 10:54:19 -0700 (PDT) Received: from localhost.localdomain ([94.29.72.160]) by mx.google.com with ESMTPSA id jr19sm2820162lab.0.2013.05.11.10.54.19 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 11 May 2013 10:54:19 -0700 (PDT) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] emit EXTRA_DIST unconditionally so tarball does not depend on configured platform Date: Sat, 11 May 2013 21:54:14 +0400 Message-Id: <1368294854-14729-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.8.1.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.217.173 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: Sat, 11 May 2013 18:08:30 -0000 Currently extra_dist sources are emitted under enabled platform conditions. So if module/image/... is not enabled for every platform, extra_dist files will not be included in tarball during "make dist" if module is not enabled for currently configured platform. As example, attempt to build i386-pc from tarball created under x86_64-efi fails with: 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 -DGRUB_MACHINE_PCBIOS=1 -DGRUB_MACHINE=I386_PC -DGRUB_TARGET_CPU_I386=1 -m32 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.7/include -DGRUB_FILE=\"efiemu/loadcore32.c\" ... -c -o efiemu/efiemu_module-loadcore32.o `test -f 'efiemu/loadcore32.c' || echo './'`efiemu/loadcore32.c efiemu/loadcore32.c:22:22: fatal error: loadcore.c: No such file or directory compilation terminated. Change gentpl.py to emit dist_noinst_DATA instead. Automake collects them even when assignment is under false condition, so it ensures tarball always includes the same files on every platform. It also changes data to emit dist__DATA instead of using EXTRA_DIST. Signed-off-by: Andrey Borzenkov --- conf/Makefile.common | 2 +- gentpl.py | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) 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 = platform_DATA = sbin_PROGRAMS = check_SCRIPTS = -grubconf_DATA = +dist_grubconf_DATA = check_PROGRAMS = noinst_SCRIPTS = noinst_PROGRAMS = 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 += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_MODULE) " + platform_ccasflags(platform)) # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)") r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)") @@ -410,7 +410,7 @@ def kernel(platform): r += var_set(cname() + "_STRIPFLAGS", "$(AM_STRIPFLAGS) $(STRIPFLAGS_KERNEL) " + platform_stripflags(platform)) # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)") r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)") @@ -443,7 +443,7 @@ def image(platform): r += var_set(cname() + "_OBJCOPYFLAGS", "$(OBJCOPYFLAGS_IMAGE) " + platform_objcopyflags(platform)) # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)") r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)") @@ -476,7 +476,7 @@ def library(platform): r += var_add(cname() + "_CCASFLAGS", first_time("$(AM_CCASFLAGS) $(CCASFLAGS_LIBRARY) ") + platform_ccasflags(platform)) # r += var_add(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += first_time(gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")) r += first_time(gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")) return r @@ -515,15 +515,14 @@ def program(platform, test=False): r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM) " + platform_ccasflags(platform)) # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) + r += gvar_add("dist_noinst_DATA", extra_dist()) r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)") r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)") return r def data(platform): - r = gvar_add("EXTRA_DIST", platform_sources(platform)) - r += gvar_add("EXTRA_DIST", extra_dist()) - r += var_add(installdir() + "_DATA", platform_sources(platform)) + r = var_add("dist_" + installdir() + "_DATA", platform_sources(platform)) + r += gvar_add("dist_noinst_DATA", extra_dist()) return r def script(platform): -- tg: (936f633..) u/extra_dist (depends on: master)