From 15bfbdfa21fd6baf2a681da6c7c52accf4b028bd Mon Sep 17 00:00:00 2001 From: Nick Alcock Date: Tue, 23 Jul 2013 13:32:19 +0100 Subject: [PATCH] SPEC: Changes for UEK merge. Boost the associated kernel version to 3.8.13-1. Kernel package is now named kernel-uek, not kernel-uek-dtrace, unless the build_variant is defined to specify a different name. Reintroduce merging of config-dtrace into .config. Revert unnecessary changes from upstream UEK specfile, in preparation for merge (e.g. forced building of firmware). Signed-off-by: Nick Alcock --- dtrace/dtrace-module.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dtrace/dtrace-module.spec b/dtrace/dtrace-module.spec index 4dc8b6fa6eac..c76dca46ab68 100644 --- a/dtrace/dtrace-module.spec +++ b/dtrace/dtrace-module.spec @@ -5,8 +5,12 @@ %define karch x86_64 %endif +# Redefine 'build_variant' at build time to create a kernel package named +# something like 'kernel-uek-dtrace'. +%define variant %{?build_variant:%{build_variant}}%{!?build_variant:-uek} + # Set this to the version of the kernel this module is compiled against. -%define kver 3.8.12-101.1.0.el6uek +%define kver 3.8.13-1.el6uek # Increment this whenever the DTrace/userspace interface changes in an # incompatible way. @@ -19,10 +23,10 @@ Release: 1.el6 Provides: dtrace-kernel-interface = %{dtrace_kernel_interface} License: CDDL Group: System Environment/Kernel -Requires: kernel-uek-dtrace = %{kver} +Requires: kernel%{variant} = %{kver} Source0: dtrace-module-%{kver}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kernel-uek-dtrace-devel = %{kver} +BuildRequires: kernel%{variant}-devel = %{kver} BuildRequires: libdtrace-ctf ExclusiveArch: x86_64 -- 2.50.1