X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;fp=Makefile;h=d4ec45969ac0ef87c766519d4723f947f30a04e4;hb=bb73021c2b43630016afe8674da4a7b52cf1a5e1;hp=5bfef90702ecb42883c61390be6b74db713023c8;hpb=83b1895c7ca444868c73ed12cc22f72c1c413cc0;p=build.git

diff --git a/Makefile b/Makefile
index 5bfef907..d4ec4596 100644
--- a/Makefile
+++ b/Makefile
@@ -426,6 +426,19 @@ export HOME := $(FAKEROOT)
 else
 export HOME := $(PWD)
 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)
@@ -434,6 +447,9 @@ 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