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
ORNL-10: Basic IR implementation
[fs/lustre-release.git]
/
build
/
lbuild-rhel
diff --git
a/build/lbuild-rhel
b/build/lbuild-rhel
index
082476b
..
87e4815
100644
(file)
--- a/
build/lbuild-rhel
+++ b/
build/lbuild-rhel
@@
-5,7
+5,8
@@
# to force a kernel build on all distributions, update the BUILD_GEN variable
# in build/lbuild)
#BUILD_GEN+=".0"
# to force a kernel build on all distributions, update the BUILD_GEN variable
# in build/lbuild)
#BUILD_GEN+=".0"
-BUILD_GEN+=".1" # refactor both rhel5 and rhel6
+#BUILD_GEN+=".1" # refactor both rhel5 and rhel6
+BUILD_GEN+=".0" # TT-107: don't cache the BUILD dir (reset major to 5)
DEVEL_KERNEL_TYPE="devel"
RPM_HELPERS_DIR="/usr/lib/rpm/redhat"
DEVEL_KERNEL_TYPE="devel"
RPM_HELPERS_DIR="/usr/lib/rpm/redhat"
@@
-113,7
+114,11
@@
prepare_and_build_srpm() {
# for informative purposes, display a diff between the .config that
# was actually built and what we proposed as a .config
echo "Diffs between $(basename $CONFIG_FILE) and the built kernel's .config:"
# for informative purposes, display a diff between the .config that
# was actually built and what we proposed as a .config
echo "Diffs between $(basename $CONFIG_FILE) and the built kernel's .config:"
- diff -u $CONFIG_FILE $TOPDIR/BUILD/kernel-${lnxmaj}-${lnxrel}/linux-${lnxmaj}-${lnxrel}.${BUILD_ARCHS# }/.config
+ local rpmname="$TOPDIR/RPMS/${BUILD_ARCHS# }/kernel-${lnxmaj}-${lnxrel}${buildid}.${BUILD_ARCHS# }.rpm"
+ rpmcfg=$(rpm -qpl $rpmname | grep '/boot/config-')
+ rpm2cpio $rpmname | cpio -id .$rpmcfg
+ diff -u $CONFIG_FILE .$rpmcfg
+ rm -rf .$rpmcfg
return 0
return 0