Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r=adilger
[fs/lustre-release.git]
/
build
/
lustre-kernel-2.4.spec.in
diff --git
a/build/lustre-kernel-2.4.spec.in
b/build/lustre-kernel-2.4.spec.in
index
5066ea6
..
d7fe38d
100644
(file)
--- a/
build/lustre-kernel-2.4.spec.in
+++ b/
build/lustre-kernel-2.4.spec.in
@@
-171,7
+171,7
@@
BuildPreReq: bzip2, findutils, dev, gzip, m4
Vendor: Cluster File Systems, Inc.
URL: http://www.kernel.org/
Vendor: Cluster File Systems, Inc.
URL: http://www.kernel.org/
-Buildroot:
/var/tmp/%{name}-%{PACKAGE_VERSION
}-root
+Buildroot:
%{_tmppath}/%{name}-%{version
}-root
Source0: @LUSTRE_SOURCE@
Source1: @KERNEL_SOURCE@
Source0: @LUSTRE_SOURCE@
Source1: @KERNEL_SOURCE@
@@
-402,6
+402,9
@@
for flavor in "" smp bigmem bigsmp pseries64 BOOT jensen ; do
echo "fi" >> ${script}
;;
post)
echo "fi" >> ${script}
;;
post)
+ # /sbin/update-modules.dep compares when the modules were built, rather
+ # than installed, so force modules.dep to be recreated
+ echo "rm -f /lib/modules/%{KVERREL}${flavor}/modules.dep" >> ${script}
echo "if [ -f /etc/modprobe.conf ] ; then" >> ${script}
sed -e "s^%ver_str^%{KVERREL}${flavor}^g" %{SOURCE26} >> ${script}
echo "if [ -f /etc/modprobe.conf ] ; then" >> ${script}
sed -e "s^%ver_str^%{KVERREL}${flavor}^g" %{SOURCE26} >> ${script}
@@
-635,8
+638,9
@@
BuildObj ()
c="$RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}"
o="${c}-obj/%{_target_cpu}/$flavor"
mkdir -p $o
c="$RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}"
o="${c}-obj/%{_target_cpu}/$flavor"
mkdir -p $o
- cp ../lustre/kernel_patches/kernel_configs/kernel-%{kversion}-@LUSTRE_TARGET@-%{_target_cpu}%{dashtargetboard}${flavext}.config \
- $o/.config
+ # use the one we just built
+ #cp ../lustre/kernel_patches/kernel_configs/kernel-%{kversion}-@LUSTRE_TARGET@-%{_target_cpu}%{dashtargetboard}${flavext}.config \
+ cp .config $o/.config
for oc in oldconfig_nonint silentoldconfig oldconfig ; do
if grep -q "$oc" Makefile ; then
OLDCONFIG="$oc"
for oc in oldconfig_nonint silentoldconfig oldconfig ; do
if grep -q "$oc" Makefile ; then
OLDCONFIG="$oc"
@@
-716,7
+720,10
@@
if [ "%{buildbase}" -ne 0 ] ; then
done
else # 2.4 rh-style
perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{kextraver}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile
done
else # 2.4 rh-style
perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{kextraver}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile
- cp ../lustre/kernel_patches/kernel_configs/kernel-%{kversion}-@LUSTRE_TARGET@-%{_target_cpu}%{dashtargetboard}.config $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/.config
+ # get the one from the build we just completed as it might have picked
+ # up new options
+ #cp ../lustre/kernel_patches/kernel_configs/kernel-%{kversion}-@LUSTRE_TARGET@-%{_target_cpu}%{dashtargetboard}.config $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/.config
+ cp .config $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/.config
for oc in oldconfig_nonint silentoldconfig oldconfig ; do
if grep -q "$oc" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile ; then
OLDCONFIG="$oc"
for oc in oldconfig_nonint silentoldconfig oldconfig ; do
if grep -q "$oc" $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile ; then
OLDCONFIG="$oc"
@@
-846,12
+853,6
@@
rm -rf $RPM_BUILD_ROOT
%endif
%post -n lustre-lite-utils
%endif
%post -n lustre-lite-utils
-if [ ! -e /dev/obd ]; then
- mknod /dev/obd c 10 241
-fi
-if [ ! -e /dev/portals ]; then
- mknod /dev/portals c 10 240
-fi
if [ -f /etc/init.d/lustre ] ; then
/sbin/chkconfig --add lustre
/sbin/chkconfig --add lustrefs
if [ -f /etc/init.d/lustre ] ; then
/sbin/chkconfig --add lustre
/sbin/chkconfig --add lustrefs