X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Flbuild-sles11;h=32f79b5d2b882de4b0b4e72f417e92c413db23be;hb=9c476e723c92a7c300c420fa612433f7643995fb;hp=6f00c5f3e1de8fc2b88b1fbe24af66e63a5e5daf;hpb=16cf66d437fdf756222e8a30e0948da2052b7693;p=fs%2Flustre-release.git

diff --git a/build/lbuild-sles11 b/build/lbuild-sles11
index 6f00c5f..32f79b5 100644
--- a/build/lbuild-sles11
+++ b/build/lbuild-sles11
@@ -28,24 +28,24 @@ cp  %_sourcedir/linux-2.6.27-lustre.patch %_builddir/%{name}-%{version}/lustre.p
         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\
+            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' \
-               -e "s/^\(%package -n kernel-\)\(.*\)/\1lustre-\2/" \
-               -e "s/^\(%description -n kernel-\)\(.*\)/\1lustre-\2/" \
-               -e "s/^\(%files -n kernel-\)\(.*\)/\1lustre-\2/" \
-               -e "s/^\(Provides:.*kernel-\)\(.*\)/\1lustre-\2/" \
-               -e "s/^\(Requires:.*kernel-\)\(.*\)/\1lustre-\2/" \
-               -e "s/^\(Supplements:.*kernel-\)\(.*\)/\1lustre-\2/" \
-          SOURCES/kernel-${spec}.spec || \
-            fatal 1 "Error while editing SOURCES/kernel-${spec}.spec"
+                   -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' \
+                   -e "s/^\(%package -n kernel-\)\(.*\)/\1lustre-\2/" \
+                   -e "s/^\(%description -n kernel-\)\(.*\)/\1lustre-\2/" \
+                   -e "s/^\(%files -n kernel-\)\(.*\)/\1lustre-\2/" \
+                   -e "s/^\(Provides:.*kernel-\)\(.*\)/\1lustre-\2/" \
+                   -e "s/^\(Requires:.*kernel-\)\(.*\)/\1lustre-\2/" \
+                   -e "s/^\(Supplements:.*kernel-\)\(.*\)/\1lustre-\2/" \
+                SOURCES/kernel-${spec}.spec || \
+                fatal 1 "Error while editing SOURCES/kernel-${spec}.spec"
         fi
 
-    # XXX - a building-on-Ubuntu hack
+        # XXX - a building-on-Ubuntu hack
         if grep -q "Ubuntu" /etc/issue; then
             sed -i -e '/^%_sourcedir\/install-configs %_sourcedir .*/i\
 curl ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.17/2.6.17-mm1/broken-out/i386-use-c-code-for-current_thread_info.patch | patch -p1' \
@@ -65,10 +65,7 @@ unpack_linux_devel_rpm-sles11() {
 
     local kernelrpm
     local wanted_kernel="${lnxmaj}${lnxmin}-${lnxrel}"
-    if $PATCHLESS; then
-# this $PATCHLESS block should go away when bug 19336 lands.
-        wanted_kernel="${lnxmaj}${lnxmin}-${lnxrel}"
-    fi
+
     # 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 = $wanted_kernel"); then