trying another angle

diff --git a/build.common b/build.common
index bb0e479..45facd1 100644 (file)
--- a/build.common
+++ b/build.common
@@ -73,13 +73,9 @@ 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
+       ### assuming all distros run at least 2.6.32
        f*)
-           echo 'kernel kernel-PAE kernel-PAEdebug kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iptables-ipv6 iproute drupal' ;;
+           echo 'kernel* 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*)

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index d345f36..9690f92 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -9,7 +9,6 @@ ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f15 centos5)"
 kernel-WHITELIST-RPMS  := kernel-devel,kernel-headers
 endif
 kernel-DEVEL-RPMS              += elfutils-libelf-devel
-kernel-RPMFLAGS                        += --without firmware
 
 madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-2
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-4