summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-07-08 11:21:47 -0700
committerLaura Abbott <labbott@fedoraproject.org>2016-07-08 11:27:47 -0700
commit82ff1fb714a8ddb67896eb09b1bf6a2c81f088bf (patch)
treeb82cbffc2f7679db0f15323d506bbe5cabd4f6ae /kernel.spec
parente7f74eea09482c8f2b64e46d1f1dfe289d125e1e (diff)
downloadkernel-82ff1fb714a8ddb67896eb09b1bf6a2c81f088bf.tar.gz
kernel-82ff1fb714a8ddb67896eb09b1bf6a2c81f088bf.tar.xz
kernel-82ff1fb714a8ddb67896eb09b1bf6a2c81f088bf.zip
Workaround for glibc change
glibc recently did a sync up and this trickled into Fedora http://repo.or.cz/glibc.git/commit/94e73c95d9b5ac7d3b3f178e2ca03ef6b60e82aa This added a definition for metag but added none of the relocations which breaks some checks. Work around this temporarily until upstream and glibc agree what to do.
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec8
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index e9f09c4be..ce9830188 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -630,6 +630,9 @@ Patch833: drm-nouveau-disp-sor-gf119-select-correct-sor-when.patch
#rhbz 1346753
Patch834: qla2xxx-Fix-NULL-pointer-deref-in-QLA-interrupt.patch
+#Workaround for glibc update
+Patch835: 0001-Work-around-for-addition-of-metag-def-but-not-reloca.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -2155,6 +2158,9 @@ fi
#
#
%changelog
+* Fri Jul 08 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc6.git2.2
+- Workaround for glibc change
+
* Fri Jul 08 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc6.git2.1
- Linux v4.7-rc6-94-gcc23c61