From 77e4c9294738e51ee314729bf662b47dfa964d02 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2014 15:24:11 +0000 Subject: debrand kernel-3.10.0-123.6.3.el7 --- diff --git a/.gitignore b/.gitignore index 9116531..bbf80d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ SOURCES/linux-3.10.0-123.6.3.el7.tar.xz SOURCES/rheldup3.x509 SOURCES/rhelkpatch1.x509 +SOURCES/centos.cer diff --git a/.kernel.metadata b/.kernel.metadata index 775d220..a910e26 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,3 +1,4 @@ 651cb172983e94bd5c07d7f206aef8d748f5abbb SOURCES/linux-3.10.0-123.6.3.el7.tar.xz 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509 d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509 +6e9105eb51e55a46761838f289a917611cad8091 SOURCES/centos.cer diff --git a/SOURCES/debrand-rh_taint.patch b/SOURCES/debrand-rh_taint.patch new file mode 100644 index 0000000..8ef4557 --- /dev/null +++ b/SOURCES/debrand-rh_taint.patch @@ -0,0 +1,25 @@ +From 69c0d42cfa26515196896dea086857c2caccb6eb Mon Sep 17 00:00:00 2001 +From: Jim Perrin +Date: Thu, 19 Jun 2014 10:05:12 -0500 +Subject: [PATCH] branding patch for rh_taint + +--- + kernel/rh_taint.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/rh_taint.c b/kernel/rh_taint.c +index 59a74b0..0708e15 100644 +--- a/kernel/rh_taint.c ++++ b/kernel/rh_taint.c +@@ -8,7 +8,7 @@ + void mark_hardware_unsupported(const char *msg) + { + /* Print one single message */ +- pr_crit("Warning: %s - this hardware has not undergone testing by Red Hat and might not be certified. Please consult https://hardware.redhat.com for certified hardware.\n", msg); ++ pr_crit("Warning: %s - this hardware has not undergone upstream testing. Please consult http://wiki.centos.org/FAQ for more information\n", msg); + } + EXPORT_SYMBOL(mark_hardware_unsupported); + +-- +1.8.3.1 + diff --git a/SOURCES/debrand-single-cpu.patch b/SOURCES/debrand-single-cpu.patch new file mode 100644 index 0000000..9d2e08b --- /dev/null +++ b/SOURCES/debrand-single-cpu.patch @@ -0,0 +1,25 @@ +From 66185f5c6f881847776702e3a7956c504400f4f2 Mon Sep 17 00:00:00 2001 +From: Jim Perrin +Date: Thu, 19 Jun 2014 09:53:13 -0500 +Subject: [PATCH] branding patch for single-cpu systems + +--- + arch/x86/kernel/setup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c +index b289118..9d25982 100644 +--- a/arch/x86/kernel/setup.c ++++ b/arch/x86/kernel/setup.c +@@ -846,7 +846,7 @@ static void rh_check_supported(void) + if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) && + !x86_hyper && !cpu_has_hypervisor && !is_kdump_kernel()) { + pr_crit("Detected single cpu native boot.\n"); +- pr_crit("Important: In Red Hat Enterprise Linux 7, single threaded, single CPU 64-bit physical systems are unsupported by Red Hat. Please contact your Red Hat support representative for a list of certified and supported systems."); ++ pr_crit("Important: In CentOS 7, single threaded, single CPU 64-bit physical systems are unsupported. Please see http://wiki.centos.org/FAQ for more information"); + } + + /* The RHEL7 kernel does not support this hardware. The kernel will +-- +1.8.3.1 + diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 04ebea4..cff1452 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -338,7 +338,7 @@ Source10: sign-modules %define modsign_cmd %{SOURCE10} Source11: x509.genkey Source12: extra_certificates -Source13: securebootca.cer +Source13: centos.cer Source14: secureboot.cer Source15: rheldup3.x509 Source16: rhelkpatch1.x509 @@ -369,6 +369,8 @@ Source2001: cpupower.config # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch +Patch1001: debrand-rh_taint.patch +Patch1000: debrand-single-cpu.patch BuildRoot: %{_tmppath}/kernel-%{KVRA}-root @@ -668,6 +670,11 @@ cd linux-%{KVRA} # Drop some necessary files from the source dir into the buildroot cp $RPM_SOURCE_DIR/kernel-%{version}-*.config . +# CentOS Branding Modification +ApplyOptionalPatch debrand-rh_taint.patch +ApplyOptionalPatch debrand-single-cpu.patch +# End of CentOS Modification + ApplyOptionalPatch linux-kernel-test.patch # Any further pre-build tree manipulations happen here. @@ -819,7 +826,7 @@ BuildKernel() { fi # EFI SecureBoot signing, x86_64-only %ifarch x86_64 - %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE13} -c %{SOURCE14} -n redhatsecureboot301 + %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE13} -c %{SOURCE13} -n redhatsecureboot301 mv $KernelImage.signed $KernelImage %endif $CopyKernel $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer @@ -1474,6 +1481,12 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog +* Wed Aug 06 2014 CentOS Sources - 3.10.0-123.6.3.el7 +- Apply debranding changes + +* Wed Aug 06 2014 CentOS Sources - 3.10.0-123.6.3.el7 +- Apply debranding changes + * Wed Jul 16 2014 Phillip Lougher [3.10.0-123.6.3.el7] - [net] l2tp_ppp: fail when socket option level is not SOL_PPPOL2TP (Petr Matousek) [1119465 1119466] {CVE-2014-4943}