X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fscripts%2Flustre-kernel-2.4.spec.in;h=0ff57eaea25d7f79373d734b28edeb6ef639f692;hb=1e4392a78495d4cacc63a1bce0df892b68b51235;hp=27463b08392a280728028be3a327619cbcc50a94;hpb=86fb040c25e646e343aad6480ee93d0c5e308cee;p=fs%2Flustre-release.git

diff --git a/lustre/scripts/lustre-kernel-2.4.spec.in b/lustre/scripts/lustre-kernel-2.4.spec.in
index 27463b0..0ff57ea 100644
--- a/lustre/scripts/lustre-kernel-2.4.spec.in
+++ b/lustre/scripts/lustre-kernel-2.4.spec.in
@@ -9,6 +9,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 # adding some text to the end of the version number.
 #
 %define kversion @KERNEL_VERSION@
+%define kextraver @KERNEL_EXTRA_VERSION@
 %define release @KERNEL_RELEASE@
 # /usr/src/%{kslnk} -> /usr/src/linux-%{KVERREL}
 %define kslnk linux-2.4
@@ -19,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 || :
@@ -125,10 +127,10 @@ Second, per-architecture exclusions (ifarch)
 Name: kernel
 Version: %{kversion}
 Release: %{release}%{?targetboard:%{targetboard}}%{?debuglevel_1:.dbg}
-%define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
+%define KVERREL %{PACKAGE_VERSION}-%{kextraver}%{?targetboard:%{targetboard}}%{?debuglevel_1:.dbg}
 License: GPL
 Group: System Environment/Kernel
-ExclusiveArch: %{all_x86} x86_64
+ExclusiveArch: %{all_x86} x86_64 ia64
 ExclusiveOS: Linux
 Obsoletes: kernel-modules, kernel-sparc
 Provides: kernel = %{version}
@@ -150,6 +152,7 @@ Buildroot: /var/tmp/%{name}-%{PACKAGE_VERSION}-root
 Source0: @LUSTRE_SOURCE@
 Source1: @KERNEL_SOURCE@
 
+Source15: linux-rhconfig.h
 Source16: linux-merge-config.awk
 Source17: linux-merge-modules.awk
 
@@ -319,7 +322,7 @@ DependKernel()
 	--target @LUSTRE_TARGET@ \
 	--target-arch %{_target_cpu} \
 	${target_config} \
-	--extraversion %{release} \
+	--extraversion %{kextraver} \
 	-j $RPM_BUILD_NCPUS
 }
 
@@ -332,7 +335,7 @@ BuildKernel()
 	--target @LUSTRE_TARGET@ \
 	--target-arch %{_target_cpu} \
 	${target_config} \
-	--extraversion %{release} \
+	--extraversion %{kextraver} \
 	--kerneldir $RPM_SOURCE_DIR \
 	-j $RPM_BUILD_NCPUS \
 	--destdir $RPM_BUILD_ROOT \
@@ -360,7 +363,7 @@ SaveHeaders()
   sh -x ./scripts/lmake \
 	--save-headers \
 	--target @LUSTRE_TARGET@ \
-	--extraversion %{release} \
+	--extraversion %{kextraver} \
 	--destdir $RPM_BUILD_ROOT
 }
 
@@ -420,7 +423,7 @@ pushd linux >/dev/null
 mkdir -p $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}
 rm -f drivers/net/hamradio/soundmodem/gentbl scripts/mkdep
 tar cf - . | tar xf - -C $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}
-perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile
+perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{kextraver}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile
 ln -sf linux-%{KVERREL} $RPM_BUILD_ROOT/usr/src/linux
 # install -m 644 %{SOURCE10}  $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}
 
@@ -462,7 +465,7 @@ for l in $list; do
 done
 echo '#endif' >> modversions.h
 sed 's,$,autoconf.h,' ../../savedheaders/list | awk -f %{SOURCE16} >> autoconf.h
-# install -m 644 %{SOURCE15} rhconfig.h
+install -m 644 %{SOURCE15} rhconfig.h
 echo "#include <linux/rhconfig.h>" >> version.h
 keyword=if
 for i in smp BOOT BOOTsmp bigmem  up ; do
@@ -502,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
 
@@ -733,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
@@ -752,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
@@ -772,6 +784,7 @@ exit 0
 %files -n lustre-lite-utils
 %defattr(-, root, root)
 %doc lustre/COPYING lustre/BUGS lustre/ChangeLog lustre/README lustre/doc/lustre.pdf
+/sbin/*
 %{_sbindir}/*
 %{_bindir}/*
 %{_libdir}/lustre/python