(Finally!) remove the additional -lustre tag from the Lustre kernel RPM

[fs/lustre-release.git] / build / lbuild-sles11

diff --git a/build/lbuild-sles11 b/build/lbuild-sles11
index daf057f..18fa654 100644 (file)
--- a/build/lbuild-sles11
+++ b/build/lbuild-sles11
@@ -2,7 +2,8 @@
 
 # increment this if you have made a change that should force a new kernel
 # to build built
-BUILD_GEN=1
+# BUILD_GEN=1
+BUILD_GEN=2    # bz19952: remove -lustre tag from kernel RPM names
 
 source ${0%/*}/lbuild-sles
 
@@ -15,17 +16,23 @@ edit_specs() {
     local spec
     for spec in $RPMSMPTYPE source; do
         #cp $TOPDIR/SPECS/kernel-$spec.spec{,.orig}
-        sed -i -e 's/^\(Name:.*kernel-\)\(.*\)/\1lustre-\2/' \
-               -e "s/^\(Release: *\).*$/\1${real_lnxrel}_${buildid}/" \
-               -e "/^Provides:  *kernel = /a\
-Provides:       kernel-$spec = %{version}-%{release}
-" \
+        sed -i -e "s/^\(Release: *\).*$/\1${real_lnxrel}_${buildid}/" \
                -e "s/^ExclusiveArch:.*/& ppc ppc64/" \
                -e '/^%setup /a\
 cp  %_sourcedir/linux-2.6.27-lustre.patch %_builddir/%{name}-%{version}/lustre.patch\
 ! grep -q lustre.patch %_sourcedir/series.conf && echo -e "\\n\\tlustre.patch" >> %_sourcedir/series.conf' \
                -e "/flavor=\${config/a\
     [ \"\$flavor\" == \"$RPMSMPTYPE\" ] || continue" \
+               -e "s/^\(BuildRequires:  kernel-dummy\)/# \1/" \
+          SPECS/kernel-${spec}.spec
+
+        if $KERNEL_LUSTRE_NAMING; then
+            # these are all of the changes needed because we change the package names
+            # to kernel-lustre-*.  these should all go away when we stop this insanity
+        sed -i -e 's/^\(Name:.*kernel-\)\(.*\)/\1lustre-\2/' \
+               -e "/^Provides:  *kernel = /a\
+Provides:       kernel-$spec = %{version}-%{release}
+" \
                -e 's/^\([      ][      ]*-i %_builddir\/kernel-\)\(source-2.6.27.21\/\$patch; then\)/\1lustre-\2/' \
                -e '/^%build/,/^%changelog/s/\(kernel-\)\(source\.files\)/\1lustre-\2/g' \
                -e '/--no-backup-if-mismatch/,/fi/s/kernel-source-/kernel-lustre-source-/g' \
@@ -35,8 +42,8 @@ cp  %_sourcedir/linux-2.6.27-lustre.patch %_builddir/%{name}-%{version}/lustre.p
                -e "s/^\(Provides:.*kernel-\)\(.*\)/\1lustre-\2/" \
                -e "s/^\(Requires:.*kernel-\)\(.*\)/\1lustre-\2/" \
                -e "s/^\(Supplements:.*kernel-\)\(.*\)/\1lustre-\2/" \
-               -e "s/^\(BuildRequires:  kernel-dummy\)/# \1/" \
           SPECS/kernel-${spec}.spec
+        fi
 
     # XXX - a building-on-Ubuntu hack
         if grep -q "Ubuntu" /etc/issue; then