summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-12-30 23:31:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:28 +0000
commit3cd0a8c3812915037aebfa37ce53b5aa30198cc8 (patch)
treecaa793701c33274d1bffdeb325c632328e9fa0f7
parentaaa85169b663ddc41b55400c7e07bddffc2f9c16 (diff)
downloadpoky-3cd0a8c3812915037aebfa37ce53b5aa30198cc8.tar.gz
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>
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch42
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.18.2.bb3
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 @@
1From f8910022dc3ec622272f168cd0022dbdf6dff93a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 30 Dec 2015 23:05:41 +0000
4Subject: [PATCH] add musleabi to known target tripets
5
6helps compiling dpkg for musl/arm-softfloat
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending
11
12 ostable | 1 +
13 triplettable | 1 +
14 2 files changed, 2 insertions(+)
15
16diff --git a/ostable b/ostable
17index 3bb6819..d0ffdc7 100644
18--- a/ostable
19+++ b/ostable
20@@ -15,6 +15,7 @@
21 uclibceabi-linux linux-uclibceabi linux[^-]*-uclibceabi
22 uclibc-linux linux-uclibc linux[^-]*-uclibc
23 musleabihf-linux linux-musleabihf linux[^-]*-musleabihf
24+musleabi-linux linux-musleabi linux[^-]*-musleabi
25 musl-linux linux-musl linux[^-]*-musl
26 gnueabihf-linux linux-gnueabihf linux[^-]*-gnueabihf
27 gnueabi-linux linux-gnueabi linux[^-]*-gnueabi
28diff --git a/triplettable b/triplettable
29index 1213584..70d24c1 100644
30--- a/triplettable
31+++ b/triplettable
32@@ -6,6 +6,7 @@
33 uclibceabi-linux-arm uclibc-linux-armel
34 uclibc-linux-<cpu> uclibc-linux-<cpu>
35 musleabihf-linux-arm musl-linux-armhf
36+musleabi-linux-arm musl-linux-armel
37 musl-linux-<cpu> musl-linux-<cpu>
38 gnueabihf-linux-arm armhf
39 gnueabi-linux-arm armel
40--
412.6.4
42
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 @@
1require dpkg.inc 1require dpkg.inc
2LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 2LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
3 3
4SRC_URI_append_class-native =" file://glibc2.5-sync_file_range.patch "
4SRC_URI += "file://noman.patch \ 5SRC_URI += "file://noman.patch \
5 file://remove-tar-no-timestamp.patch \ 6 file://remove-tar-no-timestamp.patch \
6 file://fix-abs-redefine.patch \ 7 file://fix-abs-redefine.patch \
7 file://arch_pm.patch \ 8 file://arch_pm.patch \
8 file://dpkg-configure.service \ 9 file://dpkg-configure.service \
9 file://glibc2.5-sync_file_range.patch \
10 file://add_armeb_triplet_entry.patch \ 10 file://add_armeb_triplet_entry.patch \
11 file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \ 11 file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \
12 file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ 12 file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \
13 file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ 13 file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \
14 file://0005-dpkg-compiler.m4-remove-Wvla.patch \ 14 file://0005-dpkg-compiler.m4-remove-Wvla.patch \
15 file://0006-add-musleabi-to-known-target-tripets.patch \
15 " 16 "
16 17
17SRC_URI[md5sum] = "63b9d869081ec49adeef6c5ff62d6576" 18SRC_URI[md5sum] = "63b9d869081ec49adeef6c5ff62d6576"