summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy.Li <rongqing.li@windriver.com>2013-07-15 16:59:06 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-18 21:23:40 +0100
commitaef74ef890b94ada4eef06b918825a804510737a (patch)
treedd93b3744f729da574e9b1a715e3c22b01da6914
parent3dee534f1e25109e0bdb681de0746c336f4b8840 (diff)
downloadpoky-aef74ef890b94ada4eef06b918825a804510737a.tar.gz
dpkg: backport a patch to support mipsn32el and mips64el
(From OE-Core rev: cdc8c8d73ab782d712acafb85d97f2af688ae4c9) Signed-off-by: Roy.Li <rongqing.li@windriver.com> [sgw - tweaked Upstream-Status] Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/Add-support-for-mipsn32-el-and-mips64-el-to-arch-tab.patch78
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.16.10.bb3
2 files changed, 80 insertions, 1 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/Add-support-for-mipsn32-el-and-mips64-el-to-arch-tab.patch b/meta/recipes-devtools/dpkg/dpkg/Add-support-for-mipsn32-el-and-mips64-el-to-arch-tab.patch
new file mode 100644
index 0000000000..abebdc57c8
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/Add-support-for-mipsn32-el-and-mips64-el-to-arch-tab.patch
@@ -0,0 +1,78 @@
1Upstream-Status: Backport
2
3Signed-off-by: Roy.Li <rongqing.li@windriver.com>
4
5
6From 597a7348527cbe91e35cf04a2e214a562612a768 Mon Sep 17 00:00:00 2001
7From: YunQiang Su <wzssyqa@gmail.com>
8Date: Sat, 22 Jun 2013 06:14:09 +0200
9Subject: [PATCH] Add support for mipsn32(el) and mips64(el) to arch tables
10
11[guillem@debian.org:
12 - Remove unneeded abi entry.
13 - Fix mips64 endianness. ]
14
15Closes: #685096, #707323
16
17Signed-off-by: Guillem Jover <guillem@debian.org>
18---
19 abitable | 1 +
20 cputable | 2 ++
21 ostable | 2 ++
22 triplettable | 4 ++++
23 5 files changed, 11 insertions(+)
24
25diff --git a/abitable b/abitable
26index 578228d..300a1ab 100644
27--- a/abitable
28+++ b/abitable
29@@ -7,4 +7,5 @@
30 # Column 2 is the size (in bits) of the ABI integers/pointers.
31 #
32 # <Debian name> <Bits>
33+gnuabin32 32
34 gnux32 32
35diff --git a/cputable b/cputable
36index c556fdd..d48e59c 100644
37--- a/cputable
38+++ b/cputable
39@@ -27,6 +27,8 @@ m32r m32r m32r 32 big
40 m68k m68k m68k 32 big
41 mips mips mips(eb)? 32 big
42 mipsel mipsel mipsel 32 little
43+mips64 mips64 mips64 64 big
44+mips64el mips64el mips64el 64 little
45 powerpc powerpc (powerpc|ppc) 32 big
46 ppc64 powerpc64 (powerpc|ppc)64 64 big
47 s390 s390 s390 32 big
48diff --git a/ostable b/ostable
49index 1383150..29d3843 100644
50--- a/ostable
51+++ b/ostable
52@@ -18,6 +18,8 @@ musleabihf-linux linux-musleabihf linux[^-]*-musleabihf
53 musl-linux linux-musl linux[^-]*-musl
54 gnueabihf-linux linux-gnueabihf linux[^-]*-gnueabihf
55 gnueabi-linux linux-gnueabi linux[^-]*-gnueabi
56+gnuabin32-linux linux-gnuabin32 linux[^-]*-gnuabin32
57+gnuabi64-linux linux-gnuabi64 linux[^-]*-gnuabi64
58 gnuspe-linux linux-gnuspe linux[^-]*-gnuspe
59 gnux32-linux linux-gnux32 linux[^-]*-gnux32
60 gnulp-linux linux-gnulp linux[^-]*-gnulp
61diff --git a/triplettable b/triplettable
62index e0d78a4..a2c683f 100644
63--- a/triplettable
64+++ b/triplettable
65@@ -9,6 +9,10 @@ musleabihf-linux-arm musl-linux-armhf
66 musl-linux-<cpu> musl-linux-<cpu>
67 gnueabihf-linux-arm armhf
68 gnueabi-linux-arm armel
69+gnuabin32-linux-mips64el mipsn32el
70+gnuabin32-linux-mips64 mipsn32
71+gnuabi64-linux-mips64el mips64el
72+gnuabi64-linux-mips64 mips64
73 gnuspe-linux-powerpc powerpcspe
74 gnux32-linux-amd64 x32
75 gnulp-linux-i386 lpia
76--
771.7.10.4
78
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.16.10.bb b/meta/recipes-devtools/dpkg/dpkg_1.16.10.bb
index 309c17c555..5a486ed510 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.16.10.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.16.10.bb
@@ -6,7 +6,8 @@ SRC_URI += "file://noman.patch \
6 file://check_version.patch \ 6 file://check_version.patch \
7 file://preinst.patch \ 7 file://preinst.patch \
8 file://fix-timestamps.patch \ 8 file://fix-timestamps.patch \
9 file://remove-tar-no-timestamp.patch" 9 file://remove-tar-no-timestamp.patch \
10 file://Add-support-for-mipsn32-el-and-mips64-el-to-arch-tab.patch"
10 11
11SRC_URI[md5sum] = "a20a06a5272717274a8b009368f237da" 12SRC_URI[md5sum] = "a20a06a5272717274a8b009368f237da"
12SRC_URI[sha256sum] = "aeaacf0884039940d9463901102194f9a42eb5702157b9e7a23f43e0d9f65cf2" 13SRC_URI[sha256sum] = "aeaacf0884039940d9463901102194f9a42eb5702157b9e7a23f43e0d9f65cf2"