From bb50137e21ceb393f441fda5ec22b139a1cb10ad Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 3 Dec 2007 11:03:40 +0000 Subject: [PATCH] (*) dismantled DEPENDDEVELS (*) keep only DEPENDDEVELRPMS, with dependencies now correctly managed (*) some internal variables renamed - ongoing move to be completed with next change --- Makefile | 27 +++++++++++++++------------ planetlab.mk | 7 +++---- spec2make.c | 12 +++++++----- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index cb623ebe..47592191 100644 --- a/Makefile +++ b/Makefile @@ -60,8 +60,6 @@ # would let you use the %release from the kernel's package when rpmbuild'ing mydriver - see automatic below # (*) package-DEPENDS # a set of *packages* that this package depends on -# (*) package-DEPENDDEVELS -# a set of *packages* that the build will rpm-install the -devel variant before building # (*) package-DEPENDDEVELRPMS # a set of *rpms* that the build will rpm-install before building # (*) package-DEPENDFILES @@ -114,6 +112,7 @@ HOSTARCH := $(shell uname -i) DISTRO := $(shell ./getdistro.sh) RELEASE := $(shell ./getrelease.sh) +RPM-INSTALL-DEVEL := rpm --force -Uvh #################### Makefile # Default target @@ -416,14 +415,12 @@ srpms: $(ALLSRPMS) # usage: target_source_rpm package # select upon the package name, whether it contains srpm or not define target_source_rpm +$(1).all-devel-rpm-paths := $(foreach rpm,$($(1)-DEPENDDEVELRPMS),$($(rpm).rpm-path)) ifeq "$(subst srpm,,$(1))" "$(1)" $($(1)-SRPM): $($(1)_specpath) .rpmmacros $($(1)-TARBALLS) mkdir -p BUILD SRPMS tmp @(echo -n "XXXXXXXXXXXXXXX -- BEG SRPM $(1) " ; date) - deps="$(foreach devel,$($(1)-DEPENDDEVELS),$(if $($(devel)-DEVEL-RPMS), $($(devel)-DEVEL-RPMS))) \ - $(foreach rpm,$($(1)-DEPENDDEVELRPMS), $($(rpm)-RPM-PATH))"; \ - if test -n "$$$${deps/ /}"; then rpm -Uvh --force $$$$deps; \ - else :; fi + $(if $($(1).all-devel-rpm-paths), $(RPM-INSTALL-DEVEL) $($(1).all-devel-rpm-paths)) $(if $($(1)-RPMBUILD),\ $($(1)-RPMBUILD) $($(1)-RPMFLAGS) -bs $($(1)_specpath), $(RPMBUILD) $($(1)-RPMFLAGS) -bs $($(1)_specpath)) @@ -432,8 +429,7 @@ else $($(1)-SRPM): $($(1)_specpath) .rpmmacros $($(1)-CODEBASE) mkdir -p BUILD SRPMS tmp @(echo -n "XXXXXXXXXXXXXXX -- BEG SRPM $(1) (using make srpm) " ; date) - -$(foreach devel,$($(1)-DEPENDDEVELS), $(if $($(devel)-DEVEL-RPMS),rpm --force -Uvh $($(devel)-DEVEL-RPMS);)) - -$(foreach rpm,$($(1)-DEPENDDEVELRPMS), rpm --force -Uvh $($(rpm)-RPM-PATH);) + $(if $($(1).all-devel-rpm-paths), $(RPM-INSTALL-DEVEL) $($(1).all-devel-rpm-paths)) make -C $($(1)-CODEBASE) srpm && \ rm -f SRPMS/$(notdir $($(1)-SRPM)) && \ ln $($(1)-CODEBASE)/$(notdir $($(1)-SRPM)) SRPMS/$(notdir $($(1)-SRPM)) @@ -493,16 +489,24 @@ endef $(foreach package,$(ALL),$(eval $(call target_shorthand,$(package)))) -### dependencies +### file dependencies define package_depends_on_file $(1):$(2) -$($(1)-RPMS):$(2) +$($(1)-SRPM):$(2) endef define target_dependfiles $(foreach file,$($(1)-DEPENDFILES),$(eval $(call package_depends_on_file,$(1),$(file)))) endef +$(foreach package,$(ALL),$(eval $(call target_dependfiles,$(package)))) + +### package dependencies +define compute_devel_depends +$(1).depend-devel-packages := $(foreach rpm,$($(1)-DEPENDDEVELRPMS),$($(rpm).package)) +endef +$(foreach package,$(ALL),$(eval $(call compute_devel_depends,$(package)))) + define package_depends_on_package $(1):$(2) $(1):$($(2)-RPMS) @@ -510,11 +514,10 @@ $($(1)-SRPM):$($(2)-RPMS) endef define target_depends -$(foreach package,$($(1)-DEPENDS) $($(1)-DEPENDDEVELS),$(eval $(call package_depends_on_package,$(1),$(package)))) +$(foreach package,$($(1)-DEPENDS) $($(1).depend-devel-packages),$(eval $(call package_depends_on_package,$(1),$(package)))) endef $(foreach package,$(ALL),$(eval $(call target_depends,$(package)))) -$(foreach package,$(ALL),$(eval $(call target_dependfiles,$(package)))) ### clean target # usage: target_clean package diff --git a/planetlab.mk b/planetlab.mk index 2184a349..10ce4dc0 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -115,7 +115,7 @@ ALL += libhttpd # proper-MODULES := proper proper-SPEC := proper.spec -proper-DEPENDDEVELS := libhttpd +proper-DEPENDDEVELRPMS := libhttpd++-devel ALL += proper # @@ -132,8 +132,7 @@ IN_BOOTSTRAPFS += codemux # ulogd-MODULES := ulogd ulogd-SPEC := ulogd.spec -ulogd-DEPENDDEVELS := $(kernel_package) -ulogd-DEPENDDEVELRPMS := proper-libs proper-devel +ulogd-DEPENDDEVELRPMS := kernel-devel proper-libs proper-devel ALL += ulogd IN_VSERVER += ulogd @@ -166,7 +165,7 @@ IN_BOOTSTRAPFS += pl_mom # iptables-MODULES := iptables iptables-SPEC := iptables.spec -iptables-DEPENDDEVELS := $(kernel_package) +iptables-DEPENDDEVELRPMS := kernel-devel ALL += iptables IN_BOOTSTRAPFS += iptables diff --git a/spec2make.c b/spec2make.c index edb43b59..ff21e9d1 100644 --- a/spec2make.c +++ b/spec2make.c @@ -165,15 +165,17 @@ main(int argc, char *argv[]) arch=target; } } + /* skip empty packages */ if (pkg->fileList) { + /* attach (add) rpm path to package */ printf("%s-RPMS += RPMS/%s/%s-%s-%s.%s.rpm\n", package_name, arch, name, version, release, arch); - printf("%s-RPM-PATH := RPMS/%s/%s-%s-%s.%s.rpm\n", + /* attach path to rpm name */ + printf("%s.rpm-path := RPMS/%s/%s-%s-%s.%s.rpm\n", name,arch, name, version, release, arch); - if (strstr (name,"-devel")!=NULL) { - printf("%s-DEVEL-RPMS += RPMS/%s/%s-%s-%s.%s.rpm\n", - package_name, arch, name, version, release, arch); - } + /* attach package to rpm name for backward resolution - should be unique */ + printf("%s.package := %s\n", + name,package_name); } } } -- 2.43.0