From 46d76e527871d81836c0f31a66d5c08cd2d12af8 Mon Sep 17 00:00:00 2001
From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Fri, 21 Jan 2011 12:47:25 +0100
Subject: [PATCH] build: get kernel module packages to actually work on sles10

We hit some rpm internal buffer limit on sles10.
To work around that, we skip some flavors,
and adjust the suse rpm macros some more.
---
 drbd-kernel.spec.in                     |  7 +++++++
 rpm-macro-fixes/suse_macros.sles10.diff | 20 +++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/drbd-kernel.spec.in b/drbd-kernel.spec.in
index 5103444d3..489ad612a 100644
--- a/drbd-kernel.spec.in
+++ b/drbd-kernel.spec.in
@@ -14,7 +14,14 @@ BuildRequires: %kernel_module_package_buildreqs
 %if %{defined suse_kernel_module_package}
 # Support also sles10, where kernel_module_package was not yet defined.
 # In sles11, suse_k_m_p became a wrapper around k_m_p.
+
+%if 0%{?suse_version} < 1110
+# We need to exclude some flavours on sles10 etc,
+# or we hit an rpm internal buffer limit.
+%suse_kernel_module_package -n drbd -p drbd/preamble -f drbd/filelist-suse kdump kdumppae vmi vmipae
+%else
 %suse_kernel_module_package -n drbd -p drbd/preamble -f drbd/filelist-suse
+%endif
 %else
 %kernel_module_package -n drbd -p drbd/preamble -f drbd/filelist-redhat
 %endif
diff --git a/rpm-macro-fixes/suse_macros.sles10.diff b/rpm-macro-fixes/suse_macros.sles10.diff
index 70ae3c07a..058acd351 100644
--- a/rpm-macro-fixes/suse_macros.sles10.diff
+++ b/rpm-macro-fixes/suse_macros.sles10.diff
@@ -2,8 +2,13 @@ See comment in macros.kernel-source.sles11-sp1.diff
 
 --- /usr/lib/rpm/suse_macros.orig
 +++ /usr/lib/rpm/suse_macros
-@@ -476,9 +476,8 @@
- %{expand:%( \
+@@ -473,12 +473,12 @@
+ 
+ # Defines %flavors_to_build as a side effect.
+ %suse_kernel_module_package(n:v:r:s:f:xp:) \
+-%{expand:%( \
++%{expand:%{expand:%( \
++	( \
          subpkg=%{-s*}%{!-s:/usr/lib/rpm/rpm-suse-kernel-module-subpackage} \
          echo "%%define _suse_kernel_module_subpackage(n:v:r:f:p:) %%{expand:%%(cd %_sourcedir; cat $subpkg; echo %%%%nil)}" \
 -        flavors="%{-x:%*}%{!-x:$(ls /usr/src/linux-obj/%_target_cpu 2>/dev/null)}" \
@@ -13,7 +18,7 @@ See comment in macros.kernel-source.sles11-sp1.diff
          for flavor in $flavors; do \
              if [ -z "%{-x}" ]; then \
                  case " %* " in \
-@@ -486,12 +485,15 @@
+@@ -486,19 +486,23 @@
                      continue ;; \
                  esac \
              fi \
@@ -30,3 +35,12 @@ See comment in macros.kernel-source.sles11-sp1.diff
          \
          echo "%package -n %{-n*}%{!-n:%name}-kmp-_dummy_" \
          echo "Version: %version" \
+         echo "Summary: %summary" \
+         echo "Group: %group" \
+         echo "%description -n %{-n*}%{!-n:%name}-kmp-_dummy_" \
+-        )}
++	) | sed -e 's/%%/%%%%/g' \
++        )}}
+ 
+ %suse_version 1010
+ %sles_version 10