[Oracleasm-commits] jlbec commits r352 - in trunk/vendor: sles10 sles9
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Wed Jul 12 20:14:58 CDT 2006
Author: jlbec
Date: 2006-07-12 20:14:57 -0500 (Wed, 12 Jul 2006)
New Revision: 352
Modified:
trunk/vendor/sles10/kernel.guess
trunk/vendor/sles9/kernel.guess
Log:
Port sles10's kernel.guess to sles9, so that it can also use the
multiple-include capabilities.
Fix a few remaining s/SLES9/SLES10/ lines in sles10's kernel.guess
Modified: trunk/vendor/sles10/kernel.guess
===================================================================
--- trunk/vendor/sles10/kernel.guess 2006-07-13 01:10:27 UTC (rev 351)
+++ trunk/vendor/sles10/kernel.guess 2006-07-13 01:14:57 UTC (rev 352)
@@ -1,9 +1,9 @@
#!/bin/sh
-SLES9_KERNEL_BASE="/usr/src"
+SLES10_KERNEL_BASE="/usr/src"
#
-# SLES9 has wacky names for its kernel flavors. So we'll just create
+# SLES10 has wacky names for its kernel flavors. So we'll just create
# a list here of the mappings. It's pretty simple. One entry per
# architecture, <arch>:<flavor1>[,<flavor> ...]
#
@@ -11,7 +11,7 @@
# packages for. A kernel is only built if build trees for all flavors
# are installed.
#
-SLES9_KERNEL_TYPES="
+SLES10_KERNEL_TYPES="
x86_64:default,smp
ppc64:pseries64,iseries64,pmac64
ia64:default,64k-pagesize,sn2
@@ -48,7 +48,7 @@
return
fi
- for typelist in $SLES9_KERNEL_TYPES
+ for typelist in $SLES10_KERNEL_TYPES
do
TARCH=$(echo $typelist | cut -f1 -d:)
if [ "$TARCH" = "$ARCH" ]
@@ -96,18 +96,18 @@
KVER="$1"
DIR="$2"
- if [ ! -d "${SLES9_KERNEL_BASE}/${DIR}" ]
+ if [ ! -d "${SLES10_KERNEL_BASE}/${DIR}" ]
then
return 1
- elif [ ! -f "${SLES9_KERNEL_BASE}/${DIR}/include/linux/autoconf.h" ]
+ elif [ ! -f "${SLES10_KERNEL_BASE}/${DIR}/include/linux/autoconf.h" ]
then
return 1
- elif [ ! -f "${SLES9_KERNEL_BASE}/${DIR}/include/linux/version.h" ]
+ elif [ ! -f "${SLES10_KERNEL_BASE}/${DIR}/include/linux/version.h" ]
then
return 1
fi
- if [ "$KVER" != "`verfromdir "${SLES9_KERNEL_BASE}/${DIR}"`" ]
+ if [ "$KVER" != "`verfromdir "${SLES10_KERNEL_BASE}/${DIR}"`" ]
then
return 1
fi
@@ -124,7 +124,7 @@
dir=`guess_sles10_dir "$KVER"`
if validate_dir "$KVER" "$dir"
then
- echo "${SLES9_KERNEL_BASE}/${dir}"
+ echo "${SLES10_KERNEL_BASE}/${dir}"
fi
}
@@ -137,7 +137,7 @@
fi
types=
- for typelist in $SLES9_KERNEL_TYPES
+ for typelist in $SLES10_KERNEL_TYPES
do
TARCH=$(echo $typelist | cut -f1 -d:)
if [ "$TARCH" = "$ARCH" ]
@@ -153,9 +153,9 @@
fi
# Find the most recent valid kernel
- ls -1 -t "$SLES9_KERNEL_BASE" | while read kdir
+ ls -1 -t "$SLES10_KERNEL_BASE" | while read kdir
do
- if [ -L "${SLES9_KERNEL_BASE}/${kdir}" -o ! -d "${SLES9_KERNEL_BASE}/${kdir}" ]
+ if [ -L "${SLES10_KERNEL_BASE}/${kdir}" -o ! -d "${SLES10_KERNEL_BASE}/${kdir}" ]
then
continue
fi
@@ -170,10 +170,10 @@
KERNELDIR=
for type in $types
do
- KVER="`verfromdir "${SLES9_KERNEL_BASE}/${kdir}/${ARCH}/${type}"`"
+ KVER="`verfromdir "${SLES10_KERNEL_BASE}/${kdir}/${ARCH}/${type}"`"
if validate_dir "$KVER" "$kdir/${ARCH}/${type}"
then
- KERNELDIR="${SLES9_KERNEL_BASE}/${kdir}/${ARCH}/${type}"
+ KERNELDIR="${SLES10_KERNEL_BASE}/${kdir}/${ARCH}/${type}"
break
fi
done
@@ -192,7 +192,7 @@
types="$3"
for type in $types
do
- KVER="`verfromdir "${SLES9_KERNEL_BASE}/${kdir}/${ARCH}/${type}"`"
+ KVER="`verfromdir "${SLES10_KERNEL_BASE}/${kdir}/${ARCH}/${type}"`"
if ! validate_dir "$KVER" "$kdir/${ARCH}/${type}"
then
return 1
@@ -211,7 +211,7 @@
fi
types=
- for typelist in $SLES9_KERNEL_TYPES
+ for typelist in $SLES10_KERNEL_TYPES
do
TARCH=$(echo $typelist | cut -f1 -d:)
if [ "$TARCH" = "$ARCH" ]
@@ -226,10 +226,10 @@
return
fi
- ls -1 -t "$SLES9_KERNEL_BASE" | while read kdir
+ ls -1 -t "$SLES10_KERNEL_BASE" | while read kdir
do
# Avoid the symlinks
- if [ -L "${SLES9_KERNEL_BASE}/${kdir}" -o ! -d "${SLES9_KERNEL_BASE}/${kdir}" ]
+ if [ -L "${SLES10_KERNEL_BASE}/${kdir}" -o ! -d "${SLES10_KERNEL_BASE}/${kdir}" ]
then
continue
fi
Modified: trunk/vendor/sles9/kernel.guess
===================================================================
--- trunk/vendor/sles9/kernel.guess 2006-07-13 01:10:27 UTC (rev 351)
+++ trunk/vendor/sles9/kernel.guess 2006-07-13 01:14:57 UTC (rev 352)
@@ -251,6 +251,17 @@
done
}
+sles9_includes()
+{
+ DIR="$1"
+ kernelsrc=`awk '/^KERNELSRC/{print $3}' "${DIR}/Makefile" 2>/dev/null`
+
+ INCLUDES="$DIR/include"
+ [ -n "$kernelsrc" ] && INCLUDES="${INCLUDES} ${DIR}/${kernelsrc}/include"
+
+ echo "$INCLUDES"
+}
+
case "$1" in
include|build)
if [ -n "$2" ]
@@ -268,9 +279,10 @@
then
if [ "$1" = "include" ]
then
- KPATH="${KPATH}/include"
+ sles9_includes "${KPATH}"
+ else
+ echo "${KPATH}"
fi
- echo "${KPATH}"
fi
;;
targets)
More information about the Oracleasm-commits
mailing list