summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b59769d)
(*) keep only DEPENDDEVELRPMS, with dependencies now correctly managed
(*) some internal variables renamed - ongoing move to be completed with next change
# 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
# 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>
# (*) package-DEPENDDEVELRPMS
# a set of *rpms* that the build will rpm-install before building <package>
# (*) package-DEPENDFILES
# (*) package-DEPENDDEVELRPMS
# a set of *rpms* that the build will rpm-install before building <package>
# (*) package-DEPENDFILES
HOSTARCH := $(shell uname -i)
DISTRO := $(shell ./getdistro.sh)
RELEASE := $(shell ./getrelease.sh)
HOSTARCH := $(shell uname -i)
DISTRO := $(shell ./getdistro.sh)
RELEASE := $(shell ./getrelease.sh)
+RPM-INSTALL-DEVEL := rpm --force -Uvh
#################### Makefile
# Default target
#################### Makefile
# Default target
# usage: target_source_rpm package
# select upon the package name, whether it contains srpm or not
define target_source_rpm
# 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)
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))
$(if $($(1)-RPMBUILD),\
$($(1)-RPMBUILD) $($(1)-RPMFLAGS) -bs $($(1)_specpath),
$(RPMBUILD) $($(1)-RPMFLAGS) -bs $($(1)_specpath))
$($(1)-SRPM): $($(1)_specpath) .rpmmacros $($(1)-CODEBASE)
mkdir -p BUILD SRPMS tmp
@(echo -n "XXXXXXXXXXXXXXX -- BEG SRPM $(1) (using make srpm) " ; date)
$($(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))
make -C $($(1)-CODEBASE) srpm && \
rm -f SRPMS/$(notdir $($(1)-SRPM)) && \
ln $($(1)-CODEBASE)/$(notdir $($(1)-SRPM)) SRPMS/$(notdir $($(1)-SRPM))
$(foreach package,$(ALL),$(eval $(call target_shorthand,$(package))))
$(foreach package,$(ALL),$(eval $(call target_shorthand,$(package))))
define package_depends_on_file
$(1):$(2)
define package_depends_on_file
$(1):$(2)
endef
define target_dependfiles
$(foreach file,$($(1)-DEPENDFILES),$(eval $(call package_depends_on_file,$(1),$(file))))
endef
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)
define package_depends_on_package
$(1):$(2)
$(1):$($(2)-RPMS)
endef
define target_depends
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))))
endef
$(foreach package,$(ALL),$(eval $(call target_depends,$(package))))
-$(foreach package,$(ALL),$(eval $(call target_dependfiles,$(package))))
### clean target
# usage: target_clean package
### clean target
# usage: target_clean package
#
proper-MODULES := proper
proper-SPEC := proper.spec
#
proper-MODULES := proper
proper-SPEC := proper.spec
-proper-DEPENDDEVELS := libhttpd
+proper-DEPENDDEVELRPMS := libhttpd++-devel
#
ulogd-MODULES := ulogd
ulogd-SPEC := ulogd.spec
#
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
ALL += ulogd
IN_VSERVER += ulogd
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
-iptables-DEPENDDEVELS := $(kernel_package)
+iptables-DEPENDDEVELRPMS := kernel-devel
ALL += iptables
IN_BOOTSTRAPFS += iptables
ALL += iptables
IN_BOOTSTRAPFS += iptables
+ /* skip empty packages */
+ /* 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-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);
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);