Skip to content

Commit 46d76e5

Browse files
committed
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.
1 parent d04dadd commit 46d76e5

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

drbd-kernel.spec.in

+7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,14 @@ BuildRequires: %kernel_module_package_buildreqs
1414
%if %{defined suse_kernel_module_package}
1515
# Support also sles10, where kernel_module_package was not yet defined.
1616
# In sles11, suse_k_m_p became a wrapper around k_m_p.
17+
18+
%if 0%{?suse_version} < 1110
19+
# We need to exclude some flavours on sles10 etc,
20+
# or we hit an rpm internal buffer limit.
21+
%suse_kernel_module_package -n drbd -p drbd/preamble -f drbd/filelist-suse kdump kdumppae vmi vmipae
22+
%else
1723
%suse_kernel_module_package -n drbd -p drbd/preamble -f drbd/filelist-suse
24+
%endif
1825
%else
1926
%kernel_module_package -n drbd -p drbd/preamble -f drbd/filelist-redhat
2027
%endif

rpm-macro-fixes/suse_macros.sles10.diff

+17-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ See comment in macros.kernel-source.sles11-sp1.diff
22

33
--- /usr/lib/rpm/suse_macros.orig
44
+++ /usr/lib/rpm/suse_macros
5-
@@ -476,9 +476,8 @@
6-
%{expand:%( \
5+
@@ -473,12 +473,12 @@
6+
7+
# Defines %flavors_to_build as a side effect.
8+
%suse_kernel_module_package(n:v:r:s:f:xp:) \
9+
-%{expand:%( \
10+
+%{expand:%{expand:%( \
11+
+ ( \
712
subpkg=%{-s*}%{!-s:/usr/lib/rpm/rpm-suse-kernel-module-subpackage} \
813
echo "%%define _suse_kernel_module_subpackage(n:v:r:f:p:) %%{expand:%%(cd %_sourcedir; cat $subpkg; echo %%%%nil)}" \
914
- 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
1318
for flavor in $flavors; do \
1419
if [ -z "%{-x}" ]; then \
1520
case " %* " in \
16-
@@ -486,12 +485,15 @@
21+
@@ -486,19 +486,23 @@
1722
continue ;; \
1823
esac \
1924
fi \
@@ -30,3 +35,12 @@ See comment in macros.kernel-source.sles11-sp1.diff
3035
\
3136
echo "%package -n %{-n*}%{!-n:%name}-kmp-_dummy_" \
3237
echo "Version: %version" \
38+
echo "Summary: %summary" \
39+
echo "Group: %group" \
40+
echo "%description -n %{-n*}%{!-n:%name}-kmp-_dummy_" \
41+
- )}
42+
+ ) | sed -e 's/%%/%%%%/g' \
43+
+ )}}
44+
45+
%suse_version 1010
46+
%sles_version 10

0 commit comments

Comments
 (0)