summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2015-10-28 17:52:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:39:30 +0000
commitab123ef69417d0957741102cc28ac3d17daefb84 (patch)
tree916e36c6ec665f097c4b88ec352e46f89036bd8a /meta
parentaf8c1365d352e9f052d8a7aed6e29c0b320cb5b9 (diff)
downloadpoky-ab123ef69417d0957741102cc28ac3d17daefb84.tar.gz
rpm: define EM_AARCH64 for debugedit
EM_AARCH64 maybe not be defined due to old version elf.h when compile rpm-native, and lead to that debugedit can not work on aarch64 elf object files, since there is no other dependence, except these two macro, define them to make debugedit work on aarch64 elf files. debugedit: /bitbake_build/tmp/work/aarch64-wrs-linux/libvirt/1.2.19-r0/ package/usr/lib64/libvirt/ptest/daemon/libvirtd_admin_la-admin_server.o: Unhandled relocation 258 in .debug_info section (From OE-Core rev: 91a159e64d404653b2d9178caf027f797a4d3f3b) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch35
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.14.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch b/meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch
new file mode 100644
index 0000000000..f5fcfecf31
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch
@@ -0,0 +1,35 @@
1[PATCH] define EM_AARCH64
2
3Upstream-Status: pending
4
5EM_AARCH64 maybe not be defined due to old version elf.h, and lead to
6that debugedit can not work on aarch64 elf object files, since there is
7no other dependence, except these two macro, define them to make
8debugedit work on aarch64 elf files.
9
10Signed-off-by: Roy Li <rongqing.li@windriver.com>
11---
12 tools/debugedit.c | 7 +++++++
13 1 file changed, 7 insertions(+)
14
15diff --git a/tools/debugedit.c b/tools/debugedit.c
16index de693ed..d16a641 100644
17--- a/tools/debugedit.c
18+++ b/tools/debugedit.c
19@@ -35,6 +35,13 @@
20
21 #include <gelf.h>
22
23+#ifndef EM_AARCH64
24+#define EM_AARCH64 183 /* ARM AARCH64 */
25+#endif
26+#ifndef R_AARCH64_ABS32
27+#define R_AARCH64_ABS32 258
28+#endif
29+
30 /* some defines taken from the dwarf standard */
31
32 #define DW_TAG_compile_unit 0x11
33--
341.9.1
35
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
index 73b3734d58..39304103ea 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
@@ -100,6 +100,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e
100 file://rpm-macros.in-disable-external-key-server.patch \ 100 file://rpm-macros.in-disable-external-key-server.patch \
101 file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \ 101 file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \
102 file://configure.ac-check-for-both-gpg2-and-gpg.patch \ 102 file://configure.ac-check-for-both-gpg2-and-gpg.patch \
103 file://0001-define-EM_AARCH64.patch \
103 " 104 "
104 105
105# Uncomment the following line to enable platform score debugging 106# Uncomment the following line to enable platform score debugging