diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2016-07-08 11:21:47 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2016-07-08 11:27:47 -0700 |
| commit | 82ff1fb714a8ddb67896eb09b1bf6a2c81f088bf (patch) | |
| tree | b82cbffc2f7679db0f15323d506bbe5cabd4f6ae | |
| parent | e7f74eea09482c8f2b64e46d1f1dfe289d125e1e (diff) | |
| download | kernel-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.
| -rw-r--r-- | 0001-Work-around-for-addition-of-metag-def-but-not-reloca.patch | 50 | ||||
| -rw-r--r-- | kernel.spec | 8 |
2 files changed, 57 insertions, 1 deletions
diff --git a/0001-Work-around-for-addition-of-metag-def-but-not-reloca.patch b/0001-Work-around-for-addition-of-metag-def-but-not-reloca.patch new file mode 100644 index 000000000..fcafe4d29 --- /dev/null +++ b/0001-Work-around-for-addition-of-metag-def-but-not-reloca.patch @@ -0,0 +1,50 @@ +From 4196017cd0e50e434ee72ca706742804f75c8827 Mon Sep 17 00:00:00 2001 +From: Laura Abbott <labbott@fedoraproject.org> +Date: Fri, 8 Jul 2016 11:15:43 -0700 +Subject: [PATCH] Work around for addition of metag def but not relocations + +Caused by commit in sync up from +http://pkgs.fedoraproject.org/cgit/rpms/glibc.git/commit/?id=9a78be1808600ca5e66eab741542447a29cfbeb3 + +Fixes build errors like: + +scripts/recordmcount.c: In function 'do_file': +scripts/recordmcount.c:466:28: error: 'R_METAG_ADDR32' undeclared (first use in this function) + case EM_METAG: reltype = R_METAG_ADDR32; + ^~~~~~~~~~~~~~ +scripts/recordmcount.c:466:28: note: each undeclared identifier is reported only once for each function it appears in +scripts/recordmcount.c:468:20: error: 'R_METAG_NONE' undeclared (first use in this function) + rel_type_nop = R_METAG_NONE; + ^~~~~~~~~~~~ + +Signed-off-by: Laura Abbott <labbott@fedoraproject.org> +--- + scripts/recordmcount.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c +index e1675927..42396a7 100644 +--- a/scripts/recordmcount.c ++++ b/scripts/recordmcount.c +@@ -33,10 +33,17 @@ + #include <string.h> + #include <unistd.h> + ++/* ++ * glibc synced up and added the metag number but didn't add the relocations. ++ * Work around this in a crude manner for now. ++ */ + #ifndef EM_METAG +-/* Remove this when these make it to the standard system elf.h. */ + #define EM_METAG 174 ++#endif ++#ifndef R_METAG_ADDR32 + #define R_METAG_ADDR32 2 ++#endif ++#ifndef R_METAG_NONE + #define R_METAG_NONE 3 + #endif + +-- +2.9.0 + 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 |