b=20744 add changelog entry and set REBUILD_OFED_DEVEL_RPM for patched kernel only

diff --git a/build/lbuild-sles10 b/build/lbuild-sles10
index 48711bb..7d8ffa0 100644 (file)
--- a/build/lbuild-sles10
+++ b/build/lbuild-sles10
@@ -12,7 +12,10 @@ source ${0%/*}/lbuild-sles
 OFED_DEVEL_LOCATION="$KERNELTREE"
 
 # do we want to rebuild the OFED devel RPM or use the supplied one?
-REBUILD_OFED_DEVEL_RPM=${REBUILD_OFED_DEVEL_RPM:-true}
+if ! $PATCHLESS; then
+       REBUILD_OFED_DEVEL_RPM=${REBUILD_OFED_DEVEL_RPM:-true}
+else
+       REBUILD_OFED_DEVEL_RPM=${REBUILD_OFED_DEVEL_RPM:-false}
 
 edit_specs() {
 

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 02cd20e..238e863 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -16,6 +16,17 @@ Severity   : enhancement
 Bugzilla   : 20744
 Description: Update to SLES10 SP3 kernel 2.6.16.60-0.69.1.
 
+Severity   : normal
+Frequency  : only with SLES10
+Bugzilla   : 20744
+Description: Use OFED "KMP" provided by Novell
+Details    : SLES10 SP3 ships with OFED in a separate "KMP" package.
+            Lustre is now built against this package. That means you need to
+            install the ofed-kmp package from Novell for the patchless client
+            and from our download site for the server. Note that the ofed-kmp
+            that Novell ships may not exactly match the kernel version but
+            should still be compatible.
+
 Severity   : enhancement
 Bugzilla   : 21610
 Description: Update SLES11 SP1 kernel to 2.6.32.19-0.2.1.