Merge branch 'master' of ssh://git.planet-lab.org/git/build

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index c464a65..a21d887 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -1,5 +1,6 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
+mkinitrd-GITPATH               := git://git.planet-lab.org/mkinitrd.git@master
 linux-2.6-BRANCH               := rhel6
 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-9
 madwifi-GITPATH                        := git://git.planet-lab.org/madwifi.git@master

diff --git a/planetlab.mk b/planetlab.mk
index a66c33d..4ea5549 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -10,6 +10,20 @@
 # see doc in Makefile  
 #
 
+# mkinitrd
+#
+ifeq "$(PLDISTROTAGS)" "planetlab-k32-tags.mk"
+ifeq "$(DISTRONAME)" "centos5"
+mkinitrd-MODULES := mkinitrd
+mkinitrd-SPEC := mkinitrd.spec
+mkinitrd-BUILD-FROM-SRPM := yes
+ALL += mkinitrd
+IN_BOOTCD += mkinitrd
+IN_VSERVER += mkinitrd 
+IN_BOOTSTRAPFS += mkinitrd
+IN_MYPLC += mkinitrd
+endif
+endif
 #
 # kernel
 #