118 lines
4.3 KiB
Diff
118 lines
4.3 KiB
Diff
From 917c7805691bf980a3930fe503b891e5adab62fc Mon Sep 17 00:00:00 2001
|
|
Message-Id: <917c7805691bf980a3930fe503b891e5adab62fc.1524081065.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
|
|
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Tue, 9 May 2017 13:00:12 -0400
|
|
Subject: [PATCH 04/39] Disable debug
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
SPECS/kernel-rt.spec | 27 ++++++++++++++++++++++++---
|
|
1 file changed, 24 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
|
|
index 9a8fb8c..b3126ce 100644
|
|
--- a/SPECS/kernel-rt.spec
|
|
+++ b/SPECS/kernel-rt.spec
|
|
@@ -29,13 +29,13 @@ Summary: The Linux Realtime kernel
|
|
# Likewise a bcond_with implies the variable is off by default (turned on by --with)
|
|
%bcond_without rt
|
|
%bcond_without doc
|
|
-%bcond_without debug
|
|
-%bcond_with headers
|
|
+%bcond_with debug
|
|
+%bcond_without headers
|
|
%bcond_with vanilla
|
|
%bcond_with trace
|
|
%bcond_with perf
|
|
%bcond_with firmware
|
|
-%bcond_without debuginfo
|
|
+%bcond_with debuginfo
|
|
|
|
# What parts do we want to build? We must build at least one kernel.
|
|
# These are the kernels that are built IF the architecture allows it.
|
|
@@ -407,6 +407,7 @@ Summary: Header files for the Linux kernel for use by glibc
|
|
Group: Development/System
|
|
Obsoletes: glibc-kernheaders < 3.0-46
|
|
Provides: glibc-kernheaders = 3.0-46
|
|
+Provides: kernel-headers
|
|
%description headers
|
|
Kernel-headers includes the C header files that specify the interface
|
|
between the Linux kernel and userspace libraries and programs. The
|
|
@@ -466,6 +467,7 @@ AutoReq: no\
|
|
This package provides KVM modules for package %{name}%{?1:-%{1}}.\
|
|
%{nil}
|
|
|
|
+%if %{builddebuginfo}
|
|
#
|
|
# This macro creates a kernel-rt-<subpackage>-kvm-debuginfo package.
|
|
# %%kernel_kvm_debuginfo_package <subpackage>
|
|
@@ -481,7 +483,9 @@ This package provides debug information for package %{name}%{?1:-%{1}}.\
|
|
This is required to use SystemTap with %{name}%{?1:%{1}}-%{KVERREL}.\
|
|
%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:\.%{1}}/.*|/.*%%{KVERREL}%{?1:\.%{1}}(\.debug)?' -o debuginfo%{?1}-kvm.list}\
|
|
%{nil}
|
|
+%endif
|
|
|
|
+%if %{builddebuginfo}
|
|
#
|
|
# This macro creates a kernel-<subpackage>-debuginfo package.
|
|
# %%kernel_debuginfo_package <subpackage>
|
|
@@ -498,6 +502,7 @@ This package provides debug information for package %{name}%{?1:-%{1}}.\
|
|
This is required to use SystemTap with %{name}%{?1:%{1}}-%{KVERREL}.\
|
|
%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:\.%{1}}/.*|/.*%%{KVERREL}%{?1:\.%{1}}(\.debug)?' -o debuginfo%{?1}.list}\
|
|
%{nil}
|
|
+%endif
|
|
|
|
#
|
|
# This macro creates a kernel-<subpackage>-devel package.
|
|
@@ -511,6 +516,7 @@ Provides: installonlypkg(kernel-rt-devel) = %{version}-%{release}%{?1:.%{1}}\
|
|
Provides: kernel-rt%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\
|
|
Provides: kernel-rt-devel-%{_target_cpu} = %{version}-%{release}%{?1:.%{1}}\
|
|
Provides: kernel-rt-devel-uname-r = %{KVERREL}%{?1:.%{1}}\
|
|
+Provides: kernel-devel = %{version}-%{release}%{?1:.%{1}}\
|
|
AutoReqProv: no\
|
|
Requires(pre): /usr/bin/find\
|
|
%description -n kernel-rt%{?variant}%{?1:-%{1}}-devel\
|
|
@@ -523,6 +529,7 @@ against the %{?2:%{2} }kernel package.\
|
|
# %%define variant_summary The Linux kernel compiled for <configuration>
|
|
# %%kernel_variant_package [-n <pretty-name>] <subpackage>
|
|
#
|
|
+%if %{builddebuginfo}
|
|
%define kernel_variant_package(n:) \
|
|
%package %1\
|
|
Summary: %{variant_summary}\
|
|
@@ -533,15 +540,29 @@ Group: System Environment/Kernel\
|
|
%{expand:%%kernel_kvm_package %1}\
|
|
%{expand:%%kernel_kvm_debuginfo_package %1}\
|
|
%{nil}
|
|
+%else
|
|
+%define kernel_variant_package(n:) \
|
|
+%package %1\
|
|
+Summary: %{variant_summary}\
|
|
+Group: System Environment/Kernel\
|
|
+%kernel_reqprovconf\
|
|
+%{expand:%%kernel_devel_package %1 %{!?-n:%1}%{?-n:%{-n*}}}\
|
|
+%{expand:%%kernel_kvm_package %1}\
|
|
+%{nil}
|
|
+%endif
|
|
|
|
|
|
# First the auxiliary packages of the main kernel package.
|
|
%kernel_devel_package
|
|
+%if %{builddebuginfo}
|
|
%kernel_debuginfo_package
|
|
+%endif
|
|
|
|
# create the production kvm module package
|
|
%kernel_kvm_package
|
|
+%if %{builddebuginfo}
|
|
%kernel_kvm_debuginfo_package
|
|
+%endif
|
|
|
|
# Now, each variant package.
|
|
|
|
--
|
|
1.8.3.1
|
|
|