Skip to content

Commit

Permalink
build: get kernel module packages to actually work on sles10
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
lge committed Jan 21, 2011
1 parent d04dadd commit 46d76e5
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 3 deletions.
7 changes: 7 additions & 0 deletions drbd-kernel.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 17 additions & 3 deletions rpm-macro-fixes/suse_macros.sles10.diff
Original file line number Diff line number Diff line change
Expand Up @@ -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)}" \
Expand All @@ -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 \
Expand All @@ -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

0 comments on commit 46d76e5

Please sign in to comment.