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
lustre b1_4_rhel4 requires portals b1_4_rhel4
[fs/lustre-release.git]
/
build
/
lbuild
diff --git
a/build/lbuild
b/build/lbuild
index
c0c0474
..
a7c7e64
100755
(executable)
--- a/
build/lbuild
+++ b/
build/lbuild
@@
-32,6
+32,7
@@
BOOT_ARCHS=
JENSEN_ARCHS=
SMP_ARCHS=
BIGSMP_ARCHS=
JENSEN_ARCHS=
SMP_ARCHS=
BIGSMP_ARCHS=
+PSERIES64_ARCHS=
UP_ARCHS=
DATE=$(date)
UP_ARCHS=
DATE=$(date)
@@
-39,6
+40,8
@@
DATE=$(date)
USE_DATESTAMP=1
RPMBUILD=
USE_DATESTAMP=1
RPMBUILD=
+export CC=${CC:-gcc}
+
cleanup()
{
true
cleanup()
{
true
@@
-231,7
+234,7
@@
load_target()
fi
# EXTRA_VERSION=${EXTRA_VERSION//-/_}
fi
# EXTRA_VERSION=${EXTRA_VERSION//-/_}
- ALL_ARCHS="$BASE_ARCHS $BIGMEM_ARCHS $BOOT_ARCHS $JENSEN_ARCHS $SMP_ARCHS $BIGSMP_ARCHS $UP_ARCHS"
+ ALL_ARCHS="$BASE_ARCHS $BIGMEM_ARCHS $BOOT_ARCHS $JENSEN_ARCHS $SMP_ARCHS $BIGSMP_ARCHS $
PSERIES64_ARCHS $
UP_ARCHS"
BUILD_ARCHS=
for arch in $(uniqify "$ALL_ARCHS") ; do
BUILD_ARCHS=
for arch in $(uniqify "$ALL_ARCHS") ; do
@@
-336,7
+339,8
@@
patch_linux()
rm -f linux/configs/*
copysuccess=0
for patchesdir in "$EXTERNAL_PATCHES" "lustre/lustre/kernel_patches" ; do
rm -f linux/configs/*
copysuccess=0
for patchesdir in "$EXTERNAL_PATCHES" "lustre/lustre/kernel_patches" ; do
- cp -v $patchesdir/kernel_configs/kernel-${VERSION}-${TARGET}*.config linux/configs/ >/dev/null && copysuccess=1
+ [ "$patchesdir" ] && \
+ cp -v $patchesdir/kernel_configs/kernel-${VERSION}-${TARGET}*.config linux/configs/ >/dev/null && copysuccess=1
done
[ "$copysuccess" = "1" ] || \
fatal 1 "Error copying in kernel configs."
done
[ "$copysuccess" = "1" ] || \
fatal 1 "Error copying in kernel configs."
@@
-383,6
+387,7
@@
prep_build()
-e "s^@LINUX26@^$LINUX26^g" \
-e "s^@LUSTRE_SOURCE@^${LUSTRE##*/}^g" \
-e "s^@LUSTRE_TARGET@^$TARGET^g" \
-e "s^@LINUX26@^$LINUX26^g" \
-e "s^@LUSTRE_SOURCE@^${LUSTRE##*/}^g" \
-e "s^@LUSTRE_TARGET@^$TARGET^g" \
+ -e "s^@PSERIES64_ARCHS@^$PSERIES64_ARCHS^g" \
-e "s^@RHBUILD@^$RHBUILD^g" \
-e "s^@SMP_ARCHS@^$SMP_ARCHS^g" \
-e "s^@SUSEBUILD@^$SUSEBUILD^g" \
-e "s^@RHBUILD@^$RHBUILD^g" \
-e "s^@SMP_ARCHS@^$SMP_ARCHS^g" \
-e "s^@SUSEBUILD@^$SUSEBUILD^g" \