diff --git a/.gitignore b/.gitignore
index 277de6b..e8bd007 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/kernel-rt-3.10.0-514.2.2.rt56.424.tar.xz
+SOURCES/kernel-rt-3.10.0-514.6.1.rt56.429.tar.xz
SOURCES/rheldup3.x509
SOURCES/rhelkpatch1.x509
diff --git a/.kernel-rt.metadata b/.kernel-rt.metadata
index 6d23142..f9af577 100644
--- a/.kernel-rt.metadata
+++ b/.kernel-rt.metadata
@@ -1,3 +1,3 @@
-c8052bdc007f0abd9682d160fcf7641f475d3fd7 SOURCES/kernel-rt-3.10.0-514.2.2.rt56.424.tar.xz
+d955ed9dc3420d0cf98638622e56937bb2151afd SOURCES/kernel-rt-3.10.0-514.6.1.rt56.429.tar.xz
95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509
diff --git a/SOURCES/centos-kpatch.x509 b/SOURCES/centos-kpatch.x509
deleted file mode 100644
index ca57a43..0000000
Binary files a/SOURCES/centos-kpatch.x509 and /dev/null differ
diff --git a/SOURCES/centos-ldup.x509 b/SOURCES/centos-ldup.x509
deleted file mode 100644
index 9c65dd3..0000000
Binary files a/SOURCES/centos-ldup.x509 and /dev/null differ
diff --git a/SOURCES/centos.cer b/SOURCES/centos.cer
deleted file mode 100644
index 00a5580..0000000
Binary files a/SOURCES/centos.cer and /dev/null differ
diff --git a/SOURCES/debrand-rh-i686-cpu.patch b/SOURCES/debrand-rh-i686-cpu.patch
deleted file mode 100644
index 739855c..0000000
--- a/SOURCES/debrand-rh-i686-cpu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 8ef4557..0000000
--- a/SOURCES/debrand-rh_taint.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index 9d2e08b..0000000
--- a/SOURCES/debrand-single-cpu.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 f5d3d91..49c6ce8 100644
--- a/SOURCES/genkey
+++ b/SOURCES/genkey
@@ -2,6 +2,6 @@
%secring kernel.sec
Key-Type: DSA
Key-Length: 512
-Name-Real: CentOS
+Name-Real: Red Hat, Inc.
Name-Comment: Kernel Module GPG key
%commit
diff --git a/SOURCES/x509.genkey b/SOURCES/x509.genkey
index c9afeba..b1bbe38 100644
--- a/SOURCES/x509.genkey
+++ b/SOURCES/x509.genkey
@@ -5,9 +5,9 @@ prompt = no
x509_extensions = myexts
[ req_distinguished_name ]
-O = CentOS
-CN = CentOS Linux kernel signing key
-emailAddress = security@centos.org
+O = Red Hat
+CN = Red Hat Enterprise Linux kernel signing key
+emailAddress = secalert@redhat.com
[ myexts ]
basicConstraints=critical,CA:FALSE
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 2f626bf..f225fa2 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -9,10 +9,10 @@ Summary: The Linux Realtime kernel
%global __spec_install_pre %{___build_pre}
# realtimeN
-%global rtbuild 424
+%global rtbuild 429
# RHEL7 build number
-%global rhel_build 514.2.2
+%global rhel_build 514.6.1
# The preempt RT patch level
%global rttag rt56
@@ -376,10 +376,10 @@ Source19: extrakeys.pub
Source31: x509.genkey
Source32: extra_certificates
-Source33: centos.cer
+Source33: securebootca.cer
Source34: secureboot.cer
-Source35: centos-ldup.x509
-Source36: centos-kpatch.x509
+Source35: rheldup3.x509
+Source36: rhelkpatch1.x509
### Configuration files
Source50: kernel-%{version}-x86_64-rt.config
@@ -399,10 +399,6 @@ Patch001: avoid-debuginfo-hash-collision-scripts.patch
# Empty final patch file to facilitate testing of kernel patches
Patch999999: linux-kernel-test.patch
-Patch1000: debrand-single-cpu.patch
-Patch1001: debrand-rh_taint.patch
-Patch1002: debrand-rh-i686-cpu.patch
-
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -599,7 +595,7 @@ EOF
if [ -s %{SOURCE19} ]; then
gpg --homedir . --no-default-keyring --keyring kernel.pub --import %{SOURCE19}
fi
-gpg --homedir . --export --keyring ./kernel.pub CentOS > extract.pub
+gpg --homedir . --export --keyring ./kernel.pub Red > 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
@@ -718,9 +714,6 @@ 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
@@ -882,7 +875,7 @@ BuildKernel() {
fi
# EFI SecureBoot signing, x86_64-only
%ifarch x86_64
- %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE33} -c %{SOURCE33}
+ %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE33} -c %{SOURCE34} -n redhatsecureboot301
mv $KernelImage.signed $KernelImage
%endif
$CopyKernel $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
@@ -1507,8 +1500,23 @@ fi
%endif
%changelog
-* Thu Dec 22 2016 Johnny Hughes <johnny@centos.org> [3.10.0-514.2.2.rt56.424.el7]
-- Manual CentOS Debranding
+* Wed Dec 14 2016 Clark Williams <williams@redhat.com> [3.10.0-514.6.1.rt56.429.el7]
+- [rt] kernel-rt-3.10.0-514.6.1.rt56.429.el7 (Clark Williams) [1401863]
+- [rt] specfile changelog cleanup (Clark Williams)
+
+* Tue Dec 13 2016 Clark Williams <williams@redhat.com> [3.10.0-514.6.1.rt56.428.el7]
+- [rt] kernel-rt-3.10.0-514.6.1.rt56.428.el7 (Clark Williams) [1401863]
+
+* Tue Dec 13 2016 Clark Williams <williams@redhat.com> [3.10.0-514.6.1.rt56.427.el7]
+- [rt] kernel-rt-3.10.0-514.6.1.rt56.427.el7 (Clark Williams) [1377840]
+
+* Thu Dec 08 2016 Clark Williams <williams@redhat.com> [3.10.0-514.5.1.rt56.426.el7]
+- [rt] kernel-rt-3.10.0-514.5.1.rt56.426.el7 (Clark Williams) [1377840]
+- [rt] net: Always disable irqs in napi_schedule*() (Steven Rostedt) [1402837]
+
+* Mon Dec 05 2016 Clark Williams <williams@redhat.com> [3.10.0-514.5.1.rt56.425.el7]
+- [rt] kernel-rt-3.10.0-514.5.1.rt56.425.el7 (Clark Williams) [1377840]
+- [rt] dm: Make rt aware (Thomas Gleixner) [1400930]
* Thu Nov 17 2016 Clark Williams <williams@redhat.com> [3.10.0-514.2.2.rt56.424.el7]
- [rt] kernel-rt-3.10.0-514.2.2.rt56.424.el7 (Clark Williams) [1377840]