diff options
author | sweeaun <swee.aun.khor@intel.com> | 2017-09-10 00:28:30 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-13 22:07:42 +0100 |
commit | b7cb89ebbf8709ae16de63c90788c1110a0b83b7 (patch) | |
tree | a63b8c1f527ff930a48fe194e7506fdf49b9b448 | |
parent | d892af43aaba6ba402c97c72c40f2a41202bf886 (diff) | |
download | poky-b7cb89ebbf8709ae16de63c90788c1110a0b83b7.tar.gz |
dpkg: Support muslx32 build
Modified ostable and tupletable to support muslx32 build.
(From OE-Core rev: 13ee656aaa6d529b0d40001062f6d4d84b896d62)
Signed-off-by: sweeaun <swee.aun.khor@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch | 41 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg_1.18.24.bb | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch b/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch new file mode 100644 index 0000000000..50e6894406 --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From a328c8bec0bf8071ae8f20fee4c7475205064ba1 Mon Sep 17 00:00:00 2001 | ||
2 | From: sweeaun <swee.aun.khor@intel.com> | ||
3 | Date: Sun, 10 Sep 2017 00:14:15 -0700 | ||
4 | Subject: [PATCH] dpkg: Support muslx32 build | ||
5 | |||
6 | Upstream-Status: Pending. | ||
7 | Changes made on ostable and tupletable to enable muslx32 build. | ||
8 | |||
9 | Signed-off-by: sweeaun <swee.aun.khor@intel.com> | ||
10 | --- | ||
11 | data/ostable | 1 + | ||
12 | data/tupletable | 1 + | ||
13 | 2 files changed, 2 insertions(+) | ||
14 | |||
15 | diff --git a/data/ostable b/data/ostable | ||
16 | index be64342..87db273 100644 | ||
17 | --- a/data/ostable | ||
18 | +++ b/data/ostable | ||
19 | @@ -19,6 +19,7 @@ base-uclibc-linux linux-uclibc linux[^-]*-uclibc | ||
20 | eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf | ||
21 | eabi-musl-linux linux-musleabi linux[^-]*-musleabi | ||
22 | base-musl-linux linux-musl linux[^-]*-musl | ||
23 | +x32-musl-linux linux-muslx32 linux[^-]*-muslx32 | ||
24 | eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf | ||
25 | eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi | ||
26 | abin32-gnu-linux linux-gnuabin32 linux[^-]*-gnuabin32 | ||
27 | diff --git a/data/tupletable b/data/tupletable | ||
28 | index 28f00bf..748ffab 100644 | ||
29 | --- a/data/tupletable | ||
30 | +++ b/data/tupletable | ||
31 | @@ -10,6 +10,7 @@ base-uclibc-linux-<cpu> uclibc-linux-<cpu> | ||
32 | eabihf-musl-linux-arm musl-linux-armhf | ||
33 | eabi-musl-linux-arm musl-linux-armel | ||
34 | base-musl-linux-<cpu> musl-linux-<cpu> | ||
35 | +x32-musl-linux-amd64 x32 | ||
36 | ilp32-gnu-linux-arm64 arm64ilp32 | ||
37 | eabihf-gnu-linux-arm armhf | ||
38 | eabi-gnu-linux-arm armel | ||
39 | -- | ||
40 | 2.7.4 | ||
41 | |||
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb b/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb index f06b604ebb..7e241af55b 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \ | |||
13 | file://0005-dpkg-compiler.m4-remove-Wvla.patch \ | 13 | file://0005-dpkg-compiler.m4-remove-Wvla.patch \ |
14 | file://0006-add-musleabi-to-known-target-tripets.patch \ | 14 | file://0006-add-musleabi-to-known-target-tripets.patch \ |
15 | file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ | 15 | file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ |
16 | file://0001-dpkg-Support-muslx32-build.patch \ | ||
16 | " | 17 | " |
17 | SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch " | 18 | SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch " |
18 | 19 | ||