Patchwork [1/1] dpkg: fix configuration issure for mips64

login
register
mail settings
Submitter Joe Slater
Date Aug. 26, 2013, 8:46 p.m.
Message ID <1377550010-14358-1-git-send-email-jslater@windriver.com>
Download mbox | patch
Permalink /patch/56655/
State New
Headers show

Comments

Joe Slater - Aug. 26, 2013, 8:46 p.m.
CQID: 431771

configure cannot determine the proper cpu, os, or
architeture 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>
---
 meta/recipes-devtools/dpkg/dpkg/arch_pm.patch |   19 +++++++++++++++++++
 meta/recipes-devtools/dpkg/dpkg_1.17.1.bb     |    1 +
 2 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
Saul Wold - Aug. 26, 2013, 8:51 p.m.
On 08/26/2013 01:46 PM, Joe Slater wrote:
> CQID: 431771
>
> configure cannot determine the proper cpu, os, or
> architeture 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>
> ---
>   meta/recipes-devtools/dpkg/dpkg/arch_pm.patch |   19 +++++++++++++++++++
>   meta/recipes-devtools/dpkg/dpkg_1.17.1.bb     |    1 +
>   2 files changed, 20 insertions(+), 0 deletions(-)
>   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..2ce5ef3
> --- /dev/null
> +++ b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
> @@ -0,0 +1,19 @@
> +configure cannot determine the proper cpu, os, or
> +architeture 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
> +
Should be Upstream-Status: Pending

and no Signed-off-by:

Sau!

> +--- 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 9ac2aa7..e436f4e 100644
> --- a/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb
> +++ b/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb
> @@ -7,6 +7,7 @@ SRC_URI += "file://noman.patch \
>               file://preinst.patch \
>               file://fix-timestamps.patch \
>               file://remove-tar-no-timestamp.patch \
> +            file://arch_pm.patch \
>              "
>
>   SRC_URI[md5sum] = "ece3ae87a099158c17bde95c0036c575"
>

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..2ce5ef3
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
@@ -0,0 +1,19 @@ 
+configure cannot determine the proper cpu, os, or
+architeture 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
+
+--- 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 9ac2aa7..e436f4e 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb
@@ -7,6 +7,7 @@  SRC_URI += "file://noman.patch \
             file://preinst.patch \
             file://fix-timestamps.patch \
             file://remove-tar-no-timestamp.patch \
+            file://arch_pm.patch \
            "
 
 SRC_URI[md5sum] = "ece3ae87a099158c17bde95c0036c575"