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
Create a .cvsignore for this directory.
[fs/lustre-release.git]
/
build
/
lbuild-sles11
diff --git
a/build/lbuild-sles11
b/build/lbuild-sles11
index
18fa654
..
5ed4279
100644
(file)
--- a/
build/lbuild-sles11
+++ b/
build/lbuild-sles11
@@
-3,7
+3,8
@@
# increment this if you have made a change that should force a new kernel
# to build built
# BUILD_GEN=1
# increment this if you have made a change that should force a new kernel
# to build built
# BUILD_GEN=1
-BUILD_GEN=2 # bz19952: remove -lustre tag from kernel RPM names
+#BUILD_GEN=2 # bz19952: remove -lustre tag from kernel RPM names
+BUILD_GEN=3 # bz19975 enable the building of src.rpms by default
source ${0%/*}/lbuild-sles
source ${0%/*}/lbuild-sles
@@
-15,7
+16,7
@@
edit_specs() {
# edit the SPECs with our changes
local spec
for spec in $RPMSMPTYPE source; do
# edit the SPECs with our changes
local spec
for spec in $RPMSMPTYPE source; do
- #cp $TOPDIR/S
PEC
S/kernel-$spec.spec{,.orig}
+ #cp $TOPDIR/S
OURCE
S/kernel-$spec.spec{,.orig}
sed -i -e "s/^\(Release: *\).*$/\1${real_lnxrel}_${buildid}/" \
-e "s/^ExclusiveArch:.*/& ppc ppc64/" \
-e '/^%setup /a\
sed -i -e "s/^\(Release: *\).*$/\1${real_lnxrel}_${buildid}/" \
-e "s/^ExclusiveArch:.*/& ppc ppc64/" \
-e '/^%setup /a\
@@
-24,7
+25,7
@@
cp %_sourcedir/linux-2.6.27-lustre.patch %_builddir/%{name}-%{version}/lustre.p
-e "/flavor=\${config/a\
[ \"\$flavor\" == \"$RPMSMPTYPE\" ] || continue" \
-e "s/^\(BuildRequires: kernel-dummy\)/# \1/" \
-e "/flavor=\${config/a\
[ \"\$flavor\" == \"$RPMSMPTYPE\" ] || continue" \
-e "s/^\(BuildRequires: kernel-dummy\)/# \1/" \
- S
PEC
S/kernel-${spec}.spec
+ S
OURCE
S/kernel-${spec}.spec
if $KERNEL_LUSTRE_NAMING; then
# these are all of the changes needed because we change the package names
if $KERNEL_LUSTRE_NAMING; then
# these are all of the changes needed because we change the package names
@@
-42,7
+43,7
@@
Provides: kernel-$spec = %{version}-%{release}
-e "s/^\(Provides:.*kernel-\)\(.*\)/\1lustre-\2/" \
-e "s/^\(Requires:.*kernel-\)\(.*\)/\1lustre-\2/" \
-e "s/^\(Supplements:.*kernel-\)\(.*\)/\1lustre-\2/" \
-e "s/^\(Provides:.*kernel-\)\(.*\)/\1lustre-\2/" \
-e "s/^\(Requires:.*kernel-\)\(.*\)/\1lustre-\2/" \
-e "s/^\(Supplements:.*kernel-\)\(.*\)/\1lustre-\2/" \
- S
PEC
S/kernel-${spec}.spec
+ S
OURCE
S/kernel-${spec}.spec
fi
# XXX - a building-on-Ubuntu hack
fi
# XXX - a building-on-Ubuntu hack
@@
-52,7
+53,7
@@
curl ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.17/2.6.17
-e 's/^\(BuildRequires: .*\)$/#NOU \1/g' \
-e 's/%(\(chmod .*\))$/%(bash -c "\1")/' \
-e 's/ -a 109//' \
-e 's/^\(BuildRequires: .*\)$/#NOU \1/g' \
-e 's/%(\(chmod .*\))$/%(bash -c "\1")/' \
-e 's/ -a 109//' \
- S
PEC
S/kernel-${spec}.spec
+ S
OURCE
S/kernel-${spec}.spec
fi
done
}
fi
done
}
@@
-63,9
+64,14
@@
unpack_linux_devel_rpm-sles11() {
local rpmdir="${callers_rpm%/*}"
local kernelrpm
local rpmdir="${callers_rpm%/*}"
local kernelrpm
+ local wanted_kernel="${lnxmaj}${lnxmin}${TARGET_DELIMITER}${lnxrel}"
+ if $PATCHLESS; then
+# this $PATCHLESS block should go away when bug 19336 lands.
+ wanted_kernel="${lnxmaj}${lnxmin}${TARGET_DELIMITER}${real_lnxrel}"
+ fi
# this is a hack that should go away when the modified lustre kernel
# Provides kernel-default-base vvvvvvvvv
# this is a hack that should go away when the modified lustre kernel
# Provides kernel-default-base vvvvvvvvv
- if ! kernelrpm=$(find_rpm "$rpmdir" provides "^kernel-(lustre-)?default-base ="); then
+ if ! kernelrpm=$(find_rpm "$rpmdir" provides "^kernel-(lustre-)?default-base =
$wanted_kernel
"); then
fatal 1 "Could not find the kernel-default-base in $rpmdir/"
fi
fatal 1 "Could not find the kernel-default-base in $rpmdir/"
fi