From e3e38cca4c8745690c2c3bfcbd2a8a8f129a349f Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Mon, 26 Aug 2013 23:38:45 +0000 Subject: [PATCH] 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/dpkg/dpkg/arch_pm.patch | 22 ++++++++++++++++++++++ meta/recipes-devtools/dpkg/dpkg_1.17.1.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 meta/recipes-devtools/dpkg/dpkg/arch_pm.patch 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 0000000..cad4c0f --- /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 + + +--- a/scripts/Dpkg/Arch.pm ++++ b/scripts/Dpkg/Arch.pm +@@ -233,9 +233,6 @@ sub read_triplettable() + (my $dt = $debtriplet) =~ s//$_cpu/; + (my $da = $debarch) =~ s//$_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 01027a0..525f759 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" -- 2.7.4