summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2013-08-26 23:38:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-28 00:41:33 +0100
commitf17404dd712eec0e97efc7a43fcb602330521f5b (patch)
tree053449e9447e613cfa1aac31c544aa3d46f0fe7d /meta/recipes-devtools
parent937968bf95e38dcdfc3e7791dc9efaf5f7613f24 (diff)
downloadpoky-f17404dd712eec0e97efc7a43fcb602330521f5b.tar.gz
dpkg: fix configuration issue for mips64
CQID: 431771 configure cannot determine the proper cpu, os, or architecture for mips64, and possibly other arch's, because of faulty code added to Arch.pm in the latest release from upstream. We remove that code. (From OE-Core rev: e56b4af3a325d6d5332c779e6253da9b3cd2fce0) Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/arch_pm.patch22
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.17.1.bb1
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
new file mode 100644
index 0000000000..cad4c0f0a1
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
@@ -0,0 +1,22 @@
1configure cannot determine the proper cpu, os, or
2architecture for mips64, and possibly other arch's
3because of faulty code added to Arch.pm in the latest
4release from upstream. We remove that code.
5
6Upstream-Status: Pending
7
8Signed-off-by: Joe Slater <jslater@windriver.com>
9
10
11--- a/scripts/Dpkg/Arch.pm
12+++ b/scripts/Dpkg/Arch.pm
13@@ -233,9 +233,6 @@ sub read_triplettable()
14 (my $dt = $debtriplet) =~ s/<cpu>/$_cpu/;
15 (my $da = $debarch) =~ s/<cpu>/$_cpu/;
16
17- next if exists $debarch_to_debtriplet{$da}
18- or exists $debtriplet_to_debarch{$dt};
19-
20 $debarch_to_debtriplet{$da} = $dt;
21 $debtriplet_to_debarch{$dt} = $da;
22 }
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb b/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb
index 01027a037d..525f75908b 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb
@@ -8,6 +8,7 @@ SRC_URI += "file://noman.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://fix-abs-redefine.patch \ 10 file://fix-abs-redefine.patch \
11 file://arch_pm.patch \
11 " 12 "
12 13
13SRC_URI[md5sum] = "ece3ae87a099158c17bde95c0036c575" 14SRC_URI[md5sum] = "ece3ae87a099158c17bde95c0036c575"