harmonize names for devel-rpms - was confusing - now has LOCAL-DEVEL-RPMS and STOCK...

diff --git a/Makefile b/Makefile
index 6674ae0..12d4a00 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@
 # (*) modules are named after the subversion or git tree; we would wish to keep
 #     these names lowercase as far as possible
 # (*) rpms are named in the spec files. A package typically defines several rpms;
-#     rpms are used for defining DEPEND-DEVEL-RPMS. See also package.rpmnames
+#     rpms are used for defining LOCAL-DEVEL-RPMS. See also package.rpmnames
 # 
 # in simple cases, one package uses one module (in which case using the same name sounds right)
 # but others might need several modules (e.g. image-creation packages like bootstrapfs need 
@@ -52,16 +52,16 @@
 #     a set of (obviously local) *packages* that this package depends on, e.g.
 #     bootstrapfs-DEPEND-PACKAGES += kernel
 #     this impacts the order of the build
-# (*) package-DEVEL-RPMS
+# (*) package-STOCK-DEVEL-RPMS
 #     a set of stock rpms that this package needs at build-time
 #     this can also be set in config.<distro>/devel.pkgs or config.planetlab/devel.pkgs as appropriate
-# (*) package-DEPEND-DEVEL-RPMS
+# (*) package-LOCAL-DEVEL-RPMS
 #     a set of *local* rpms that the build will rpm-install before building <package>
 #     the build will attempt to uninstall those once the package is built, this is not fatal though
 #     this is intended to denote local rpms, i.e. ones that are results of our own build
-#     stock rpms should be mentioned in DEVEL-RPMS or in devel.pkgs as described above
-# (*) package-DEPEND-DEVEL-RPMS-UPDATES
-#     like package-DEPEND-DEVEL-RPMS but for crucial packages (like autoconf) that only need an update from our build
+#     stock rpms should be mentioned in STOCK-DEVEL-RPMS or in devel.pkgs as described above
+# (*) package-LOCAL-DEVEL-RPMS-CRUCIAL
+#     like package-LOCAL-DEVEL-RPMS but for crucial packages (like autoconf) that only need an update from our build
 #     rpms in this area will *not* be uninstalled after the target is made, because that would ruin the build vm for good
 # (*) package-DEPEND-FILES
 #     a set of files that the package depends on - and that make needs to know about
@@ -120,11 +120,6 @@ HOSTARCH := $(shell uname -i 2> /dev/null || uname -m 2> /dev/null)
 DISTRO := $(shell ./getdistro.sh)
 RELEASE := $(shell ./getrelease.sh)
 DISTRONAME := $(shell ./getdistroname.sh)
-RPM-INSTALL-DEVEL := rpm --force -Uvh
-# uninstall -- cannot force rpm -e
-# need to ignore result, kernel-headers cannot be uninstalled as glibc depends on it
-RPM-UNINSTALL-DEVEL := rpm -e
-YUM-INSTALL-DEVEL := yum -y install
 
 #################### Makefile
 # Default target
@@ -464,13 +459,13 @@ all: envfrompreviousrun
 define stage2_variables
 ### devel dependencies
 $(1).rpmbuild = $(RPMBUILD) $($(1)-RPMFLAGS)
-$(1).all-devel-rpm-paths := $(foreach rpm,$($(1)-DEPEND-DEVEL-RPMS) $($(1)-DEPEND-DEVEL-RPMS-UPDATES),$($(rpm).rpm-path))
-$(1).depend-devel-packages := $(sort $(foreach rpm,$($(1)-DEPEND-DEVEL-RPMS),$($(rpm).package)))
-ALL-DEVEL-RPMS += $($(1)-DEPEND-DEVEL-RPMS)
+$(1).all-devel-rpm-paths := $(foreach rpm,$($(1)-LOCAL-DEVEL-RPMS) $($(1)-LOCAL-DEVEL-RPMS-CRUCIAL),$($(rpm).rpm-path))
+$(1).depend-devel-packages := $(sort $(foreach rpm,$($(1)-LOCAL-DEVEL-RPMS),$($(rpm).package)))
+ALL-STOCK-DEVEL-RPMS += $($(1)-LOCAL-DEVEL-RPMS)
 endef
 
 $(foreach package,$(ALL),$(eval $(call stage2_variables,$(package))))
-ALL-DEVEL-RPMS := $(sort $(ALL-DEVEL-RPMS))
+ALL-STOCK-DEVEL-RPMS := $(sort $(ALL-STOCK-DEVEL-RPMS))
 
 
 ### pack sources into tarballs
@@ -530,43 +525,51 @@ srpms: $(ALLSRPMS)
        @echo $(words $(ALLSRPMS)) source rpms OK
 .PHONY: srpms
 
+#################### manage build requirements
+# default values
+RPMYUM-INSTALL-LOCAL := rpm --force -Uvh
+# uninstall -- cannot force rpm -e
+# need to ignore result, kernel-headers cannot be uninstalled as glibc depends on it
+RPMYUM-UNINSTALL-STOCK := rpm -e
+RPMYUM-INSTALL-STOCK := yum -y install
 
-# install the DEVEL-RPMS rpms if defined
-define handle_stock_devel_rpms_pre 
-       $(if $($(1)-DEVEL-RPMS), echo "Installing for $(1)-DEVEL-RPMS" ; $(YUM-INSTALL-DEVEL) $($(1)-DEVEL-RPMS))
+### these macro handles the LOCAL-DEVEL-RPMS and LOCAL-DEVEL-RPMS-CRUCIAL tags for a given package
+# before building : rpm-install LOCAL-DEVEL-RPMS 
+define rpmyum_install_local_rpms 
+       $(if $($(1).all-devel-rpm-paths), echo "Installing for $(1)-LOCAL-DEVEL-RPMS" ; $(RPMYUM-INSTALL-LOCAL) $($(1).all-devel-rpm-paths)) 
 endef
 
-### these macro handles the DEPEND-DEVEL-RPMS and DEPEND-DEVEL-RPMS-UPDATES tags for a given package
-# before building : rpm-install DEPEND-DEVEL-RPMS 
-define handle_local_devel_rpms_pre 
-       $(if $($(1).all-devel-rpm-paths), echo "Installing for $(1)-DEPEND-DEVEL-RPMS" ; $(RPM-INSTALL-DEVEL) $($(1).all-devel-rpm-paths)) 
+# install stock rpms if defined
+define rpmyum_install_stock_rpms 
+       $(if $($(1)-STOCK-DEVEL-RPMS), echo "Installing for $(1)-STOCK-DEVEL-RPMS" ; $(RPMYUM-INSTALL-STOCK) $($(1)-STOCK-DEVEL-RPMS))
 endef
 
-define handle_local_devel_rpms_post
-       -$(if $($(1)-DEPEND-DEVEL-RPMS), echo "Unstalling for $(1)-DEPEND-DEVEL-RPMS" ; $(RPM-UNINSTALL-DEVEL) $($(1)-DEPEND-DEVEL-RPMS))
+define rpmyum_uninstall_stock_rpms
+       -$(if $($(1)-LOCAL-DEVEL-RPMS), echo "Unstalling for $(1)-LOCAL-DEVEL-RPMS" ; $(RPMYUM-UNINSTALL-STOCK) $($(1)-LOCAL-DEVEL-RPMS))
 endef
 
+####################
 # usage: target_source_rpm package
 define target_source_rpm 
 ifeq "$($(1)-BUILD-FROM-SRPM)" ""
 $($(1).srpm): $($(1).specpath) .rpmmacros $($(1).tarballs) 
        mkdir -p BUILD SRPMS tmp
        @(echo -n "XXXXXXXXXXXXXXX -- BEG SRPM $(1) (using SOURCES) " ; date)
-       $(call handle_stock_devel_rpms_pre,$(1))
-       $(call handle_local_devel_rpms_pre,$(1))
+       $(call rpmyum_install_stock_rpms,$(1))
+       $(call rpmyum_install_local_rpms,$(1))
        $($(1).rpmbuild) -bs $($(1).specpath)
-       $(call handle_local_devel_rpms_post,$(1))
+       $(call rpmyum_uninstall_stock_rpms,$(1))
        @(echo -n "XXXXXXXXXXXXXXX -- END SRPM $(1) " ; date)
 else
 $($(1).srpm): $($(1).specpath) .rpmmacros $($(1).source)
        mkdir -p BUILD SRPMS tmp
        @(echo -n "XXXXXXXXXXXXXXX -- BEG SRPM $(1) (using make srpm) " ; date)
-       $(call handle_stock_devel_rpms_pre,$(1))
-       $(call handle_local_devel_rpms_pre,$(1))
+       $(call rpmyum_install_stock_rpms,$(1))
+       $(call rpmyum_install_local_rpms,$(1))
        make -C $($(1).source) srpm SPECFILE=$(HOME)/$($(1).specpath) EXPECTED_SRPM=$(notdir $($(1).srpm)) && \
            rm -f SRPMS/$(notdir $($(1).srpm)) && \
            ln $($(1).source)/$(notdir $($(1).srpm)) SRPMS/$(notdir $($(1).srpm)) 
-       $(call handle_local_devel_rpms_post,$(1))
+       $(call rpmyum_uninstall_stock_rpms,$(1))
        @(echo -n "XXXXXXXXXXXXXXX -- END SRPM $(1) " ; date)
 endif
 endef
@@ -592,20 +595,20 @@ $($(1).rpms): $($(1).srpm)
        mkdir -p RPMS tmp
        @(echo -n "XXXXXXXXXXXXXXX -- BEG RPM $(1) " ; date)
        $(if $(findstring RPMS/yumgroups.xml,$($(1)-DEPEND-FILES)), $(createrepo) , )
-       $(call handle_stock_devel_rpms_pre,$(1))
-       $(call handle_local_devel_rpms_pre,$(1))
+       $(call rpmyum_install_stock_rpms,$(1))
+       $(call rpmyum_install_local_rpms,$(1))
        $($(1).rpmbuild) --rebuild $(RPM-USE-TMP-DIRS) $($(1).srpm)
-       $(call handle_local_devel_rpms_post,$(1))
+       $(call rpmyum_uninstall_stock_rpms,$(1))
        @(echo -n "XXXXXXXXXXXXXXX -- END RPM $(1) " ; date)
 # for manual use only - in case we need to investigate the results of an rpmbuild
 $(1)-compile: $($(1).srpm)
        mkdir -p COMPILE tmp
        @(echo -n "XXXXXXXXXXXXXXX -- BEG compile $(1) " ; date)
        $(if $(findstring RPMS/yumgroups.xml,$($(1)-DEPEND-FILES)), $(createrepo) , )
-       $(call handle_stock_devel_rpms_pre,$(1))
-       $(call handle_local_devel_rpms_pre,$(1))
+       $(call rpmyum_install_stock_rpms,$(1))
+       $(call rpmyum_install_local_rpms,$(1))
        $($(1).rpmbuild) --recompile $(RPM-USE-TMP-DIRS) $($(1).srpm)
-       $(call handle_local_devel_rpms_post,$(1))
+       $(call rpmyum_uninstall_stock_rpms,$(1))
        @(echo -n "XXXXXXXXXXXXXXX -- END compile $(1) " ; date)
 .PHONY: $(1)-compile
 endef
@@ -739,7 +742,7 @@ distclean: distclean1 distclean2
 .PHONY: distclean1 distclean2 distclean
 
 develclean:
-       -$(RPM-UNINSTALL-DEVEL) $(ALL-DEVEL-RPMS)
+       -$(RPMYUM-UNINSTALL-STOCK) $(ALL-STOCK-DEVEL-RPMS)
 
 ####################
 # gather build information for the 'About' page

diff --git a/f12-tags.mk b/f12-tags.mk
index 16ed56c..0523a89 100644 (file)
--- a/f12-tags.mk
+++ b/f12-tags.mk
@@ -1,10 +1,10 @@
 linux-2.6-BRANCH               := f12
 linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6.32-f12
-kernel-DEVEL-RPMS              += elfutils-libelf-devel 
-kernel-DEVEL-RPMS              += e2fsprogs 
+kernel-STOCK-DEVEL-RPMS                += elfutils-libelf-devel 
+kernel-STOCK-DEVEL-RPMS                += e2fsprogs 
 util-vserver-BRANCH            := f12
 util-vserver-GITPATH           := git://git.onelab.eu/util-vserver.git@f12
-util-vserver-DEVEL-RPMS                += nss nss-devel
-#util-vserver-DEVEL-RPMS               += dietlibc
+util-vserver-STOCK-DEVEL-RPMS          += nss nss-devel
+#util-vserver-STOCK-DEVEL-RPMS         += dietlibc
 yum-BRANCH                     := f12
 yum-SVNPATH                    := http://svn.planet-lab.org/svn/yum/branches/f12@16162

diff --git a/f14-tags.mk b/f14-tags.mk
index f99a507..ed7ea71 100644 (file)
--- a/f14-tags.mk
+++ b/f14-tags.mk
@@ -1,17 +1,17 @@
 ### # don't bother to upgrade
 ### linux-2.6-BRANCH           := f12
 ### linux-2.6-GITPATH          := git://git.onelab.eu/linux-2.6.git@linux-2.6.32-f12
-### kernel-DEVEL-RPMS          += elfutils-libelf-devel 
-### kernel-DEVEL-RPMS          += e2fsprogs 
-### kernel-DEVEL-RPMS          += xmlto 
-### kernel-DEVEL-RPMS          += asciidoc
+### kernel-STOCK-DEVEL-RPMS            += elfutils-libelf-devel 
+### kernel-STOCK-DEVEL-RPMS            += e2fsprogs 
+### kernel-STOCK-DEVEL-RPMS            += xmlto 
+### kernel-STOCK-DEVEL-RPMS            += asciidoc
 #util-vserver-BRANCH           := f12
 #util-vserver-GITPATH          := git://git.onelab.eu/util-vserver.git@f12-bbox-f14
 util-vserver-GITPATH           := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-17
-util-vserver-DEVEL-RPMS                += nss nss-devel
-util-vserver-DEVEL-RPMS                += dietlibc
+util-vserver-STOCK-DEVEL-RPMS          += nss nss-devel
+util-vserver-STOCK-DEVEL-RPMS          += dietlibc
 # but use latest stuff for f12 that has 3.2.28
 yum-BRANCH                     := f12
 yum-GITPATH                    := git://git.onelab.eu/yum.git@3.2.28-99-f1x
-yum-DEVEL-RPMS                 += gettext
-yum-DEVEL-RPMS                 += intltool
+yum-STOCK-DEVEL-RPMS                   += gettext
+yum-STOCK-DEVEL-RPMS                   += intltool

diff --git a/lxc.mk b/lxc.mk
index d007a92..d21b9b5 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -149,17 +149,17 @@ libvirt-MODULES := libvirt
 libvirt-SPEC    := libvirt.spec
 libvirt-BUILD-FROM-SRPM := yes
 # The --without options are breaking spec2make : hard-wired in the specfile instead
-libvirt-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnutls-devel 
-libvirt-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel 
-libvirt-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel 
-libvirt-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub 
+libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnutls-devel 
+libvirt-STOCK-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel 
+libvirt-STOCK-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel 
+libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub 
 ifeq "$(DISTRONAME)" "f16"
-libvirt-DEVEL-RPMS += libnl-devel libudev-devel
+libvirt-STOCK-DEVEL-RPMS += libnl-devel libudev-devel
 endif
 # strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
 ifeq "$(DISTRONAME)" "f18"
-libvirt-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad 
-libvirt-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 
+libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad 
+libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 
 endif
 libvirt-RPMFLAGS :=    --define 'packager PlanetLab'
 ALL += libvirt
@@ -216,7 +216,7 @@ endif
 #
 # openvswitch-MODULES := openvswitch
 # openvswitch-SPEC := openvswitch.spec
-# openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+# openvswitch-LOCAL-STOCK-DEVEL-RPMS += kernel-devel
 # IN_NODEIMAGE += openvswitch
 # # build only on f14 as f16 has this natively
 # ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14)"
@@ -229,9 +229,9 @@ endif
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
 # ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
-vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
+vsys-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
 ifeq "$(local_inotify_tools)" "true"
-vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
+vsys-LOCAL-STOCK-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif
 IN_NODEIMAGE += vsys
 ALL += vsys
@@ -287,7 +287,7 @@ ifeq "$(DISTRO)" "Fedora"
 ifneq "$(DISTRONAME)" "f16"
 mod_python-MODULES := mod_python
 mod_python-SPEC        := mod_python.spec
-mod_python-DEVEL-RPMS := httpd-devel
+mod_python-STOCK-DEVEL-RPMS := httpd-devel
 mod_python-BUILD-FROM-SRPM := yes
 ALL += mod_python
 endif
@@ -330,7 +330,7 @@ ALL += pcucontrol
 #
 #monitor-MODULES := monitor
 #monitor-SPEC := Monitor.spec
-#monitor-DEVEL-RPMS += net-snmp net-snmp-devel
+#monitor-STOCK-DEVEL-RPMS += net-snmp net-snmp-devel
 #ALL += monitor
 #IN_NODEIMAGE += monitor
 
@@ -399,14 +399,14 @@ IN_BOOTCD += pyplnet
 #
 rvm-ruby-MODULES := rvm-ruby
 rvm-ruby-SPEC := rpm/rvm-ruby.spec
-rvm-ruby-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel
+rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel
 ALL += rvm-ruby
 
 #
 # OML measurement library
 #
 oml-MODULES := oml
-oml-DEVEL-RPMS += sqlite-devel 
+oml-STOCK-DEVEL-RPMS += sqlite-devel 
 oml-SPEC := liboml.spec
 ALL += oml
 
@@ -536,7 +536,7 @@ endif
 # don't build these by default, we have separate builds for that
 myslice-MODULES := myslice
 myslice-SPEC := myslice.spec
-myslice-DEVEL-RPMS := python-django
+myslice-STOCK-DEVEL-RPMS := python-django
 #ALL += myslice
 
 manifold-MODULES := manifold

diff --git a/mlab-tags.mk b/mlab-tags.mk
index 7691d0b..9b9a1fe 100644 (file)
--- a/mlab-tags.mk
+++ b/mlab-tags.mk
@@ -7,7 +7,7 @@ linux-2.6-GITPATH               := git://git.planet-lab.org/linux-2.6.git@rhel6-mlab
 ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 kernel-WHITELIST-RPMS  := kernel-devel,kernel-headers
 endif
-kernel-DEVEL-RPMS              += elfutils-libelf-devel
+kernel-STOCK-DEVEL-RPMS                += elfutils-libelf-devel
 madwifi-GITPATH                 := git://git.planet-lab.org/madwifi.git@madwifi-4132-6
 # iptables 1.4.7 creates libxtables.so.4 while later versions libxtables.so.5
 # this breaks dependencies for other centos6 packages.

diff --git a/mlab.mk b/mlab.mk
index b95f38b..2dd151b 100644 (file)
--- a/mlab.mk
+++ b/mlab.mk
@@ -15,8 +15,8 @@ ifeq "$(DISTRONAME)" "centos5"
 mkinitrd-MODULES := mkinitrd
 mkinitrd-SPEC := mkinitrd.spec
 mkinitrd-BUILD-FROM-SRPM := yes
-mkinitrd-DEVEL-RPMS += parted-devel glib2-devel libdhcp4client-devel libdhcp6client-devel libdhcp-devel 
-mkinitrd-DEVEL-RPMS += device-mapper libselinux-devel libsepol-devel libnl-devel
+mkinitrd-STOCK-DEVEL-RPMS += parted-devel glib2-devel libdhcp4client-devel libdhcp6client-devel libdhcp-devel 
+mkinitrd-STOCK-DEVEL-RPMS += device-mapper libselinux-devel libsepol-devel libnl-devel
 ALL += mkinitrd
 IN_BOOTCD += mkinitrd
 IN_SLICEIMAGE += mkinitrd 
@@ -60,7 +60,7 @@ ifneq "$(DISTRONAME)" "f8"
 madwifi-MODULES := madwifi
 madwifi-SPEC := madwifi.spec
 madwifi-BUILD-FROM-SRPM := yes
-madwifi-DEPEND-DEVEL-RPMS += kernel-devel
+madwifi-LOCAL-STOCK-DEVEL-RPMS += kernel-devel
 madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
        kernel_release=$(kernel.rpm-release) \
        kernel_arch=$(kernel.rpm-arch)
@@ -75,7 +75,7 @@ endif
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
 iptables-BUILD-FROM-SRPM := yes        
-iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
+iptables-LOCAL-STOCK-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
 IN_NODEIMAGE += iptables
 
@@ -116,7 +116,7 @@ libnl-MODULES := libnl
 libnl-SPEC := libnl.spec
 libnl-BUILD-FROM-SRPM := yes
 # this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers
-libnl-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
+libnl-LOCAL-STOCK-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += libnl
 IN_NODEIMAGE += libnl
 endif
@@ -126,9 +126,9 @@ endif
 #
 util-vserver-pl-MODULES := util-vserver-pl
 util-vserver-pl-SPEC := util-vserver-pl.spec
-util-vserver-pl-DEPEND-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core 
+util-vserver-pl-LOCAL-STOCK-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core 
 ifeq "$(local_libnl)" "true"
-util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel
+util-vserver-pl-LOCAL-STOCK-DEVEL-RPMS += libnl libnl-devel
 endif
 ALL += util-vserver-pl
 IN_NODEIMAGE += util-vserver-pl
@@ -249,7 +249,7 @@ endif
 #
 openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
-openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+openvswitch-LOCAL-STOCK-DEVEL-RPMS += kernel-devel
 
 #ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
 #IN_NODEIMAGE += openvswitch
@@ -262,9 +262,9 @@ openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
 # ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
-vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
+vsys-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
 ifeq "$(local_inotify_tools)" "true"
-vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
+vsys-LOCAL-STOCK-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif
 IN_NODEIMAGE += vsys
 ALL += vsys
@@ -330,7 +330,7 @@ ALL += pcucontrol
 #
 monitor-MODULES := monitor
 monitor-SPEC := Monitor.spec
-monitor-DEVEL-RPMS += net-snmp net-snmp-devel
+monitor-STOCK-DEVEL-RPMS += net-snmp net-snmp-devel
 ALL += monitor
 IN_NODEIMAGE += monitor
 

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 13b3ac7..86f3c46 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -8,7 +8,7 @@ linux-2.6-GITPATH               := git://git.onelab.eu/linux-2.6.git@linux-2.6-3
 ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f16 centos5)"
 kernel-WHITELIST-RPMS  := kernel-devel,kernel-headers
 endif
-kernel-DEVEL-RPMS              += elfutils-libelf-devel
+kernel-STOCK-DEVEL-RPMS                += elfutils-libelf-devel
 
 ipfw-GITPATH                    := git://git.onelab.eu/ipfw-sourceforge.git@ipfw-20130423-1
 madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-6

diff --git a/onelab.mk b/onelab.mk
index d17c6f8..23abb0b 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -40,7 +40,7 @@ IN_NODEIMAGE += $(KERNELS)
 #
 ipfwroot-MODULES := ipfw
 ipfwroot-SPEC := planetlab/ipfwroot.spec
-ipfwroot-DEPEND-DEVEL-RPMS += kernel-devel
+ipfwroot-LOCAL-STOCK-DEVEL-RPMS += kernel-devel
 ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_release=$(kernel.rpm-release) \
         kernel_arch=$(kernel.rpm-arch)
@@ -60,7 +60,7 @@ ifneq "$(DISTRONAME)" "f8"
 madwifi-MODULES := madwifi
 madwifi-SPEC := madwifi.spec
 madwifi-BUILD-FROM-SRPM := yes
-madwifi-DEPEND-DEVEL-RPMS += kernel-devel
+madwifi-LOCAL-STOCK-DEVEL-RPMS += kernel-devel
 madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
        kernel_release=$(kernel.rpm-release) \
        kernel_arch=$(kernel.rpm-arch)
@@ -99,7 +99,7 @@ ALL += umts-frontend
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
 iptables-BUILD-FROM-SRPM := yes        
-iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
+iptables-LOCAL-STOCK-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
 IN_NODEIMAGE += iptables
 
@@ -143,7 +143,7 @@ libnl-MODULES := libnl
 libnl-SPEC := libnl.spec
 libnl-BUILD-FROM-SRPM := yes
 # this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers
-libnl-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
+libnl-LOCAL-STOCK-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += libnl
 IN_NODEIMAGE += libnl
 endif
@@ -153,9 +153,9 @@ endif
 #
 util-vserver-pl-MODULES := util-vserver-pl
 util-vserver-pl-SPEC := util-vserver-pl.spec
-util-vserver-pl-DEPEND-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core 
+util-vserver-pl-LOCAL-STOCK-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core 
 ifeq "$(local_libnl)" "true"
-util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel
+util-vserver-pl-LOCAL-STOCK-DEVEL-RPMS += libnl libnl-devel
 endif
 ALL += util-vserver-pl
 IN_NODEIMAGE += util-vserver-pl
@@ -273,7 +273,7 @@ endif
 # #
 # openvswitch-MODULES := openvswitch
 # openvswitch-SPEC := openvswitch.spec
-# openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+# openvswitch-LOCAL-STOCK-DEVEL-RPMS += kernel-devel
 # 
 # ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
 # IN_NODEIMAGE += openvswitch
@@ -286,9 +286,9 @@ endif
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
 # ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
-vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
+vsys-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
 ifeq "$(local_inotify_tools)" "true"
-vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
+vsys-LOCAL-STOCK-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif
 IN_NODEIMAGE += vsys
 ALL += vsys
@@ -336,7 +336,7 @@ ALL += bind_public
 sliver-openvswitch-MODULES := sliver-openvswitch
 sliver-openvswitch-SPEC := sliver-openvswitch.spec
 ifeq "$(DISTRONAME)" "f12"
-sliver-openvswitch-DEPEND-DEVEL-RPMS-UPDATES := autoconf
+sliver-openvswitch-LOCAL-STOCK-DEVEL-RPMS-CRUCIAL := autoconf
 endif
 IN_SLICEIMAGE += sliver-openvswitch
 ALL += sliver-openvswitch
@@ -386,7 +386,7 @@ ALL += pcucontrol
 #
 monitor-MODULES := monitor
 monitor-SPEC := Monitor.spec
-monitor-DEVEL-RPMS += net-snmp net-snmp-devel
+monitor-STOCK-DEVEL-RPMS += net-snmp net-snmp-devel
 ALL += monitor
 IN_NODEIMAGE += monitor
 
@@ -455,14 +455,14 @@ IN_BOOTCD += pyplnet
 #
 rvm-ruby-MODULES := rvm-ruby
 rvm-ruby-SPEC := rpm/rvm-ruby.spec
-rvm-ruby-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel
+rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel
 ALL += rvm-ruby
 
 #
 # OML measurement library
 #
 oml-MODULES := oml
-oml-DEVEL-RPMS += sqlite-devel 
+oml-STOCK-DEVEL-RPMS += sqlite-devel 
 oml-SPEC := liboml.spec
 ALL += oml
 
@@ -592,7 +592,7 @@ endif
 # don't build these by default, we have separate builds for that
 myslice-MODULES := myslice
 myslice-SPEC := myslice.spec
-myslice-DEVEL-RPMS := python-django
+myslice-STOCK-DEVEL-RPMS := python-django
 #ALL += myslice
 
 manifold-MODULES := manifold

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index deb8641..12ffc6b 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -7,7 +7,7 @@ linux-2.6-GITPATH               := git://git.planet-lab.org/linux-2.6.git@32
 ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 kernel-WHITELIST-RPMS  := kernel-devel,kernel-headers
 endif
-kernel-DEVEL-RPMS              += elfutils-libelf-devel
+kernel-STOCK-DEVEL-RPMS                += elfutils-libelf-devel
 madwifi-GITPATH                 := git://git.planet-lab.org/madwifi.git@madwifi-4132-6
 iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-5
 # we use the stock iproute2 with 2.6.32, since our gre patch is not needed anymore with that kernel

diff --git a/planetlab.mk b/planetlab.mk
index 7a09e92..4f9c393 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -15,8 +15,8 @@ ifeq "$(DISTRONAME)" "centos5"
 mkinitrd-MODULES := mkinitrd
 mkinitrd-SPEC := mkinitrd.spec
 mkinitrd-BUILD-FROM-SRPM := yes
-mkinitrd-DEVEL-RPMS += parted-devel glib2-devel libdhcp4client-devel libdhcp6client-devel libdhcp-devel 
-mkinitrd-DEVEL-RPMS += device-mapper libselinux-devel libsepol-devel libnl-devel
+mkinitrd-STOCK-DEVEL-RPMS += parted-devel glib2-devel libdhcp4client-devel libdhcp6client-devel libdhcp-devel 
+mkinitrd-STOCK-DEVEL-RPMS += device-mapper libselinux-devel libsepol-devel libnl-devel
 ALL += mkinitrd
 IN_BOOTCD += mkinitrd
 IN_SLICEIMAGE += mkinitrd 
@@ -60,7 +60,7 @@ ifneq "$(DISTRONAME)" "f8"
 madwifi-MODULES := madwifi
 madwifi-SPEC := madwifi.spec
 madwifi-BUILD-FROM-SRPM := yes
-madwifi-DEPEND-DEVEL-RPMS += kernel-devel
+madwifi-LOCAL-STOCK-DEVEL-RPMS += kernel-devel
 madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
        kernel_release=$(kernel.rpm-release) \
        kernel_arch=$(kernel.rpm-arch)
@@ -75,7 +75,7 @@ endif
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
 iptables-BUILD-FROM-SRPM := yes        
-iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
+iptables-LOCAL-STOCK-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
 IN_NODEIMAGE += iptables
 
@@ -116,7 +116,7 @@ libnl-MODULES := libnl
 libnl-SPEC := libnl.spec
 libnl-BUILD-FROM-SRPM := yes
 # this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers
-libnl-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
+libnl-LOCAL-STOCK-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += libnl
 IN_NODEIMAGE += libnl
 endif
@@ -126,9 +126,9 @@ endif
 #
 util-vserver-pl-MODULES := util-vserver-pl
 util-vserver-pl-SPEC := util-vserver-pl.spec
-util-vserver-pl-DEPEND-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core 
+util-vserver-pl-LOCAL-STOCK-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core 
 ifeq "$(local_libnl)" "true"
-util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel
+util-vserver-pl-LOCAL-STOCK-DEVEL-RPMS += libnl libnl-devel
 endif
 ALL += util-vserver-pl
 IN_NODEIMAGE += util-vserver-pl
@@ -243,7 +243,7 @@ endif
 #
 openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
-openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+openvswitch-LOCAL-STOCK-DEVEL-RPMS += kernel-devel
 
 #ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
 #IN_NODEIMAGE += openvswitch
@@ -256,9 +256,9 @@ openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
 # ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
-vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
+vsys-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
 ifeq "$(local_inotify_tools)" "true"
-vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
+vsys-LOCAL-STOCK-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif
 IN_NODEIMAGE += vsys
 ALL += vsys
@@ -324,7 +324,7 @@ ALL += pcucontrol
 #
 monitor-MODULES := monitor
 monitor-SPEC := Monitor.spec
-monitor-DEVEL-RPMS += net-snmp net-snmp-devel
+monitor-STOCK-DEVEL-RPMS += net-snmp net-snmp-devel
 ALL += monitor
 IN_NODEIMAGE += monitor