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-5003 llog: do not fix remote llogs
[fs/lustre-release.git]
/
contrib
/
lbuild
/
lbuild-rhel
diff --git
a/contrib/lbuild/lbuild-rhel
b/contrib/lbuild/lbuild-rhel
index
3a7d378
..
0015042
100644
(file)
--- a/
contrib/lbuild/lbuild-rhel
+++ b/
contrib/lbuild/lbuild-rhel
@@
-159,12
+159,6
@@
find_linux_devel_paths() {
LINUX=$path/usr/src/kernels/${lnxmaj}${lnxmin}-${lnxrel}${DEVEL_PATH_ARCH_DELIMETER:-"-"}${ARCH}
# RHEL doesn't have the -obj tree
LINUXOBJ=""
LINUX=$path/usr/src/kernels/${lnxmaj}${lnxmin}-${lnxrel}${DEVEL_PATH_ARCH_DELIMETER:-"-"}${ARCH}
# RHEL doesn't have the -obj tree
LINUXOBJ=""
- # XXX - i don't think we need this any more
- #LINUXRELEASE=$(find_linux_release "$LINUX")
- #if [ -z "$LINUXRELEASE" ]; then
- # echo "Failed to find linux release in $LINUX"
- # return 255
- #fi
return 0
}
return 0
}
@@
-188,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=""