add RHBUILD to targets and spec to distinguish files that come from using a redhat...

typo fix to have lbuild error on building rpms
removed erroneous EXTRA_VERSION manipulation

diff --git a/lustre/kernel_patches/targets/hp_pnnl-2.4.target b/lustre/kernel_patches/targets/hp_pnnl-2.4.target
index a16acce..0d60be7 100644 (file)
--- a/lustre/kernel_patches/targets/hp_pnnl-2.4.target
+++ b/lustre/kernel_patches/targets/hp_pnnl-2.4.target
@@ -2,6 +2,7 @@ KERNEL=linux-2.4.20-hp_pnnl.tar.gz
 SERIES=hp-pnnl-2.4.20
 VERSION=2.4.20
 EXTRA_VERSION=hp_pnnl_lustre
+RHBUILD=0
 
 BASE_ARCHS="ia64"
 BIGMEM_ARCHS=""

diff --git a/lustre/kernel_patches/targets/rh-2.4.target b/lustre/kernel_patches/targets/rh-2.4.target
index 275cfff..cca5324 100644 (file)
--- a/lustre/kernel_patches/targets/rh-2.4.target
+++ b/lustre/kernel_patches/targets/rh-2.4.target
@@ -2,6 +2,7 @@ KERNEL=linux-2.4.20-28.9.tar.gz
 SERIES=rh-2.4.20
 VERSION=2.4.20
 EXTRA_VERSION=28.9_lustre
+RHBUILD=1
 
 BASE_ARCHS="i586"
 BIGMEM_ARCHS=""

diff --git a/lustre/scripts/lbuild b/lustre/scripts/lbuild
index 0e682c5..2c76308 100755 (executable)
--- a/lustre/scripts/lbuild
+++ b/lustre/scripts/lbuild
@@ -308,6 +308,7 @@ prep_build()
        -e "s/@JENSEN_ARCHS@/$BOOT_ARCHS/g" \
        -e "s/@SMP_ARCHS@/$SMP_ARCHS/g" \
        -e "s/@UP_ARCHS@/$UP_ARCHS/g" \
+       -e "s/@RHBUILD@/$RHBUILD/g" \
        < $TOPDIR/lustre/scripts/lustre-kernel-2.4.spec.in \
        > lustre-kernel-2.4.spec
     [ -d SRPMS ] || mkdir SRPMS
@@ -337,11 +338,11 @@ build()
     done
 
     rpmbuild $targets -bb lustre-kernel-2.4.spec \
-       --define "_topdir $TOPDIR" \
+       --define "_topdir $TOPDIR" || \
        fatal 1 "Error building rpms for $arch."
 
     (( $DO_SRC )) && rpmbuild -bs lustre-kernel-2.4.spec \
-       --define "_topdir $TOPDIR" \
+       --define "_topdir $TOPDIR" || \
        fatal 1 "Error building .src.rpm."
 }
 

diff --git a/lustre/scripts/lmake b/lustre/scripts/lmake
index 8a5143e..a79f89b 100755 (executable)
--- a/lustre/scripts/lmake
+++ b/lustre/scripts/lmake
@@ -219,7 +219,6 @@ load_target()
     else
        EXTRA_VERSION="${EXTRA_VERSION}_lustre.$(get_lustre_version)"
     fi
-    EXTRA_VERSION=${EXTRA_VERSION//-/_}
 }
 
 tarflags()

diff --git a/lustre/scripts/lustre-kernel-2.4.spec.in b/lustre/scripts/lustre-kernel-2.4.spec.in
index 3fef13d..0ff57ea 100644 (file)
--- a/lustre/scripts/lustre-kernel-2.4.spec.in
+++ b/lustre/scripts/lustre-kernel-2.4.spec.in
@@ -20,6 +20,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 
 %define nptlarchs %{all_x86}
 #define nptlarchs noarch
+%define rhbuild @RHBUILD@
 
 # disable build root strip policy
 %define __spec_install_post /usr/lib/rpm/brp-compress || :
@@ -504,8 +505,11 @@ rm -f $RPM_BUILD_ROOT/usr/include/linux
 
 rm -rf $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/savedheaders
 
+%if %{rhbuild}
 # fix up the tmp_include_depends file wrt the buildroot
 perl -p -i -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/tmp_include_depends
+%endif
+
 popd >/dev/null
 %endif
 
@@ -735,7 +739,9 @@ exit 0
 /usr/src/linux-%{KVERREL}/arch/sparc64
 %endif
 /usr/src/linux-%{KVERREL}/drivers
+%if %{rhbuild}
 /usr/src/linux-%{KVERREL}/crypto
+%endif
 /usr/src/linux-%{KVERREL}/fs
 /usr/src/linux-%{KVERREL}/init
 /usr/src/linux-%{KVERREL}/ipc
@@ -754,12 +760,16 @@ exit 0
 %{?ibcs_1:/usr/src/linux-%{KVERREL}/include/abi}
 %endif
 /usr/src/linux-%{KVERREL}/include/linux
+%if %{rhbuild}
 /usr/src/linux-%{KVERREL}/include/rxrpc
+%endif
 /usr/src/linux-%{KVERREL}/include/net
 /usr/src/linux-%{KVERREL}/include/pcmcia
 /usr/src/linux-%{KVERREL}/include/scsi
 /usr/src/linux-%{KVERREL}/include/video
+%if %{rhbuild}
 /usr/src/linux-%{KVERREL}/tmp_include_depends
+%endif
 %dir /usr/src/linux-%{KVERREL}/include
 %dir /usr/src/linux-%{KVERREL}/arch
 %ifarch alpha sparc