diff options
| author | Saul Wold <sgw@linux.intel.com> | 2017-02-03 11:25:58 -0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2017-02-10 07:52:49 -0800 |
| commit | b5b93ad3ee49efea3906d715da339cc1a75baf6b (patch) | |
| tree | a26be480a9f41d3da4fae1ef66a1eb59be8ec4ce | |
| parent | bb6021a0931a0593eb45d3bd9b222020cf0620b1 (diff) | |
| download | meta-intel-b5b93ad3ee49efea3906d715da339cc1a75baf6b.tar.gz | |
iucode-tool: Add support for MUSL
iucode-tool needs the arpg API which is not part of MUSL, so add argp-standalone as
a dependency. The arpg library is also required for linking, so add a patch to
the Makefile.am, which is added again based on tclib being MUSL
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | common/recipes-core/microcode/iucode-tool/0001-Makefile.am-Add-arg-parse-library-for-MUSL-support.patch | 29 | ||||
| -rw-r--r-- | common/recipes-core/microcode/iucode-tool_2.1.1.bb | 4 |
2 files changed, 33 insertions, 0 deletions
diff --git a/common/recipes-core/microcode/iucode-tool/0001-Makefile.am-Add-arg-parse-library-for-MUSL-support.patch b/common/recipes-core/microcode/iucode-tool/0001-Makefile.am-Add-arg-parse-library-for-MUSL-support.patch new file mode 100644 index 00000000..ca97d2ab --- /dev/null +++ b/common/recipes-core/microcode/iucode-tool/0001-Makefile.am-Add-arg-parse-library-for-MUSL-support.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | From 5f6826b3a59dedf508d5a6122362d69a4813e8e6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Saul Wold <sgw@linux.intel.com> | ||
| 3 | Date: Fri, 3 Feb 2017 16:08:51 -0800 | ||
| 4 | Subject: [PATCH] Makefile.am: Add arg-parse library for MUSL support | ||
| 5 | |||
| 6 | iucode-tool needs argp-standalone when used with MUSL, so add this | ||
| 7 | patch to the Makefile to link with argp | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
| 11 | --- | ||
| 12 | Makefile.am | 1 + | ||
| 13 | 1 file changed, 1 insertion(+) | ||
| 14 | |||
| 15 | diff --git a/Makefile.am b/Makefile.am | ||
| 16 | index 415a241..764fb61 100644 | ||
| 17 | --- a/Makefile.am | ||
| 18 | +++ b/Makefile.am | ||
| 19 | @@ -5,6 +5,7 @@ | ||
| 20 | sbin_PROGRAMS = iucode_tool | ||
| 21 | man_MANS = iucode_tool.8 | ||
| 22 | |||
| 23 | +iucode_tool_LDADD = -largp | ||
| 24 | iucode_tool_SOURCES = intel_microcode.h intel_microcode.c iucode_tool.c | ||
| 25 | EXTRA_DIST = autogen.sh CONTRIBUTING | ||
| 26 | |||
| 27 | -- | ||
| 28 | 2.7.4 | ||
| 29 | |||
diff --git a/common/recipes-core/microcode/iucode-tool_2.1.1.bb b/common/recipes-core/microcode/iucode-tool_2.1.1.bb index e98bca60..5b216992 100644 --- a/common/recipes-core/microcode/iucode-tool_2.1.1.bb +++ b/common/recipes-core/microcode/iucode-tool_2.1.1.bb | |||
| @@ -16,7 +16,11 @@ LICENSE = "GPLv2+" | |||
| 16 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | 16 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ |
| 17 | file://iucode_tool.c;beginline=1;endline=15;md5=5d8e3639c3b6a80e7d5e0e073933da16" | 17 | file://iucode_tool.c;beginline=1;endline=15;md5=5d8e3639c3b6a80e7d5e0e073933da16" |
| 18 | 18 | ||
| 19 | DEPENDS_append_libc-musl = " argp-standalone" | ||
| 20 | |||
| 19 | SRC_URI = "https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_${PV}.tar.xz" | 21 | SRC_URI = "https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_${PV}.tar.xz" |
| 22 | SRC_URI_append_libc-musl = " file://0001-Makefile.am-Add-arg-parse-library-for-MUSL-support.patch" | ||
| 23 | |||
| 20 | SRC_URI[md5sum] = "306d20b43da847812af4bf973f46045d" | 24 | SRC_URI[md5sum] = "306d20b43da847812af4bf973f46045d" |
| 21 | SRC_URI[sha256sum] = "8f94ec73f5d4d1a6801aaa894fa1c6544d9b27aec16e1a00e18e8241c7e0f6ba" | 25 | SRC_URI[sha256sum] = "8f94ec73f5d4d1a6801aaa894fa1c6544d9b27aec16e1a00e18e8241c7e0f6ba" |
| 22 | 26 | ||
