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
b=23428 Fix lustre built with --enable-lu_ref
[fs/lustre-release.git]
/
build
/
lbuild-sles
diff --git
a/build/lbuild-sles
b/build/lbuild-sles
index
83fae95
..
ad774d9
100644
(file)
--- a/
build/lbuild-sles
+++ b/
build/lbuild-sles
@@
-45,7
+45,7
@@
prepare_and_build_srpm() {
# now build it
if ! $RPMBUILD $rpmbuildopt $targets \
--define "_topdir $TOPDIR" \
# now build it
if ! $RPMBUILD $rpmbuildopt $targets \
--define "_topdir $TOPDIR" \
- $TOPDIR/SOURCES/kernel-$RPMSMPTYPE.spec
>&2
; then
+ $TOPDIR/SOURCES/kernel-$RPMSMPTYPE.spec
2>&1
; then
fatal 1 "Failed to build kernel RPM"
fi
#fi
fatal 1 "Failed to build kernel RPM"
fi
#fi
@@
-53,7
+53,7
@@
prepare_and_build_srpm() {
# for SLES, we also need to build the kernel-source rpm
if ! $RPMBUILD $rpmbuildopt $targets \
--define "_topdir $TOPDIR" \
# for SLES, we also need to build the kernel-source rpm
if ! $RPMBUILD $rpmbuildopt $targets \
--define "_topdir $TOPDIR" \
- $TOPDIR/SOURCES/kernel-source.spec
>&2
; then
+ $TOPDIR/SOURCES/kernel-source.spec
2>&1
; then
fatal 1 "Failed to build kernel source RPM"
fi
fatal 1 "Failed to build kernel source RPM"
fi
@@
-86,22
+86,24
@@
rpm_BUILD_kernel_dirname() {
find_linux_devel_paths() {
local path="$1"
find_linux_devel_paths() {
local path="$1"
- LINUX=$path/usr/src/linux-${lnxmaj}${lnxmin}
${delimiter}${lnxrel##${lnxmin#.}-
}
+ LINUX=$path/usr/src/linux-${lnxmaj}${lnxmin}
-${lnxrel
}
local objects=$TARGET_ARCH/$RPMSMPTYPE
local objects=$TARGET_ARCH/$RPMSMPTYPE
- if [ -d $path/usr/src/linux-${lnxmaj}${lnxmin}
${delimiter}${lnxrel##${lnxmin#.}-
}-obj/powerpc ]; then
+ if [ -d $path/usr/src/linux-${lnxmaj}${lnxmin}
-${lnxrel
}-obj/powerpc ]; then
objects="powerpc/$TARGET_ARCH"
elif [ $TARGET_ARCH == 'i686' ]; then
objects="i386/$RPMSMPTYPE"
fi
objects="powerpc/$TARGET_ARCH"
elif [ $TARGET_ARCH == 'i686' ]; then
objects="i386/$RPMSMPTYPE"
fi
- LINUXOBJ=$path/usr/src/linux-${lnxmaj}${lnxmin}${delimiter}${lnxrel##${lnxmin#.}-}-obj/$objects
+ LINUXOBJ=$path/usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}-obj/$objects
+ LINUXRELEASE=$(find_linux_release "$LINUXOBJ")
- LINUXRELEASE=$(find_linux_release ${LINUXOBJ:-$LINUX})
if [ -z "$LINUXRELEASE" ]; then
if [ -z "$LINUXRELEASE" ]; then
- echo "Failed to find linux release in $
{LINUXOBJ:-$LINUX}
"
-
RC=
255
+ echo "Failed to find linux release in $
LINUXOBJ
"
+
return
255
fi
fi
+
+ return 0
}
mcpu_rpmbuild_opt() {
}
mcpu_rpmbuild_opt() {
@@
-109,4
+111,3
@@
mcpu_rpmbuild_opt() {
echo "--define \'jobs $(/usr/bin/getconf _NPROCESSORS_ONLN)\'"
return 0
}
echo "--define \'jobs $(/usr/bin/getconf _NPROCESSORS_ONLN)\'"
return 0
}
-