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
LU-3584 osd-zfs: error check dmu_tx_hold_sa
[fs/lustre-release.git]
/
contrib
/
lbuild
/
lbuild-sles
diff --git
a/contrib/lbuild/lbuild-sles
b/contrib/lbuild/lbuild-sles
index
e61b27f
..
9ed22f1
100644
(file)
--- a/
contrib/lbuild/lbuild-sles
+++ b/
contrib/lbuild/lbuild-sles
@@
-2,7
+2,7
@@
# increment this if you have made a change that should force a new kernel
# to build built
# increment this if you have made a change that should force a new kernel
# to build built
-BUILD_GEN+=".
0" # TT-107: don't cache the BUILD dir (reset major to 5)
+BUILD_GEN+=".
1" #LU-3337 add missing build files for sles11sp2 server
DEVEL_KERNEL_TYPE="source"
RPM_HELPERS_DIR="/usr/lib/rpm"
DEVEL_KERNEL_TYPE="source"
RPM_HELPERS_DIR="/usr/lib/rpm"
@@
-10,10
+10,6
@@
RPM_HELPERS_DIR="/usr/lib/rpm"
prepare_and_build_srpm() {
pushd $TOPDIR >/dev/null
prepare_and_build_srpm() {
pushd $TOPDIR >/dev/null
- # all of the specs but one are put into SOURCES, so let's just move
- # the one lone one in SPECS into SOURCES and just reference them from
- # there
- mv SPECS/*.spec SOURCES/
# generate our buildid
local buildid="lustre${EXTRA_VERSION##*_lustre}"
# generate our buildid
local buildid="lustre${EXTRA_VERSION##*_lustre}"
@@
-132,3
+128,8
@@
mcpu_rpmbuild_opt() {
echo "--define \'jobs $(/usr/bin/getconf _NPROCESSORS_ONLN)\'"
return 0
}
echo "--define \'jobs $(/usr/bin/getconf _NPROCESSORS_ONLN)\'"
return 0
}
+
+# This function digs out the linux release from a linux-obj tree
+find_linux_release() {
+ _find_linux_release $LINUXOBJ
+}