[opensuse-kernel] [PATCH] Use new suse-module-tools package
The "weak-modules" programs moved to "suse-module-tools" in openSUSE 12.3. "modutils" is an unversioned virtual provides to get at an implementation that has the "insmod", "modprobe"-named executables. Because "modutils" is not even new, it is now unconditionally used in macros.kernel-source. --- rpm/kernel-binary.spec.in | 8 ++++++-- rpm/macros.kernel-source | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index 26e2332..654c7c2 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -62,7 +62,7 @@ Release: @RELEASE@ License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse +BuildRequires: coreutils modutils sparse BuildRequires: fdupes Provides: multiversion(kernel) Provides: %{name}_%_target_cpu = %version-%release @@ -73,8 +73,12 @@ Provides: kernel-base = %version-%source_rel Obsoletes: %name-base <= 2.6.31 %endif Requires(pre): coreutils awk -# Need a module-init-tools with /usr/lib/module-init-tools/weak-modules2 +# We need the weak-modules2 utility +%if 0%{?suse_version} >= 1230 +Requires(post): suse-module-tools +%else Requires(post): module-init-tools >= 3.4 +%endif # This Requires is wrong, because the post/postun scripts have a # test -x update-bootloader, having perl-Bootloader is not a hard requirement. # But, there is no way to tell rpm or yast to schedule the installation diff --git a/rpm/macros.kernel-source b/rpm/macros.kernel-source index f584129..27fa8bb 100644 --- a/rpm/macros.kernel-source +++ b/rpm/macros.kernel-source @@ -1,6 +1,6 @@ # A few cross-distro definitions: %kernel_module_package_release 1 -%kernel_module_package_buildreqs module-init-tools kernel-syms +%kernel_module_package_buildreqs modutils kernel-syms # Defines %flavors_to_build and %kernel_source() as a side effect. %_kernel_module_package(n:v:r:t:f:Xp:b) \ -- 1.7.10.4 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
On 23.11.2012 18:58, Jan Engelhardt wrote:
The "weak-modules" programs moved to "suse-module-tools" in openSUSE 12.3.
"modutils" is an unversioned virtual provides to get at an implementation that has the "insmod", "modprobe"-named executables. Because "modutils" is not even new, it is now unconditionally used in macros.kernel-source. --- rpm/kernel-binary.spec.in | 8 ++++++-- rpm/macros.kernel-source | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index 26e2332..654c7c2 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -62,7 +62,7 @@ Release: @RELEASE@ License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse +BuildRequires: coreutils modutils sparse
This needs to be acompanied by a prjconfig update to select between module-init-tools and kmod. So why not keep it as is.
-# Need a module-init-tools with /usr/lib/module-init-tools/weak-modules2 +# We need the weak-modules2 utility +%if 0%{?suse_version} >= 1230 +Requires(post): suse-module-tools +%else Requires(post): module-init-tools >= 3.4 +%endif
This is slightly impractical, because a kernel built for Factory will not be installable on older distributions. This is something that worked fine until now. But I do not see a way around this, so we will have to take this.
-%kernel_module_package_buildreqs module-init-tools kernel-syms +%kernel_module_package_buildreqs modutils kernel-syms
Same as #1, the build depedency can stay as is. Michal -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
On 23.11.2012 20:59, Michal Marek wrote:
On 23.11.2012 18:58, Jan Engelhardt wrote:
-# Need a module-init-tools with /usr/lib/module-init-tools/weak-modules2 +# We need the weak-modules2 utility +%if 0%{?suse_version} >= 1230 +Requires(post): suse-module-tools +%else Requires(post): module-init-tools >= 3.4 +%endif
This is slightly impractical, because a kernel built for Factory will not be installable on older distributions. This is something that worked fine until now. But I do not see a way around this, so we will have to take this.
Actually there is a way, simply depend on 'modutils'. It will not be correct on openSUSE 11.0 and older due to too old module-init-tools package, but I guess that after four years, this is not a problem anymore :). Micha -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
On Friday 2012-11-23 20:59, Michal Marek wrote:
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index 26e2332..654c7c2 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -62,7 +62,7 @@ Release: @RELEASE@ License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse +BuildRequires: coreutils modutils sparse
This needs to be acompanied by a prjconfig update to select between module-init-tools and kmod. So why not keep it as is.
Because it forces m-i-t on me, which means I can't install kmod-compat. It's not like editing prjconf is an unmanageable task...
-# Need a module-init-tools with /usr/lib/module-init-tools/weak-modules2 +# We need the weak-modules2 utility +%if 0%{?suse_version} >= 1230 +Requires(post): suse-module-tools +%else Requires(post): module-init-tools >= 3.4 +%endif
This is slightly impractical, because a kernel built for Factory will not be installable on older distributions.
That's why Kernel:* has more build targets than just openSUSE_Factory.
-%kernel_module_package_buildreqs module-init-tools kernel-syms +%kernel_module_package_buildreqs modutils kernel-syms
Same as #1, the build depedency can stay as is.
It cannot. -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
On 23.11.2012 21:12, Jan Engelhardt wrote:
On Friday 2012-11-23 20:59, Michal Marek wrote:
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index 26e2332..654c7c2 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -62,7 +62,7 @@ Release: @RELEASE@ License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse +BuildRequires: coreutils modutils sparse
This needs to be acompanied by a prjconfig update to select between module-init-tools and kmod. So why not keep it as is.
Because it forces m-i-t on me, which means I can't install kmod-compat.
OK, for build in a live system, this makes sense.
It's not like editing prjconf is an unmanageable task...
Fair enough.
-# Need a module-init-tools with /usr/lib/module-init-tools/weak-modules2 +# We need the weak-modules2 utility +%if 0%{?suse_version} >= 1230 +Requires(post): suse-module-tools +%else Requires(post): module-init-tools >= 3.4 +%endif
This is slightly impractical, because a kernel built for Factory will not be installable on older distributions.
That's why Kernel:* has more build targets than just openSUSE_Factory.
Each Kernel:* project has exactly one target. Michal -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
On Friday 2012-11-23 21:57, Michal Marek wrote:
module-init-tools and kmod. So why not keep it as is.
Because it forces m-i-t on me, which means I can't install kmod-compat.
OK, for build in a live system, this makes sense. [..]
Can you enable openSUSE_12.2_standard for Base:System/module-init-tools? -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
participants (2)
-
Jan Engelhardt -
Michal Marek