[OE-core] [PATCH v2] libtirpc: upgrade 1.1.4 -> 1.2.5
Drop musl patch and backport a fix from upstream instead.
Signed-off-by: Anuj Mittal
---
...r_float-do-not-include-bits-endian.h.patch | 34 +++
.../libtirpc/libtirpc/musl.patch | 30
.../{libtirpc_1.1.4.bb => libtirpc_1.2.5.bb} | 6 ++--
3 files changed, 37 insertions(+), 33 deletions(-)
create mode 100644
meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch
delete mode 100644 meta/recipes-extended/libtirpc/libtirpc/musl.patch
rename meta/recipes-extended/libtirpc/{libtirpc_1.1.4.bb => libtirpc_1.2.5.bb}
(81%)
diff --git
a/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch
b/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch
new file mode 100644
index 00..3797cdf521
--- /dev/null
+++
b/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch
@@ -0,0 +1,34 @@
+From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001
+From: Rosen Penev
+Date: Tue, 21 Jan 2020 11:51:16 -0500
+Subject: [PATCH] xdr_float: do not include bits/endian.h
+
+bits/endian.h is an internal header. endian.h should be included.
+
+Fixes compilation with recent musl.
+
+Signed-off-by: Rosen Penev
+Signed-off-by: Steve Dickson
+
+Upstream-Status: Backport
[http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=d04f4d6f0e682f16b0ce96839ab4eadade591eb1]
+Signed-off-by: Anuj Mittal
+---
+ src/xdr_float.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xdr_float.c b/src/xdr_float.c
+index 26bc865..349d48f 100644
+--- a/src/xdr_float.c
b/src/xdr_float.c
+@@ -83,7 +83,7 @@ static struct sgl_limits {
+ };
+ #else
+
+-#include
++#include
+ #define IEEEFP
+
+ #endif /* vax */
+--
+2.21.1
+
diff --git a/meta/recipes-extended/libtirpc/libtirpc/musl.patch
b/meta/recipes-extended/libtirpc/libtirpc/musl.patch
deleted file mode 100644
index 21cd9f9588..00
--- a/meta/recipes-extended/libtirpc/libtirpc/musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Consider musl provided built-in defines
-
-Helps compile libtirpc with musl
-bits/endian.h is not supposed to be included directly
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj
-
a/tirpc/rpc/types.h
-+++ b/tirpc/rpc/types.h
-@@ -66,7 +66,7 @@ typedef int32_t rpc_inline_t;
- #define mem_free(ptr, bsize) free(ptr)
-
-
--#if defined __APPLE_CC__ || defined __FreeBSD__
-+#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__)
- # define __u_char_defined
- # define __daddr_t_defined
- #endif
a/src/xdr_float.c
-+++ b/src/xdr_float.c
-@@ -83,7 +83,7 @@ static struct sgl_limits {
- };
- #else
-
--#include
-+#include
- #define IEEEFP
-
- #endif /* vax */
diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
b/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb
similarity index 81%
rename from meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
rename to meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb
index 53ed5e81f7..fc66821ecc 100644
--- a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
+++ b/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb
@@ -10,12 +10,12 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \
PROVIDES = "virtual/librpc"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
- file://musl.patch \
+ file://0001-xdr_float-do-not-include-bits-endian.h.patch \
"
UPSTREAM_CHECK_URI =
"https://sourceforge.net/projects/libtirpc/files/libtirpc/";
UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/"
-SRC_URI[md5sum] = "f5d2a623e9dfbd818d2f3f3a4a878e3a"
-SRC_URI[sha256sum] =
"2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d"
+SRC_URI[md5sum] = "688787ddff7c6a92ef15ae3f5dc4dfa1"
+SRC_URI[sha256sum] =
"f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca"
inherit autotools pkgconfig
--
2.21.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libtirpc: upgrade 1.1.4 -> 1.2.5
On Wed, Jan 22, 2020 at 9:32 PM Anuj Mittal wrote:
>
> Drop musl patch and backport a fix from upstream instead.
>
seems good. You might want to add a link to Backport section for reference
> Signed-off-by: Anuj Mittal
> ---
> ...r_float-do-not-include-bits-endian.h.patch | 34 +++
> .../libtirpc/libtirpc/musl.patch | 30
> .../{libtirpc_1.1.4.bb => libtirpc_1.2.5.bb} | 6 ++--
> 3 files changed, 37 insertions(+), 33 deletions(-)
> create mode 100644
> meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch
> delete mode 100644 meta/recipes-extended/libtirpc/libtirpc/musl.patch
> rename meta/recipes-extended/libtirpc/{libtirpc_1.1.4.bb =>
> libtirpc_1.2.5.bb} (81%)
>
> diff --git
> a/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch
>
> b/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch
> new file mode 100644
> index 00..777bd5588c
> --- /dev/null
> +++
> b/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch
> @@ -0,0 +1,34 @@
> +From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001
> +From: Rosen Penev
> +Date: Tue, 21 Jan 2020 11:51:16 -0500
> +Subject: [PATCH] xdr_float: do not include bits/endian.h
> +
> +bits/endian.h is an internal header. endian.h should be included.
> +
> +Fixes compilation with recent musl.
> +
> +Signed-off-by: Rosen Penev
> +Signed-off-by: Steve Dickson
> +
> +Upstream-Status: Backport
> +Signed-off-by: Anuj Mittal
> +---
> + src/xdr_float.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/xdr_float.c b/src/xdr_float.c
> +index 26bc865..349d48f 100644
> +--- a/src/xdr_float.c
> b/src/xdr_float.c
> +@@ -83,7 +83,7 @@ static struct sgl_limits {
> + };
> + #else
> +
> +-#include
> ++#include
> + #define IEEEFP
> +
> + #endif /* vax */
> +--
> +2.21.1
> +
> diff --git a/meta/recipes-extended/libtirpc/libtirpc/musl.patch
> b/meta/recipes-extended/libtirpc/libtirpc/musl.patch
> deleted file mode 100644
> index 21cd9f9588..00
> --- a/meta/recipes-extended/libtirpc/libtirpc/musl.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -Consider musl provided built-in defines
> -
> -Helps compile libtirpc with musl
> -bits/endian.h is not supposed to be included directly
> -
> -Upstream-Status: Pending
> -Signed-off-by: Khem Raj
> -
> a/tirpc/rpc/types.h
> -+++ b/tirpc/rpc/types.h
> -@@ -66,7 +66,7 @@ typedef int32_t rpc_inline_t;
> - #define mem_free(ptr, bsize) free(ptr)
> -
> -
> --#if defined __APPLE_CC__ || defined __FreeBSD__
> -+#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__)
> - # define __u_char_defined
> - # define __daddr_t_defined
> - #endif
> a/src/xdr_float.c
> -+++ b/src/xdr_float.c
> -@@ -83,7 +83,7 @@ static struct sgl_limits {
> - };
> - #else
> -
> --#include
> -+#include
> - #define IEEEFP
> -
> - #endif /* vax */
> diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
> b/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb
> similarity index 81%
> rename from meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
> rename to meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb
> index 53ed5e81f7..fc66821ecc 100644
> --- a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
> +++ b/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb
> @@ -10,12 +10,12 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \
> PROVIDES = "virtual/librpc"
>
> SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
> - file://musl.patch \
> + file://0001-xdr_float-do-not-include-bits-endian.h.patch \
> "
> UPSTREAM_CHECK_URI =
> "https://sourceforge.net/projects/libtirpc/files/libtirpc/";
> UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/"
> -SRC_URI[md5sum] = "f5d2a623e9dfbd818d2f3f3a4a878e3a"
> -SRC_URI[sha256sum] =
> "2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d"
> +SRC_URI[md5sum] = "688787ddff7c6a92ef15ae3f5dc4dfa1"
> +SRC_URI[sha256sum] =
> "f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca"
>
> inherit autotools pkgconfig
>
> --
> 2.21.1
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][zeus] libxml2: Fix CVE-2019-19956
Yes, patch already in 2.9.10
-Original Message-
From: akuster808
Sent: Thursday, January 23, 2020 1:46 PM
To: Lee, Chee Yang ;
openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH][zeus] libxml2: Fix CVE-2019-19956
On 1/22/20 6:09 PM, chee.yang@intel.com wrote:
> From: Lee Chee Yang
>
> see:
> https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd
> 90641d8d9b0d0549
>
> Signed-off-by: Lee Chee Yang
So Master is not affected? 2.9.10
- armin
> ---
> .../libxml/libxml2/Fix-CVE-2019-19956.patch| 40
> ++
> meta/recipes-core/libxml/libxml2_2.9.9.bb | 1 +
> 2 files changed, 41 insertions(+)
> create mode 100644
> meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch
>
> diff --git a/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch
> b/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch
> new file mode 100644
> index 000..1c2dff9
> --- /dev/null
> +++ b/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch
> @@ -0,0 +1,40 @@
> +From 5a02583c7e683896d84878bd90641d8d9b0d0549 Mon Sep 17 00:00:00
> +2001
> +From: Zhipeng Xie
> +Date: Wed, 7 Aug 2019 17:39:17 +0800
> +Subject: [PATCH] Fix memory leak in
> +xmlParseBalancedChunkMemoryRecover
> +
> +When doc is NULL, namespace created in xmlTreeEnsureXMLDecl is bind
> +to newDoc->oldNs, in this case, set newDoc->oldNs to NULL and free
> +newDoc will cause a memory leak.
> +
> +Found with libFuzzer.
> +
> +Closes #82.
> +
> +Upstream-Status: Backport
> +[https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878
> +bd90641d8d9b0d0549]
> +CVE: CVE-2019-19956
> +
> +Signed-off-by: Chee Yang Lee
> +
> +---
> + parser.c | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/parser.c b/parser.c
> +index 1ce1ccf1..26d9f4e3 100644
> +--- a/parser.c
> b/parser.c
> +@@ -13894,7 +13894,8 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc,
> xmlSAXHandlerPtr sax,
> + xmlFreeParserCtxt(ctxt);
> + newDoc->intSubset = NULL;
> + newDoc->extSubset = NULL;
> +-newDoc->oldNs = NULL;
> ++if(doc != NULL)
> ++newDoc->oldNs = NULL;
> + xmlFreeDoc(newDoc);
> +
> + return(ret);
> +--
> +2.24.1
> +
> +
> diff --git a/meta/recipes-core/libxml/libxml2_2.9.9.bb
> b/meta/recipes-core/libxml/libxml2_2.9.9.bb
> index c38f883..c44a90b 100644
> --- a/meta/recipes-core/libxml/libxml2_2.9.9.bb
> +++ b/meta/recipes-core/libxml/libxml2_2.9.9.bb
> @@ -20,6 +20,7 @@ SRC_URI =
> "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \
> file://libxml-m4-use-pkgconfig.patch \
>
> file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \
> file://fix-execution-of-ptests.patch \
> + file://Fix-CVE-2019-19956.patch \
> "
>
> SRC_URI[libtar.md5sum] = "c04a5a0a042eaa157e8e8c9eabe76bd6"
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][zeus] libxml2: Fix CVE-2019-19956
On 1/22/20 6:09 PM, chee.yang@intel.com wrote:
> From: Lee Chee Yang
>
> see:
> https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549
>
> Signed-off-by: Lee Chee Yang
So Master is not affected? 2.9.10
- armin
> ---
> .../libxml/libxml2/Fix-CVE-2019-19956.patch| 40
> ++
> meta/recipes-core/libxml/libxml2_2.9.9.bb | 1 +
> 2 files changed, 41 insertions(+)
> create mode 100644 meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch
>
> diff --git a/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch
> b/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch
> new file mode 100644
> index 000..1c2dff9
> --- /dev/null
> +++ b/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch
> @@ -0,0 +1,40 @@
> +From 5a02583c7e683896d84878bd90641d8d9b0d0549 Mon Sep 17 00:00:00 2001
> +From: Zhipeng Xie
> +Date: Wed, 7 Aug 2019 17:39:17 +0800
> +Subject: [PATCH] Fix memory leak in xmlParseBalancedChunkMemoryRecover
> +
> +When doc is NULL, namespace created in xmlTreeEnsureXMLDecl
> +is bind to newDoc->oldNs, in this case, set newDoc->oldNs to
> +NULL and free newDoc will cause a memory leak.
> +
> +Found with libFuzzer.
> +
> +Closes #82.
> +
> +Upstream-Status: Backport
> [https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549]
> +CVE: CVE-2019-19956
> +
> +Signed-off-by: Chee Yang Lee
> +
> +---
> + parser.c | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/parser.c b/parser.c
> +index 1ce1ccf1..26d9f4e3 100644
> +--- a/parser.c
> b/parser.c
> +@@ -13894,7 +13894,8 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc,
> xmlSAXHandlerPtr sax,
> + xmlFreeParserCtxt(ctxt);
> + newDoc->intSubset = NULL;
> + newDoc->extSubset = NULL;
> +-newDoc->oldNs = NULL;
> ++if(doc != NULL)
> ++newDoc->oldNs = NULL;
> + xmlFreeDoc(newDoc);
> +
> + return(ret);
> +--
> +2.24.1
> +
> +
> diff --git a/meta/recipes-core/libxml/libxml2_2.9.9.bb
> b/meta/recipes-core/libxml/libxml2_2.9.9.bb
> index c38f883..c44a90b 100644
> --- a/meta/recipes-core/libxml/libxml2_2.9.9.bb
> +++ b/meta/recipes-core/libxml/libxml2_2.9.9.bb
> @@ -20,6 +20,7 @@ SRC_URI =
> "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \
> file://libxml-m4-use-pkgconfig.patch \
>
> file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \
> file://fix-execution-of-ptests.patch \
> + file://Fix-CVE-2019-19956.patch \
> "
>
> SRC_URI[libtar.md5sum] = "c04a5a0a042eaa157e8e8c9eabe76bd6"
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libtirpc: upgrade 1.1.4 -> 1.2.5
Drop musl patch and backport a fix from upstream instead.
Signed-off-by: Anuj Mittal
---
...r_float-do-not-include-bits-endian.h.patch | 34 +++
.../libtirpc/libtirpc/musl.patch | 30
.../{libtirpc_1.1.4.bb => libtirpc_1.2.5.bb} | 6 ++--
3 files changed, 37 insertions(+), 33 deletions(-)
create mode 100644
meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch
delete mode 100644 meta/recipes-extended/libtirpc/libtirpc/musl.patch
rename meta/recipes-extended/libtirpc/{libtirpc_1.1.4.bb => libtirpc_1.2.5.bb}
(81%)
diff --git
a/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch
b/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch
new file mode 100644
index 00..777bd5588c
--- /dev/null
+++
b/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch
@@ -0,0 +1,34 @@
+From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001
+From: Rosen Penev
+Date: Tue, 21 Jan 2020 11:51:16 -0500
+Subject: [PATCH] xdr_float: do not include bits/endian.h
+
+bits/endian.h is an internal header. endian.h should be included.
+
+Fixes compilation with recent musl.
+
+Signed-off-by: Rosen Penev
+Signed-off-by: Steve Dickson
+
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal
+---
+ src/xdr_float.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xdr_float.c b/src/xdr_float.c
+index 26bc865..349d48f 100644
+--- a/src/xdr_float.c
b/src/xdr_float.c
+@@ -83,7 +83,7 @@ static struct sgl_limits {
+ };
+ #else
+
+-#include
++#include
+ #define IEEEFP
+
+ #endif /* vax */
+--
+2.21.1
+
diff --git a/meta/recipes-extended/libtirpc/libtirpc/musl.patch
b/meta/recipes-extended/libtirpc/libtirpc/musl.patch
deleted file mode 100644
index 21cd9f9588..00
--- a/meta/recipes-extended/libtirpc/libtirpc/musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Consider musl provided built-in defines
-
-Helps compile libtirpc with musl
-bits/endian.h is not supposed to be included directly
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj
-
a/tirpc/rpc/types.h
-+++ b/tirpc/rpc/types.h
-@@ -66,7 +66,7 @@ typedef int32_t rpc_inline_t;
- #define mem_free(ptr, bsize) free(ptr)
-
-
--#if defined __APPLE_CC__ || defined __FreeBSD__
-+#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__)
- # define __u_char_defined
- # define __daddr_t_defined
- #endif
a/src/xdr_float.c
-+++ b/src/xdr_float.c
-@@ -83,7 +83,7 @@ static struct sgl_limits {
- };
- #else
-
--#include
-+#include
- #define IEEEFP
-
- #endif /* vax */
diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
b/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb
similarity index 81%
rename from meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
rename to meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb
index 53ed5e81f7..fc66821ecc 100644
--- a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
+++ b/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb
@@ -10,12 +10,12 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \
PROVIDES = "virtual/librpc"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
- file://musl.patch \
+ file://0001-xdr_float-do-not-include-bits-endian.h.patch \
"
UPSTREAM_CHECK_URI =
"https://sourceforge.net/projects/libtirpc/files/libtirpc/";
UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/"
-SRC_URI[md5sum] = "f5d2a623e9dfbd818d2f3f3a4a878e3a"
-SRC_URI[sha256sum] =
"2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d"
+SRC_URI[md5sum] = "688787ddff7c6a92ef15ae3f5dc4dfa1"
+SRC_URI[sha256sum] =
"f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca"
inherit autotools pkgconfig
--
2.21.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][zeus] libxml2: Fix CVE-2019-19956
From: Lee Chee Yang
see:
https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549
Signed-off-by: Lee Chee Yang
---
.../libxml/libxml2/Fix-CVE-2019-19956.patch| 40 ++
meta/recipes-core/libxml/libxml2_2.9.9.bb | 1 +
2 files changed, 41 insertions(+)
create mode 100644 meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch
diff --git a/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch
b/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch
new file mode 100644
index 000..1c2dff9
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/Fix-CVE-2019-19956.patch
@@ -0,0 +1,40 @@
+From 5a02583c7e683896d84878bd90641d8d9b0d0549 Mon Sep 17 00:00:00 2001
+From: Zhipeng Xie
+Date: Wed, 7 Aug 2019 17:39:17 +0800
+Subject: [PATCH] Fix memory leak in xmlParseBalancedChunkMemoryRecover
+
+When doc is NULL, namespace created in xmlTreeEnsureXMLDecl
+is bind to newDoc->oldNs, in this case, set newDoc->oldNs to
+NULL and free newDoc will cause a memory leak.
+
+Found with libFuzzer.
+
+Closes #82.
+
+Upstream-Status: Backport
[https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549]
+CVE: CVE-2019-19956
+
+Signed-off-by: Chee Yang Lee
+
+---
+ parser.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/parser.c b/parser.c
+index 1ce1ccf1..26d9f4e3 100644
+--- a/parser.c
b/parser.c
+@@ -13894,7 +13894,8 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc,
xmlSAXHandlerPtr sax,
+ xmlFreeParserCtxt(ctxt);
+ newDoc->intSubset = NULL;
+ newDoc->extSubset = NULL;
+-newDoc->oldNs = NULL;
++if(doc != NULL)
++ newDoc->oldNs = NULL;
+ xmlFreeDoc(newDoc);
+
+ return(ret);
+--
+2.24.1
+
+
diff --git a/meta/recipes-core/libxml/libxml2_2.9.9.bb
b/meta/recipes-core/libxml/libxml2_2.9.9.bb
index c38f883..c44a90b 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.9.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.9.bb
@@ -20,6 +20,7 @@ SRC_URI =
"http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \
file://libxml-m4-use-pkgconfig.patch \
file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \
file://fix-execution-of-ptests.patch \
+ file://Fix-CVE-2019-19956.patch \
"
SRC_URI[libtar.md5sum] = "c04a5a0a042eaa157e8e8c9eabe76bd6"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] make: 4.2.1 -> 4.3
Announcement: https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html
1) Remove upstream provided patches
0001-glob-Do-not-assume-glibc-glob-internals.patch
and 0002-glob-Do-not-assume-glibc-glob-internals.patch.
2) License has been changed to GPLv3 only
3) Important bug-fix is
* https://lists.gnu.org/archive/html/bug-make/2018-09/msg6.html
4) Backward-incompatibilities:
* Number signs (#) appearing inside a macro reference or function invocation
no longer introduce comments and should not be escaped with backslashes
* Previously appending using '+=' to an empty variable would result in a
value
starting with a space. Now the initial space is only added if the variable
already contains some value. Similarly, appending an empty string does not
add a trailing space.
Signed-off-by: Jens Rehsack
---
meta/recipes-devtools/make/make.inc | 4 +-
...b-Do-not-assume-glibc-glob-internals.patch | 70 ---
...b-Do-not-assume-glibc-glob-internals.patch | 38 --
meta/recipes-devtools/make/make_4.2.1.bb | 12
meta/recipes-devtools/make/make_4.3.bb| 10 +++
5 files changed, 11 insertions(+), 123 deletions(-)
delete mode 100644
meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
delete mode 100644
meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch
delete mode 100644 meta/recipes-devtools/make/make_4.2.1.bb
create mode 100644 meta/recipes-devtools/make/make_4.3.bb
diff --git a/meta/recipes-devtools/make/make.inc
b/meta/recipes-devtools/make/make.inc
index b8905bc6d3..4142cf23d3 100644
--- a/meta/recipes-devtools/make/make.inc
+++ b/meta/recipes-devtools/make/make.inc
@@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files
and how to compute
HOMEPAGE = "http://www.gnu.org/software/make/";
SECTION = "devel"
-SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \
- file://0001-glob-Do-not-assume-glibc-glob-internals.patch \
- file://0002-glob-Do-not-assume-glibc-glob-internals.patch \
+SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \
"
inherit autotools gettext pkgconfig texinfo
diff --git
a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
deleted file mode 100644
index 2b6e4d40c3..00
---
a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001
-From: Paul Eggert
-Date: Sun, 24 Sep 2017 09:12:58 -0400
-Subject: [PATCH 1/2] glob: Do not assume glibc glob internals.
-
-It has been proposed that glibc glob start using gl_lstat,
-which the API allows it to do. GNU 'make' should not get in
-the way of this. See:
-https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
-
-* dir.c (local_lstat): New function, like local_stat.
-(dir_setup_glob): Use it to initialize gl_lstat too, as the API
-requires.
-Upstream-Status: Backport
-Signed-off-by: Khem Raj
-
- dir.c | 29 +++--
- 1 file changed, 27 insertions(+), 2 deletions(-)
-
-diff --git a/dir.c b/dir.c
-index f34bbf5..12eef30 100644
a/dir.c
-+++ b/dir.c
-@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
- }
- #endif
-
-+/* Similarly for lstat. */
-+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
-+# ifndef VMS
-+# ifndef HAVE_SYS_STAT_H
-+int lstat (const char *path, struct stat *sbuf);
-+# endif
-+# else
-+/* We are done with the fake lstat. Go back to the real lstat */
-+# ifdef lstat
-+# undef lstat
-+# endif
-+# endif
-+# define local_lstat lstat
-+#elif defined(WINDOWS32)
-+/* Windows doesn't support lstat(). */
-+# define local_lstat local_stat
-+#else
-+static int
-+local_lstat (const char *path, struct stat *buf)
-+{
-+ int e;
-+ EINTRLOOP (e, lstat (path, buf));
-+ return e;
-+}
-+#endif
-+
- void
- dir_setup_glob (glob_t *gl)
- {
- gl->gl_opendir = open_dirstream;
- gl->gl_readdir = read_dirstream;
- gl->gl_closedir = free;
-+ gl->gl_lstat = local_lstat;
- gl->gl_stat = local_stat;
-- /* We don't bother setting gl_lstat, since glob never calls it.
-- The slot is only there for compatibility with 4.4 BSD. */
- }
-
- void
---
-2.16.1
-
diff --git
a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch
b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch
deleted file mode 100644
index d49acd9f6e..00
---
a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001
-From: Paul Eggert
-Date: Sun, 24 Sep 2017 09:12:58 -0400
-Subject: [PATCH 2/2] glob: Do not assume glibc glob internal
Re: [OE-core] [PATCH] ethtool: upgrade 5.3 -> 5.4
WARNING: ethtool-5.4-r0 do_patch: Fuzz detected: Applying patch avoid_parallel_tests.patch patching file configure.ac Hunk #1 succeeded at 2 with fuzz 1. The context lines in the patches can be updated with devtool: devtool modify ethtool devtool finish --force-patch-refresh ethtool Don't forget to review changes done by devtool! WARNING: ethtool-5.4-r0 do_patch: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz] -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2] kbd: make libkbdfile-test08 ptest work for multilib
LGTM.
Thanks Matthew.
../Randy
On 1/22/20 3:20 PM, Mingde (Matthew) Zeng wrote:
This patch fixes kbd ptest libkbdfile-test08 failure in 64-bit images.
```sh
root@intel-x86-64:/usr/lib64/kbd/ptest# ./run-ptest
make: Entering directory '/usr/lib64/kbd/ptest/tests'
make[1]: Entering directory '/usr/lib64/kbd/ptest/tests'
PASS: libkbdfile-test01
PASS: libkbdfile-test02
PASS: libkbdfile-test03
PASS: libkbdfile-test04
PASS: libkbdfile-test05
PASS: libkbdfile-test06
PASS: libkbdfile-test07
FAIL: libkbdfile-test08
PASS: libkbdfile-test09
...
```
`DATADIR` and `ABS_DATADIR` are compile flags defined in
./kbd/tests/Makefile.am. `DATADIR` is the relative directory of
kbd, i.e `./kbd/ptest/tests` whereas `ABS_DATADIR` is the full
directory path, i.e `/usr/lib/kbd/ptest/tests`. The latter has a
problem when building ptests for a 64-bit image, because the tests
folder is located at `/usr/lib64/kbd/ptest/tests` instead.
Therefore `ABS_DATADIR` is changed to `DATADIR`, also consistent with
what *every other* kbd test is doing.
The test searches DATADIR recursively for a file named `test0.map`,
but it finds the wrong file at
`/findfile/test_0/keymaps/test0.map`,
while it actually needs
`/findfile/test_0/keymaps/i386/qwerty/test0.map`.
Thus appending `/i386` to `dirpath` so that `libkbdfile-test08.c`
finds the right test file.
Signed-off-by: Matthew Zeng
---
...append-i386-to-fix-libkbdfile-test08.patch | 45 +++
meta/recipes-core/kbd/kbd_2.2.0.bb| 1 +
2 files changed, 46 insertions(+)
create mode 100644
meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
diff --git
a/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
b/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
new file mode 100644
index 00..54e4dc9034
--- /dev/null
+++
b/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
@@ -0,0 +1,45 @@
+From 4c12f76f4177cfd560cf708a16774ebfadbd41a5 Mon Sep 17 00:00:00 2001
+From: "Mingde (Matthew) Zeng"
+Date: Wed, 22 Jan 2020 11:02:17 -0500
+Subject: [PATCH] Use DATADIR and append i386 to fix libkbdfile-test08 ptest
+ failure
+
+Replace ABS_DATADIR with DATADIR and append i386 to dirpath.
+
+Upstream-Status: Inappropriate [OE specific]
+
+This OE specific patch applies to kbd v2.2.0 for now, the upstream
+made drastic changes since v2.2.0, in fact they got rid of ABS_DATADIR
+in commit 5b6df5c along with a series of other commits which may or
+may not fix this issue. We will find out in future releases.
+
+Signed-off-by: Matthew Zeng
+---
+ tests/libkbdfile-test08.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/libkbdfile-test08.c b/tests/libkbdfile-test08.c
+index bf41707..5e287f1 100644
+--- a/tests/libkbdfile-test08.c
b/tests/libkbdfile-test08.c
+@@ -14,14 +14,14 @@ main(int __attribute__((unused)) argc, char **argv)
+ if (!fp)
+ kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile");
+
+- const char *const dirpath[] = { "", DATADIR
"/findfile/test_0/keymaps/**", 0 };
++ const char *const dirpath[] = { "", DATADIR
"/findfile/test_0/keymaps/i386/**", 0 };
+ const char *const suffixes[] = { "", ".map", ".kmap", 0 };
+
+- const char *expect = ABS_DATADIR
"/findfile/test_0/keymaps/i386/qwerty/test0.map";
++ const char *expect = DATADIR
"/findfile/test_0/keymaps/i386/qwerty/test0.map";
+
+ int rc = 0;
+
+- rc = kbdfile_find((char *)(ABS_DATADIR
"/findfile/test_0/keymaps/i386/qwerty/test0"), (char **) dirpath, (char **)
suffixes, fp);
++ rc = kbdfile_find((char *)"test0", (char **) dirpath, (char **)
suffixes, fp);
+
+ if (rc != 0)
+ kbd_error(EXIT_FAILURE, 0, "unable to find file");
+--
+2.24.1
+
diff --git a/meta/recipes-core/kbd/kbd_2.2.0.bb
b/meta/recipes-core/kbd/kbd_2.2.0.bb
index df9b0bb90b..e13cea7634 100644
--- a/meta/recipes-core/kbd/kbd_2.2.0.bb
+++ b/meta/recipes-core/kbd/kbd_2.2.0.bb
@@ -16,6 +16,7 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
file://run-ptest \
${@bb.utils.contains('DISTRO_FEATURES', 'ptest',
'file://set-proper-path-of-resources.patch', '', d)} \
file://0001-analyze.l-add-missing-string-format.patch \
+
file://0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch \
"
SRC_URI[md5sum] = "d1d7ae0b5fb875dc082731e09cd0c8bc"
--
2.24.0
--
# Randy MacLeod
# Wind River Linux
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gettext: Fix overloadable error with clang
On Tue, Jan 21, 2020 at 8:32 AM Adrian Bunk wrote: > > On Thu, Jan 16, 2020 at 07:17:20AM -0800, Khem Raj wrote: > > On Thu, Jan 16, 2020 at 5:13 AM Adrian Bunk wrote: > > > > > > On Wed, Jan 15, 2020 at 08:46:09PM -0800, Khem Raj wrote: > > > > Clang detects that getcwd is being re-declared and signatures don't > > > > match, simple solution is to let clang use overloadable attribute > > > >... > > > > +Fixes > > > > +dcigettext.c:147:7: error: redeclaration of 'getcwd' must have the > > > > 'overloadable' attribute > > > >... > > > > +-char *getcwd (); > > > >... > > > > > > Looks like a bug in clang to me, and should be fixed there. > > > > > > The code does not tell anything regarding the parameters, > > > but clang seems to misinterpret it as "no parameters". > > > > > its conflicting with declaration from glibc system headers > >... > > Why did the glibc 2.31 upgrade add a not upstreamed patch from 2017 that > created these conflicts? > This supports building userspace with clang better and find more errors when fortify sources option is on. this patch was already proposed to glibc and I will follow up on it. It definitely improves fortify when using clang > The commit message does not mention that this patch was added, > and an OE-only patch that makes a compiler reject valid C code > is not good. > I think thats my bad as it slipped my mind with numerous rebases I did over the life of the glibc patchset. however, I think its probably best to leave it outside core for now. There is another patchset I will do for glibc 2.31 where I will drop it and perhaps house it in meta-clang. > cu > Adrian -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2] kbd: make libkbdfile-test08 ptest work for multilib
This patch fixes kbd ptest libkbdfile-test08 failure in 64-bit images.
```sh
root@intel-x86-64:/usr/lib64/kbd/ptest# ./run-ptest
make: Entering directory '/usr/lib64/kbd/ptest/tests'
make[1]: Entering directory '/usr/lib64/kbd/ptest/tests'
PASS: libkbdfile-test01
PASS: libkbdfile-test02
PASS: libkbdfile-test03
PASS: libkbdfile-test04
PASS: libkbdfile-test05
PASS: libkbdfile-test06
PASS: libkbdfile-test07
FAIL: libkbdfile-test08
PASS: libkbdfile-test09
...
```
`DATADIR` and `ABS_DATADIR` are compile flags defined in
./kbd/tests/Makefile.am. `DATADIR` is the relative directory of
kbd, i.e `./kbd/ptest/tests` whereas `ABS_DATADIR` is the full
directory path, i.e `/usr/lib/kbd/ptest/tests`. The latter has a
problem when building ptests for a 64-bit image, because the tests
folder is located at `/usr/lib64/kbd/ptest/tests` instead.
Therefore `ABS_DATADIR` is changed to `DATADIR`, also consistent with
what *every other* kbd test is doing.
The test searches DATADIR recursively for a file named `test0.map`,
but it finds the wrong file at
`/findfile/test_0/keymaps/test0.map`,
while it actually needs
`/findfile/test_0/keymaps/i386/qwerty/test0.map`.
Thus appending `/i386` to `dirpath` so that `libkbdfile-test08.c`
finds the right test file.
Signed-off-by: Matthew Zeng
---
...append-i386-to-fix-libkbdfile-test08.patch | 45 +++
meta/recipes-core/kbd/kbd_2.2.0.bb| 1 +
2 files changed, 46 insertions(+)
create mode 100644
meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
diff --git
a/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
b/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
new file mode 100644
index 00..54e4dc9034
--- /dev/null
+++
b/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
@@ -0,0 +1,45 @@
+From 4c12f76f4177cfd560cf708a16774ebfadbd41a5 Mon Sep 17 00:00:00 2001
+From: "Mingde (Matthew) Zeng"
+Date: Wed, 22 Jan 2020 11:02:17 -0500
+Subject: [PATCH] Use DATADIR and append i386 to fix libkbdfile-test08 ptest
+ failure
+
+Replace ABS_DATADIR with DATADIR and append i386 to dirpath.
+
+Upstream-Status: Inappropriate [OE specific]
+
+This OE specific patch applies to kbd v2.2.0 for now, the upstream
+made drastic changes since v2.2.0, in fact they got rid of ABS_DATADIR
+in commit 5b6df5c along with a series of other commits which may or
+may not fix this issue. We will find out in future releases.
+
+Signed-off-by: Matthew Zeng
+---
+ tests/libkbdfile-test08.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/libkbdfile-test08.c b/tests/libkbdfile-test08.c
+index bf41707..5e287f1 100644
+--- a/tests/libkbdfile-test08.c
b/tests/libkbdfile-test08.c
+@@ -14,14 +14,14 @@ main(int __attribute__((unused)) argc, char **argv)
+ if (!fp)
+ kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile");
+
+- const char *const dirpath[] = { "", DATADIR
"/findfile/test_0/keymaps/**", 0 };
++ const char *const dirpath[] = { "", DATADIR
"/findfile/test_0/keymaps/i386/**", 0 };
+ const char *const suffixes[] = { "", ".map", ".kmap", 0 };
+
+- const char *expect = ABS_DATADIR
"/findfile/test_0/keymaps/i386/qwerty/test0.map";
++ const char *expect = DATADIR
"/findfile/test_0/keymaps/i386/qwerty/test0.map";
+
+ int rc = 0;
+
+- rc = kbdfile_find((char *)(ABS_DATADIR
"/findfile/test_0/keymaps/i386/qwerty/test0"), (char **) dirpath, (char **)
suffixes, fp);
++ rc = kbdfile_find((char *)"test0", (char **) dirpath, (char **)
suffixes, fp);
+
+ if (rc != 0)
+ kbd_error(EXIT_FAILURE, 0, "unable to find file");
+--
+2.24.1
+
diff --git a/meta/recipes-core/kbd/kbd_2.2.0.bb
b/meta/recipes-core/kbd/kbd_2.2.0.bb
index df9b0bb90b..e13cea7634 100644
--- a/meta/recipes-core/kbd/kbd_2.2.0.bb
+++ b/meta/recipes-core/kbd/kbd_2.2.0.bb
@@ -16,6 +16,7 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
file://run-ptest \
${@bb.utils.contains('DISTRO_FEATURES', 'ptest',
'file://set-proper-path-of-resources.patch', '', d)} \
file://0001-analyze.l-add-missing-string-format.patch \
+
file://0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch \
"
SRC_URI[md5sum] = "d1d7ae0b5fb875dc082731e09cd0c8bc"
--
2.24.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kbd: fix ptest libkbdfile-test08
Change your oneline summary from:
Re: [PATCH] kbd: fix ptest libkbdfile-test08
to:
Re: [PATCH] kbd: make libkbdfile-test08 ptest work for multilib
That's more specific so it helps readers but it's still terse
and just a bit over the recommended 50 character git shortlog length:
https://chris.beams.io/posts/git-commit/
( See the definition of multlib in:
https://www.yoctoproject.org/docs/current/dev-manual/dev-manual.html#combining-multiple-versions-library-files-into-one-image
)
On 1/22/20 1:47 PM, Mingde (Matthew) Zeng wrote:
Hold on...
First you should state the problem you are solving and
include the key part of a test failure output.
`DATADIR` and `ABS_DATADIR` are compile flags defined in
./kbd/tests/Makefile.am. `DATADIR` is the relative directory of
kbd, i.e `./kbd/ptest/tests` whereas `ABS_DATADIR` is the full
directory path, i.e `/usr/lib/kbd/ptest/tests`. The latter has a
problem when building ptests for a 64-bit image, because the tests
folder is located at `/usr/lib64/kbd/ptest/tests` instead.
Therefore `ABS_DATADIR` is changed to `DATADIR`, also consistent
with what *every other* kbd test is doing.
If that's what every other kbd test is doing, then maybe your patch
would be accepted upstream... Oh, I see below that upstream has been
making significant changes so I suppose it's okay to keep this as
oe-specific. In fact they get rid if this ABS_DATADIR in commit:
5b6df5c Use autotest
so you might mention that in the commit/patch log.
The test searches DATADIR recursively for a file named
`test0.map`, but it finds the wrong file at
`/findfile/test_0/keymaps/i386/qwerty/test0.map`, while it
actually needs `/findfile/test_0/keymaps/i386/qwerty/test0.map`.
Your formatting here could be improved, i.e.:
The test searches DATADIR recursively for a file named `test0.map`,
but it finds the wrong file at:
`/findfile/test_0/keymaps/i386/qwerty/test0.map`,
while it actually needs:
`/findfile/test_0/keymaps/i386/qwerty/test0.map`.
---
This format also makes it clear that you have used the same path twice
which doesn't seem to make sense, right?
Thus appending `/i386` to `dirpath` so that `libkbdfile-test08.c`
finds the right test file.
Signed-off-by: Matthew Zeng
---
...append-i386-to-fix-libkbdfile-test08.patch | 44 +++
meta/recipes-core/kbd/kbd_2.2.0.bb| 1 +
2 files changed, 45 insertions(+)
create mode 100644
meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
diff --git
a/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
b/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
new file mode 100644
index 00..ec40764c1d
--- /dev/null
+++
b/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
@@ -0,0 +1,44 @@
+From 92c0fb720cf7b9966494e5eaa1f7a4ea8e0a34d2 Mon Sep 17 00:00:00 2001
+From: "Mingde (Matthew) Zeng"
+Date: Wed, 22 Jan 2020 11:02:17 -0500
+Subject: [PATCH] Use DATADIR and append i386 to fix libkbdfile-test08 ptest
+ failure
+
+Replace ABS_DATADIR with DATADIR and append i386 to dirpath.
+
+Upstream-Status: Inappropriate [OE specific]
+
+This OE specific patch applies to kbd v2.2.0 for now, the upstream
+made drastic changes since v2.2.0 which may or may not fix this
+issue, we will find out in future releases.
+
+Signed-off-by: Matthew Zeng
+---
+ tests/libkbdfile-test08.c | 8 +++-
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/tests/libkbdfile-test08.c b/tests/libkbdfile-test08.c
+index bf41707..993fedc 100644
+--- a/tests/libkbdfile-test08.c
b/tests/libkbdfile-test08.c
+@@ -14,14 +14,12 @@ main(int __attribute__((unused)) argc, char **argv)
+ if (!fp)
+ kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile");
+
+- const char *const dirpath[] = { "", DATADIR
"/findfile/test_0/keymaps/**", 0 };
++ const char *const dirpath[] = { "", DATADIR
"/findfile/test_0/keymaps/i386/**", 0 };
+ const char *const suffixes[] = { "", ".map", ".kmap", 0 };
+
+- const char *expect = ABS_DATADIR
"/findfile/test_0/keymaps/i386/qwerty/test0.map";
++ const char *expect = DATADIR
"/findfile/test_0/keymaps/i386/qwerty/test0.map";
+
+- int rc = 0;
+-
+- rc = kbdfile_find((char *)(ABS_DATADIR
"/findfile/test_0/keymaps/i386/qwerty/test0"), (char **) dirpath, (char **)
suffixes, fp);
++ int rc = kbdfile_find((char *)"test0", (char **) dirpath, (char **)
suffixes, fp);
Minor point but generally, when you are fixing a bug,
just change the minimum so in the 4 lines above, you should leave:
int rc = 0;
That makes the diff a bit smaller and means that any compiler output
such as a warning should remain the same. Most bug fixes should ideally
only affect the bug being addressed.
Good work, please send a v2.
../
[OE-core] [PATCH] kbd: fix ptest libkbdfile-test08
`DATADIR` and `ABS_DATADIR` are compile flags defined in
./kbd/tests/Makefile.am. `DATADIR` is the relative directory of
kbd, i.e `./kbd/ptest/tests` whereas `ABS_DATADIR` is the full
directory path, i.e `/usr/lib/kbd/ptest/tests`. The latter has a
problem when building ptests for a 64-bit image, because the tests
folder is located at `/usr/lib64/kbd/ptest/tests` instead.
Therefore `ABS_DATADIR` is changed to `DATADIR`, also consistent
with what *every other* kbd test is doing.
The test searches DATADIR recursively for a file named
`test0.map`, but it finds the wrong file at
`/findfile/test_0/keymaps/i386/qwerty/test0.map`, while it
actually needs `/findfile/test_0/keymaps/i386/qwerty/test0.map`.
Thus appending `/i386` to `dirpath` so that `libkbdfile-test08.c`
finds the right test file.
Signed-off-by: Matthew Zeng
---
...append-i386-to-fix-libkbdfile-test08.patch | 44 +++
meta/recipes-core/kbd/kbd_2.2.0.bb| 1 +
2 files changed, 45 insertions(+)
create mode 100644
meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
diff --git
a/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
b/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
new file mode 100644
index 00..ec40764c1d
--- /dev/null
+++
b/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch
@@ -0,0 +1,44 @@
+From 92c0fb720cf7b9966494e5eaa1f7a4ea8e0a34d2 Mon Sep 17 00:00:00 2001
+From: "Mingde (Matthew) Zeng"
+Date: Wed, 22 Jan 2020 11:02:17 -0500
+Subject: [PATCH] Use DATADIR and append i386 to fix libkbdfile-test08 ptest
+ failure
+
+Replace ABS_DATADIR with DATADIR and append i386 to dirpath.
+
+Upstream-Status: Inappropriate [OE specific]
+
+This OE specific patch applies to kbd v2.2.0 for now, the upstream
+made drastic changes since v2.2.0 which may or may not fix this
+issue, we will find out in future releases.
+
+Signed-off-by: Matthew Zeng
+---
+ tests/libkbdfile-test08.c | 8 +++-
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/tests/libkbdfile-test08.c b/tests/libkbdfile-test08.c
+index bf41707..993fedc 100644
+--- a/tests/libkbdfile-test08.c
b/tests/libkbdfile-test08.c
+@@ -14,14 +14,12 @@ main(int __attribute__((unused)) argc, char **argv)
+ if (!fp)
+ kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile");
+
+- const char *const dirpath[] = { "", DATADIR
"/findfile/test_0/keymaps/**", 0 };
++ const char *const dirpath[] = { "", DATADIR
"/findfile/test_0/keymaps/i386/**", 0 };
+ const char *const suffixes[] = { "", ".map", ".kmap", 0 };
+
+- const char *expect = ABS_DATADIR
"/findfile/test_0/keymaps/i386/qwerty/test0.map";
++ const char *expect = DATADIR
"/findfile/test_0/keymaps/i386/qwerty/test0.map";
+
+- int rc = 0;
+-
+- rc = kbdfile_find((char *)(ABS_DATADIR
"/findfile/test_0/keymaps/i386/qwerty/test0"), (char **) dirpath, (char **)
suffixes, fp);
++ int rc = kbdfile_find((char *)"test0", (char **) dirpath, (char **)
suffixes, fp);
+
+ if (rc != 0)
+ kbd_error(EXIT_FAILURE, 0, "unable to find file");
+--
+2.24.1
+
diff --git a/meta/recipes-core/kbd/kbd_2.2.0.bb
b/meta/recipes-core/kbd/kbd_2.2.0.bb
index df9b0bb90b..e13cea7634 100644
--- a/meta/recipes-core/kbd/kbd_2.2.0.bb
+++ b/meta/recipes-core/kbd/kbd_2.2.0.bb
@@ -16,6 +16,7 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
file://run-ptest \
${@bb.utils.contains('DISTRO_FEATURES', 'ptest',
'file://set-proper-path-of-resources.patch', '', d)} \
file://0001-analyze.l-add-missing-string-format.patch \
+
file://0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch \
"
SRC_URI[md5sum] = "d1d7ae0b5fb875dc082731e09cd0c8bc"
--
2.24.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] util-linux: upgrade 2.34 -> 2.35
Hi Mikko,
Le 22/01/2020 à 10:28, mikko.rap...@bmw.de a écrit :
Which parts of util-linux are now licensed with GPLv3?
As said by Peter previously, it's only for hwclock. In fact
since commit 7a3000f7ba548cf7d74ac77cc63fe8de228a669e ("hwclock: use
parse_date function ") so the version 2.30,
hwclock is linked with parse_date.y from gnullib.
And gnulib code is distributed with GPLv3
Regards
--
Pierre-Jean Texier
Embedded Linux Engineer
https://koncepto.io
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] oeqa: reproducible: Do not strip packages
On 1/22/20 10:06 AM, Richard Purdie wrote:
On Wed, 2020-01-22 at 10:02 -0600, Joshua Watt wrote:
On 1/22/20 9:53 AM, Richard Purdie wrote:
On Sun, 2020-01-19 at 12:59 -0600, Joshua Watt wrote:
Do not strip packages when testing reproducible builds. In some cases,
stripped data differs between builds, but then gets removed. However,
the contents affect the generation of the GCC build-id, which then
differs in the resulting ELF files, even though the data that caused
this is no longer there. Inhibit stripping so that their causes can be
evaluated.
Signed-off-by: Joshua Watt
---
meta/lib/oeqa/selftest/cases/reproducible.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py
b/meta/lib/oeqa/selftest/cases/reproducible.py
index c00b92d2e90..34462a0b3a4 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -149,6 +149,7 @@ class ReproducibleTests(OESelftestTestCase):
config = textwrap.dedent('''\
INHERIT += "reproducible_build"
PACKAGE_CLASSES = "{package_classes}"
+INHIBIT_PACKAGE_STRIP = "1"
TMPDIR = "{tmpdir}"
''').format(package_classes=' '.join('package_%s' % c for c in
self.package_classes),
tmpdir=tmpdir)
This generates quite the failure list:
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates-dbg_20190110-r0_all.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates-dev_20190110-r0_all.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates-doc_20190110-r0_all.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates_20190110-r0_all.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/acl-ptest_2.2.53-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/attr-ptest_2.4.48-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/bc-doc_1.07.1-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/binutils-doc_2.33.1-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/busybox-ptest_1.31.1-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/coreutils-doc_8.31-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/e2fsprogs-doc_1.45.4-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/elfutils-ptest_0.178-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/ethtool-ptest_5.3-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/flex-ptest_2.6.4-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-dbg_3.24.13-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-src_3.24.13-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/icu-dev_64.2-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libevdev-src_1.8.0-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libgcrypt-dbg_1.8.5-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libgcrypt_1.8.5-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libgtk-3.0_3.24.13-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libidn2-dev_2.3.0-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libinput-dbg_1.14.3-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libinput10_1.14.3-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libx11-locale_1.6.9
[OE-core] [PATCH] libx11: squash whitespace in generated files
The locale data in the recipe is generated using cpp, which results in
differing amounts of whitespace depending on what compiler is used.
This means that the files may differ in just whitespace, which is
sufficient for RPM's multilib code to consider them different and not
allow lib32-libx11-locale and lib64-libx11-locale to be installed at the
same time.
[ YOCTO #13647 ]
Signed-off-by: Ross Burton
---
.../xorg-lib/files/libx11-whitespace.patch| 56 +++
.../xorg-lib/libx11-compose-data_1.6.8.bb | 3 +-
.../recipes-graphics/xorg-lib/libx11_1.6.9.bb | 3 +-
3 files changed, 60 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch
diff --git a/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch
b/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch
new file mode 100644
index 000..3f971430820
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch
@@ -0,0 +1,56 @@
+Upstream-Status: Submitted
[https://gitlab.freedesktop.org/xorg/lib/libx11/merge_requests/33]
+Signed-off-by: Ross Burton
+
+From b41469c5f08b1f3365667ff3c430b104c9b8e25f Mon Sep 17 00:00:00 2001
+From: Ross Burton
+Date: Wed, 22 Jan 2020 17:11:23 +
+Subject: [PATCH libX11] cpprules.in: squash whitespace in generated files
+
+CPP is used to generate files, but as cpp reads files from the build host the
+output has a number of blank lines at the beginning which varies depending on
+what GCC and friends is used.
+
+Pathalogical example:
+
+ $ cpp -undef -traditional /dev/null
+ # 1 "/dev/null"
+ # 1 ""
+ # 1 ""
+ # 31 ""
+ # 1 "/usr/include/stdc-predef.h" 1 3 4
+
+ # 17 "/usr/include/stdc-predef.h" 3 4
+
+ [ 40 blank line ]
+
+ # 32 "" 2
+ # 1 "/dev/null"
+
+So depending on the content of stdc-predef.h and what other headers CPP will
+load, the amount of whitespace in the generates files varies. This can result
in
+differences in reproducible environments, and file conflicts in multilib
+environments.
+
+As whitespace is irrelevant to these machine-readable files, extend the sed to
+just delete blank lines.
+---
+ cpprules.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cpprules.in b/cpprules.in
+index 03d6701e..ce6b3c98 100644
+--- a/cpprules.in
b/cpprules.in
+@@ -23,7 +23,8 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
+-e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
+-e '/^[ ]*XHASH/s/XHASH/\#/' \
+-e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
+- -e '/\@\@$$/s/\@\@$$/\\/'
++ -e '/\@\@$$/s/\@\@$$/\\/' \
++ -e '/^$$/d'
+
+ .pre:
+ @$(MKDIR_P) $(@D)
+--
+2.20.1
+
diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
index cabb84e686d..3d97ad78d2a 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
@@ -14,7 +14,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
SRC_URI[sha256sum] =
"b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5"
-SRC_URI += "file://0001-Drop-x11-dependencies.patch"
+SRC_URI += "file://0001-Drop-x11-dependencies.patch \
+file://libx11-whitespace.patch"
XORG_PN = "libX11"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb
b/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb
index 8c2a57c6744..ff60a4240c6 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb
@@ -11,7 +11,8 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:"
PE = "1"
SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \
-file://disable_tests.patch"
+file://disable_tests.patch \
+file://libx11-whitespace.patch"
SRC_URI[md5sum] = "55adbfb6d4370ecac5e70598c4e7eed2"
SRC_URI[sha256sum] =
"9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] busybox: udhcpc: fix 'ip route add' with multiple interfaces on the same network
The udhcpc script fails to properly set a default route when: - 'ip' is present ($have_bin_ip -eq 1) - there are 2 or more interfaces connected to the same network (e.g. ethernet + wifi on the same home LAN / same DHCP server) In this case, when the first interface gets an address from DHCP (e.g. eth0), a default route is set correctly. When the second interface (e.g. wlan0) gets its address, 'ip route add' without 'dev $interface' sets the route on the other interface. The result looks like: # ip route default via 192.168.1.1 dev eth0 metric 5 default via 192.168.1.1 dev eth0 metric 10 # wrong dev here 192.168.1.0/24 dev eth0 scope link src 192.168.1.20 192.168.1.0/24 dev wlan0 scope link src 192.168.1.30 # The situation might go unnoticed until eth0 is disconnected, because only wlan0 is present but there is no route through wlan0. Fix by explicitly passing "dev $interface" to 'ip route add'. Note that all other 'ip' invocations already have "dev $interface" passed. Signed-off-by: Luca Ceresoli --- meta/recipes-core/busybox/files/simple.script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/files/simple.script b/meta/recipes-core/busybox/files/simple.script index 6ed0293525c1..7bfa1526400f 100644 --- a/meta/recipes-core/busybox/files/simple.script +++ b/meta/recipes-core/busybox/files/simple.script @@ -59,7 +59,7 @@ case "$1" in metric=10 for i in $router ; do if [ $have_bin_ip -eq 1 ]; then -/SBIN_DIR/ip route add default via $i metric $metric +/SBIN_DIR/ip route add default via $i metric $metric dev $interface else /SBIN_DIR/route add default gw $i dev $interface metric $metric 2>/dev/null fi -- 2.25.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] oeqa: reproducible: Do not strip packages
On Wed, 2020-01-22 at 10:02 -0600, Joshua Watt wrote:
> On 1/22/20 9:53 AM, Richard Purdie wrote:
> > On Sun, 2020-01-19 at 12:59 -0600, Joshua Watt wrote:
> > > Do not strip packages when testing reproducible builds. In some cases,
> > > stripped data differs between builds, but then gets removed. However,
> > > the contents affect the generation of the GCC build-id, which then
> > > differs in the resulting ELF files, even though the data that caused
> > > this is no longer there. Inhibit stripping so that their causes can be
> > > evaluated.
> > >
> > > Signed-off-by: Joshua Watt
> > > ---
> > > meta/lib/oeqa/selftest/cases/reproducible.py | 1 +
> > > 1 file changed, 1 insertion(+)
> > >
> > > diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py
> > > b/meta/lib/oeqa/selftest/cases/reproducible.py
> > > index c00b92d2e90..34462a0b3a4 100644
> > > --- a/meta/lib/oeqa/selftest/cases/reproducible.py
> > > +++ b/meta/lib/oeqa/selftest/cases/reproducible.py
> > > @@ -149,6 +149,7 @@ class ReproducibleTests(OESelftestTestCase):
> > > config = textwrap.dedent('''\
> > > INHERIT += "reproducible_build"
> > > PACKAGE_CLASSES = "{package_classes}"
> > > +INHIBIT_PACKAGE_STRIP = "1"
> > > TMPDIR = "{tmpdir}"
> > > ''').format(package_classes=' '.join('package_%s' % c for c
> > > in self.package_classes),
> > > tmpdir=tmpdir)
> > This generates quite the failure list:
> >
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates-dbg_20190110-r0_all.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates-dev_20190110-r0_all.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates-doc_20190110-r0_all.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates_20190110-r0_all.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/acl-ptest_2.2.53-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/attr-ptest_2.4.48-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/bc-doc_1.07.1-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/binutils-doc_2.33.1-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/busybox-ptest_1.31.1-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/coreutils-doc_8.31-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/e2fsprogs-doc_1.45.4-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/elfutils-ptest_0.178-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/ethtool-ptest_5.3-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/flex-ptest_2.6.4-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-dbg_3.24.13-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-src_3.24.13-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/icu-dev_64.2-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libevdev-src_1.8.0-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libgcrypt-dbg_1.8.5-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libgcrypt_1.8.5-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libgtk-3.0_3.24.13-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libidn2-dev_2.3.0-r0_amd64.deb
> >
> > /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libinput-dbg_1.14.3-r0_amd64.deb
> >
Re: [OE-core] [PATCH 3/3] oeqa: reproducible: Do not strip packages
On 1/22/20 9:53 AM, Richard Purdie wrote:
On Sun, 2020-01-19 at 12:59 -0600, Joshua Watt wrote:
Do not strip packages when testing reproducible builds. In some cases,
stripped data differs between builds, but then gets removed. However,
the contents affect the generation of the GCC build-id, which then
differs in the resulting ELF files, even though the data that caused
this is no longer there. Inhibit stripping so that their causes can be
evaluated.
Signed-off-by: Joshua Watt
---
meta/lib/oeqa/selftest/cases/reproducible.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py
b/meta/lib/oeqa/selftest/cases/reproducible.py
index c00b92d2e90..34462a0b3a4 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -149,6 +149,7 @@ class ReproducibleTests(OESelftestTestCase):
config = textwrap.dedent('''\
INHERIT += "reproducible_build"
PACKAGE_CLASSES = "{package_classes}"
+INHIBIT_PACKAGE_STRIP = "1"
TMPDIR = "{tmpdir}"
''').format(package_classes=' '.join('package_%s' % c for c in
self.package_classes),
tmpdir=tmpdir)
This generates quite the failure list:
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates-dbg_20190110-r0_all.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates-dev_20190110-r0_all.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates-doc_20190110-r0_all.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates_20190110-r0_all.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/acl-ptest_2.2.53-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/attr-ptest_2.4.48-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/bc-doc_1.07.1-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/binutils-doc_2.33.1-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/busybox-ptest_1.31.1-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/coreutils-doc_8.31-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/e2fsprogs-doc_1.45.4-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/elfutils-ptest_0.178-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/ethtool-ptest_5.3-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/flex-ptest_2.6.4-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-dbg_3.24.13-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-src_3.24.13-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/icu-dev_64.2-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libevdev-src_1.8.0-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libgcrypt-dbg_1.8.5-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libgcrypt_1.8.5-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libgtk-3.0_3.24.13-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libidn2-dev_2.3.0-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libinput-dbg_1.14.3-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libinput10_1.14.3-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libx11-locale_1.6.9-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libxml
Re: [OE-core] [PATCH 3/3] oeqa: reproducible: Do not strip packages
On Sun, 2020-01-19 at 12:59 -0600, Joshua Watt wrote:
> Do not strip packages when testing reproducible builds. In some cases,
> stripped data differs between builds, but then gets removed. However,
> the contents affect the generation of the GCC build-id, which then
> differs in the resulting ELF files, even though the data that caused
> this is no longer there. Inhibit stripping so that their causes can be
> evaluated.
>
> Signed-off-by: Joshua Watt
> ---
> meta/lib/oeqa/selftest/cases/reproducible.py | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py
> b/meta/lib/oeqa/selftest/cases/reproducible.py
> index c00b92d2e90..34462a0b3a4 100644
> --- a/meta/lib/oeqa/selftest/cases/reproducible.py
> +++ b/meta/lib/oeqa/selftest/cases/reproducible.py
> @@ -149,6 +149,7 @@ class ReproducibleTests(OESelftestTestCase):
> config = textwrap.dedent('''\
> INHERIT += "reproducible_build"
> PACKAGE_CLASSES = "{package_classes}"
> +INHIBIT_PACKAGE_STRIP = "1"
> TMPDIR = "{tmpdir}"
> ''').format(package_classes=' '.join('package_%s' % c for c in
> self.package_classes),
> tmpdir=tmpdir)
This generates quite the failure list:
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates-dbg_20190110-r0_all.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates-dev_20190110-r0_all.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates-doc_20190110-r0_all.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./all/ca-certificates_20190110-r0_all.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/acl-ptest_2.2.53-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/attr-ptest_2.4.48-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/bc-doc_1.07.1-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/binutils-doc_2.33.1-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/busybox-ptest_1.31.1-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/coreutils-doc_8.31-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/e2fsprogs-doc_1.45.4-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/elfutils-ptest_0.178-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/ethtool-ptest_5.3-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/flex-ptest_2.6.4-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-dbg_3.24.13-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/gtk+3-src_3.24.13-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/icu-dev_64.2-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libevdev-src_1.8.0-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libgcrypt-dbg_1.8.5-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libgcrypt_1.8.5-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libgtk-3.0_3.24.13-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libidn2-dev_2.3.0-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libinput-dbg_1.14.3-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libinput10_1.14.3-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libx11-locale_1.6.9-r0_amd64.deb
/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-12270/reproducibleB/tmp/deploy/deb/./core2-64/libxml2-ptest_2.9.10-r0_amd64.deb
[OE-core] [PATCH 1/3] packagegroup-base: only pull in dosfstools if licensing allows
packagegroup-base-vfat RRECOMMENDS on dosfstools, but this is GPLv3 so
may be blacklisted. Respect INCOMPATIBLE_LICENSE and don't recommend if
GPL-3.0 has been blacklisted.
Signed-off-by: Ross Burton
---
meta/recipes-core/packagegroups/packagegroup-base.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb
b/meta/recipes-core/packagegroups/packagegroup-base.bb
index 1f802da09b7..3476db09c35 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -168,7 +168,7 @@ RRECOMMENDS_packagegroup-base-vfat = "\
kernel-module-vfat \
kernel-module-nls-iso8859-1 \
kernel-module-nls-cp437 \
-dosfstools"
+${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPL-3.0", "", "dosfstools",
d)}"
SUMMARY_packagegroup-base-alsa = "ALSA sound support"
RDEPENDS_packagegroup-base-alsa = "\
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] shared-mime-info: actually depends on itstool-native
shared-mime-info needs itstool-native, not itstool. Fixing this removes itstool from the rdepends of shared-mime-info-dev. Signed-off-by: Ross Burton --- meta/recipes-support/shared-mime-info/shared-mime-info_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb index b2d562157b7..f0d5bc62e9e 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb @@ -5,7 +5,7 @@ SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "libxml2 itstool glib-2.0 shared-mime-info-native" +DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native" SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https" SRCREV = "829b26d85e7d89a0caee03046c3bce373f04c80a" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] connman: add PACKAGECONFIG for the commandline client
The client depends on readline which is GPLv3. Add a PACKAGECONFIG so users who
don't need the client and are against GPLv3 can disable it.
Also remove the explicit installation of the client in do_install_append, as the
Makefile installs it now.
Signed-off-by: Ross Burton
---
meta/recipes-connectivity/connman/connman.inc | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman.inc
b/meta/recipes-connectivity/connman/connman.inc
index ff3aff5f1ff..d3eeb3be1c2 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
inherit autotools pkgconfig systemd update-rc.d update-alternatives
-DEPENDS = "dbus glib-2.0 ppp readline"
+DEPENDS = "dbus glib-2.0 ppp"
INC_PR = "r20"
@@ -27,13 +27,11 @@ EXTRA_OECONF += "\
--enable-ethernet \
--enable-tools \
--disable-polkit \
---enable-client \
"
-PACKAGECONFIG ??= "wispr \
+PACKAGECONFIG ??= "wispr iptables client\
${@bb.utils.filter('DISTRO_FEATURES', '3g systemd wifi',
d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth',
'bluez', '', d)} \
- iptables \
"
# If you want ConnMan to support VPN, add following statement into
@@ -54,6 +52,7 @@ PACKAGECONFIG[wispr] =
"--enable-wispr,--disable-wispr,gnutls,"
PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,libmnl
libnftnl,,kernel-module-nf-tables kernel-module-nft-chain-nat-ipv4
kernel-module-nft-chain-route-ipv4 kernel-module-nft-masq-ipv4
kernel-module-nft-nat"
PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables"
PACKAGECONFIG[nfc] = "--enable-neard, --disable-neard, neard, neard"
+PACKAGECONFIG[client] = "--enable-client,--disable-client,readline"
INITSCRIPT_NAME = "connman"
INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
@@ -87,7 +86,6 @@ do_install_append() {
if [ -e ${B}/tools/wispr ]; then
install -m 0755 ${B}/tools/wispr ${D}${bindir}
fi
- install -m 0755 ${B}/client/connmanctl ${D}${bindir}
# We don't need to package an empty directory
rmdir --ignore-fail-on-non-empty ${D}${libdir}/connman/scripts
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] psplash: add systemd support
From: Stefan Agner
Make use of the recently added systemd support in psplash. The utility
psplash-systemd communicates boot progress to the splash screen. The
splash is disabled once systemd consideres the system fully booted
(progress is at 1.0). Note that this can take a while if systemd is
stuck on a failing unit.
This change adds two systemd services. One service starts psplash itself
(psplash-start.service) and the second service starts the helper utility
psplash-systemd (psplash-systemd.service). The units are written such
that psplash-systemd.service can be used indepenendenly. This is useful
when starting psplash in initramfs (not using systemd).
Signed-off-by: Stefan Agner
---
Note that this does *not* move to the very latest version of psplash.
The latest changes from Yann Dirson change how the header files for
the splash logo and progress bar are generated which needs more work
on the recipe side.
In fact, we probably could get rid of most of the logic which generates
the header files in the recipe and make use of the built-in functionality
now. It also would somewhat brake the recipe "API" as we probably would
allow to define header files directly through file:// anymore.
I currently do not plan to work on this.
--
Stefan
meta/recipes-core/psplash/files/psplash-init | 8 ++--
.../psplash/files/psplash-start.service | 10 +
.../psplash/files/psplash-systemd.service | 10 +
meta/recipes-core/psplash/psplash_git.bb | 38 +++
4 files changed, 47 insertions(+), 19 deletions(-)
create mode 100644 meta/recipes-core/psplash/files/psplash-start.service
create mode 100644 meta/recipes-core/psplash/files/psplash-systemd.service
diff --git a/meta/recipes-core/psplash/files/psplash-init
b/meta/recipes-core/psplash/files/psplash-init
index 4bee866b0d..f58e043733 100755
--- a/meta/recipes-core/psplash/files/psplash-init
+++ b/meta/recipes-core/psplash/files/psplash-init
@@ -23,10 +23,10 @@ for x in $CMDLINE; do
esac
done
-export TMPDIR=/mnt/.psplash
-[ -d $TMPDIR ] || mkdir -p $TMPDIR
-if ! mountpoint -q $TMPDIR; then
- mount tmpfs -t tmpfs $TMPDIR -o,size=40k
+export PSPLASH_FIFO_DIR=/mnt/.psplash
+[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR
+if ! mountpoint -q $PSPLASH_FIFO_DIR; then
+ mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k
fi
rotation=0
diff --git a/meta/recipes-core/psplash/files/psplash-start.service
b/meta/recipes-core/psplash/files/psplash-start.service
new file mode 100644
index 00..9de8f6321a
--- /dev/null
+++ b/meta/recipes-core/psplash/files/psplash-start.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Start psplash boot splash screen
+DefaultDependencies=no
+Requires=psplash-systemd.service
+
+[Service]
+ExecStart=/usr/bin/psplash
+
+[Install]
+WantedBy=sysinit.target
diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service
b/meta/recipes-core/psplash/files/psplash-systemd.service
new file mode 100644
index 00..e14f42032d
--- /dev/null
+++ b/meta/recipes-core/psplash/files/psplash-systemd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Start psplash-systemd progress communication helper
+DefaultDependencies=no
+After=systemd-start.service
+
+[Service]
+ExecStart=/usr/bin/psplash-systemd
+
+[Install]
+WantedBy=sysinit.target
diff --git a/meta/recipes-core/psplash/psplash_git.bb
b/meta/recipes-core/psplash/psplash_git.bb
index 56734c1582..6ff0393194 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -3,14 +3,16 @@ DESCRIPTION = "PSplash is a userspace graphical boot splash
screen for mainly em
HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash";
SECTION = "base"
LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM =
"file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85bed78dd09dc7745c6"
+LIC_FILES_CHKSUM =
"file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224"
-SRCREV = "2015f7073e98dd9562db0936a254af5ef56356cf"
+SRCREV = "773a3977d255e8f59a741ad6ce37c4d40f1feaa1"
PV = "0.1+git${SRCPV}"
PR = "r15"
SRC_URI = "git://git.yoctoproject.org/${BPN} \
file://psplash-init \
+ file://psplash-start.service \
+ file://psplash-systemd.service \
${SPLASH_IMAGES}"
UPSTREAM_CHECK_COMMITS = "1"
@@ -66,7 +68,11 @@ python __anonymous() {
S = "${WORKDIR}/git"
-inherit autotools pkgconfig update-rc.d update-alternatives
+inherit autotools pkgconfig update-rc.d update-alternatives systemd
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+
+PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd"
ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash"
@@ -97,8 +103,17 @@ python do_compile () {
}
do_install_append() {
- install -d ${D}${sysconfdir}/init.d/
- install -m 0755 ${WORKDIR}/psplash-init
${D}${sysconfdir}/init.d/psplash.sh
+ if ${@bb.utils.contains('DI
[OE-core] Excluding test folders from python install path
Hello, When preparing an image for device I'd like to exclude test folders from python install path, i.e. folders like: /usr/lib/python2.7/test /usr/lib/python2.7/sqlite3/test ... They take much space and are not needed on my device. Could you please advice is there a configure option for python recipe to exclude these folders? Or maybe some other python recipe modification? Thanks in advance, Maxim -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] License not found when building for different architectures
Hi there,
I encountered a problem using bitbake for different architectures and building
an image with the licenses:
local.conf:
COPY_LIC_MANIFEST = "1"
COPY_LIC_DIRS = "1"
LICENSE_CREATE_PACKAGE = "1"
The problem appears in warrior and can be reproduced with the following steps:
1. Build a full image with license for architecture A
2. Build the same image for architecture B
3. With architecture A environnement, cleanall package X that was packed in the
image
4. Build again full image for architecture B
At steps 1 and 2, the directory build/tmp/deploy/licenses is populated with the
proper licenses (but only once).
At step 3, the license of the package X is removed from the deploy directory.
At step 4, the sstate of the package X says there is nothing to do, but when
the rootfs is created, the license is missing.
Does anybody knows about this problem and have a solution ?
The only thing I could do now is to put the licenses in
"${DEPLOY_DIR}/licenses/${PACKAGE_ARCH}"
And change the code in license_image to check subdirectories in
${DEPLOY_DIR}/licenses in order to retrieve the licenses.
Best regards,
Alexandre Bard
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] busybox: udhcpc: fix IPv6 support when using udhcpc
Hi Khem, On Tue, Jan 21, 2020 at 10:08:59AM -0800, Khem Raj wrote: > On Tue, Jan 21, 2020 at 1:23 AM Quentin Schulz > wrote: > > > > Hi Khem, > > > > On Mon, Jan 20, 2020 at 11:26:27AM -0800, Khem Raj wrote: > > > > Just checked, we still override that script in our layer, so definitely > > > > would be happy if this gets merged upstream so I can get rid of our > > > > custom script downstream. > > > > > > > > > > I think this is good to go got OE-core, but I was wondering if default > > > script in busybox also need this and perhaps upstream too > > > > > > > What do you mean by "default script"? > > https://git.openembedded.org/openembedded-core/tree/meta/recipes-core/busybox/files/default.script > > ? > > yes. I'm confused then. Bear with me, I'm new to userspace so I'm sure I'm missing something rather obvious. The content of default.script is: exec run-parts -a "$1" /etc/udhcpc.d AFAICT from a quick look at busybox.inc, the only things in that /etc/udhcpc.d directory are simple.script (named 50default actually) and default.script. What do you think should be done for that file wrt the original issue? > > > > Upstream could benefit from it, I'd agree. Though, it is technically > > just provided as an example. > > https://git.busybox.net/busybox/tree/examples/udhcp/simple.script > > > @all: FYI, patch is merged: https://git.openembedded.org/openembedded-core/commit/meta/recipes-core/busybox/files/simple.script?id=b77541dbb2f442e51842f9d24c8745a6df2d1478 > > The reason why I didn't bother to send a patch to busybox before pinging > > on this patch was that we're already different from the upstream > > simple.script > > so it didn't make sense to me to add the Upstream-Status: pending or > > something on the patch (in some ways, since it's patching the file > > directly and not adding a patch in SRC_URI). Anyway, digressing. Do you > > want a patch to be sent to busybox ML (or PR or whatever they use) > > before taking this patch? > > > > I think the problem this patch fixes is generic and somewhere the > script OE has is also derived from > that example, so while the patch in itself is enough for OE, it would > be better if it was in upstream too > perhaps one less thing to worry about when we cherry pick changes from > upstream script in future. > Agreed, I'll put it on my TODO-list. If I do not send an answer on this mail with the link to the PR or patch in the next week, anyone, please ping me. Thx, Quentin -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] util-linux: upgrade 2.34 -> 2.35
On Tue, Jan 21, 2020 at 07:28:44PM +0100, Pierre-Jean Texier via
Openembedded-core wrote:
> License-Update: add GPLv3 text
Which parts of util-linux are now licensed with GPLv3?
-Mikko
> Drop upstreamed patch
>
> See full changelog
> https://lore.kernel.org/util-linux/20200121105711.zzeeolydlivqn...@ws.net.home/T/#u
>
> Signed-off-by: Pierre-Jean Texier
> ---
> meta/recipes-core/util-linux/util-linux.inc| 5 +--
> ...lsblk-force-to-print-PKNAME-for-partition.patch | 36
> --
> .../{util-linux_2.34.bb => util-linux_2.35.bb} | 5 ++-
> 3 files changed, 5 insertions(+), 41 deletions(-)
> delete mode 100644
> meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch
> rename meta/recipes-core/util-linux/{util-linux_2.34.bb =>
> util-linux_2.35.bb} (58%)
>
> diff --git a/meta/recipes-core/util-linux/util-linux.inc
> b/meta/recipes-core/util-linux/util-linux.inc
> index 179cb3d..0f8a6c2 100644
> --- a/meta/recipes-core/util-linux/util-linux.inc
> +++ b/meta/recipes-core/util-linux/util-linux.inc
> @@ -6,11 +6,12 @@ disk partitioning, kernel message management, filesystem
> creation, and system lo
>
> SECTION = "base"
>
> -LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"
> +LICENSE = "GPLv2+ & GPLv3+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"
>
> -LIC_FILES_CHKSUM =
> "file://README.licensing;md5=972a134f1e14b2b060e365df2fab0099 \
> +LIC_FILES_CHKSUM =
> "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \
> file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>
> file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263
> \
> +
> file://Documentation/licenses/COPYING.GPL-3.0-or-later;md5=1ebbd3e34237af26da5dc08a4e440464
> \
>
> file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c
> \
>
> file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af
> \
>
> file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262
> \
> diff --git
> a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch
>
> b/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch
> deleted file mode 100644
> index 5d4c148..000
> ---
> a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001
> -From: Karel Zak
> -Date: Thu, 27 Jun 2019 09:22:18 +0200
> -Subject: [PATCH] lsblk: force to print PKNAME for partition
> -
> -PKNAME (parent kernel device name) is based on printed tree according
> -to parent -> child relationship. The tree is optional and not printed
> -if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old
> -versions print the PKNAME also in this case.
> -
> -Upstream-Status: Backport
> [https://github.com/karelzak/util-linux/commit/e3bb9bfb76c17b1d05814436ced62c05c4011f48]
> -
> -Addresses: https://github.com/karelzak/util-linux/issues/813
> -Signed-off-by: Karel Zak
> -Signed-off-by: Liwei Song
>
> - misc-utils/lsblk.c | 3 +++
> - 1 file changed, 3 insertions(+)
> -
> -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
> -index e95af7af0256..3ce6da730264 100644
> a/misc-utils/lsblk.c
> -+++ b/misc-utils/lsblk.c
> -@@ -1019,6 +1019,9 @@ static void device_to_scols(
> - DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name));
> - ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s
> ---> is open!", dev->name));
> -
> -+if (!parent && dev->wholedisk)
> -+parent = dev->wholedisk;
> -+
> - /* Do not print device more than one in --list mode */
> - if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed)
> - return;
> ---
> -2.17.1
> -
> diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb
> b/meta/recipes-core/util-linux/util-linux_2.35.bb
> similarity index 58%
> rename from meta/recipes-core/util-linux/util-linux_2.34.bb
> rename to meta/recipes-core/util-linux/util-linux_2.35.bb
> index e9c2d80..71f7cd1 100644
> --- a/meta/recipes-core/util-linux/util-linux_2.34.bb
> +++ b/meta/recipes-core/util-linux/util-linux_2.35.bb
> @@ -7,7 +7,6 @@ SRC_URI += "file://configure-sbindir.patch \
> file://run-ptest \
> file://display_testname_for_subtest.patch \
> file://avoid_parallel_tests.patch \
> -file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \
> "
> -SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50"
> -SRC_URI[sha256sum] =
> "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5"
> +SRC_URI[md5sum] = "479488469f057ddeed0d3ca7d6ab5f16"
> +SRC_URI[sha256sum] =
Re: [OE-core] [OE-Core][PATCH] make: 4.2.1 -> 4.3
> Am 21.01.2020 um 17:59 schrieb Martin Jansa :
>
> There are also some backwards incompatible changes introduced in this release.
>
> Link to whole
> announcement:https://lists.gnu.org/archive/html/bug-make/2020-01/msg00057.html
Do you want them included in commit message?
AFAIK hostbuild is used anyway - so this affects SDK's and I got reports from
SDK users that the kernel build is not running parallel.
> On Tue, Jan 21, 2020 at 5:47 PM Jens Rehsack wrote:
> 1) Remove upstream provided patches
> 0001-glob-Do-not-assume-glibc-glob-internals.patch
>and 0002-glob-Do-not-assume-glibc-glob-internals.patch.
>
> 2) License has been changed to GPLv3 only
>
> 3) Important bug-fix is
>* https://lists.gnu.org/archive/html/bug-make/2018-09/msg6.html
>
> Signed-off-by: Jens Rehsack
> ---
> meta/recipes-devtools/make/make.inc | 4 +-
> ...b-Do-not-assume-glibc-glob-internals.patch | 70 ---
> ...b-Do-not-assume-glibc-glob-internals.patch | 38 --
> meta/recipes-devtools/make/make_4.2.1.bb | 12
> meta/recipes-devtools/make/make_4.3.bb| 10 +++
> 5 files changed, 11 insertions(+), 123 deletions(-)
> delete mode 100644
> meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
> delete mode 100644
> meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch
> delete mode 100644 meta/recipes-devtools/make/make_4.2.1.bb
> create mode 100644 meta/recipes-devtools/make/make_4.3.bb
>
> diff --git a/meta/recipes-devtools/make/make.inc
> b/meta/recipes-devtools/make/make.inc
> index b8905bc6d3..4142cf23d3 100644
> --- a/meta/recipes-devtools/make/make.inc
> +++ b/meta/recipes-devtools/make/make.inc
> @@ -5,9 +5,7 @@ called the makefile, which lists each of the non-source files
> and how to compute
> HOMEPAGE = "http://www.gnu.org/software/make/";
> SECTION = "devel"
>
> -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \
> - file://0001-glob-Do-not-assume-glibc-glob-internals.patch \
> - file://0002-glob-Do-not-assume-glibc-glob-internals.patch \
> +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.lz \
> "
>
> inherit autotools gettext pkgconfig texinfo
> diff --git
> a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
>
> b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
> deleted file mode 100644
> index 2b6e4d40c3..00
> ---
> a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
> +++ /dev/null
> @@ -1,70 +0,0 @@
> -From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001
> -From: Paul Eggert
> -Date: Sun, 24 Sep 2017 09:12:58 -0400
> -Subject: [PATCH 1/2] glob: Do not assume glibc glob internals.
> -
> -It has been proposed that glibc glob start using gl_lstat,
> -which the API allows it to do. GNU 'make' should not get in
> -the way of this. See:
> -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
> -
> -* dir.c (local_lstat): New function, like local_stat.
> -(dir_setup_glob): Use it to initialize gl_lstat too, as the API
> -requires.
>
> -Upstream-Status: Backport
> -Signed-off-by: Khem Raj
> -
> - dir.c | 29 +++--
> - 1 file changed, 27 insertions(+), 2 deletions(-)
> -
> -diff --git a/dir.c b/dir.c
> -index f34bbf5..12eef30 100644
> a/dir.c
> -+++ b/dir.c
> -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
> - }
> - #endif
> -
> -+/* Similarly for lstat. */
> -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
> -+# ifndef VMS
> -+# ifndef HAVE_SYS_STAT_H
> -+int lstat (const char *path, struct stat *sbuf);
> -+# endif
> -+# else
> -+/* We are done with the fake lstat. Go back to the real lstat */
> -+# ifdef lstat
> -+# undef lstat
> -+# endif
> -+# endif
> -+# define local_lstat lstat
> -+#elif defined(WINDOWS32)
> -+/* Windows doesn't support lstat(). */
> -+# define local_lstat local_stat
> -+#else
> -+static int
> -+local_lstat (const char *path, struct stat *buf)
> -+{
> -+ int e;
> -+ EINTRLOOP (e, lstat (path, buf));
> -+ return e;
> -+}
> -+#endif
> -+
> - void
> - dir_setup_glob (glob_t *gl)
> - {
> - gl->gl_opendir = open_dirstream;
> - gl->gl_readdir = read_dirstream;
> - gl->gl_closedir = free;
> -+ gl->gl_lstat = local_lstat;
> - gl->gl_stat = local_stat;
> -- /* We don't bother setting gl_lstat, since glob never calls it.
> -- The slot is only there for compatibility with 4.4 BSD. */
> - }
> -
> - void
> ---
> -2.16.1
> -
> diff --git
> a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch
>
> b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch
> deleted file mode 100644
> index d49acd9f6e..00
> ---
> a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -Fr
[OE-core] [PATCH v3] gstreamer1.0-plugins-common.inc: disable orc on mips
From: Mingli Yu
After transiton to meson build for gstreamer series,
for gstreamer1.0-plugins-base, with below two commits
introduced:
238080ed89 gstreamer: Remove unused common files and patches
20614408dc gstreamer1.0-plugins-base: Transition to meson based builds
With below config in local.conf
MACHINE ??= "qemumips64"
require conf/multilib.conf
MULTILIB_GLOBAL_VARIANTS_append = " libn32"
MULTILIBS ?= "multilib:lib32 multilib:libn32"
DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips"
DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32"
there comes below failure:
$ bitbake lib32-gstreamer1.0-plugins-base
[snip]
mips-pokymllib32-linux-gcc -meb -mabi=32 -mhard-float -fstack-protector-strong
-D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security
--sysroot=/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0/lib32-recipe-sysroot
-Itests/check/7d01337@@orc_video@exe -Itests/check
-I../gst-plugins-base-1.16.1/tests/check
-I/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0/lib32-recipe-sysroot/usr/include/orc-0.4
-fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -fvisibility=hidden
-fno-strict-aliasing -DG_DISABLE_CAST_CHECKS -Wmissing-declarations
-Wredundant-decls -Wundef -Wwrite-strings -Wformat -Wformat-nonliteral
-Wformat-security -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar
-Wvla -Wpointer-arith -Wmissing-prototypes -Wdeclaration-after-statement -O2 -g
-feliminate-unused-debug-types
-fmacro-prefix-map=/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0=/u
sr/src/debug/lib32-gstreamer1.0-plugins-base/1.16.1-r0
-fdebug-prefix-map=/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0=/usr/src/debug/lib32-gstreamer1.0-plugins-base/1.16.1-r0
-fdebug-prefix-map=/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0/lib32-recipe-sysroot=
-fdebug-prefix-map=/mybuild/tmp/work/mips-pokymllib32-linux/lib32-gstreamer1.0-plugins-base/1.16.1-r0/recipe-sysroot-native=
-MD -MQ 'tests/check/7d01337@@orc_video@exe/meson-generated_.._orc_video.c.o'
-MF 'tests/check/7d01337@@orc_video@exe/meson-generated_.._orc_video.c.o.d' -o
'tests/check/7d01337@@orc_video@exe/meson-generated_.._orc_video.c.o' -c
tests/check/orc_video.c
FAILED: tests/check/7d01337@@orc_video@exe/meson-generated_.._orc_video.c.o
{standard input}: Assembler messages:
{standard input}:46587: Error: branch out of range
{standard input}:46613: Error: branch out of range
[snip]
BTW, gstreamer1.0-plugins-good also occurs
the same build failure as above.
Disable orc as workaround to fix the above issue
Signed-off-by: Mingli Yu
---
.../gstreamer/gstreamer1.0-plugins-common.inc| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
index ccf55500a9..dba96e0f6e 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
@@ -18,7 +18,10 @@ require gstreamer1.0-plugins-packaging.inc
# This value is used in the PACKAGECONFIG values for each plugin set recipe.
# By modifying it, Orc can be enabled/disabled in all of these recipes at once.
GSTREAMER_ORC ?= "orc"
-
+# workaround to disable orc on mips to fix the build failure
+# {standard input}: Assembler messages:
+# {standard input}:46587: Error: branch out of range
+GSTREAMER_ORC_mips = ""
PACKAGECONFIG[orc] = "-Dorc=enabled,-Dorc=disabled,orc orc-native"
# TODO: put this in a gettext.bbclass patch (with variables to allow for
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 05/24] nss: update to 3.49.1
On Tue, Jan 21, 2020 at 2:02 PM Khem Raj wrote: > > > > On Tue, Jan 21, 2020 at 12:22 PM Richard Purdie > wrote: >> >> On Tue, 2020-01-21 at 11:35 -0800, Khem Raj wrote: >> > This is failing on qemuarm btw >> > >> > http://errors.yoctoproject.org/Errors/Details/307410/ >> >> That is odd as it passed testing on the autobuilder. It must be >> something tune specific :( > > Thanks > > While my builds are dealing with py2 things this seems not related but I do > have gcc10 in my mix > So it could be future build break I need to triage it a bit more and see > what’s going on > It was not a compiler issue but another issue in the patch proposed to disable crypto, I have not sent a patch on top of this one which should fix the problem and make the patch to disable crypto on arm disable it fully. see https://patchwork.openembedded.org/patch/169340/ >> >> Cheers, >> >> Richard >> -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] nss: Pass NSS_USE_ARM_HW_CRYPTO as define in CFLAGS
Use NSS_USE_ARM_HW_CRYPTO to detect USE_ARM_GCM, since there are dependent, without this we control the crypto code function inclusion in build but do not control the call sites, which can result in undefined symbols e.g. Linux_SINGLE_SHLIB/gcm.o: in function `gcmHash_InitContext': /usr/src/debug/nss/3.49.1-r0/nss-3.49.1/nss/lib/freebl/gcm.c:112: undefined reference to `gcm_HashInit_hw' Signed-off-by: Khem Raj --- ...figure-option-to-disable-ARM-HW-cryp.patch | 25 --- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index fe29d19882..803c06b218 100644 --- a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -12,20 +12,19 @@ Signed-off-by: Alexander Kanavin nss/lib/freebl/Makefile | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 06506f0..a8b015d 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile -@@ -125,6 +125,8 @@ else +@@ -125,6 +125,9 @@ else DEFINES += -DNSS_X86 endif endif + +ifdef NSS_USE_ARM_HW_CRYPTO ++DEFINES += -DNSS_USE_ARM_HW_CRYPTO ifeq ($(CPU_ARCH),aarch64) DEFINES += -DUSE_HW_AES EXTRA_SRCS += aes-armv8.c gcm-aarch64.c -@@ -145,6 +147,7 @@ ifeq ($(CPU_ARCH),arm) +@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) endif endif endif @@ -33,3 +32,21 @@ index 06506f0..a8b015d 100644 ifeq ($(OS_TARGET),OSF1) DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD +--- a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c +@@ -17,6 +17,7 @@ + + #include + ++#ifdef NSS_USE_ARM_HW_CRYPTO + /* old gcc doesn't support some poly64x2_t intrinsic */ + #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ + (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) +@@ -28,6 +29,7 @@ + * that compiler uses -mfpu=neon only. */ + #define USE_ARM_GCM + #endif ++#endif + + /* Forward declarations */ + SECStatus gcm_HashInit_hw(gcmHashContext *ghash); -- 2.25.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
