From: brian <brian>
Date: Wed, 5 Apr 2006 00:30:27 +0000 (+0000)
Subject: Need a bit more kernel prep fu.  Thanx Cliff and bug 7108.
X-Git-Tag: 1.4.10~323
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=65dcb148f22720f4a67a97c1887c01c6d41531a2;p=fs%2Flustre-release.git

Need a bit more kernel prep fu.  Thanx Cliff and bug 7108.
Need to be able to tell the lustre.spec which kernel sources to build against.
lmake "cheats" and re-substs the lustre.spec.in template file.
---

diff --git a/build/lbuild b/build/lbuild
index 48dfd97..2fb22b2 100755
--- a/build/lbuild
+++ b/build/lbuild
@@ -570,7 +570,8 @@ build_lustre()
     ./configure "--with-linux=${LINUX}" ${CONFIGURE_FLAGS}
 
     $RPMBUILD $targets -bb build/lustre.spec \
-        --define "_topdir $TOPDIR" || \
+        --define "_topdir $TOPDIR" \
+        --define "configure_flags --with-linux=${LINUX}" || \
         fatal 1 "Error building rpms for $BUILD_ARCHS."
 
     popd >/dev/null
@@ -714,6 +715,14 @@ if [ -z "$LINUX" ] ; then
         # but we still need the headers
         unpack_linux
         LINUX=$(pwd)/linux
+        pushd $LINUX && {
+            # need a .config -- like a user would do
+            cp /boot/config-${lnxmaj}-${lnxrel}smp .config
+            make oldconfig
+            make include/asm
+            make include/linux/version.h
+            make SUBDIRS=scripts
+        popd
         build_lustre
     fi
 else
diff --git a/build/lustre.spec.in b/build/lustre.spec.in
index d376b58..c8b1268 100644
--- a/build/lustre.spec.in
+++ b/build/lustre.spec.in
@@ -86,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 
 # Set an explicit path to our Linux tree, if we can.
 cd $RPM_BUILD_DIR/lustre-%{version}
-./configure @ac_configure_args@ \
+./configure @ac_configure_args@ %{configure_flags} \
 	--sysconfdir=%{_sysconfdir} \
 	--mandir=%{_mandir} \
 	--libdir=%{_libdir}