X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=159d60f5d4d94f3179816e0a9da8d41e52cb8cf5;hb=f3607d1e08b97e2b3cd0d4fced26b0e9df8989db;hp=a3fdaa913669526be6e490c81fec9c9c7353bbc1;hpb=268c7b20012d12ec4fd01ebefac8796a7a7c9437;p=build.git

diff --git a/onelab.mk b/onelab.mk
index a3fdaa91..159d60f5 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -41,8 +41,7 @@ IN_MYPLC += $(KERNELS)
 #
 # kexec-tools
 #
-ifeq "$(DISTRO)" "Fedora"
-ifeq "$(RELEASE)" "4"
+ifeq "$(DISTRONAME)" "fc4"
 kexec-tools-MODULES := kexec-tools
 kexec-tools-SPEC := kexec-tools.spec
 kexec-tools-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
@@ -50,7 +49,6 @@ kexec-tools-TAG := planetlab-4_1-rc2
 ALL += kexec-tools
 IN_BOOTCD += kexec-tools
 endif
-endif
 
 #
 # madwifi
@@ -65,32 +63,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
-#
-# mac80211
-#
-mac80211-MODULES := mac80211
-mac80211-SPEC := mac80211.spec
-mac80211-BUILD-FROM-SRPM := yes
-mac80211-DEPEND-DEVEL-RPMS := kernel-devel
-mac80211-SPECVARS = kernel_version=$(kernel.rpm-version) \
-	kernel_release=$(kernel.rpm-release) \
-	kernel_arch=$(kernel.rpm-arch)
-#ALL += mac80211
-#IN_BOOTSTRAPFS += mac80211
-
-#
-# iwlwifi
-#
-iwlwifi-MODULES := iwlwifi
-iwlwifi-SPEC := iwlwifi.spec
-iwlwifi-BUILD-FROM-SRPM := yes
-iwlwifi-DEPEND-DEVEL-RPMS := kernel-devel mac80211-devel
-iwlwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
-	kernel_release=$(kernel.rpm-release) \
-	kernel_arch=$(kernel.rpm-arch)
-#ALL += iwlwifi
-#IN_BOOTSTRAPFS += iwlwifi
-
 #
 # wireless-tools
 # 
@@ -228,6 +200,14 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_BOOTSTRAPFS += fprobe-ulog
 
+#
+# pf2slice
+#
+pf2slice-MODULES := pf2slice
+pf2slice-SPEC := pf2slice.spec
+ALL += pf2slice
+
+
 #
 # netflow
 #
@@ -264,16 +244,24 @@ IN_BOOTSTRAPFS += iproute
 #
 # vsys
 #
+vsys_support=yes
+ifeq "$(DISTRONAME)" "fc4"
+vsys_support=
+endif
+ifeq "$(DISTRONAME)" "fc6"
+vsys_support=
+endif
+# cannot find the required packages (see devel.pkgs) on centos5
+ifeq "$(DISTRONAME)" "centos5"
+vsys_support=
+endif
+
+ifeq "$(vsys_support)" "yes"
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
-ifeq "$(DISTRO)" "Fedora"
-ifeq "$(RELEASE)" "7"
+IN_BOOTSTRAPFS += vsys
 ALL += vsys
 endif
-ifeq "$(RELEASE)" "8"
-ALL += vsys
-endif
-endif
 
 #
 # PLCAPI
@@ -286,11 +274,19 @@ IN_MYPLC += PLCAPI
 #
 # PLCWWW
 #
-PLCWWW-MODULES := WWW
+PLCWWW-MODULES := PLCWWW
 PLCWWW-SPEC := PLCWWW.spec
 ALL += PLCWWW
 IN_MYPLC += PLCWWW
 
+#
+# nodeconfig
+#
+nodeconfig-MODULES := nodeconfig
+nodeconfig-SPEC := nodeconfig.spec
+ALL += nodeconfig
+IN_MYPLC += nodeconfig
+
 #
 # bootmanager
 #
@@ -345,6 +341,26 @@ bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
 ALL += bootstrapfs
 IN_MYPLC += bootstrapfs
 
+#
+# noderepo
+#
+# all rpms resulting from packages marked as being in bootstrapfs and vserver
+NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms))
+# replace space with +++ (specvars cannot deal with spaces)
+SPACE=$(subst x, ,x)
+NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
+
+noderepo-MODULES := BootstrapFS 
+noderepo-SPEC := noderepo.spec
+noderepo-RPMBUILD := sudo bash ./rpmbuild.sh
+# package requires all regular packages
+noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
+noderepo-DEPEND-FILES := RPMS/yumgroups.xml
+#export rpm list to the specfile
+noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
+ALL += noderepo
+IN_MYPLC += noderepo
+
 #
 # myplc : initial, chroot-based packaging
 #