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-8056 llite: POSIX_ACL_XATTR_{ACCESS,DEFAULT} removed in 4.5
[fs/lustre-release.git]
/
contrib
/
lbuild
/
lbuild-rhel
diff --git
a/contrib/lbuild/lbuild-rhel
b/contrib/lbuild/lbuild-rhel
index
a81aff5
..
8f20270
100644
(file)
--- a/
contrib/lbuild/lbuild-rhel
+++ b/
contrib/lbuild/lbuild-rhel
@@
-102,7
+102,7
@@
prepare_and_build_srpm() {
rpmbuildopt="$rpmbuildopt $(get_rpmbuildopts)"
# now build it
rpmbuildopt="$rpmbuildopt $(get_rpmbuildopts)"
# now build it
- if ! eval
$RPMBUILD
$rpmbuildopt $targets --with baseonly \
+ if ! eval
rpmbuild
$rpmbuildopt $targets --with baseonly \
--define \"_topdir $TOPDIR\" \
--define \"buildid $buildid\" \
--define \"_tmppath $TMPDIR\" \
--define \"_topdir $TOPDIR\" \
--define \"buildid $buildid\" \
--define \"_tmppath $TMPDIR\" \
@@
-182,7
+182,7
@@
unpack_linux_devel_rpm-rhel() {
find_linux_rpm-rhel() {
local prefix="$1"
local wanted_kernel="$2"
find_linux_rpm-rhel() {
local prefix="$1"
local wanted_kernel="$2"
- local pathtorpms=${3:-"$
{KERNELRPMSBASE}/${lnxmaj}/${DISTRO}/${TARGET_ARCH}
"}
+ local pathtorpms=${3:-"$
KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH
"}
local tmpdir=$(mktemp -d $pathtorpms/yumXXXXXX)
local sudo=""
local tmpdir=$(mktemp -d $pathtorpms/yumXXXXXX)
local sudo=""