From: S.Çağlar Onur <caglar@verivue.com>
Date: Fri, 11 Mar 2011 16:40:07 +0000 (-0500)
Subject: adjustments for sl6
X-Git-Tag: 5.0-rc21~55
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=cb2700adc502e65f18130ec8b38db7622d94de6b;p=build.git

adjustments for sl6
---

diff --git a/build.common b/build.common
index 9972393e..2e86452e 100644
--- a/build.common
+++ b/build.common
@@ -83,7 +83,7 @@ function pl_getKexcludes () {
 	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 inotify-tools* libnl' ;;
+	    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 ;;
     esac
diff --git a/config.coblitz/bootstrapfs.pkgs b/config.coblitz/bootstrapfs.pkgs
index 6d6f7f20..e0375b87 100644
--- a/config.coblitz/bootstrapfs.pkgs
+++ b/config.coblitz/bootstrapfs.pkgs
@@ -35,7 +35,8 @@ package: setserial
 package: setup
 package: vim-minimal
 package: shadow-utils
-package: anacron
+package>=centos5: anacron
+package>=sl6: cronie-anacron
 package: at
 package: authconfig
 package: bc
@@ -71,7 +72,8 @@ package: yum
 package: curl
 package: gzip
 package: iptables
-package: mkinitrd
+package>=centos5: mkinitrd
+package>=sl6: dracut
 package: ntp
 package: perl
 package: python
@@ -84,10 +86,10 @@ package: PyXML
 #
 # platform-dependent
 #
-package>=f8: rsyslog
+package>=f8 package=sl6: rsyslog
 package=centos5: sysklogd
 
-package>=f8: util-linux-ng
+package>=f8 package>=sl6: util-linux-ng
 package=centos5: util-linux
 
 package<=f8 package=centos5: termcap libtermcap vixie-cron
diff --git a/config.coblitz/devel.pkgs b/config.coblitz/devel.pkgs
index d6392fdf..6947dda0 100644
--- a/config.coblitz/devel.pkgs
+++ b/config.coblitz/devel.pkgs
@@ -84,16 +84,17 @@ package: pciutils-devel
 # for vsys - same as for php-devel above
 package: ocaml.@arch@ ocaml-docs 
 # use local inotify-tools on centos
-package>=f8:inotify-tools-devel 
+package>=f8: inotify-tools-devel 
 # for util-vserver
 package: ctags
+package>=sl6: e2fsprogs nss-devel
 ##########
 ## for util-vserver-pl
 # use local libnl on centos
-package>=f8: libnl-devel
+package>=f8 package=sl6: libnl-devel
 # zabbix/monitor
 package: net-snmp net-snmp-devel
-package>=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@
+package>=centos5 package=sl6: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@
 package: python-cherrypy
 ##########
 # for sfa : rebuilding wsdl index at build-time