starlingx
/
integ
Code Issues Proposed changes

update patch for new kernel package 3.10.0-862.6.3 

Story: 2002761

Depends-On: https://review.openstack.org/#/c/580308/

Change-Id: I816b739a2157a26fc4bf6c243465a87b06a4d26c
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-07-09 19:25:59 +08:00
parent 42a05dcd81
commit c585f46890
10 changed files with 60 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel-rt/centos/build_srpm.data
View File

@ -1,4 +1,4 @@
COPY_LIST="files/*"
TIS_PATCH_VER=41
TIS_PATCH_VER=42
BUILD_IS_BIG=10
BUILD_IS_SLOW=12

11
kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch
View File

@ -1,8 +1,7 @@
From dc53b79fa7cf0faa28e58d72ef4b34d405b469c0 Mon Sep 17 00:00:00 2001
Message-Id: <dc53b79fa7cf0faa28e58d72ef4b34d405b469c0.1528227674.git.Jim.Somerville@windriver.com>
From 779c7986900ecc5dcc736c46b80690df8626746b Mon Sep 17 00:00:00 2001
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Mon, 23 Apr 2018 15:18:45 -0400
Subject: [PATCH 1/3] Build logic and sources for TiC
Subject: [PATCH 1/5] Build logic and sources for TiC
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -10,7 +9,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 272 insertions(+), 7 deletions(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 3de5c86..905ae52 100644
index dc814f7..4dc3361 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -17,23 +17,33 @@ Summary: The Linux Realtime kernel
@ -521,8 +520,8 @@ index 3de5c86..905ae52 100644
+%endif # do_sign
+
%changelog
* Thu May 17 2018 Luis Claudio R. Goncalves <lgoncalv@redhat.com> [3.10.0-862.3.2.rt56.808.el7]
* Mon Jun 18 2018 Luis Claudio R. Goncalves <lgoncalv@redhat.com> [3.10.0-862.6.3.rt56.811.el7]
- [rt] Update source tree to match RHEL 7.5 tree [1549768 1462329]
--
1.8.3.1
2.7.4

2
kernel-rt/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/kernel-rt-3.10.0-862.3.2.rt56.808.el7.src.rpm
mirror:Source/kernel-rt-3.10.0-862.6.3.rt56.811.el7.src.rpm

2
kernel-std/centos/build_srpm.data
View File

@ -1,4 +1,4 @@
COPY_LIST="files/*"
TIS_PATCH_VER=34
TIS_PATCH_VER=35
BUILD_IS_BIG=10
BUILD_IS_SLOW=12

56
kernel-std/centos/meta_patches/Build-logic-and-sources-for-TiC.patch
View File

@ -1,16 +1,15 @@
From c816cd8703a35098673bf1198d54a5c48bf39994 Mon Sep 17 00:00:00 2001
Message-Id: <c816cd8703a35098673bf1198d54a5c48bf39994.1527697578.git.Jim.Somerville@windriver.com>
From a75195ff25cd30a4662cae5835d32a2403032a33 Mon Sep 17 00:00:00 2001
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Fri, 20 Apr 2018 14:51:56 -0400
Subject: [PATCH 1/3] Build logic and sources for TiC
Subject: [PATCH 1/5] Build logic and sources for TiC
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 72 +++++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 59 insertions(+), 13 deletions(-)
SPECS/kernel.spec | 73 +++++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 60 insertions(+), 13 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 419eaff..998487f 100644
index 31a5f11..eef356a 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -5,7 +5,8 @@ Summary: The Linux kernel
@ -23,23 +22,24 @@ index 419eaff..998487f 100644
# For a kernel released for public testing, released_kernel should be 1.
# For internal testing builds during development, it should be 0.
@@ -14,12 +15,13 @@ Summary: The Linux kernel
@@ -14,12 +15,14 @@ Summary: The Linux kernel
%global distro_build 862
%define rpmversion 3.10.0
-%define pkgrelease 862.3.2.el7
+%define _pkgrelease 862.3.2
-%define pkgrelease 862.6.3.el7
+%define _pkgrelease 862.6.3
+%define pkgrelease %{_pkgrelease}.el7
+
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 862.3.2%{?dist}
%define specrelease 862.6.3%{?dist}
-%define pkg_release %{specrelease}%{?buildid}
+%define pkg_release %{specrelease}%{buildid}
# The kernel tarball/base version
%define rheltarball %{rpmversion}-%{pkgrelease}
@@ -66,7 +68,7 @@ Summary: The Linux kernel
@@ -66,7 +69,7 @@ Summary: The Linux kernel
%define with_dbgonly %{?_with_dbgonly: 1} %{?!_with_dbgonly: 0}
# Control whether we perform a compat. check against published ABI.
@ -48,7 +48,7 @@ index 419eaff..998487f 100644
# Control whether we perform a compat. check against DUP ABI.
%define with_kabidupchk 1
@@ -89,7 +91,7 @@ Summary: The Linux kernel
@@ -89,7 +92,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'. RHEL only ever does 1.
@ -57,7 +57,7 @@ index 419eaff..998487f 100644
%define with_gcov %{?_with_gcov: 1} %{?!_with_gcov: 0}
@@ -370,6 +372,7 @@ BuildRequires: bison flex
@@ -370,6 +373,7 @@ BuildRequires: bison flex
# required for zfcpdump
BuildRequires: glibc-static
%endif
@ -65,7 +65,7 @@ index 419eaff..998487f 100644
Source0: linux-%{rpmversion}-%{pkgrelease}.tar.xz
@@ -435,6 +438,12 @@ Patch1000: debrand-single-cpu.patch
@@ -435,6 +439,12 @@ Patch1000: debrand-single-cpu.patch
Patch1001: debrand-rh_taint.patch
Patch1002: debrand-rh-i686-cpu.patch
@ -78,7 +78,7 @@ index 419eaff..998487f 100644
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
%description
@@ -586,6 +595,13 @@ This package provides debug information for package kernel-tools.
@@ -586,6 +596,13 @@ This package provides debug information for package kernel-tools.
%endif # with_tools
@ -92,7 +92,7 @@ index 419eaff..998487f 100644
%if %{with_gcov}
%package gcov
Summary: gcov graph and source files for coverage data collection.
@@ -751,6 +767,9 @@ cd linux-%{KVRA}
@@ -751,6 +768,9 @@ cd linux-%{KVRA}
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/kernel-%{version}-*.config .
@ -102,7 +102,7 @@ index 419eaff..998487f 100644
ApplyOptionalPatch linux-kernel-test.patch
ApplyOptionalPatch debrand-single-cpu.patch
ApplyOptionalPatch debrand-rh_taint.patch
@@ -795,6 +814,15 @@ for i in *.config
@@ -795,6 +815,15 @@ for i in *.config
do
mv $i .config
Arch=`head -1 .config | cut -b 3-`
@ -118,7 +118,7 @@ index 419eaff..998487f 100644
make %{?cross_opts} ARCH=$Arch listnewconfig | grep -E '^CONFIG_' >.newoptions || true
%if %{listnewconfig_fail}
if [ -s .newoptions ]; then
@@ -868,12 +896,13 @@ BuildKernel() {
@@ -868,12 +897,13 @@ BuildKernel() {
# and now to start the build process
@ -133,7 +133,7 @@ index 419eaff..998487f 100644
cp configs/$Config .config
@@ -888,8 +917,8 @@ BuildKernel() {
@@ -888,8 +918,8 @@ BuildKernel() {
fi
%endif
@ -144,7 +144,7 @@ index 419eaff..998487f 100644
if [ "$Flavour" != "kdump" ]; then
make -s %{?cross_opts} ARCH=$Arch V=1 %{?_smp_mflags} KCFLAGS="%{?kcflags}" WITH_GCOV="%{?with_gcov}" modules %{?sparse_mflags} || exit 1
@@ -913,6 +942,8 @@ BuildKernel() {
@@ -913,6 +943,8 @@ BuildKernel() {
fi
# EFI SecureBoot signing, x86_64-only
%ifarch x86_64
@ -153,7 +153,7 @@ index 419eaff..998487f 100644
%pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE13} -c %{SOURCE13}
mv $KernelImage.signed $KernelImage
%endif
@@ -929,7 +960,7 @@ BuildKernel() {
@@ -929,7 +961,7 @@ BuildKernel() {
if [ "$Flavour" != "kdump" ]; then
# Override $(mod-fw) because we don't want it to install any firmware
# we'll get it from the linux-firmware package and we don't want conflicts
@ -162,7 +162,7 @@ index 419eaff..998487f 100644
%if %{with_gcov}
# install gcov-needed files to $BUILDROOT/$BUILD/...:
# gcov_info->filename is absolute path
@@ -939,7 +970,7 @@ BuildKernel() {
@@ -939,7 +971,7 @@ BuildKernel() {
%endif
fi
%ifarch %{vdso_arches}
@ -171,7 +171,7 @@ index 419eaff..998487f 100644
if [ ! -s ldconfig-kernel.conf ]; then
echo > ldconfig-kernel.conf "\
# Placeholder file, no vDSO hwcap entries used in this kernel."
@@ -1148,6 +1179,12 @@ BuildKernel() {
@@ -1148,6 +1180,12 @@ BuildKernel() {
cp signing_key.priv signing_key.priv.sign${Flavour:+.${Flavour}}
cp signing_key.x509 signing_key.x509.sign${Flavour:+.${Flavour}}
@ -184,7 +184,7 @@ index 419eaff..998487f 100644
# remove files that will be auto generated by depmod at rpm -i time
for i in alias alias.bin builtin.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap softdep devname
do
@@ -1208,15 +1245,15 @@ make %{?cross_opts} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false
@@ -1208,15 +1246,15 @@ make %{?cross_opts} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false
%endif
%ifarch x86_64
pushd tools/power/x86/x86_energy_perf_policy/
@ -203,7 +203,7 @@ index 419eaff..998487f 100644
popd
%endif
@@ -1475,6 +1512,10 @@ fi}\
@@ -1487,6 +1525,10 @@ fi}\
%{expand:\
%{_sbindir}/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --install %{KVRA}%{?-v:.%{-v*}} || exit $?\
}\
@ -214,7 +214,7 @@ index 419eaff..998487f 100644
%{nil}
#
@@ -1685,6 +1726,11 @@ fi
@@ -1697,6 +1739,11 @@ fi
%kernel_variant_files %{with_debug} debug
%kernel_variant_files %{with_kdump} kdump
@ -224,8 +224,8 @@ index 419eaff..998487f 100644
+%endif
+
%changelog
* Mon May 21 2018 CentOS Sources <bugs@centos.org> - 3.10.0-862.3.2.el7
* Tue Jun 26 2018 CentOS Sources <bugs@centos.org> - 3.10.0-862.6.3.el7
- Apply debranding changes
--
1.8.3.1
2.7.4

13
kernel-std/centos/meta_patches/Compile-issues.patch
View File

@ -1,8 +1,7 @@
From c7352436ea37647d140f76e818f211e764170d3d Mon Sep 17 00:00:00 2001
Message-Id: <c7352436ea37647d140f76e818f211e764170d3d.1527700333.git.Jim.Somerville@windriver.com>
From 0bdbfc48c66177522eae9bb7c0449f39f418e609 Mon Sep 17 00:00:00 2001
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Wed, 30 May 2018 13:12:03 -0400
Subject: [PATCH 1/1] Compile issues
Subject: [PATCH 4/5] Compile issues
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -10,10 +9,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 3 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index ca03e10..4dd7ae4 100644
index 01dd989..d45c419 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -473,6 +473,8 @@ Patch40024: aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
@@ -474,6 +474,8 @@ Patch40024: aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
Patch40025: dpt_i2o-fix-build-warning.patch
# DRBD was choking on write same
Patch40026: turn-off-write-same-in-smartqpi-driver.patch
@ -22,7 +21,7 @@ index ca03e10..4dd7ae4 100644
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -832,6 +834,7 @@ ApplyOptionalPatch US103091-IMA-System-Configuration.patch
@@ -833,6 +835,7 @@ ApplyOptionalPatch US103091-IMA-System-Configuration.patch
ApplyOptionalPatch aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
ApplyOptionalPatch dpt_i2o-fix-build-warning.patch
ApplyOptionalPatch turn-off-write-same-in-smartqpi-driver.patch
@ -31,5 +30,5 @@ index ca03e10..4dd7ae4 100644
# Any further pre-build tree manipulations happen here.
--
1.8.3.1
2.7.4

15
kernel-std/centos/meta_patches/Kernel-source-patches-for-TiC.patch
View File

@ -1,10 +1,7 @@
From 25b9dae2044cbf7f8e0274b68b6f4eef4e20560c Mon Sep 17 00:00:00 2001
Message-Id: <25b9dae2044cbf7f8e0274b68b6f4eef4e20560c.1527697578.git.Jim.Somerville@windriver.com>
In-Reply-To: <c816cd8703a35098673bf1198d54a5c48bf39994.1527697578.git.Jim.Somerville@windriver.com>
References: <c816cd8703a35098673bf1198d54a5c48bf39994.1527697578.git.Jim.Somerville@windriver.com>
From d9d90b72c19c1d063272d2b84bd76c52514bf6ac Mon Sep 17 00:00:00 2001
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Fri, 20 Apr 2018 16:13:47 -0400
Subject: [PATCH 2/3] Kernel source patches for TiC
Subject: [PATCH 2/5] Kernel source patches for TiC
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +9,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 58 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 998487f..ce9e9f8 100644
index eef356a..f1a0092 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -444,6 +444,36 @@ Patch1002: debrand-rh-i686-cpu.patch
@@ -445,6 +445,36 @@ Patch1002: debrand-rh-i686-cpu.patch
Source30000: kernel-3.10.0-x86_64.config.tis_extra
Source30001: ima_signing_key.pub
@ -52,7 +49,7 @@ index 998487f..ce9e9f8 100644
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
%description
@@ -775,6 +805,34 @@ ApplyOptionalPatch debrand-single-cpu.patch
@@ -776,6 +806,34 @@ ApplyOptionalPatch debrand-single-cpu.patch
ApplyOptionalPatch debrand-rh_taint.patch
ApplyOptionalPatch debrand-rh-i686-cpu.patch
@ -88,5 +85,5 @@ index 998487f..ce9e9f8 100644
chmod +x scripts/checkpatch.pl
--
1.8.3.1
2.7.4

15
kernel-std/centos/meta_patches/Lower-the-compiler-version-requirement.patch
View File

@ -1,10 +1,7 @@
From 4b85e25e8cdebe6e6643a4a17e85bf0582310c04 Mon Sep 17 00:00:00 2001
Message-Id: <4b85e25e8cdebe6e6643a4a17e85bf0582310c04.1527697578.git.Jim.Somerville@windriver.com>
In-Reply-To: <c816cd8703a35098673bf1198d54a5c48bf39994.1527697578.git.Jim.Somerville@windriver.com>
References: <c816cd8703a35098673bf1198d54a5c48bf39994.1527697578.git.Jim.Somerville@windriver.com>
From 393eb8d3d3a15cda274f5d0c45763de9a8b3fcab Mon Sep 17 00:00:00 2001
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 29 May 2018 13:06:24 -0400
Subject: [PATCH 3/3] Lower the compiler version requirement
Subject: [PATCH 3/5] Lower the compiler version requirement
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,18 +9,18 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index ce9e9f8..ca03e10 100644
index f1a0092..01dd989 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -334,7 +334,7 @@ ExclusiveOS: Linux
@@ -335,7 +335,7 @@ ExclusiveOS: Linux
#
BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar
BuildRequires: xz, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk
-BuildRequires: gcc >= 4.8.5-28, binutils >= 2.25, redhat-rpm-config >= 9.1.0-55
-BuildRequires: gcc >= 4.8.5-28.el7_5.1, binutils >= 2.25, redhat-rpm-config >= 9.1.0-55
+BuildRequires: gcc >= 4.8.5-16, binutils >= 2.25, redhat-rpm-config >= 9.1.0-55
BuildRequires: hostname, net-tools, bc
BuildRequires: xmlto, asciidoc
BuildRequires: openssl
--
1.8.3.1
2.7.4

11
kernel-std/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch
View File

@ -1,8 +1,7 @@
From adbf49eafdcbf817f11a9decead1df92cff75543 Mon Sep 17 00:00:00 2001
Message-Id: <adbf49eafdcbf817f11a9decead1df92cff75543.1527884268.git.Jim.Somerville@windriver.com>
From ec433bddc585744616d73daefc1b32326002a8ab Mon Sep 17 00:00:00 2001
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Fri, 1 Jun 2018 16:17:43 -0400
Subject: [PATCH 1/1] Lower the linux firmware version requirement
Subject: [PATCH 5/5] Lower the linux firmware version requirement
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -10,10 +9,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 4dd7ae4..89c5a74 100644
index d45c419..9fdd37a 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -300,7 +300,7 @@ Provides: kernel-modeset = 1\
@@ -301,7 +301,7 @@ Provides: kernel-modeset = 1\
Provides: kernel-uname-r = %{KVRA}%{?1:.%{1}}\
Requires(pre): %{kernel_prereq}\
Requires(pre): %{initrd_prereq}\
@ -23,5 +22,5 @@ index 4dd7ae4..89c5a74 100644
Requires(post): system-release\
Requires(preun): %{_sbindir}/new-kernel-pkg\
--
1.8.3.1
2.7.4

2
kernel-std/centos/srpm_path
View File

@ -1,2 +1,2 @@
mirror:Source/kernel-3.10.0-862.3.2.el7.src.rpm
mirror:Source/kernel-3.10.0-862.6.3.el7.src.rpm