kernel-rt: enable debuginfo rpm
Debuginfo RPM was disabled in the spec file. This fix defaults it to enabled. Change-Id: I087739a6129731fa8f96c82d46e0141865348a06 Closes-Bug: 1889300 Signed-off-by: Davlet Panech <davlet.panech@windriver.com>
This commit is contained in:
parent
f674c2ff37
commit
d180bd9e5b
@ -7,12 +7,13 @@ Subject: [PATCH 1/2] Build logic and sources for TiC
|
|||||||
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
||||||
Signed-off-by: Robin Lu <bin1.lu@intel.com>
|
Signed-off-by: Robin Lu <bin1.lu@intel.com>
|
||||||
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
|
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
|
||||||
|
Signed-off-by: Davlet Panech <davlet.panech@windriver.com>
|
||||||
---
|
---
|
||||||
SPECS/kernel-rt.spec | 87 ++++++++++++++++++++++++++++++++--------------------
|
SPECS/kernel-rt.spec | 85 +++++++++++++++++++++++++++++++---------------------
|
||||||
1 file changed, 53 insertions(+), 34 deletions(-)
|
1 file changed, 51 insertions(+), 34 deletions(-)
|
||||||
|
|
||||||
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
|
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
|
||||||
index f9cfea3..b89db57 100644
|
index f9cfea3..9e6de9a 100644
|
||||||
--- a/SPECS/kernel-rt.spec
|
--- a/SPECS/kernel-rt.spec
|
||||||
+++ b/SPECS/kernel-rt.spec
|
+++ b/SPECS/kernel-rt.spec
|
||||||
@@ -36,9 +36,9 @@ Summary: The Linux kernel
|
@@ -36,9 +36,9 @@ Summary: The Linux kernel
|
||||||
@ -44,16 +45,7 @@ index f9cfea3..b89db57 100644
|
|||||||
# kernel-headers
|
# kernel-headers
|
||||||
# realtime
|
# realtime
|
||||||
%define with_realtime %{?_without_realtime: 0} %{?!_without_realtime: 1}
|
%define with_realtime %{?_without_realtime: 0} %{?!_without_realtime: 1}
|
||||||
@@ -67,6 +70,8 @@ Summary: The Linux kernel
|
@@ -126,10 +129,11 @@ Summary: The Linux kernel
|
||||||
%define with_bpftool %{?_without_bpftool: 0} %{?!_without_bpftool: 1}
|
|
||||||
# kernel-debuginfo
|
|
||||||
%define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
|
|
||||||
+# STX: disable debuginfo
|
|
||||||
+%define with_debuginfo 0
|
|
||||||
# Want to build a the vsdo directories installed
|
|
||||||
%define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
|
|
||||||
# kernel-zfcpdump (s390 specific kernel for zfcpdump)
|
|
||||||
@@ -126,10 +131,11 @@ Summary: The Linux kernel
|
|
||||||
%global rttag .rt24
|
%global rttag .rt24
|
||||||
# realtimeN
|
# realtimeN
|
||||||
%global rtbuild .96
|
%global rtbuild .96
|
||||||
@ -67,7 +59,7 @@ index f9cfea3..b89db57 100644
|
|||||||
%define with_bpftool 0
|
%define with_bpftool 0
|
||||||
%define with_zfcpdump 0
|
%define with_zfcpdump 0
|
||||||
%define with_kabichk 0
|
%define with_kabichk 0
|
||||||
@@ -291,7 +297,7 @@ Requires: rt-setup
|
@@ -291,7 +295,7 @@ Requires: rt-setup
|
||||||
#
|
#
|
||||||
BuildRequires: kmod, patch, bash, tar, git
|
BuildRequires: kmod, patch, bash, tar, git
|
||||||
BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
|
BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
|
||||||
@ -76,7 +68,7 @@ index f9cfea3..b89db57 100644
|
|||||||
BuildRequires: net-tools, hostname, bc, bison, flex, elfutils-devel
|
BuildRequires: net-tools, hostname, bc, bison, flex, elfutils-devel
|
||||||
%if %{with_sparse}
|
%if %{with_sparse}
|
||||||
BuildRequires: sparse
|
BuildRequires: sparse
|
||||||
@@ -357,6 +363,7 @@ BuildRequires: xmlto
|
@@ -357,6 +361,7 @@ BuildRequires: xmlto
|
||||||
%if %{with_perf} || %{with_tools}
|
%if %{with_perf} || %{with_tools}
|
||||||
BuildRequires: asciidoc
|
BuildRequires: asciidoc
|
||||||
%endif
|
%endif
|
||||||
@ -84,7 +76,7 @@ index f9cfea3..b89db57 100644
|
|||||||
|
|
||||||
Source0: linux-%{rpmversion}-%{pkgrelease}.tar.xz
|
Source0: linux-%{rpmversion}-%{pkgrelease}.tar.xz
|
||||||
|
|
||||||
@@ -417,6 +424,12 @@ Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
|
@@ -417,6 +422,12 @@ Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
|
||||||
Source2000: cpupower.service
|
Source2000: cpupower.service
|
||||||
Source2001: cpupower.config
|
Source2001: cpupower.config
|
||||||
|
|
||||||
@ -97,7 +89,7 @@ index f9cfea3..b89db57 100644
|
|||||||
## Patches needed for building this package
|
## Patches needed for building this package
|
||||||
|
|
||||||
# END OF PATCH DEFINITIONS
|
# END OF PATCH DEFINITIONS
|
||||||
@@ -915,6 +928,7 @@ ApplyOptionalPatch()
|
@@ -915,6 +926,7 @@ ApplyOptionalPatch()
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -105,7 +97,7 @@ index f9cfea3..b89db57 100644
|
|||||||
%setup -q -n %{name}-%{rpmversion}-%{pkgrelease} -c
|
%setup -q -n %{name}-%{rpmversion}-%{pkgrelease} -c
|
||||||
mv linux-%{rpmversion}-%{pkgrelease} linux-%{KVERREL}
|
mv linux-%{rpmversion}-%{pkgrelease} linux-%{KVERREL}
|
||||||
|
|
||||||
@@ -938,20 +952,6 @@ mv COPYING COPYING-%{version}
|
@@ -938,20 +950,6 @@ mv COPYING COPYING-%{version}
|
||||||
# This Prevents scripts/setlocalversion from mucking with our version numbers.
|
# This Prevents scripts/setlocalversion from mucking with our version numbers.
|
||||||
touch .scmversion
|
touch .scmversion
|
||||||
|
|
||||||
@ -126,7 +118,7 @@ index f9cfea3..b89db57 100644
|
|||||||
%define make make %{?cross_opts} HOSTCFLAGS="%{?build_hostcflags}" HOSTLDFLAGS="%{?build_hostldflags}"
|
%define make make %{?cross_opts} HOSTCFLAGS="%{?build_hostcflags}" HOSTLDFLAGS="%{?build_hostldflags}"
|
||||||
|
|
||||||
# only deal with configs if we are going to build for the arch
|
# only deal with configs if we are going to build for the arch
|
||||||
@@ -965,6 +965,9 @@ cd configs
|
@@ -965,6 +963,9 @@ cd configs
|
||||||
|
|
||||||
# Drop some necessary files from the source dir into the buildroot
|
# Drop some necessary files from the source dir into the buildroot
|
||||||
cp $RPM_SOURCE_DIR/kernel-*.config .
|
cp $RPM_SOURCE_DIR/kernel-*.config .
|
||||||
@ -136,7 +128,7 @@ index f9cfea3..b89db57 100644
|
|||||||
cp %{SOURCE41} .
|
cp %{SOURCE41} .
|
||||||
VERSION=%{version} ./generate_all_configs.sh %{name}
|
VERSION=%{version} ./generate_all_configs.sh %{name}
|
||||||
|
|
||||||
@@ -984,8 +987,20 @@ do
|
@@ -984,8 +985,20 @@ do
|
||||||
done
|
done
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -158,7 +150,7 @@ index f9cfea3..b89db57 100644
|
|||||||
|
|
||||||
# end of kernel config
|
# end of kernel config
|
||||||
%endif
|
%endif
|
||||||
@@ -1092,7 +1107,7 @@ BuildKernel() {
|
@@ -1092,7 +1105,7 @@ BuildKernel() {
|
||||||
fi
|
fi
|
||||||
%if %{signkernel}
|
%if %{signkernel}
|
||||||
# Sign the image if we're using EFI
|
# Sign the image if we're using EFI
|
||||||
@ -167,7 +159,7 @@ index f9cfea3..b89db57 100644
|
|||||||
if [ ! -s vmlinuz.signed ]; then
|
if [ ! -s vmlinuz.signed ]; then
|
||||||
echo "pesigning failed"
|
echo "pesigning failed"
|
||||||
exit 1
|
exit 1
|
||||||
@@ -1439,6 +1454,12 @@ BuildKernel() {
|
@@ -1439,6 +1452,12 @@ BuildKernel() {
|
||||||
# Save the signing keys so we can sign the modules in __modsign_install_post
|
# Save the signing keys so we can sign the modules in __modsign_install_post
|
||||||
cp certs/signing_key.pem certs/signing_key.pem.sign${Flav}
|
cp certs/signing_key.pem certs/signing_key.pem.sign${Flav}
|
||||||
cp certs/signing_key.x509 certs/signing_key.x509.sign${Flav}
|
cp certs/signing_key.x509 certs/signing_key.x509.sign${Flav}
|
||||||
@ -180,7 +172,7 @@ index f9cfea3..b89db57 100644
|
|||||||
fi
|
fi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@@ -1991,7 +2012,7 @@ fi
|
@@ -1991,7 +2010,7 @@ fi
|
||||||
%endif # with_perf
|
%endif # with_perf
|
||||||
|
|
||||||
%if %{with_tools}
|
%if %{with_tools}
|
||||||
@ -189,7 +181,7 @@ index f9cfea3..b89db57 100644
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%ifarch %{cpupowerarchs}
|
%ifarch %{cpupowerarchs}
|
||||||
%files -n %{name}-tools -f cpupower.lang
|
%files -n %{name}-tools -f cpupower.lang
|
||||||
@@ -2087,26 +2108,24 @@ fi
|
@@ -2087,26 +2106,24 @@ fi
|
||||||
%if %{with_realtime}\
|
%if %{with_realtime}\
|
||||||
%exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/arch/x86/kvm\
|
%exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/arch/x86/kvm\
|
||||||
%exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/drivers/gpu/drm/i915/gvt\
|
%exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/drivers/gpu/drm/i915/gvt\
|
||||||
@ -223,7 +215,7 @@ index f9cfea3..b89db57 100644
|
|||||||
%dir /lib/modules\
|
%dir /lib/modules\
|
||||||
%dir /lib/modules/%{KVERREL}%{?3:+%{3}}\
|
%dir /lib/modules/%{KVERREL}%{?3:+%{3}}\
|
||||||
%dir /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel\
|
%dir /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel\
|
||||||
@@ -2127,7 +2146,6 @@ fi
|
@@ -2127,7 +2144,6 @@ fi
|
||||||
%exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/arch/x86/kvm\
|
%exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/arch/x86/kvm\
|
||||||
%exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/drivers/gpu/drm/i915/gvt\
|
%exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/drivers/gpu/drm/i915/gvt\
|
||||||
%exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.kvm\
|
%exclude /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.kvm\
|
||||||
@ -231,7 +223,7 @@ index f9cfea3..b89db57 100644
|
|||||||
%endif\
|
%endif\
|
||||||
%{expand:%%files %{?3:%{3}-}devel}\
|
%{expand:%%files %{?3:%{3}-}devel}\
|
||||||
%defattr(-,root,root)\
|
%defattr(-,root,root)\
|
||||||
@@ -2157,19 +2175,20 @@ fi
|
@@ -2157,19 +2173,20 @@ fi
|
||||||
/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.kvm\
|
/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.kvm\
|
||||||
/lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/arch/x86/kvm\
|
/lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/arch/x86/kvm\
|
||||||
/lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/drivers/gpu/drm/i915/gvt/kvmgt.ko*\
|
/lib/modules/%{KVERREL}%{?3:+%{3}}/kernel/drivers/gpu/drm/i915/gvt/kvmgt.ko*\
|
||||||
|
Loading…
x
Reference in New Issue
Block a user