libexecinfo: Move it to the core
PATCH v3 1/2 libexecinfo: Move it to the core
Move the libexecinfo recipe from meta-openembedded to meta-oe.
The motivation for doing this is building mtd-utils 2.3.0 with musl.
Musl requires an external libexecinfo to provide backtrace support.
---
Changes since v2:
- Use Upstream-Status: Inactive-Upstream. (Alexander)
meta/conf/distro/include/maintainers.inc | 1 + .../0001-makefile-Fix-build-on-linux.patch | 60 ++++++++++++++ ...piler-errors-found-with-newer-gcc-cl.patch | 79 +++++++++++++++++++ meta/recipes-core/musl/libexecinfo_1.1.bb | 30 +++++++ 4 files changed, 170 insertions(+) create mode 100644 meta/recipes-core/musl/libexecinfo/0001-makefile-Fix-build-on-linux.patch create mode 100644 meta/recipes-core/musl/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch create mode 100644 meta/recipes-core/musl/libexecinfo_1.1.bb
meta/conf/distro/include/maintainers.inc +1 -0
@@ -333,6 +333,7 @@ RECIPE_MAINTAINER:pn-libepoxy = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-liberation-fonts = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libevdev = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-libevent = "Anuj Mittal <[email protected]>" +RECIPE_MAINTAINER:pn-libexecinfo = "Khem Raj <[email protected]>" RECIPE_MAINTAINER:pn-libexif = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libfakekey = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libffi = "Unassigned <[email protected]>"
meta/recipes-core/musl/libexecinfo/0001-makefile-Fix-build-on-linux.patch new file +60 -0
60 lines not on this page · raw message
meta/recipes-core/musl/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch new file +79 -0
79 lines not on this page · raw message
meta/recipes-core/musl/libexecinfo_1.1.bb new file +30 -0
@@ -0,0 +1,30 @@ +# Copyright (C) 2017 Khem Raj <[email protected]> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Library for inspecting program's backtrace" +DESCRIPTION = "A quick-n-dirty BSD licensed clone of the GNU libc backtrace facility." +HOMEPAGE = "http://www.freshports.org/devel/libexecinfo" +LIC_FILES_CHKSUM = "file://execinfo.c;endline=25;md5=85bd3fa4ea9acae5182e29db063fe2e5" +LICENSE = "BSD-2-Clause" +SECTION = "libs" +DEPENDS = "" + +SRC_URI = "http://distcache.freebsd.org/local-distfiles/itetcu/${BP}.tar.bz2 \ + file://0001-makefile-Fix-build-on-linux.patch \ + file://0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch \ + " +SRC_URI[sha256sum] = "c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f" + +CFLAGS += "-fno-omit-frame-pointer -D_GNU_SOURCE" + +do_install() { + install -D -m 0744 ${S}/execinfo.h ${D}${includedir}/execinfo.h + install -D -m 0744 ${S}/stacktraverse.h ${D}${includedir}/stacktraverse.h + install -D -m 0744 ${B}/libexecinfo.a ${D}${libdir}/libexecinfo.a + install -D -m 0755 ${B}/libexecinfo.so.1 ${D}${libdir}/libexecinfo.so.1 + ln -s libexecinfo.so.1 ${D}${libdir}/libexecinfo.so +} +# +# We will skip parsing for non-musl systems +# +COMPATIBLE_HOST = ".*-musl.*"
Signature · 1 line
2.40.1
PATCH v3 2/2 mtd-utils: Upgrade to 2.3.0
From: Fabio Estevam <[email protected]>
Upgrade to mtd-utils 2.3.0.
Details about the 2.3.0 release:
https://lore.kernel.org/linux-mtd/[email protected]/T/#u
---
Changes since v2:
- Use v4 of the series submitted to linux-mtd kernel mailing list.
...-ubifs-utils-ubifs.h-Include-fcntl.h.patch | 53 ++++++++++++++++++
...ifs-utils-journal-Include-sys-stat.h.patch | 41 ++++++++++++++
...d-a-check-for-execinfo-and-backtrace.patch | 54 +++++++++++++++++++
...extract_files-Include-linux-limits.h.patch | 41 ++++++++++++++
...{mtd-utils_2.2.1.bb => mtd-utils_2.3.0.bb} | 11 +++-
5 files changed, 199 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-devtools/mtd/files/0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch
create mode 100644 meta/recipes-devtools/mtd/files/0002-ubifs-utils-journal-Include-sys-stat.h.patch
create mode 100644 meta/recipes-devtools/mtd/files/0003-configure.ac-Add-a-check-for-execinfo-and-backtrace.patch
create mode 100644 meta/recipes-devtools/mtd/files/0004-ubifs-utils-extract_files-Include-linux-limits.h.patch
rename meta/recipes-devtools/mtd/{mtd-utils_2.2.1.bb => mtd-utils_2.3.0.bb} (89%)meta/recipes-devtools/mtd/files/0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch new file +53 -0
@@ -0,0 +1,53 @@ +From 2fc872697f72214e1e3efc6c2523e374fa5d681d Mon Sep 17 00:00:00 2001 +From: Fabio Estevam <[email protected]> +Date: Mon, 17 Feb 2025 16:02:04 -0300 +Subject: [PATCH v4 mtd-utils 1/4] ubifs-utils: ubifs.h: Include <fcntl.h> + +Include the <fcntl.h> header file to fix the following error +when building with musl: + +| In file included from ../git/ubifs-utils/common/compr.c:42: +| ../git/ubifs-utils/libubifs/ubifs.h:313:9: error: unknown type name 'loff_t'; did you mean 'off_t'? +| 313 | loff_t ui_size; +| | ^~~~~~ +| | off_t +| ../git/ubifs-utils/libubifs/ubifs.h:1341:9: error: unknown type name 'loff_t'; did you mean 'off_t'? +| 1341 | loff_t i_size; +| | ^~~~~~ +| | off_t +| ../git/ubifs-utils/libubifs/ubifs.h:1342:9: error: unknown type name 'loff_t'; did you mean 'off_t'? +| 1342 | loff_t d_size; +| | ^~~~~~ +| | off_t +| ../git/ubifs-utils/libubifs/ubifs.h:1899:44: error: unknown type name 'loff_t'; did you mean 'off_t'? +| 1899 | int deletion, loff_t new_size); +| | ^~~~~~ +| | off_t +| make: *** [Makefile:4878: ubifs-utils/common/mkfs_ubifs-compr.o] Error 1 + +Upstream-Status: Submitted [https://lore.kernel.org/linux-mtd/[email protected]/T/#t] +Signed-off-by: Fabio Estevam <[email protected]> +Reviewed-by: Zhihao Cheng <[email protected]> +Reviewed-by: Khem Raj <[email protected]> +--- +Changes since v3: +- Removed Upstream-Status tag. + + ubifs-utils/libubifs/ubifs.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ubifs-utils/libubifs/ubifs.h b/ubifs-utils/libubifs/ubifs.h +index 0908a2289208..1c7bc7bd0c80 100644 +--- a/ubifs-utils/libubifs/ubifs.h ++++ b/ubifs-utils/libubifs/ubifs.h +@@ -11,6 +11,7 @@ + #ifndef __UBIFS_H__ + #define __UBIFS_H__ + ++#include <fcntl.h> + #include <string.h> + + #include "linux_types.h" +-- +2.34.1 +
meta/recipes-devtools/mtd/files/0002-ubifs-utils-journal-Include-sys-stat.h.patch new file +41 -0
41 lines not on this page · raw message
meta/recipes-devtools/mtd/files/0003-configure.ac-Add-a-check-for-execinfo-and-backtrace.patch new file +54 -0
54 lines not on this page · raw message
meta/recipes-devtools/mtd/files/0004-ubifs-utils-extract_files-Include-linux-limits.h.patch new file +41 -0
41 lines not on this page · raw message
meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb renamed from meta/recipes-devtools/mtd/mtd-utils_2.2.1.bb +10 -1
@@ -11,8 +11,15 @@ inherit autotools pkgconfig update-alternatives DEPENDS = "zlib e2fsprogs util-linux" RDEPENDS:mtd-utils-tests += "bash" -SRCREV = "13ec33609213c1dbd75852a09560a707a7f19a5c" +DEPENDS:append:libc-musl = " libexecinfo" +LDFLAGS:append:libc-musl = " -lexecinfo" + +SRCREV = "4594fc1f4496a0ed55cabd31fbeba4e3fbf05602" SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master" +SRC_URI += "file://0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch" +SRC_URI += "file://0002-ubifs-utils-journal-Include-sys-stat.h.patch" +SRC_URI += "file://0003-configure.ac-Add-a-check-for-execinfo-and-backtrace.patch" +SRC_URI += "file://0004-ubifs-utils-extract_files-Include-linux-limits.h.patch" S = "${WORKDIR}/git"
@@ -31,6 +38,8 @@ CPPFLAGS:append:riscv64 = " -pthread -D_REENTRANT" EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'" +CFLAGS += "-D_GNU_SOURCE" + # Use higher priority than corresponding BusyBox-provided applets ALTERNATIVE_PRIORITY = "100"
Signature · 1 line
2.40.1
Re: [PATCH v3 2/2] mtd-utils: Upgrade to 2.3.0
LGTM
Quoted 275 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Upgrade to mtd-utils 2.3.0.
Details about the 2.3.0 release:
https://lore.kernel.org/linux-mtd/[email protected]/T/#u
Signed-off-by Fabio Estevam <[email protected]>---
Changes since v2:
- Use v4 of the series submitted to linux-mtd kernel mailing list....-ubifs-utils-ubifs.h-Include-fcntl.h.patch | 53 ++++++++++++++++++ ...ifs-utils-journal-Include-sys-stat.h.patch | 41 ++++++++++++++ ...d-a-check-for-execinfo-and-backtrace.patch | 54 +++++++++++++++++++ ...extract_files-Include-linux-limits.h.patch | 41 ++++++++++++++ ...{mtd-utils_2.2.1.bb => mtd-utils_2.3.0.bb} | 11 +++- 5 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/mtd/files/0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch create mode 100644 meta/recipes-devtools/mtd/files/0002-ubifs-utils-journal-Include-sys-stat.h.patch create mode 100644 meta/recipes-devtools/mtd/files/0003-configure.ac-Add-a-check-for-execinfo-and-backtrace.patch create mode 100644 meta/recipes-devtools/mtd/files/0004-ubifs-utils-extract_files-Include-linux-limits.h.patch rename meta/recipes-devtools/mtd/{mtd-utils_2.2.1.bb => mtd-utils_2.3.0.bb} (89%)meta/recipes-devtools/mtd/files/0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch new file +53
-0@@ -0,0 +1,53 @@ +From 2fc872697f72214e1e3efc6c2523e374fa5d681d Mon Sep 17 00:00:00 2001 +From: Fabio Estevam <[email protected]> +Date: Mon, 17 Feb 2025 16:02:04 -0300 +Subject: [PATCH v4 mtd-utils 1/4] ubifs-utils: ubifs.h: Include <fcntl.h> + +Include the <fcntl.h> header file to fix the following error +when building with musl: + +| In file included from ../git/ubifs-utils/common/compr.c:42: +| ../git/ubifs-utils/libubifs/ubifs.h:313:9: error: unknown type name 'loff_t'; did you mean 'off_t'? +| 313 | loff_t ui_size; +| | ^~~~~~ +| | off_t +| ../git/ubifs-utils/libubifs/ubifs.h:1341:9: error: unknown type name 'loff_t'; did you mean 'off_t'? +| 1341 | loff_t i_size; +| | ^~~~~~ +| | off_t +| ../git/ubifs-utils/libubifs/ubifs.h:1342:9: error: unknown type name 'loff_t'; did you mean 'off_t'? +| 1342 | loff_t d_size; +| | ^~~~~~ +| | off_t +| ../git/ubifs-utils/libubifs/ubifs.h:1899:44: error: unknown type name 'loff_t'; did you mean 'off_t'? +| 1899 | int deletion, loff_t new_size); +| | ^~~~~~ +| | off_t +| make: *** [Makefile:4878: ubifs-utils/common/mkfs_ubifs-compr.o] Error 1 + +Upstream-Status: Submitted [https://lore.kernel.org/linux-mtd/[email protected]/T/#t] +Signed-off-by: Fabio Estevam <[email protected]> +Reviewed-by: Zhihao Cheng <[email protected]> +Reviewed-by: Khem Raj <[email protected]> +--- +Changes since v3: +- Removed Upstream-Status tag. + + ubifs-utils/libubifs/ubifs.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ubifs-utils/libubifs/ubifs.h b/ubifs-utils/libubifs/ubifs.h +index 0908a2289208..1c7bc7bd0c80 100644 +--- a/ubifs-utils/libubifs/ubifs.h ++++ b/ubifs-utils/libubifs/ubifs.h +@@ -11,6 +11,7 @@ + #ifndef __UBIFS_H__ + #define __UBIFS_H__ + ++#include <fcntl.h> + #include <string.h> + + #include "linux_types.h" +-- +2.34.1 +meta/recipes-devtools/mtd/files/0002-ubifs-utils-journal-Include-sys-stat.h.patch new file +41
-0@@ -0,0 +1,41 @@ +From 65077d8d664821e323d011956049c1c1b97d9560 Mon Sep 17 00:00:00 2001 +From: Fabio Estevam <[email protected]> +Date: Mon, 17 Feb 2025 16:07:49 -0300 +Subject: [PATCH v4 mtd-utils 2/4] ubifs-utils: journal: Include <sys/stat.h> + +Include the <sys/stat.h> header file to fix the following error +when building with musl: + +| ../git/ubifs-utils/libubifs/journal.c: In function 'ubifs_get_dent_type': +| ../git/ubifs-utils/libubifs/journal.c:414:24: error: 'S_IFMT' undeclared (first use in this function) +| 414 | switch (mode & S_IFMT) { +| | ^~~~~~ +| ../git/ubifs-utils/libubifs/journal.c:414:24: note: each undeclared identifier is reported only once for each function it appears in +| ../git/ubifs-utils/libubifs/journal.c:415:14: error: 'S_IFREG' undeclared (first use in this function) +| 415 | case S_IFREG: + +Upstream-Status: Submitted [https://lore.kernel.org/linux-mtd/[email protected]/T/#t] +Signed-off-by: Fabio Estevam <[email protected]> +Reviewed-by: Zhihao Cheng <[email protected]> +--- +Changes since v3: +- Removed Upstream-Status tag. + + ubifs-utils/libubifs/journal.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ubifs-utils/libubifs/journal.c b/ubifs-utils/libubifs/journal.c +index e78ea14f3e69..45d82fd54bdb 100644 +--- a/ubifs-utils/libubifs/journal.c ++++ b/ubifs-utils/libubifs/journal.c +@@ -46,6 +46,7 @@ + * all the nodes. + */ + ++#include <sys/stat.h> + #include "bitops.h" + #include "kmem.h" + #include "ubifs.h" +-- +2.34.1 +meta/recipes-devtools/mtd/files/0003-configure.ac-Add-a-check-for-execinfo-and-backtrace.patch new file +54
-0@@ -0,0 +1,54 @@ +From 8503bc3de0d3ff016caa715716578a3be3698548 Mon Sep 17 00:00:00 2001 +From: Fabio Estevam <[email protected]> +Date: Tue, 18 Feb 2025 18:25:56 -0300 +Subject: [PATCH v4 mtd-utils 3/4] configure.ac: Add a check for execinfo and backtrace + +musl relies on an external execinfo library to provide backtrace +functionality. If musl cannot link to libexecinfo, the following link +error happens: + +| /work/festevam/oe/poky/build/tmp/work/core2-64-poky-linux-musl/mtd-utils/2.3.0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/14.2.0/ld: ubifs-utils/libubifs/mkfs_ubifs-io.o: in function `dump_stack': +| /usr/src/debug/mtd-utils/2.3.0/ubifs-utils/common/defs.h:71:(.text+0x25): undefined reference to `backtrace' +.... +| collect2: error: ld returned 1 exit status +| make: *** [Makefile:2959: mkfs.ubifs] Error 1 + +Fix the problem by checking for backtrace support in libc first and if not +found, then check for backtrace support in the external libexecinfo. + +Upstream-Status: Submitted [https://lore.kernel.org/linux-mtd/[email protected]/T/#t] +Signed-off-by: Fabio Estevam <[email protected]> +Suggested-by: Khem Raj <[email protected]> +Reviewed-by: Zhihao Cheng <[email protected]> +--- +Change since v3: +- None. + + configure.ac | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 2a79ba820fc0..296901e61760 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -238,6 +238,17 @@ if test "x$need_cmocka" = "xyes"; then + PKG_CHECK_MODULES(CMOCKA, [cmocka], [], [cmocka_missing="yes"]) + fi + ++AC_CHECK_FUNC([backtrace], [have_backtrace=yes], [have_backtrace=no]) ++ ++if test "x$have_backtrace" = "xno"; then ++ AC_CHECK_LIB([execinfo], [backtrace], ++ [LIBS="$LIBS -lexecinfo" ++ AC_DEFINE([HAVE_BACKTRACE], [1], [backtrace is available via libexecinfo])], ++ [AC_MSG_WARN([backtrace support not found])]) ++else ++ AC_DEFINE([HAVE_BACKTRACE], [1], [backtrace is available via libc]) ++fi ++ + AC_CHECK_HEADERS([execinfo.h]) + + ##### produce summary on dependencies ##### +-- +2.34.1 +meta/recipes-devtools/mtd/files/0004-ubifs-utils-extract_files-Include-linux-limits.h.patch new file +41
-0@@ -0,0 +1,41 @@ +From f218be1ce0c8923d690221160a3dd9f1492acaf1 Mon Sep 17 00:00:00 2001 +From: Fabio Estevam <[email protected]> +Date: Tue, 18 Feb 2025 08:17:30 -0300 +Subject: [PATCH v4 mtd-utils 4/4] ubifs-utils: extract_files: Include <linux/limits.h> + +Include <linux/limits.h> to fix the following build error when building +with musl: + +| ../git/ubifs-utils/fsck.ubifs/extract_files.c: In function 'parse_ino_node': +| ../git/ubifs-utils/fsck.ubifs/extract_files.c:144:47: error: 'XATTR_LIST_MAX' undeclared (first use in this function) +| 144 | if (ino_node->xnms + ino_node->xcnt > XATTR_LIST_MAX) { +| | ^~~~~~~~~~~~~~ +| ../git/ubifs-utils/fsck.ubifs/extract_files.c:144:47: note: each undeclared identifier is reported only once for each function it appears in +| make: *** [Makefile:4374: ubifs-utils/fsck.ubifs/fsck_ubifs-extract_files.o] Error 1 + +Upstream-Status: Submitted [https://lore.kernel.org/linux-mtd/[email protected]/T/#t] +Signed-off-by: Fabio Estevam <[email protected]> +Reviewed-by: Zhihao Cheng <[email protected]> +--- +Changes since v3: +- None. + + ubifs-utils/fsck.ubifs/extract_files.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ubifs-utils/fsck.ubifs/extract_files.c b/ubifs-utils/fsck.ubifs/extract_files.c +index c83d37749bc0..000ef5d10565 100644 +--- a/ubifs-utils/fsck.ubifs/extract_files.c ++++ b/ubifs-utils/fsck.ubifs/extract_files.c +@@ -10,6 +10,8 @@ + #include <getopt.h> + #include <sys/stat.h> + ++#include <linux/limits.h> ++ + #include "linux_err.h" + #include "bitops.h" + #include "kmem.h" +-- +2.34.1 +meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb renamed from meta/recipes-devtools/mtd/mtd-utils_2.2.1.bb +10
-2@@ -11,8 +11,15 @@ inherit autotools pkgconfig update-alternatives DEPENDS = "zlib e2fsprogs util-linux" RDEPENDS:mtd-utils-tests += "bash" -SRCREV = "13ec33609213c1dbd75852a09560a707a7f19a5c" +DEPENDS:append:libc-musl = " libexecinfo" +LDFLAGS:append:libc-musl = " -lexecinfo" + +SRCREV = "4594fc1f4496a0ed55cabd31fbeba4e3fbf05602" SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master" +SRC_URI += "file://0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch" +SRC_URI += "file://0002-ubifs-utils-journal-Include-sys-stat.h.patch" +SRC_URI += "file://0003-configure.ac-Add-a-check-for-execinfo-and-backtrace.patch" +SRC_URI += "file://0004-ubifs-utils-extract_files-Include-linux-limits.h.patch" S = "${WORKDIR}/git"@@ -31,6 +38,8 @@ CPPFLAGS:append:riscv64 = " -pthread -D_REENTRANT" EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'" +CFLAGS += "-D_GNU_SOURCE" + # Use higher priority than corresponding BusyBox-provided applets ALTERNATIVE_PRIORITY = "100" --2.40.1
Re: [OE-core] [PATCH v3 2/2] mtd-utils: Upgrade to 2.3.0
In reply to Fabio EstevamReview
Quoted 3 lines · Fabio Estevam via lists.openembedded.org
(quoted diff) +2
-0+DEPENDS:append:libc-musl = " libexecinfo" +LDFLAGS:append:libc-musl = " -lexecinfo”
We already have a gcompat recipe in core which provides this:
https://git.adelielinux.org/adelie/gcompat/-/blob/current/libgcompat/execinfo.c?ref_type=heads
Would this be better than another recipe for the same code?
Ross
Re: [OE-core] [PATCH v3 2/2] mtd-utils: Upgrade to 2.3.0
Quoted 10 lines · Ross Burton
Review
Quoted 3 lines · Fabio Estevam via lists.openembedded.org
(quoted diff) +2
-0+DEPENDS:append:libc-musl = " libexecinfo" +LDFLAGS:append:libc-musl = " -lexecinfo”We already have a gcompat recipe in core which provides this:
https://git.adelielinux.org/adelie/gcompat/-/blob/current/libgcompat/execinfo.c?ref_type=heads
Would this be better than another recipe for the same code?
gcompat's goal is to run binaries pre-built for glibc on a musl system. So it provides the API implementations but do not provide headers to export them to be used for building the packages, which is expected.
libexecinfo is development library and header package.
HTH
Quoted 2 lines
Ross
Re: [OE-core] [PATCH v3 2/2] mtd-utils: Upgrade to 2.3.0
In reply to Fabio EstevamQuoted 7 lines · Fabio Estevam via lists.openembedded.org
meta/recipes-devtools/mtd/files/0003-configure.ac-Add-a-check-for-execinfo-and-backtrace.patch new file +4
-0+Subject: [PATCH v4 mtd-utils 3/4] configure.ac: Add a check for execinfo and backtrace + +musl relies on an external execinfo library to provide backtrace +functionality. If musl cannot link to libexecinfo, the following link
meta/recipes-devtools/mtd/files/0003-configure.ac-Add-a-check-for-execinfo-and-backtrace.patch line 17
Quoted 10 lines
meta/recipes-devtools/mtd/files/0003-configure.ac-Add-a-check-for-execinfo-and-backtrace.patch new file +10
-0+error happens: + +| /work/festevam/oe/poky/build/tmp/work/core2-64-poky-linux-musl/mtd-utils/2.3.0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/14.2.0/ld: ubifs-utils/libubifs/mkfs_ubifs-io.o: in function `dump_stack': +| /usr/src/debug/mtd-utils/2.3.0/ubifs-utils/common/defs.h:71:(.text+0x25): undefined reference to `backtrace' +.... +| collect2: error: ld returned 1 exit status +| make: *** [Makefile:2959: mkfs.ubifs] Error 1 + +Fix the problem by checking for backtrace support in libc first and if not +found, then check for backtrace support in the external libexecinfo.
mtd-utils already has a stub implementation of backtrace() for when a libc with execinfo.h is being used, the unifs-utils just need to actually use it. Alternatively, if the answer is to rely on an external libexecinfo, then the stubs should be removed.
I’ve just sent a patch upstream that uses the stub, let’s discuss there what direction is best so we don’t end up carrying surplus patches.
Ross
Re: [OE-core] [PATCH v3 2/2] mtd-utils: Upgrade to 2.3.0
Quoted 24 lines · Ross Burton via lists.openembedded.org
Quoted 8 lines · Fabio Estevam via lists.openembedded.org
meta/recipes-devtools/mtd/files/0003-configure.ac-Add-a-check-for-execinfo-and-backtrace.patch new file +4
-0+Subject: [PATCH v4 mtd-utils 3/4] configure.ac: Add a check for execinfo and backtrace + +musl relies on an external execinfo library to provide backtrace +functionality. If musl cannot link to libexecinfo, the following linkmeta/recipes-devtools/mtd/files/0003-configure.ac-Add-a-check-for-execinfo-and-backtrace.patch line 17
Quoted 10 lines
meta/recipes-devtools/mtd/files/0003-configure.ac-Add-a-check-for-execinfo-and-backtrace.patch new file +10
-0+error happens: + +| /work/festevam/oe/poky/build/tmp/work/core2-64-poky-linux-musl/mtd-utils/2.3.0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/14.2.0/ld: ubifs-utils/libubifs/mkfs_ubifs-io.o: in function `dump_stack': +| /usr/src/debug/mtd-utils/2.3.0/ubifs-utils/common/defs.h:71:(.text+0x25): undefined reference to `backtrace' +.... +| collect2: error: ld returned 1 exit status +| make: *** [Makefile:2959: mkfs.ubifs] Error 1 + +Fix the problem by checking for backtrace support in libc first and if not +found, then check for backtrace support in the external libexecinfo.mtd-utils already has a stub implementation of
backtrace()for when a libc withexecinfo.his being used, the unifs-utils just need to actually use it. Alternatively, if the answer is to rely on an external libexecinfo, then the stubs should be removed.
Quoted 1 line
I’ve just sent a patch upstream that uses the stub, let’s discuss there what direction is best so we don’t end up carrying surplus patches.
Update: the patch I posted is https://lore.kernel.org/linux-mtd/[email protected]/ and it’s been getting positive feedback, so hopefully it will be merged soon.
Ross
Re: [OE-core] [PATCH v3 2/2] mtd-utils: Upgrade to 2.3.0
Hi Ross,
Quoted 1 line · Ross Burton
Update: the patch I posted is https://lore.kernel.org/linux-mtd/[email protected]/ and it’s been getting positive feedback, so hopefully it will be merged soon.
I like your solution too and will submit a v4 shortly.
Thanks!
LGTM
Quoted 223 lines · Fabio Estevam
Move the libexecinfo recipe from meta-openembedded to meta-oe.
The motivation for doing this is building mtd-utils 2.3.0 with musl.
Musl requires an external libexecinfo to provide backtrace support.
Signed-off-by Fabio Estevam <[email protected]>---
Changes since v2:
- Use Upstream-Status: Inactive-Upstream. (Alexander)meta/conf/distro/include/maintainers.inc | 1 + .../0001-makefile-Fix-build-on-linux.patch | 60 ++++++++++++++ ...piler-errors-found-with-newer-gcc-cl.patch | 79 +++++++++++++++++++ meta/recipes-core/musl/libexecinfo_1.1.bb | 30 +++++++ 4 files changed, 170 insertions(+) create mode 100644 meta/recipes-core/musl/libexecinfo/0001-makefile-Fix-build-on-linux.patch create mode 100644 meta/recipes-core/musl/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch create mode 100644 meta/recipes-core/musl/libexecinfo_1.1.bbmeta/conf/distro/include/maintainers.inc +1
-0@@ -333,6 +333,7 @@ RECIPE_MAINTAINER:pn-libepoxy = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-liberation-fonts = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libevdev = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER:pn-libevent = "Anuj Mittal <[email protected]>" +RECIPE_MAINTAINER:pn-libexecinfo = "Khem Raj <[email protected]>" RECIPE_MAINTAINER:pn-libexif = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libfakekey = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-libffi = "Unassigned <[email protected]>"meta/recipes-core/musl/libexecinfo/0001-makefile-Fix-build-on-linux.patch new file +60
-0@@ -0,0 +1,60 @@ +From 910bbc2cb6cc1cfa6deed9d170da02a639902c7c Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 19 Mar 2017 16:14:54 -0700 +Subject: [PATCH 1/2] makefile: Fix build on linux + +Upstream-Status: Inactive-Upstream [no update since 2017, no maintainer: https://www.freshports.org/devel/libexecinfo] +Signed-off-by: Khem Raj <[email protected]> +--- + Makefile | 33 +++++++++++++++++---------------- + 1 file changed, 17 insertions(+), 16 deletions(-) + +Index: libexecinfo-1.1/Makefile +=================================================================== +--- libexecinfo-1.1.orig/Makefile ++++ libexecinfo-1.1/Makefile +@@ -23,24 +23,25 @@ + # SUCH DAMAGE. + # + # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $ ++# ++# Linux Makefile by Matt Smith <[email protected]>, 2011/01/04 + +-LIB= execinfo +- +-SRCS= stacktraverse.c stacktraverse.h execinfo.c execinfo.h +- +-INCS= execinfo.h +- +-SHLIB_MAJOR= 1 +-SHLIB_MINOR= 0 +- +-NOPROFILE= yes +- +-DPADD= ${LIBM} +-LDADD= -lm +- +-#WARNS?= 4 +- +-#stacktraverse.c: gen.py +-# ./gen.py > stacktraverse.c ++CC?=cc ++AR?=ar ++EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -fstack-protector -c ++EXECINFO_LDFLAGS=$(LDFLAGS) ++ ++all: static dynamic ++ ++static: ++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c ++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c ++ $(AR) rcs libexecinfo.a stacktraverse.o execinfo.o ++ ++dynamic: ++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So ++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So ++ $(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 $(EXECINFO_LDFLAGS) stacktraverse.So execinfo.So + +-.include <bsd.lib.mk> ++clean: ++ rm -rf *.o *.So *.a *.someta/recipes-core/musl/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch new file +79
-0@@ -0,0 +1,79 @@ +From 0810817773fb81d7383d2fa8464244c8f79845fb Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 19 Mar 2017 16:16:18 -0700 +Subject: [PATCH 2/2] execinfo: Fix compiler errors found with newer gcc/clang + +Upstream-Status: Inactive-Upstream [no update since 2017, no maintainer: https://www.freshports.org/devel/libexecinfo] +Signed-off-by: Khem Raj <[email protected]> +--- + execinfo.c | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +diff --git a/execinfo.c b/execinfo.c +index 906fb14..9448b60 100644 +--- a/execinfo.c ++++ b/execinfo.c +@@ -69,7 +69,8 @@ backtrace(void **buffer, int size) + char ** + backtrace_symbols(void *const *buffer, int size) + { +- int i, clen, alen, offset; ++ size_t clen, alen; ++ int i, offset; + char **rval; + char *cp; + Dl_info info; +@@ -78,7 +79,6 @@ backtrace_symbols(void *const *buffer, int size) + rval = malloc(clen); + if (rval == NULL) + return NULL; +- (char **)cp = &(rval[size]); + for (i = 0; i < size; i++) { + if (dladdr(buffer[i], &info) != 0) { + if (info.dli_sname == NULL) +@@ -92,14 +92,14 @@ backtrace_symbols(void *const *buffer, int size) + 2 + /* " <" */ + strlen(info.dli_sname) + /* "function" */ + 1 + /* "+" */ +- D10(offset) + /* "offset */ ++ 10 + /* "offset */ + 5 + /* "> at " */ + strlen(info.dli_fname) + /* "filename" */ + 1; /* "\0" */ + rval = realloc_safe(rval, clen + alen); + if (rval == NULL) + return NULL; +- snprintf(cp, alen, "%p <%s+%d> at %s", ++ snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s", + buffer[i], info.dli_sname, offset, info.dli_fname); + } else { + alen = 2 + /* "0x" */ +@@ -108,12 +108,15 @@ backtrace_symbols(void *const *buffer, int size) + rval = realloc_safe(rval, clen + alen); + if (rval == NULL) + return NULL; +- snprintf(cp, alen, "%p", buffer[i]); ++ snprintf((char *) rval + clen, alen, "%p", buffer[i]); + } +- rval[i] = cp; +- cp += alen; ++ rval[i] = (char *) clen; ++ clen += alen; + } + ++ for (i = 0; i < size; i++) ++ rval[i] += (long) rval; ++ + return rval; + } + +@@ -155,6 +158,6 @@ backtrace_symbols_fd(void *const *buffer, int size, int fd) + return; + snprintf(buf, len, "%p\n", buffer[i]); + } +- write(fd, buf, len - 1); ++ write(fd, buf, strlen(buf)); + } + } +-- +2.12.0meta/recipes-core/musl/libexecinfo_1.1.bb new file +30
-1@@ -0,0 +1,30 @@ +# Copyright (C) 2017 Khem Raj <[email protected]> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Library for inspecting program's backtrace" +DESCRIPTION = "A quick-n-dirty BSD licensed clone of the GNU libc backtrace facility." +HOMEPAGE = "http://www.freshports.org/devel/libexecinfo" +LIC_FILES_CHKSUM = "file://execinfo.c;endline=25;md5=85bd3fa4ea9acae5182e29db063fe2e5" +LICENSE = "BSD-2-Clause" +SECTION = "libs" +DEPENDS = "" + +SRC_URI = "http://distcache.freebsd.org/local-distfiles/itetcu/${BP}.tar.bz2 \ + file://0001-makefile-Fix-build-on-linux.patch \ + file://0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch \ + " +SRC_URI[sha256sum] = "c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f" + +CFLAGS += "-fno-omit-frame-pointer -D_GNU_SOURCE" + +do_install() { + install -D -m 0744 ${S}/execinfo.h ${D}${includedir}/execinfo.h + install -D -m 0744 ${S}/stacktraverse.h ${D}${includedir}/stacktraverse.h + install -D -m 0744 ${B}/libexecinfo.a ${D}${libdir}/libexecinfo.a + install -D -m 0755 ${B}/libexecinfo.so.1 ${D}${libdir}/libexecinfo.so.1 + ln -s libexecinfo.so.1 ${D}${libdir}/libexecinfo.so +} +# +# We will skip parsing for non-musl systems +# +COMPATIBLE_HOST = ".*-musl.*" --2.40.1