From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 6 Nov 2015 10:58:54 +0000 (+0100)
Subject: defining debug_package in .rpmmacros does not kick in, so let's define this in header... 
X-Git-Tag: 5.3.10~18
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=190d418e99a8c31fbfd3474ce2314a5a5687fcf2

defining debug_package in .rpmmacros does not kick in, so let's define this in header.spec instead
---

diff --git a/Makefile b/Makefile
index d4ec4596..76db1106 100644
--- a/Makefile
+++ b/Makefile
@@ -330,6 +330,15 @@ $(foreach package, $(ALL), $(eval $(call package_hasdate,$(package))))
 
 ### the common header for generated specfiles
 # useful when trying new specfiles manually
+###
+# note for fedora23 (and onwards, probably)
+# many rpms wouldn't build as-is and issue an weird error
+##
+# Processing files: pl_sshd-debuginfo-1.0-11.lxc.x86_64
+# error: Empty %files file /longbuildroot/BUILD/pl_sshd-1.0/debugfiles.list
+##
+# so to work around that we define debug_package as being nil
+# only for f23 for now, let's see what this gives us..
 header.spec:
 	(echo -n "# Generated by planetlab build on " ; date) > $@
 	echo "%define distro $(DISTRO)" >> $@
@@ -342,6 +351,9 @@ header.spec:
 	echo "%global _source_filedigest_algorithm 1" >> $@
 	echo "%global _source_payload       w9.gzdio" >> $@
 	echo "%global _binary_payload       w9.gzdio" >> $@
+ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f23)"
+	echo "%define debug_package %{nil}" >> $@
+endif
 
 ### make up spec file - extract module first
 define target_spec
@@ -430,15 +442,6 @@ endif
 # rpm macros
 # build.common (getrpmmacros.sh) defines some utilities we want in place on our images
 # in addition to these we set a few others for the build
-###
-# note for fedora23 (and onwards, probably)
-# many rpms wouldn't build as-is and issue an weird error
-##
-# Processing files: pl_sshd-debuginfo-1.0-11.lxc.x86_64
-# error: Empty %files file /longbuildroot/BUILD/pl_sshd-1.0/debugfiles.list
-##
-# so to work around that we define debug_package as being nil
-# only for f23 for now, let's see what this gives us..
 .rpmmacros:
 ifeq "$(shell pwd)" "/build"
 	rm -f $(FAKEROOT) ; ln -s $(REALROOT) $(FAKEROOT)
@@ -447,9 +450,6 @@ endif
 	echo "%_topdir $(HOME)" >> $@
 	echo "%_tmppath $(HOME)/tmp" >> $@
 	echo "%__spec_install_pre %{___build_pre}" >> $@
-ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f23)"
-	echo "%define debug_package %{nil}" >> $@
-endif
 	./getrpmmacros.sh >> $@
 
 ### this utility allows to extract various info from a spec file