reviewed options:

[build.git] / Makefile

diff --git a/Makefile b/Makefile
index 2441af5..7161dc2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -237,7 +237,7 @@ repo: RPMS/yumgroups.xml
 #
 define stage1_variables
 $(1)_spec = $(notdir $($(1)-SPEC))
-$(1)_specpath = CODESPECS/$(notdir $($(1)-SPEC))
+$(1)_specpath = SPECS/$(notdir $($(1)-SPEC))
 $(1)_module = $(firstword $($(1)-MODULES))
 endef
 
@@ -264,7 +264,7 @@ $(foreach package, $(ALL), $(eval $(call package_hasdate,$(package))))
 # cannot use variables in such rules, we need to inline everything, sigh
 define target_spec
 $($(1)_specpath):
-       mkdir -p CODESPECS
+       mkdir -p SPECS
        (echo -n "# Generated by planetlab build from $($(1)-SPEC) on " ; date) > $($(1)_specpath)
        echo "%define distroname $(DISTRO)" >> $($(1)_specpath)
        echo "%define distrorelease $(RELEASE)" >> $($(1)_specpath)
@@ -284,19 +284,23 @@ endef
 
 $(foreach package,$(ALL),$(eval $(call target_spec,$(package))))
 
-### this utility allows to extract various info from a spec file
-### and to define them in makefiles
-spec2make: spec2make.c
-       $(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild
-
+###
 # Base rpmbuild in the current directory
-# trying a longer topdir 
-# http://forums.fedoraforum.org/showthread.php?t=39625
-# and more specifically post#6
-# hard-wired for now 
-export HOME := /building
+# issues on fedora 8 : see the following posts
+# http://forums.fedoraforum.org/showthread.php?t=39625 - and more specifically post#6
+# https://www.redhat.com/archives/fedora-devel-list/2007-November/msg00171.html
+REALROOT=/build
+FAKEROOT=/longbuildroot
+PWD=$(shell /bin/pwd)
+ifeq "$(PWD)" "$(REALROOT)"
+export HOME := $(FAKEROOT)
+else
+export HOME := $(PWD)
+endif
 .rpmmacros:
-       rm -f /building ; ln -s /build /building
+ifeq "$(shell pwd)" "/build"
+       rm -f $(FAKEROOT) ; ln -s $(REALROOT) $(FAKEROOT)
+endif
        rm -f $@ 
        echo "%_topdir $(HOME)" >> $@
        echo "%_tmppath $(HOME)/tmp" >> $@
@@ -304,6 +308,11 @@ export HOME := /building
        echo "%_install_langs C:de:en:es:fr" >> $@
        echo "%_excludedocs yes" >> $@
 
+### this utility allows to extract various info from a spec file
+### and to define them in makefiles
+spec2make: spec2make.c
+       $(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild
+
 ### run spec2make on the spec file and include the result
 # usage: spec2make package
 define target_mk
@@ -439,16 +448,20 @@ rpms: $(ALLRPMS)
        @echo $(words $(ALLRPMS)) binary rpms OK
 .PHONY: rpms
 
+# use tmp dirs when building binary rpm so make remains idempotent 
+# otherwise SOURCES/ or SPEC gets touched again - which leads to rebuilding
+rpm_use_tmp_dirs = --define "_sourcedir $(HOME)/tmp" --define "_specdir $(HOME)/tmp"
+
 # usage: build_binary_rpm package
 # xxx hacky - invoke createrepo if DEPENDFILES mentions RPMS/yumgroups.xml
 define target_binary_rpm 
 $($(1)-RPMS): $($(1)-SRPM)
-       mkdir -p BUILD RPMS SPECS tmp
+       mkdir -p BUILD RPMS tmp
        @(echo -n "XXXXXXXXXXXXXXX -- BEG RPM $(1) " ; date)
        $(if $(findstring RPMS/yumgroups.xml,$($(1)-DEPENDFILES)), $(createrepo) , )
        $(if $($(1)-RPMBUILD),\
-         $($(1)-RPMBUILD) $($(1)-RPMFLAGS) --rebuild --define "_sourcedir $(HOME)/tmp" $($(1)-SRPM), \
-         $(RPMBUILD)  $($(1)-RPMFLAGS) --rebuild --define "_sourcedir $(HOME)/tmp" $($(1)-SRPM))
+         $($(1)-RPMBUILD) $($(1)-RPMFLAGS) --rebuild $(rpm_use_tmp_dirs) $($(1)-SRPM), \
+         $(RPMBUILD)  $($(1)-RPMFLAGS) --rebuild $(rpm_use_tmp_dirs) $($(1)-SRPM))
        @(echo -n "XXXXXXXXXXXXXXX -- END RPM $(1) " ; date)
 endef
 
@@ -527,8 +540,19 @@ $(1)-clean-srpm:
        rm -rf $($(1)-SRPM)
 .PHONY: $(1)-clean-srpm
 CLEANS += $(1)-clean-srpm
-$(1)-clean: $(1)-clean-codebase $(1)-clean-source $(1)-clean-tarball $(1)-clean-build $(1)-clean-rpms $(1)-clean-srpm
-.PHONY: $(1)-clean
+$(1)-codeclean: $(1)-clean-source $(1)-clean-tarball $(1)-clean-build $(1)-clean-rpms $(1)-clean-srpm
+$(1)-clean: $(1)-clean-codebase $(1)-codeclean
+.PHONY: $(1)-codeclean $(1)-clean 
+$(1)-clean-spec:
+       rm -rf $($(1)_specpath)
+.PHONY: $(1)-clean-spec
+$(1)-clean-make:
+       rm -rf MAKE/$(1).mk
+.PHONY: $(1)-clean-make
+$(1)-distclean: $(1)-distclean1 $(1)-distclean2
+$(1)-distclean1: $(1)-clean-spec $(1)-clean-make
+$(1)-distclean2: $(1)-clean
+.PHONY: $(1)-distclean $(1)-distclean1 $(1)-distclean2
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_clean,$(package))))
@@ -544,9 +568,9 @@ clean-help:
 
 ### brute force clean
 distclean1:
-       rm -rf pldistro.mk .rpmmacros spec2make CODESPECS MAKE 
+       rm -rf pldistro.mk .rpmmacros spec2make SPECS MAKE 
 distclean2:
-       rm -rf CODEBASES SOURCES BUILD RPMS SRPMS SPECS tmp
+       rm -rf CODEBASES SOURCES BUILD RPMS SRPMS tmp
 distclean: distclean1 distclean2
 .PHONY: distclean1 distclean2 distclean
 
@@ -592,7 +616,7 @@ help:
        @echo "Run make in two stages:"
        @echo ""
        @echo "make stage1=true PLDISTRO=onelab"
-       @echo " -> extracts all spec files in CODESPECS/ and mk files in MAKE/"
+       @echo " -> extracts all spec files in SPECS/ and mk files in MAKE/"
        @echo "    as well as save PLDISTRO for subsequent runs"
        @echo ""
        @echo "Then you can use the following targets"
@@ -626,6 +650,11 @@ help:
        @echo "  removes the files made by make"
        @echo "$ make distclean"
        @echo "  brute-force cleaning, removes entire directories - requires a new stage1"
+       @echo ""
+       @echo "$ make iptables-distclean"
+       @echo "$ make iptables-codeclean"
+       @echo "  run this if you've made a change in the CODEBASES area for iptables"
+       @echo ""
        @echo "$ make util-vserver-clean"
        @echo "  removes codebase, source, tarball, build, rpm and srpm for util-vserver"
        @echo "$ make util-vserver-clean-codebase"