* [PATCHv2 1/3] acpica: correct flex/bison deps, add explicit m4-native dep
@ 2019-11-26 18:08 Christopher Larson
2019-11-26 18:08 ` [PATCHv2 2/3] dosfstools: fix CP437 error from `dosfsck -l` Christopher Larson
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Christopher Larson @ 2019-11-26 18:08 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
This project doesn't require target flex or bison, just the natives,
and it uses m4 explicitly in its configuration.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-extended/acpica/acpica_20191018.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/acpica/acpica_20191018.bb b/meta/recipes-extended/acpica/acpica_20191018.bb
index 4692275762b..04732bbfe3f 100644
--- a/meta/recipes-extended/acpica/acpica_20191018.bb
+++ b/meta/recipes-extended/acpica/acpica_20191018.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;
COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
-DEPENDS = "bison flex bison-native"
+DEPENDS = "m4-native flex-native bison-native"
SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz"
SRC_URI[md5sum] = "539a0252bcb42c383ceeaeb12ae9a60d"
--
2.11.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCHv2 2/3] dosfstools: fix CP437 error from `dosfsck -l`
2019-11-26 18:08 [PATCHv2 1/3] acpica: correct flex/bison deps, add explicit m4-native dep Christopher Larson
@ 2019-11-26 18:08 ` Christopher Larson
2019-11-26 18:08 ` [PATCHv2 3/3] libcap-ng: add pthread library if header is found Christopher Larson
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Christopher Larson @ 2019-11-26 18:08 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Fix this error seen when using dosfsck -l to list fs contents:
CP437: Invalid argument
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-devtools/dosfstools/dosfstools_4.1.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb b/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb
index 69aa81af44f..23b88366705 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb
+++ b/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb
@@ -23,3 +23,6 @@ EXTRA_OECONF = "--without-udev --enable-compat-symlinks"
CFLAGS += "-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
BBCLASSEXTEND = "native"
+
+# Add codepage437 to avoid error from `dosfsck -l`
+RRECOMMENDS_${PN}_append_libc-glibc = " glibc-gconv-ibm437"
--
2.11.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCHv2 3/3] libcap-ng: add pthread library if header is found
2019-11-26 18:08 [PATCHv2 1/3] acpica: correct flex/bison deps, add explicit m4-native dep Christopher Larson
2019-11-26 18:08 ` [PATCHv2 2/3] dosfstools: fix CP437 error from `dosfsck -l` Christopher Larson
@ 2019-11-26 18:08 ` Christopher Larson
2019-11-26 18:23 ` [PATCHv2 1/3] acpica: correct flex/bison deps, add explicit m4-native dep Khem Raj
2019-11-26 18:32 ` ✗ patchtest: failure for "[v2] acpica: correct flex/biso..." and 2 more Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Christopher Larson @ 2019-11-26 18:08 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
If the pthread.h header is found, make sure library containing
"pthread_atfork" is added to the list of libraries against which to
link. On some hosts (e.g. openSUSE 15.1) "-lpthread" needs to be
explicitly added in order for the code to compile correctly.
We already had a workaround for this for native builds, but using some
external toolchains, we can be bit by this for the target recipe as
well.
Most of this is courtesy Trevor Woerner <twoerner@gmail.com>, via his
patch at stevegrubb/libcap-ng#10, the last thanks to Khem Raj.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-support/libcap-ng/libcap-ng.inc | 2 ++
| 30 ++++++++++++++++++++++
...ap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch | 24 +++++++++++++++++
meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb | 1 -
4 files changed, 56 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-support/libcap-ng/libcap-ng/0001-configure.ac-add-library-if-header-found.patch
create mode 100644 meta/recipes-support/libcap-ng/libcap-ng/0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch
diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc
index aec83896e4d..002915ad48b 100644
--- a/meta/recipes-support/libcap-ng/libcap-ng.inc
+++ b/meta/recipes-support/libcap-ng/libcap-ng.inc
@@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \
file://python.patch \
+ file://0001-configure.ac-add-library-if-header-found.patch \
+ file://0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch \
"
SRC_URI[md5sum] = "57dc267e2949cdecb651a929f9206572"
--git a/meta/recipes-support/libcap-ng/libcap-ng/0001-configure.ac-add-library-if-header-found.patch b/meta/recipes-support/libcap-ng/libcap-ng/0001-configure.ac-add-library-if-header-found.patch
new file mode 100644
index 00000000000..0fcb032f903
--- /dev/null
+++ b/meta/recipes-support/libcap-ng/libcap-ng/0001-configure.ac-add-library-if-header-found.patch
@@ -0,0 +1,30 @@
+From 0230e2e374bb71aed0181ccd9ebd13c0c5125a5d Mon Sep 17 00:00:00 2001
+From: Trevor Woerner <twoerner@gmail.com>
+Date: Fri, 25 Oct 2019 17:01:20 -0400
+Subject: [PATCH] configure.ac: add library if header found
+
+If the pthread.h header is found, make sure library containing
+"pthread_atfork" is added to the list of libraries against which to link.
+On some hosts (e.g. openSUSE 15.1) "-lpthread" needs to be explicitly added
+in order for the code to compile correctly.
+
+Signed-off-by: Trevor Woerner <twoerner@gmail.com>
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 63088f4..639b464 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,7 +56,9 @@ AC_CHECK_HEADERS(sys/xattr.h, [], [
+ AC_CHECK_HEADERS(attr/xattr.h, [], [AC_MSG_WARN(attr/xattr.h not found, disabling file system capabilities.)])
+ ])
+ AC_CHECK_HEADERS(linux/securebits.h, [], [])
+-AC_CHECK_HEADERS(pthread.h, [], [AC_MSG_WARN(pthread.h not found, disabling pthread_atfork.)])
++AC_CHECK_HEADERS(pthread.h,
++ [AC_SEARCH_LIBS(pthread_atfork, pthread)],
++ [AC_MSG_WARN(pthread.h not found, disabling pthread_atfork.)])
+
+ AC_C_CONST
+ AC_C_INLINE
diff --git a/meta/recipes-support/libcap-ng/libcap-ng/0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch b/meta/recipes-support/libcap-ng/libcap-ng/0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch
new file mode 100644
index 00000000000..7eb950f159c
--- /dev/null
+++ b/meta/recipes-support/libcap-ng/libcap-ng/0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch
@@ -0,0 +1,24 @@
+From d95c4018ad57c37f6272dbedfa5217776567c329 Mon Sep 17 00:00:00 2001
+From: Christopher Larson <chris_larson@mentor.com>
+Date: Tue, 26 Nov 2019 22:34:34 +0500
+Subject: [PATCH] Wrap pthread_atfork usage in HAVE_PTHREAD_H
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+---
+ src/cap-ng.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/cap-ng.c b/src/cap-ng.c
+index 35fcd7a..97a3dbd 100644
+--- a/src/cap-ng.c
++++ b/src/cap-ng.c
+@@ -166,7 +166,9 @@ static void deinit(void)
+ static void init_lib(void) __attribute__ ((constructor));
+ static void init_lib(void)
+ {
++#ifdef HAVE_PTHREAD_H
+ pthread_atfork(NULL, NULL, deinit);
++#endif
+ }
+
+ static void init(void)
diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb
index a9a046571fa..6e6de454940 100644
--- a/meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb
+++ b/meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb
@@ -3,7 +3,6 @@ require libcap-ng.inc
inherit lib_package autotools
EXTRA_OECONF += "--without-python --without-python3"
-LDFLAGS_append_class-native = " -pthread"
BBCLASSEXTEND = "native nativesdk"
--
2.11.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCHv2 1/3] acpica: correct flex/bison deps, add explicit m4-native dep
2019-11-26 18:08 [PATCHv2 1/3] acpica: correct flex/bison deps, add explicit m4-native dep Christopher Larson
2019-11-26 18:08 ` [PATCHv2 2/3] dosfstools: fix CP437 error from `dosfsck -l` Christopher Larson
2019-11-26 18:08 ` [PATCHv2 3/3] libcap-ng: add pthread library if header is found Christopher Larson
@ 2019-11-26 18:23 ` Khem Raj
2019-11-26 18:32 ` ✗ patchtest: failure for "[v2] acpica: correct flex/biso..." and 2 more Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Khem Raj @ 2019-11-26 18:23 UTC (permalink / raw)
To: Christopher Larson, openembedded-core; +Cc: Christopher Larson
this patchset looks good to me.
On Tue, 2019-11-26 at 23:08 +0500, Christopher Larson wrote:
> From: Christopher Larson <chris_larson@mentor.com>
>
> This project doesn't require target flex or bison, just the natives,
> and it uses m4 explicitly in its configuration.
>
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> ---
> meta/recipes-extended/acpica/acpica_20191018.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-extended/acpica/acpica_20191018.bb
> b/meta/recipes-extended/acpica/acpica_20191018.bb
> index 4692275762b..04732bbfe3f 100644
> --- a/meta/recipes-extended/acpica/acpica_20191018.bb
> +++ b/meta/recipes-extended/acpica/acpica_20191018.bb
> @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "
> file://source/compiler/aslcompile.c;beginline=7;endline=150;
>
> COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
>
> -DEPENDS = "bison flex bison-native"
> +DEPENDS = "m4-native flex-native bison-native"
>
> SRC_URI = "
> https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz"
> SRC_URI[md5sum] = "539a0252bcb42c383ceeaeb12ae9a60d"
> --
> 2.11.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* ✗ patchtest: failure for "[v2] acpica: correct flex/biso..." and 2 more
2019-11-26 18:08 [PATCHv2 1/3] acpica: correct flex/bison deps, add explicit m4-native dep Christopher Larson
` (2 preceding siblings ...)
2019-11-26 18:23 ` [PATCHv2 1/3] acpica: correct flex/bison deps, add explicit m4-native dep Khem Raj
@ 2019-11-26 18:32 ` Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2019-11-26 18:32 UTC (permalink / raw)
To: Christopher Larson; +Cc: openembedded-core
== Series Details ==
Series: "[v2] acpica: correct flex/biso..." and 2 more
Revision: 1
URL : https://patchwork.openembedded.org/series/21359/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:
* Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format]
Suggested fix Add Upstream-Status: <Valid status> to the header of meta/recipes-support/libcap-ng/libcap-ng/0001-configure.ac-add-library-if-header-found.patch
Standard format Upstream-Status: <Valid status>
Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]
If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-11-26 18:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-26 18:08 [PATCHv2 1/3] acpica: correct flex/bison deps, add explicit m4-native dep Christopher Larson
2019-11-26 18:08 ` [PATCHv2 2/3] dosfstools: fix CP437 error from `dosfsck -l` Christopher Larson
2019-11-26 18:08 ` [PATCHv2 3/3] libcap-ng: add pthread library if header is found Christopher Larson
2019-11-26 18:23 ` [PATCHv2 1/3] acpica: correct flex/bison deps, add explicit m4-native dep Khem Raj
2019-11-26 18:32 ` ✗ patchtest: failure for "[v2] acpica: correct flex/biso..." and 2 more Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox