nodeupdate

[build.git] / Makefile

diff --git a/Makefile b/Makefile
index 0533445..76db110 100644 (file)
--- 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
@@ -426,6 +438,10 @@ 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
 .rpmmacros:
 ifeq "$(shell pwd)" "/build"
        rm -f $(FAKEROOT) ; ln -s $(REALROOT) $(FAKEROOT)
@@ -721,7 +737,7 @@ $(1)-debian: $(1)-tarball
        $(call dpkgapt_install_local_debs,$(1))
        $(call dpkgapt_install_stock_debs,$(1))
        mkdir -p DEBIAN/$(1)
-       rsync -a MODULES/$(1)/ DEBIAN/$(1)/
+       rsync -a MODULES/$($(1).module)/ DEBIAN/$(1)/
        make -C DEBIAN/$(1) "RPMTARBALL=$(HOME)/$($(1).tarballs)" "RPMVERSION=$($(1).rpm-version)" "RPMRELEASE=$($(1).rpm-release)" "RPMNAME=$($(1).rpm-name)" debian
        $(call dpkgapt_uninstall_stock_debs,$(1))
 endef