X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=622bd8005fa5cb3b0d89b847d1947fafb777fc8e;hb=refs%2Fheads%2Flxc_devel;hp=ec0638e4a0626f8eba2cf51bc1155bddfcc5cee2;hpb=b7f49c8bc7f10e8ab8080a328057af49d0299f8f;p=build.git

diff --git a/build.common b/build.common
index ec0638e4..622bd800 100644
--- a/build.common
+++ b/build.common
@@ -1,8 +1,5 @@
 # -*-Shell-script-*-
 #
-# $Id$
-# $URL$
-#
 # Common functions for build scripts used by various packages
 # incorporated (e.g., build, myplc, myplc-devel, vserver-reference)
 #
@@ -73,19 +70,20 @@ function pl_getReleaseName () {
 function pl_getKexcludes () {
     distroname=$1; shift
     case $distroname in
-	### there is an ugly hack going on around here
-	# with f12, the dependencies somehow require kernel 2.6.29 but our own kernel is 2.6.27
-	# so the ugly workaround here is to let 'kernel-debug' get installed from the stock repos
-	# we then remove it manually after the image is done, look for kernel-debug below
-	# relyong on kernel-PAE for this trick won't work, as 64 bits distros don't have PAE of course
-	f*)
-	    echo 'kernel kernel-PAE kernel-PAEdebug kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iptables-ipv6 iproute drupal' ;;
-	centos5)
-	    echo 'kernel kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iproute drupal inotify-tools* libnl' ;;
-	sl*)
-	    echo 'kernel kernel-debug kernel-debug-devel kernel-devel kernel-doc kernel-firmware kernel-headers iptables iproute' ;;
-	*)
-	    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 'drupal' ;;
+    f*)
+        echo 'util-vserver* drupal' ;;
+    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
 }
 
@@ -550,6 +548,7 @@ function pl_parsePkgs () {
     fcdistro=$1; shift
     pldistro=$1; shift
 
+    echo 1>&2 "pl_parsePkgs: using -a $target_arch -f $fcdistro -d $pldistro $keyword $@"
     pkgs.py -a $target_arch -f $fcdistro -d $pldistro $keyword "$@" 
 }
 # usage: pl_getPackages [-a arch] fcdistro pldistro pkg-file[..s]