From: Marco Yuen <marcoy@gmail.com>
Date: Wed, 25 Jan 2012 19:09:18 +0000 (-0500)
Subject: Remove kernel, iptables, and iproute2 from build system.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c28ece09a2a14ec586e75c7d5e805f36b7d5a5cc;p=build.git

Remove kernel, iptables, and iproute2 from build system.
---

diff --git a/build.common b/build.common
index f86fbb7e..b33193bc 100644
--- a/build.common
+++ b/build.common
@@ -70,18 +70,20 @@ function pl_getReleaseName () {
 function pl_getKexcludes () {
     distroname=$1; shift
     case $distroname in
-	# when using k27, we need our own flavour of iproute
-	# for now we build only for k32, regardless of fcdistro
-	f8)
-	    echo 'kernel* util-vserver* iptables iptables-ipv6 drupal' ;;
-	f*)
-	    echo 'kernel* util-vserver* iptables iptables-ipv6 drupal linux-firmware' ;;
-	centos5)
-	    echo 'kernel kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables drupal inotify-tools* libnl' ;;
-	sl*)
-	    echo 'kernel kernel-debug kernel-debug-devel kernel-devel kernel-doc kernel-firmware kernel-headers iptables' ;;
-	*)
-	    echo "pl_DISTRO_NAME=$pl_DISTRO_NAME not supported in getexcludes.sh" ; exit 1 ;;
+    # when using k27, we need our own flavour of iproute
+    # for now we build only for k32, regardless of fcdistro
+    f8)
+        echo 'kernel* util-vserver* iptables iptables-ipv6 drupal' ;;
+    f16)
+        echo 'util-vserver* drupal' ;;
+    f*)
+        echo 'kernel* util-vserver* iptables iptables-ipv6 drupal linux-firmware' ;;
+    centos5)
+        echo 'kernel kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables drupal inotify-tools* libnl' ;;
+    sl*)
+        echo 'kernel kernel-debug kernel-debug-devel kernel-devel kernel-doc kernel-firmware kernel-headers iptables' ;;
+    *)
+        echo "pl_DISTRO_NAME=$pl_DISTRO_NAME not supported in getexcludes.sh" ; exit 1 ;;
     esac
 }
 
diff --git a/planetlab.mk b/planetlab.mk
index 9356c967..3485a5c2 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -31,26 +31,26 @@ endif
 # so the source rpm is created by running make srpm in the codebase
 #
 
-kernel-MODULES := linux-3
-kernel-SPEC := kernel-3.1.spec
-kernel-DEVEL-RPMS += gettext elfutils-devel
-kernel-BUILD-FROM-SRPM := yes
-ifeq "$(HOSTARCH)" "i386"
-kernel-RPMFLAGS:= --target i686 --with firmware
-else
-kernel-RPMFLAGS:= --target $(HOSTARCH) --with firmware
-endif
-kernel-SPECVARS += kernelconfig=planetlab
-KERNELS += kernel
+#kernel-MODULES := linux-3
+#kernel-SPEC := kernel-3.1.spec
+#kernel-DEVEL-RPMS += gettext elfutils-devel
+#kernel-BUILD-FROM-SRPM := yes
+#ifeq "$(HOSTARCH)" "i386"
+#kernel-RPMFLAGS:= --target i686 --with firmware
+#else
+#kernel-RPMFLAGS:= --target $(HOSTARCH) --with firmware
+#endif
+#kernel-SPECVARS += kernelconfig=planetlab
+#KERNELS += kernel
 
-kernels: $(KERNELS)
-kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
+#kernels: $(KERNELS)
+#kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
 
-ALL += $(KERNELS)
-# this is to mark on which image a given rpm is supposed to go
-IN_BOOTCD += $(KERNELS)
-IN_VSERVER += $(KERNELS)
-IN_BOOTSTRAPFS += $(KERNELS)
+#ALL += $(KERNELS)
+## this is to mark on which image a given rpm is supposed to go
+#IN_BOOTCD += $(KERNELS)
+#IN_VSERVER += $(KERNELS)
+#IN_BOOTSTRAPFS += $(KERNELS)
 
 #
 # madwifi
@@ -73,23 +73,23 @@ IN_BOOTSTRAPFS += $(KERNELS)
 #
 # iptables
 #
-iptables-MODULES := iptables
-iptables-SPEC := iptables.spec
-iptables-BUILD-FROM-SRPM := yes	
-iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
-ALL += iptables
-IN_BOOTSTRAPFS += iptables
+#iptables-MODULES := iptables
+#iptables-SPEC := iptables.spec
+#iptables-BUILD-FROM-SRPM := yes	
+#iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
+#ALL += iptables
+#IN_BOOTSTRAPFS += iptables
 
 #
 # iproute
 #
-iproute-MODULES := iproute2
-iproute-SPEC := iproute.spec
-iproute-BUILD-FROM-SRPM := yes	
-ALL += iproute
-IN_BOOTSTRAPFS += iproute
-IN_VSERVER += iproute
-IN_BOOTCD += iproute
+#iproute-MODULES := iproute2
+#iproute-SPEC := iproute.spec
+#iproute-BUILD-FROM-SRPM := yes	
+#ALL += iproute
+#IN_BOOTSTRAPFS += iproute
+#IN_VSERVER += iproute
+#IN_BOOTCD += iproute
 
 #
 # util-vserver