dpkg: Add musleabi to known architectures

Remove a glibc specific patch to be applied only for native version,
this is a dpkg-native specific patch needed for Centos 5.8, this patch
should be redone to be glibc independent for it to be applied to all
types of dpkg recipes

(From OE-Core rev: 610a9f102a83e1ffb9d7954e40df5f65d24d3a26)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 44 insertions, 1 deletions

diff --git a/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch
new file mode 100644
index 0000000000..a6b00880ce
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch
@@ -0,0 +1,42 @@
+From f8910022dc3ec622272f168cd0022dbdf6dff93a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 30 Dec 2015 23:05:41 +0000
+Subject: [PATCH] add musleabi to known target tripets
+
+helps compiling dpkg for musl/arm-softfloat
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Pending
+
+ ostable      | 1 +
+ triplettable | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/ostable b/ostable
+index 3bb6819..d0ffdc7 100644
+--- a/ostable
++++ b/ostable
+@@ -15,6 +15,7 @@
+ uclibceabi-linux       linux-uclibceabi        linux[^-]*-uclibceabi
+ uclibc-linux           linux-uclibc            linux[^-]*-uclibc
+ musleabihf-linux       linux-musleabihf        linux[^-]*-musleabihf
++musleabi-linux         linux-musleabi          linux[^-]*-musleabi
+ musl-linux             linux-musl              linux[^-]*-musl
+ gnueabihf-linux                linux-gnueabihf         linux[^-]*-gnueabihf
+ gnueabi-linux          linux-gnueabi           linux[^-]*-gnueabi
+diff --git a/triplettable b/triplettable
+index 1213584..70d24c1 100644
+--- a/triplettable
++++ b/triplettable
+@@ -6,6 +6,7 @@
+ uclibceabi-linux-arm   uclibc-linux-armel
+ uclibc-linux-<cpu>     uclibc-linux-<cpu>
+ musleabihf-linux-arm   musl-linux-armhf
++musleabi-linux-arm     musl-linux-armel
+ musl-linux-<cpu>       musl-linux-<cpu>
+ gnueabihf-linux-arm    armhf
+ gnueabi-linux-arm      armel
+-- 
+2.6.4
+
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb b/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb
index 4c3fa4f395..dd1109bbad 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb
@@ -1,17 +1,18 @@
 require dpkg.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
+SRC_URI_append_class-native =" file://glibc2.5-sync_file_range.patch "
 SRC_URI += "file://noman.patch \
             file://remove-tar-no-timestamp.patch \
             file://fix-abs-redefine.patch \
             file://arch_pm.patch \
             file://dpkg-configure.service \
-            file://glibc2.5-sync_file_range.patch \
             file://add_armeb_triplet_entry.patch \
             file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \
             file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \
             file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \
             file://0005-dpkg-compiler.m4-remove-Wvla.patch \
+            file://0006-add-musleabi-to-known-target-tripets.patch \
            "
 
 SRC_URI[md5sum] = "63b9d869081ec49adeef6c5ff62d6576"