aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/dpkg
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:29 +0100
commite56b4af3a325d6d5332c779e6253da9b3cd2fce0 (patch)
treec9ae43d294210a46fc52d0123d4a2845ec98cf0e /meta/recipes-devtools/dpkg
parent3f1788f8edf18a292cb5d8e16a2a98a19ec89239 (diff)
downloadopenembedded-core-contrib-e56b4af3a325d6d5332c779e6253da9b3cd2fce0.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. 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/dpkg')
-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 00000000000..cad4c0f0a1c
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
@@ -0,0 +1,22 @@
+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.
+
+Upstream-Status: Pending
+
+Signed-off-by: Joe Slater <jslater@windriver.com>
+
+
+--- a/scripts/Dpkg/Arch.pm
++++ b/scripts/Dpkg/Arch.pm
+@@ -233,9 +233,6 @@ sub read_triplettable()
+ (my $dt = $debtriplet) =~ s/<cpu>/$_cpu/;
+ (my $da = $debarch) =~ s/<cpu>/$_cpu/;
+
+- next if exists $debarch_to_debtriplet{$da}
+- or exists $debtriplet_to_debarch{$dt};
+-
+ $debarch_to_debtriplet{$da} = $dt;
+ $debtriplet_to_debarch{$dt} = $da;
+ }
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb b/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb
index 01027a037d2..525f75908b2 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 \
file://fix-timestamps.patch \
file://remove-tar-no-timestamp.patch \
file://fix-abs-redefine.patch \
+ file://arch_pm.patch \
"
SRC_URI[md5sum] = "ece3ae87a099158c17bde95c0036c575"