diff --git a/SOURCES/centos-kpatch.x509 b/SOURCES/centos-kpatch.x509
new file mode 100644
index 0000000..ca57a43
Binary files /dev/null and b/SOURCES/centos-kpatch.x509 differ
diff --git a/SOURCES/centos-ldup.x509 b/SOURCES/centos-ldup.x509
new file mode 100644
index 0000000..9c65dd3
Binary files /dev/null and b/SOURCES/centos-ldup.x509 differ
diff --git a/SOURCES/centos.cer b/SOURCES/centos.cer
new file mode 100644
index 0000000..00a5580
Binary files /dev/null and b/SOURCES/centos.cer differ
diff --git a/SOURCES/debrand-rh-i686-cpu.patch b/SOURCES/debrand-rh-i686-cpu.patch
new file mode 100644
index 0000000..739855c
--- /dev/null
+++ b/SOURCES/debrand-rh-i686-cpu.patch
@@ -0,0 +1,11 @@
+--- a/arch/x86/boot/main.c 2014-06-04 10:05:04.000000000 -0700
++++ b/arch/x86/boot/main.c 2014-07-09 12:54:40.000000000 -0700
+@@ -146,7 +146,7 @@ void main(void)
+
+ /* Make sure we have all the proper CPU support */
+ if (validate_cpu()) {
+- puts("This processor is unsupported in RHEL7.\n");
++ puts("This processor is unsupported in CentOS 7.\n");
+ die();
+ }
+
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 <jperrin@centos.org>
+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 <jperrin@centos.org>
+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/SOURCES/genkey b/SOURCES/genkey
index 49c6ce8..71abc69 100644
--- a/SOURCES/genkey
+++ b/SOURCES/genkey
@@ -2,6 +2,6 @@
%secring kernel.sec
Key-Type: DSA
Key-Length: 512
-Name-Real: Red Hat, Inc.
+Name-Real: CentOS
Name-Comment: Kernel Module GPG key
%commit
diff --git a/SOURCES/x509.genkey b/SOURCES/x509.genkey
index b1bbe38..d98f8fe 100644
--- a/SOURCES/x509.genkey
+++ b/SOURCES/x509.genkey
@@ -5,9 +5,9 @@ prompt = no
x509_extensions = myexts
[ req_distinguished_name ]
-O = Red Hat
-CN = Red Hat Enterprise Linux kernel signing key
-emailAddress = secalert@redhat.com
+O = CentOS
+CN = CentOS Linux kernel signing key
+emailAddress = security@centos.org
[ myexts ]
basicConstraints=critical,CA:FALSE
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index f84bbc0..9a75d1a 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -332,10 +332,10 @@ Source19: extrakeys.pub
Source31: x509.genkey
Source32: extra_certificates
-Source33: securebootca.cer
+Source33: centos.cer
Source34: secureboot.cer
-Source35: rheldup3.x509
-Source36: rhelkpatch1.x509
+Source35: centos-ldup.x509
+Source36: centos-kpatch.x509
### Configuration files
Source50: kernel-%{version}-x86_64-rt.config
@@ -352,6 +352,9 @@ Source52: kernel-%{version}-x86_64-rt-debug.config
# Commit 32b3809 was reverted and the new solution will be applying
# those changes at the %build section of the specfile.
Patch001: avoid-debuginfo-hash-collision-scripts.patch
+Patch1000: debrand-single-cpu.patch
+Patch1001: debrand-rh_taint.patch
+Patch1002: debrand-rh-i686-cpu.patch
# Empty final patch file to facilitate testing of kernel patches
Patch999999: linux-kernel-test.patch
@@ -552,7 +555,7 @@ EOF
if [ -s %{SOURCE19} ]; then
gpg --homedir . --no-default-keyring --keyring kernel.pub --import %{SOURCE19}
fi
-gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub
+gpg --homedir . --export --keyring ./kernel.pub CentOS > extract.pub
gcc -o scripts/bin2c scripts/bin2c.c
mkdir crypto/signature
scripts/bin2c ksign_def_public_key __initdata <extract.pub >crypto/signature/key.h
@@ -671,6 +674,9 @@ cp -rl vanilla-%{kversion} linux-%{kversion}.%{_target_cpu}
cd linux-%{kversion}.%{_target_cpu}
## Apply Patches here
+ApplyPatch debrand-single-cpu.patch
+ApplyPatch debrand-rh_taint.patch
+ApplyPatch debrand-rh-i686-cpu.patch
ApplyPatch linux-kernel-test.patch
# move off upstream version mechanism
@@ -828,7 +834,7 @@ BuildKernel() {
fi
# EFI SecureBoot signing, x86_64-only
%ifarch x86_64
- %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE33} -c %{SOURCE34} -n redhatsecureboot301
+ %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE33} -c %{SOURCE33}
mv $KernelImage.signed $KernelImage
%endif
$CopyKernel $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
@@ -1450,6 +1456,9 @@ fi
%endif
%changelog
+* Wed Sep 13 2017 Johnny Hughes <johnny@centos.org> [3.10.0-693.2.1.rt56.620.el7]
+- Manual CentOS Debranding
+
* Mon Aug 14 2017 Clark Williams <williams@redhat.com> [3.10.0-693.2.1.rt56.620.el7]
- [rt] kernel-rt-3.10.0-693.2.1.rt56.620.el7 (Clark Williams) [1473393]