diff --git a/kernel/kernel-rt/centos/build_srpm.data b/kernel/kernel-rt/centos/build_srpm.data index b0daa29a3..c06f85d68 100644 --- a/kernel/kernel-rt/centos/build_srpm.data +++ b/kernel/kernel-rt/centos/build_srpm.data @@ -1,4 +1,4 @@ COPY_LIST="files/*" -TIS_PATCH_VER=4 +TIS_PATCH_VER=1 BUILD_IS_BIG=11 BUILD_IS_SLOW=12 diff --git a/kernel/kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch b/kernel/kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch index d26118b62..9c350e1b0 100644 --- a/kernel/kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch +++ b/kernel/kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch @@ -9,7 +9,7 @@ Signed-off-by: Jim Somerville 1 file changed, 272 insertions(+), 7 deletions(-) diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec -index c05b910..dfbbe1f 100644 +index a922773..adffde2 100644 --- a/SPECS/kernel-rt.spec +++ b/SPECS/kernel-rt.spec @@ -17,23 +17,33 @@ Summary: The Linux Realtime kernel @@ -309,7 +309,7 @@ index c05b910..dfbbe1f 100644 $CopyKernel $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer -@@ -913,6 +1035,12 @@ BuildKernel() { +@@ -910,6 +1032,12 @@ BuildKernel() { cp signing_key.priv signing_key.priv.sign${Flavour:+.${Flavour}} cp signing_key.x509 signing_key.x509.sign${Flavour:+.${Flavour}} @@ -322,7 +322,7 @@ index c05b910..dfbbe1f 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 -@@ -928,6 +1056,15 @@ BuildKernel() { +@@ -925,6 +1053,15 @@ BuildKernel() { install -Dm644 %{SOURCE1000} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/dccp-blacklist.conf @@ -338,7 +338,7 @@ index c05b910..dfbbe1f 100644 # prune junk from kernel-devel find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -exec rm -f {} \; } -@@ -975,6 +1112,31 @@ BuildKernel %make_target %kernel_image vanilla +@@ -972,6 +1109,31 @@ BuildKernel %make_target %kernel_image vanilla BuildKernel %make_target %kernel_image %endif @@ -370,7 +370,7 @@ index c05b910..dfbbe1f 100644 %if %{builddoc} # Make the HTML and man pages. make -j1 htmldocs mandocs || %{doc_build_fail} -@@ -1007,6 +1169,7 @@ popd +@@ -1004,6 +1166,7 @@ popd # if it isn't. %ifnarch noarch @@ -378,7 +378,7 @@ index c05b910..dfbbe1f 100644 %define __modsign_install_post \ if [ "%{with_rt}" -ne "0" ]; then \ Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-rt.config | cut -b 3-` \ -@@ -1025,6 +1188,24 @@ popd +@@ -1022,6 +1185,24 @@ popd %{modsign_cmd} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.${AAA} || exit 1 \ done \ %{nil} @@ -403,7 +403,7 @@ index c05b910..dfbbe1f 100644 %endif ### -@@ -1114,6 +1295,39 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/perf +@@ -1111,6 +1292,39 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/perf %endif # buildperf %endif @@ -443,7 +443,7 @@ index c05b910..dfbbe1f 100644 %if %{buildheaders} # Install kernel headers make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install -@@ -1168,6 +1382,14 @@ rm -rf $RPM_BUILD_ROOT +@@ -1165,6 +1379,14 @@ rm -rf $RPM_BUILD_ROOT ### scripts ### @@ -458,7 +458,7 @@ index c05b910..dfbbe1f 100644 # # This macro defines a %%post script for a kernel*-devel package. # %%kernel_devel_post [] -@@ -1331,6 +1553,43 @@ fi +@@ -1328,6 +1550,43 @@ fi %endif %endif @@ -502,7 +502,7 @@ index c05b910..dfbbe1f 100644 # This is %{image_install_path} on an arch where that includes ELF files, # or empty otherwise. %global elf_image_install_path %{?kernel_image_elf:%{image_install_path}} -@@ -1347,6 +1606,7 @@ fi +@@ -1344,6 +1603,7 @@ fi /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:.%{2}}\ /%{image_install_path}/.vmlinuz-%{KVERREL}%{?2:.%{2}}.hmac\ /boot/System.map-%{KVERREL}%{?2:.%{2}}\ @@ -510,7 +510,7 @@ index c05b910..dfbbe1f 100644 /boot/config-%{KVERREL}%{?2:.%{2}}\ %exclude /lib/modules/%{KVERREL}%{?2:.%{2}}/kernel/arch/x86/kvm\ %exclude /lib/modules/%{KVERREL}%{?2:.%{2}}/kernel/drivers/gpu/drm/i915/gvt\ -@@ -1427,6 +1687,11 @@ fi +@@ -1422,6 +1682,11 @@ fi %kernel_variant_files %{buildvanilla} vanilla %endif @@ -520,8 +520,8 @@ index c05b910..dfbbe1f 100644 +%endif # do_sign + %changelog - * Fri Apr 26 2019 Luis Claudio R. Goncalves [3.10.0-957.12.2.rt56.929.el7] + * Fri Jun 14 2019 Luis Claudio R. Goncalves [3.10.0-957.21.3.rt56.935.el7] - [rt] Update source tree to match RHEL 7.6.z tree [1689417 1642619] -- -2.7.4 +1.8.3.1 diff --git a/kernel/kernel-rt/centos/srpm_path b/kernel/kernel-rt/centos/srpm_path index 9ebb1c95d..b4fa5dea5 100644 --- a/kernel/kernel-rt/centos/srpm_path +++ b/kernel/kernel-rt/centos/srpm_path @@ -1 +1 @@ -mirror:Source/kernel-rt-3.10.0-957.12.2.rt56.929.el7.src.rpm +mirror:Source/kernel-rt-3.10.0-957.21.3.rt56.935.el7.src.rpm