* [OE-core] [PATCH] libcap:upgrade 2.42 -> 2.43
@ 2020-08-27 13:16 zangrc
2020-08-27 13:16 ` [OE-core] [PATCH] libcap-ng:upgrade 0.7.10 -> 0.7.11 zangrc
2020-08-27 13:16 ` [OE-core] [PATCH] libgpg-error:upgrade 1.38 -> 1.39 zangrc
0 siblings, 2 replies; 6+ messages in thread
From: zangrc @ 2020-08-27 13:16 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
meta/recipes-support/libcap/{libcap_2.42.bb => libcap_2.43.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/libcap/{libcap_2.42.bb => libcap_2.43.bb} (96%)
diff --git a/meta/recipes-support/libcap/libcap_2.42.bb b/meta/recipes-support/libcap/libcap_2.43.bb
similarity index 96%
rename from meta/recipes-support/libcap/libcap_2.42.bb
rename to meta/recipes-support/libcap/libcap_2.43.bb
index 48f8f92628..c712c25947 100644
--- a/meta/recipes-support/libcap/libcap_2.42.bb
+++ b/meta/recipes-support/libcap/libcap_2.43.bb
@@ -12,7 +12,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${
file://0002-tests-do-not-run-target-executables.patch \
file://0001-tests-do-not-statically-link-a-test.patch \
"
-SRC_URI[sha256sum] = "3605a9cb60076547ea9f64989e0ba576da9508e4653e8dc40ae54c0d6f443dfd"
+SRC_URI[sha256sum] = "512a0e5fc4c1e06d472a20da26aa96a9b9bf2a26b23f094f77f1b8da56cc427f"
UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [OE-core] [PATCH] libcap-ng:upgrade 0.7.10 -> 0.7.11 2020-08-27 13:16 [OE-core] [PATCH] libcap:upgrade 2.42 -> 2.43 zangrc @ 2020-08-27 13:16 ` zangrc 2021-02-21 5:23 ` Khem Raj 2020-08-27 13:16 ` [OE-core] [PATCH] libgpg-error:upgrade 1.38 -> 1.39 zangrc 1 sibling, 1 reply; 6+ messages in thread From: zangrc @ 2020-08-27 13:16 UTC (permalink / raw) To: openembedded-core 0001-configure.ac-add-library-if-header-found.patch 0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch Removed since these are included in 0.7.11 Refresh the following patch: python.patch Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> --- ...n_0.7.10.bb => libcap-ng-python_0.7.11.bb} | 0 meta/recipes-support/libcap-ng/libcap-ng.inc | 6 ++-- ...igure.ac-add-library-if-header-found.patch | 31 ------------------- ...hread_atfork-usage-in-HAVE_PTHREAD_H.patch | 25 --------------- .../libcap-ng/libcap-ng/python.patch | 18 +++++------ ...ibcap-ng_0.7.10.bb => libcap-ng_0.7.11.bb} | 0 6 files changed, 10 insertions(+), 70 deletions(-) rename meta/recipes-support/libcap-ng/{libcap-ng-python_0.7.10.bb => libcap-ng-python_0.7.11.bb} (100%) delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng/0001-configure.ac-add-library-if-header-found.patch delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng/0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch rename meta/recipes-support/libcap-ng/{libcap-ng_0.7.10.bb => libcap-ng_0.7.11.bb} (100%) diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.10.bb b/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.11.bb similarity index 100% rename from meta/recipes-support/libcap-ng/libcap-ng-python_0.7.10.bb rename to meta/recipes-support/libcap-ng/libcap-ng-python_0.7.11.bb diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc index 002915ad48..6d6fa644aa 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -9,11 +9,9 @@ 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" -SRC_URI[sha256sum] = "a84ca7b4e0444283ed269b7a29f5b6187f647c82e2b876636b49b9a744f0ffbf" +SRC_URI[md5sum] = "5883ed10b621c87e29a05cff36d2928e" +SRC_URI[sha256sum] = "85815c711862d01a440db471f12fba462c9949e923966f5859607e652d9c0ae9" BBCLASSEXTEND = "native nativesdk" diff --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 deleted file mode 100644 index 6b155ccea8..0000000000 --- a/meta/recipes-support/libcap-ng/libcap-ng/0001-configure.ac-add-library-if-header-found.patch +++ /dev/null @@ -1,31 +0,0 @@ -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. - -Upstream-Status: Submitted [https://github.com/stevegrubb/libcap-ng/pull/10] -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 deleted file mode 100644 index c68254ff3d..0000000000 --- a/meta/recipes-support/libcap-ng/libcap-ng/0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 - -Upstream-Status: Pending -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/python.patch b/meta/recipes-support/libcap-ng/libcap-ng/python.patch index d60a0a39b6..fcd6f9cd33 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng/python.patch +++ b/meta/recipes-support/libcap-ng/libcap-ng/python.patch @@ -1,6 +1,3 @@ -From b4a354ae8d4f7c2ec3ec421c7d8a790cc57e77a9 Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Sat, 18 Jul 2015 23:03:30 +0900 Subject: [PATCH] configure.ac - Avoid an incorrect check for python. Makefile.am - avoid hard coded host include paths. @@ -9,6 +6,8 @@ Upstream-Status: pending Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> + --- bindings/python/Makefile.am | 4 +++- configure.ac | 17 ++--------------- @@ -30,12 +29,12 @@ index 999b184..c8e49db 100644 SWIG_INCLUDES = ${AM_CPPFLAGS} pyexec_PYTHON = capng.py diff --git a/configure.ac b/configure.ac -index 7f66179..079d026 100644 +index 8b46f51..2d7e00c 100644 --- a/configure.ac +++ b/configure.ac -@@ -123,21 +123,8 @@ if test x$use_python = xno ; then - else - AC_MSG_RESULT(testing) +@@ -141,21 +141,8 @@ fi + + # Setup Python2 with the interpreter found previously. AM_PATH_PYTHON -PYINCLUDEDIR=`python${am_cv_python_version} -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"` -if test -f ${PYINCLUDEDIR}/Python.h ; then @@ -46,7 +45,7 @@ index 7f66179..079d026 100644 - AC_MSG_NOTICE(Python bindings will be built) -else - python_found="no" -- if test x$use_python = xyes ; then +- if test "x$use_python" = xyes ; then - AC_MSG_ERROR([Python explicitly requested and python headers were not found]) - else - AC_MSG_WARN("Python headers not found - python bindings will not be made") @@ -58,5 +57,4 @@ index 7f66179..079d026 100644 AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") -- -2.7.4 - +2.25.1 diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.7.11.bb similarity index 100% rename from meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb rename to meta/recipes-support/libcap-ng/libcap-ng_0.7.11.bb -- 2.25.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH] libcap-ng:upgrade 0.7.10 -> 0.7.11 2020-08-27 13:16 ` [OE-core] [PATCH] libcap-ng:upgrade 0.7.10 -> 0.7.11 zangrc @ 2021-02-21 5:23 ` Khem Raj 2021-02-21 8:00 ` Khem Raj 0 siblings, 1 reply; 6+ messages in thread From: Khem Raj @ 2021-02-21 5:23 UTC (permalink / raw) To: zangrc; +Cc: Patches and discussions about the oe-core layer seeing this failure https://errors.yoctoproject.org/Errors/Details/571958/ https://errors.yoctoproject.org/Errors/Details/571954/ On Wed, Aug 26, 2020 at 6:16 PM zangrc <zangrc.fnst@cn.fujitsu.com> wrote: > > 0001-configure.ac-add-library-if-header-found.patch > 0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch > Removed since these are included in 0.7.11 > > Refresh the following patch: > python.patch > > Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> > --- > ...n_0.7.10.bb => libcap-ng-python_0.7.11.bb} | 0 > meta/recipes-support/libcap-ng/libcap-ng.inc | 6 ++-- > ...igure.ac-add-library-if-header-found.patch | 31 ------------------- > ...hread_atfork-usage-in-HAVE_PTHREAD_H.patch | 25 --------------- > .../libcap-ng/libcap-ng/python.patch | 18 +++++------ > ...ibcap-ng_0.7.10.bb => libcap-ng_0.7.11.bb} | 0 > 6 files changed, 10 insertions(+), 70 deletions(-) > rename meta/recipes-support/libcap-ng/{libcap-ng-python_0.7.10.bb => libcap-ng-python_0.7.11.bb} (100%) > delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng/0001-configure.ac-add-library-if-header-found.patch > delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng/0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch > rename meta/recipes-support/libcap-ng/{libcap-ng_0.7.10.bb => libcap-ng_0.7.11.bb} (100%) > > diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.10.bb b/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.11.bb > similarity index 100% > rename from meta/recipes-support/libcap-ng/libcap-ng-python_0.7.10.bb > rename to meta/recipes-support/libcap-ng/libcap-ng-python_0.7.11.bb > diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc > index 002915ad48..6d6fa644aa 100644 > --- a/meta/recipes-support/libcap-ng/libcap-ng.inc > +++ b/meta/recipes-support/libcap-ng/libcap-ng.inc > @@ -9,11 +9,9 @@ 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" > -SRC_URI[sha256sum] = "a84ca7b4e0444283ed269b7a29f5b6187f647c82e2b876636b49b9a744f0ffbf" > +SRC_URI[md5sum] = "5883ed10b621c87e29a05cff36d2928e" > +SRC_URI[sha256sum] = "85815c711862d01a440db471f12fba462c9949e923966f5859607e652d9c0ae9" > > BBCLASSEXTEND = "native nativesdk" > diff --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 > deleted file mode 100644 > index 6b155ccea8..0000000000 > --- a/meta/recipes-support/libcap-ng/libcap-ng/0001-configure.ac-add-library-if-header-found.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -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. > - > -Upstream-Status: Submitted [https://github.com/stevegrubb/libcap-ng/pull/10] > -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 > deleted file mode 100644 > index c68254ff3d..0000000000 > --- a/meta/recipes-support/libcap-ng/libcap-ng/0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -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 > - > -Upstream-Status: Pending > -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/python.patch b/meta/recipes-support/libcap-ng/libcap-ng/python.patch > index d60a0a39b6..fcd6f9cd33 100644 > --- a/meta/recipes-support/libcap-ng/libcap-ng/python.patch > +++ b/meta/recipes-support/libcap-ng/libcap-ng/python.patch > @@ -1,6 +1,3 @@ > -From b4a354ae8d4f7c2ec3ec421c7d8a790cc57e77a9 Mon Sep 17 00:00:00 2001 > -From: Li xin <lixin.fnst@cn.fujitsu.com> > -Date: Sat, 18 Jul 2015 23:03:30 +0900 > Subject: [PATCH] configure.ac - Avoid an incorrect check for python. > Makefile.am - avoid hard coded host include paths. > > @@ -9,6 +6,8 @@ Upstream-Status: pending > Signed-off-by: Mark Hatle <mark.hatle@windriver.com> > Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> > Signed-off-by: Yi Zhao <yi.zhao@windriver.com> > +Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> > + > --- > bindings/python/Makefile.am | 4 +++- > configure.ac | 17 ++--------------- > @@ -30,12 +29,12 @@ index 999b184..c8e49db 100644 > SWIG_INCLUDES = ${AM_CPPFLAGS} > pyexec_PYTHON = capng.py > diff --git a/configure.ac b/configure.ac > -index 7f66179..079d026 100644 > +index 8b46f51..2d7e00c 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -123,21 +123,8 @@ if test x$use_python = xno ; then > - else > - AC_MSG_RESULT(testing) > +@@ -141,21 +141,8 @@ fi > + > + # Setup Python2 with the interpreter found previously. > AM_PATH_PYTHON > -PYINCLUDEDIR=`python${am_cv_python_version} -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"` > -if test -f ${PYINCLUDEDIR}/Python.h ; then > @@ -46,7 +45,7 @@ index 7f66179..079d026 100644 > - AC_MSG_NOTICE(Python bindings will be built) > -else > - python_found="no" > -- if test x$use_python = xyes ; then > +- if test "x$use_python" = xyes ; then > - AC_MSG_ERROR([Python explicitly requested and python headers were not found]) > - else > - AC_MSG_WARN("Python headers not found - python bindings will not be made") > @@ -58,5 +57,4 @@ index 7f66179..079d026 100644 > AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") > > -- > -2.7.4 > - > +2.25.1 > diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.7.11.bb > similarity index 100% > rename from meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb > rename to meta/recipes-support/libcap-ng/libcap-ng_0.7.11.bb > -- > 2.25.1 > > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH] libcap-ng:upgrade 0.7.10 -> 0.7.11 2021-02-21 5:23 ` Khem Raj @ 2021-02-21 8:00 ` Khem Raj 2021-02-21 9:41 ` Richard Purdie 0 siblings, 1 reply; 6+ messages in thread From: Khem Raj @ 2021-02-21 8:00 UTC (permalink / raw) To: zangrc; +Cc: Patches and discussions about the oe-core layer I think this is wrong thread, I replied to On Sat, Feb 20, 2021 at 9:23 PM Khem Raj <raj.khem@gmail.com> wrote: > > seeing this failure > > https://errors.yoctoproject.org/Errors/Details/571958/ > https://errors.yoctoproject.org/Errors/Details/571954/ > > On Wed, Aug 26, 2020 at 6:16 PM zangrc <zangrc.fnst@cn.fujitsu.com> wrote: > > > > 0001-configure.ac-add-library-if-header-found.patch > > 0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch > > Removed since these are included in 0.7.11 > > > > Refresh the following patch: > > python.patch > > > > Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> > > --- > > ...n_0.7.10.bb => libcap-ng-python_0.7.11.bb} | 0 > > meta/recipes-support/libcap-ng/libcap-ng.inc | 6 ++-- > > ...igure.ac-add-library-if-header-found.patch | 31 ------------------- > > ...hread_atfork-usage-in-HAVE_PTHREAD_H.patch | 25 --------------- > > .../libcap-ng/libcap-ng/python.patch | 18 +++++------ > > ...ibcap-ng_0.7.10.bb => libcap-ng_0.7.11.bb} | 0 > > 6 files changed, 10 insertions(+), 70 deletions(-) > > rename meta/recipes-support/libcap-ng/{libcap-ng-python_0.7.10.bb => libcap-ng-python_0.7.11.bb} (100%) > > delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng/0001-configure.ac-add-library-if-header-found.patch > > delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng/0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch > > rename meta/recipes-support/libcap-ng/{libcap-ng_0.7.10.bb => libcap-ng_0.7.11.bb} (100%) > > > > diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.10.bb b/meta/recipes-support/libcap-ng/libcap-ng-python_0.7.11.bb > > similarity index 100% > > rename from meta/recipes-support/libcap-ng/libcap-ng-python_0.7.10.bb > > rename to meta/recipes-support/libcap-ng/libcap-ng-python_0.7.11.bb > > diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc > > index 002915ad48..6d6fa644aa 100644 > > --- a/meta/recipes-support/libcap-ng/libcap-ng.inc > > +++ b/meta/recipes-support/libcap-ng/libcap-ng.inc > > @@ -9,11 +9,9 @@ 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" > > -SRC_URI[sha256sum] = "a84ca7b4e0444283ed269b7a29f5b6187f647c82e2b876636b49b9a744f0ffbf" > > +SRC_URI[md5sum] = "5883ed10b621c87e29a05cff36d2928e" > > +SRC_URI[sha256sum] = "85815c711862d01a440db471f12fba462c9949e923966f5859607e652d9c0ae9" > > > > BBCLASSEXTEND = "native nativesdk" > > diff --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 > > deleted file mode 100644 > > index 6b155ccea8..0000000000 > > --- a/meta/recipes-support/libcap-ng/libcap-ng/0001-configure.ac-add-library-if-header-found.patch > > +++ /dev/null > > @@ -1,31 +0,0 @@ > > -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. > > - > > -Upstream-Status: Submitted [https://github.com/stevegrubb/libcap-ng/pull/10] > > -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 > > deleted file mode 100644 > > index c68254ff3d..0000000000 > > --- a/meta/recipes-support/libcap-ng/libcap-ng/0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch > > +++ /dev/null > > @@ -1,25 +0,0 @@ > > -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 > > - > > -Upstream-Status: Pending > > -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/python.patch b/meta/recipes-support/libcap-ng/libcap-ng/python.patch > > index d60a0a39b6..fcd6f9cd33 100644 > > --- a/meta/recipes-support/libcap-ng/libcap-ng/python.patch > > +++ b/meta/recipes-support/libcap-ng/libcap-ng/python.patch > > @@ -1,6 +1,3 @@ > > -From b4a354ae8d4f7c2ec3ec421c7d8a790cc57e77a9 Mon Sep 17 00:00:00 2001 > > -From: Li xin <lixin.fnst@cn.fujitsu.com> > > -Date: Sat, 18 Jul 2015 23:03:30 +0900 > > Subject: [PATCH] configure.ac - Avoid an incorrect check for python. > > Makefile.am - avoid hard coded host include paths. > > > > @@ -9,6 +6,8 @@ Upstream-Status: pending > > Signed-off-by: Mark Hatle <mark.hatle@windriver.com> > > Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> > > Signed-off-by: Yi Zhao <yi.zhao@windriver.com> > > +Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> > > + > > --- > > bindings/python/Makefile.am | 4 +++- > > configure.ac | 17 ++--------------- > > @@ -30,12 +29,12 @@ index 999b184..c8e49db 100644 > > SWIG_INCLUDES = ${AM_CPPFLAGS} > > pyexec_PYTHON = capng.py > > diff --git a/configure.ac b/configure.ac > > -index 7f66179..079d026 100644 > > +index 8b46f51..2d7e00c 100644 > > --- a/configure.ac > > +++ b/configure.ac > > -@@ -123,21 +123,8 @@ if test x$use_python = xno ; then > > - else > > - AC_MSG_RESULT(testing) > > +@@ -141,21 +141,8 @@ fi > > + > > + # Setup Python2 with the interpreter found previously. > > AM_PATH_PYTHON > > -PYINCLUDEDIR=`python${am_cv_python_version} -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"` > > -if test -f ${PYINCLUDEDIR}/Python.h ; then > > @@ -46,7 +45,7 @@ index 7f66179..079d026 100644 > > - AC_MSG_NOTICE(Python bindings will be built) > > -else > > - python_found="no" > > -- if test x$use_python = xyes ; then > > +- if test "x$use_python" = xyes ; then > > - AC_MSG_ERROR([Python explicitly requested and python headers were not found]) > > - else > > - AC_MSG_WARN("Python headers not found - python bindings will not be made") > > @@ -58,5 +57,4 @@ index 7f66179..079d026 100644 > > AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") > > > > -- > > -2.7.4 > > - > > +2.25.1 > > diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.7.11.bb > > similarity index 100% > > rename from meta/recipes-support/libcap-ng/libcap-ng_0.7.10.bb > > rename to meta/recipes-support/libcap-ng/libcap-ng_0.7.11.bb > > -- > > 2.25.1 > > > > > > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH] libcap-ng:upgrade 0.7.10 -> 0.7.11 2021-02-21 8:00 ` Khem Raj @ 2021-02-21 9:41 ` Richard Purdie 0 siblings, 0 replies; 6+ messages in thread From: Richard Purdie @ 2021-02-21 9:41 UTC (permalink / raw) To: Khem Raj, zangrc; +Cc: Patches and discussions about the oe-core layer On Sun, 2021-02-21 at 00:00 -0800, Khem Raj wrote: > I think this is wrong thread, I replied to Right, I have a libcap-ng-python patch in master which is causing issues. I won't merge that patch. Cheers, Richard ^ permalink raw reply [flat|nested] 6+ messages in thread
* [OE-core] [PATCH] libgpg-error:upgrade 1.38 -> 1.39 2020-08-27 13:16 [OE-core] [PATCH] libcap:upgrade 2.42 -> 2.43 zangrc 2020-08-27 13:16 ` [OE-core] [PATCH] libcap-ng:upgrade 0.7.10 -> 0.7.11 zangrc @ 2020-08-27 13:16 ` zangrc 1 sibling, 0 replies; 6+ messages in thread From: zangrc @ 2020-08-27 13:16 UTC (permalink / raw) To: openembedded-core 0003-build-Fix-cross-compiling-into-a-separate-build-dir.patch 0005-src-gen-lock-obj.sh-add-a-file.patch Removed since these are included in 1.39 Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> --- ...-compiling-into-a-separate-build-dir.patch | 43 ------ .../0005-src-gen-lock-obj.sh-add-a-file.patch | 134 ------------------ ...gpg-error_1.38.bb => libgpg-error_1.39.bb} | 4 +- 3 files changed, 1 insertion(+), 180 deletions(-) delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0003-build-Fix-cross-compiling-into-a-separate-build-dir.patch delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0005-src-gen-lock-obj.sh-add-a-file.patch rename meta/recipes-support/libgpg-error/{libgpg-error_1.38.bb => libgpg-error_1.39.bb} (85%) diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0003-build-Fix-cross-compiling-into-a-separate-build-dir.patch b/meta/recipes-support/libgpg-error/libgpg-error/0003-build-Fix-cross-compiling-into-a-separate-build-dir.patch deleted file mode 100644 index 20610bee5d..0000000000 --- a/meta/recipes-support/libgpg-error/libgpg-error/0003-build-Fix-cross-compiling-into-a-separate-build-dir.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6efe006e99a7e739afbf7fe8937445c82630fc8f Mon Sep 17 00:00:00 2001 -From: David Michael <fedora.dm0@gmail.com> -Date: Mon, 1 Jun 2020 10:24:53 -0400 -Subject: [PATCH] build: Fix cross-compiling into a separate build dir. - -* configure.ac: Create the src directory before writing into it. -* src/Makefile.am (EXTRA_DIST): Add gen-lock-obj.sh. - --- - -Upstream-Status: Backport -Signed-off-by: David Michael <fedora.dm0@gmail.com> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - configure.ac | 1 + - src/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index def8bba..8c0d845 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -598,6 +598,7 @@ if test x$cross_compiling = xyes; then - case $host in - *-*-linux*) - lock_obj_h_generated=yes -+ mkdir src - LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \ - CC=$CC OBJDUMP=$host_alias-objdump \ - ac_ext=$ac_ext ac_objext=$ac_objext \ -diff --git a/src/Makefile.am b/src/Makefile.am -index 2fb83c0..d773877 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -102,7 +102,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ - gpg-error.vers gpg-error.def.in \ - versioninfo.rc.in gpg-error.w32-manifest.in \ - gpg-error-config-test.sh gpg-error.pc.in \ -- $(lock_obj_pub) -+ gen-lock-obj.sh $(lock_obj_pub) - - BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \ - code-to-errno.h code-from-errno.h \ diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0005-src-gen-lock-obj.sh-add-a-file.patch b/meta/recipes-support/libgpg-error/libgpg-error/0005-src-gen-lock-obj.sh-add-a-file.patch deleted file mode 100644 index e6f6c09bac..0000000000 --- a/meta/recipes-support/libgpg-error/libgpg-error/0005-src-gen-lock-obj.sh-add-a-file.patch +++ /dev/null @@ -1,134 +0,0 @@ -From fcb414abb62223e66dba413d0ca86eab3ea5bbc3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Sun, 21 Jun 2020 13:54:47 +0000 -Subject: [PATCH] src-gen-lock-obj.sh: add a file - -This is erroneously missing from the tarball; it will show -up in the next release tarball, as upstream has fixed the -packaging in master. - -Upstream-Status: Inappropriate -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - src/gen-lock-obj.sh | 112 ++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 112 insertions(+) - create mode 100755 src/gen-lock-obj.sh - -diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh -new file mode 100755 -index 0000000..13858cf ---- /dev/null -+++ b/src/gen-lock-obj.sh -@@ -0,0 +1,112 @@ -+#! /bin/sh -+# -+# gen-lock-obj.sh - Build tool to construct the lock object. -+# -+# Copyright (C) 2020 g10 Code GmbH -+# -+# This file is part of libgpg-error. -+# -+# libgpg-error is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public License -+# as published by the Free Software Foundation; either version 2.1 of -+# the License, or (at your option) any later version. -+# -+# libgpg-error is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this program; if not, see <https://www.gnu.org/licenses/>. -+# -+ -+# -+# Following variables should be defined to invoke this script -+# -+# CC -+# OBJDUMP -+# AWK -+# ac_ext -+# ac_object -+# host -+# LOCK_ABI_VERSION -+# -+# An example: -+# -+# LOCK_ABI_VERSION=1 host=x86_64-pc-linux-gnu host_alias=x86_64-linux-gnu \ -+# CC=$host_alias-gcc OBJDUMP=$host_alias-objdump ac_ext=c ac_objext=o \ -+# AWK=gawk ./gen-lock-obj.sh -+# -+ -+AWK_VERSION_OUTPUT=$($AWK 'BEGIN { print PROCINFO["version"] }') -+if test -n "$AWK_VERSION_OUTPUT"; then -+ # It's GNU awk, which supports PROCINFO. -+ AWK_OPTION=--non-decimal-data -+fi -+ -+cat <<'EOF' >conftest.$ac_ext -+#include <pthread.h> -+pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER; -+EOF -+ -+if $CC -c conftest.$ac_ext; then : -+ ac_mtx_size=$($OBJDUMP -j .bss -t conftest.$ac_objext \ -+ | $AWK $AWK_OPTION ' -+/mtx$/ { mtx_size = int("0x" $5) } -+END { print mtx_size }') -+else -+ echo "Can't determine mutex size" -+ exit 1 -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+cat <<EOF -+## lock-obj-pub.$host.h -+## File created by gen-lock-obj.sh - DO NOT EDIT -+## To be included by mkheader into gpg-error.h -+ -+typedef struct -+{ -+ long _vers; -+ union { -+ volatile char _priv[$ac_mtx_size]; -+ long _x_align; -+ long *_xp_align; -+ } u; -+} gpgrt_lock_t; -+ -+EOF -+ -+# FIXME: Support different alignment conditions of: -+# -+# USE_16BYTE_ALIGNMENT -+# USE_DOUBLE_FOR_ALIGNMENT -+# USE_LONG_DOUBLE_FOR_ALIGNMENT -+# -+ -+echo -n "#define GPGRT_LOCK_INITIALIZER {$LOCK_ABI_VERSION,{{" -+ -+i=0 -+while test "$i" -lt $ac_mtx_size; do -+ if test "$i" -ne 0 -a "$(( $i % 8 ))" -eq 0; then -+ echo ' \' -+ echo -n " " -+ fi -+ echo -n '0' -+ if test "$i" -lt $(($ac_mtx_size - 1)); then -+ echo -n ',' -+ fi -+ i=$(( i + 1 )) -+done -+ -+cat <<'EOF' -+}}} -+## -+## Local Variables: -+## mode: c -+## buffer-read-only: t -+## End: -+## -+EOF -+ -+exit 0 diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.38.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.39.bb similarity index 85% rename from meta/recipes-support/libgpg-error/libgpg-error_1.38.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.39.bb index 9a3ec9b5bd..f53056f5c9 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.38.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.39.bb @@ -16,11 +16,9 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ file://0001-Do-not-fail-when-testing-config-scripts.patch \ - file://0003-build-Fix-cross-compiling-into-a-separate-build-dir.patch \ - file://0005-src-gen-lock-obj.sh-add-a-file.patch \ " -SRC_URI[sha256sum] = "d8988275aa69d7149f931c10442e9e34c0242674249e171592b430ff7b3afd02" +SRC_URI[sha256sum] = "4a836edcae592094ef1c5a4834908f44986ab2b82e0824a0344b49df8cdb298f" BINCONFIG = "${bindir}/gpg-error-config" -- 2.25.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-02-21 9:41 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-08-27 13:16 [OE-core] [PATCH] libcap:upgrade 2.42 -> 2.43 zangrc 2020-08-27 13:16 ` [OE-core] [PATCH] libcap-ng:upgrade 0.7.10 -> 0.7.11 zangrc 2021-02-21 5:23 ` Khem Raj 2021-02-21 8:00 ` Khem Raj 2021-02-21 9:41 ` Richard Purdie 2020-08-27 13:16 ` [OE-core] [PATCH] libgpg-error:upgrade 1.38 -> 1.39 zangrc
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.