Jan Blunck wrote:
On Fri, Apr 03, Jeff Mahoney wrote:
It was probably just left on from the SLE split. I'm committing a change now that enables those drivers. They'll automatically end up in the - -extra package unless we want to change that.
I don't think we need split kernel packages on opensuse anyway.
It does make things easier for the openSUSE JeOS case as well. Just the meaning of supported.conf is somehow different.
Wouldn't it make sense to have split packages as a CONFIG_ option and look for that during build instead of hard coding this with the package name?
I like this idea. Here's an untested stab at it. While I was getting my lunch I was also thinking about how different splits could be useful. For example, how many users really need the WAN drivers, pocket net adapters, or esoteric file systems? -extra kind of fills this gap right now, but not entirely for opensuse. -Jeff -- Jeff Mahoney SUSE Labs diff --git a/patches.rpmify/split-package b/patches.rpmify/split-package new file mode 100644 index 0000000..e763831 --- /dev/null +++ b/patches.rpmify/split-package @@ -0,0 +1,25 @@ +--- + init/Kconfig | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -105,6 +105,18 @@ config SUSE_KERNEL + bool + default y + ++config SPLIT_PACKAGE ++ bool "Split the kernel package into multiple RPMs" ++ depends on SUSE_KERNEL && MODULES ++ help ++ This is an option used by the kernel packaging infrastructure ++ to split kernel modules into different packages. It isn't used ++ by the kernel itself, but allows the the packager to make ++ decisions on a per-config basis. ++ ++ If you aren't packaging a kernel for distribution, it's safe to ++ say n. ++ + config SWAP + bool "Support for paging of anonymous memory (swap)" + depends on MMU && BLOCK diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index be1e8da..5c1ad54 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -48,19 +48,15 @@ # Define some CONFIG variables as rpm macros as well. (rpm cannot handle # defining them all at once.) -%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS +%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)} +%define split_packages (%CONFIG_SPLIT_PACKAGE == "y") %ifarch %ix86 x86_64 %define install_vdso 1 %else %define install_vdso 0 %endif -%if %build_vanilla || %build_kdump || "%CONFIG_MODULES" != "y" -%define split_packages 0 -%else -%define split_packages 0%{expand:%(test -n "$(%_sourcedir/guards %symbols base < %_sourcedir/supported.conf)" && echo 1)} -%endif Name: @NAME@ Summary: Dummy summary