Re: [OE-core] [PATCH] python-setuptools.inc: avoid using += with an over-ride
On Tue, Jul 3, 2018 at 8:15 PM, Christopher Larson wrote: > On Tue, Jul 3, 2018 at 5:55 PM Andre McCurdy wrote: >> >> An over-ride replaces the original value regardless of whether or >> not it's set up with +=. As replacing the original value seems to be >> the intention here, drop the += to make it more explicit. Also some >> minor recipe formatting tweaks. >> >> Signed-off-by: Andre McCurdy > > Technically this is not the case, not precisely. += is appending to any > existing DEPENDS_class-native value, and only *then* is the override applied > to replace DEPENDS. So it's not appending to DEPENDS, it's appending to > DEPENDS_class-native. Yes, that's what I said, or at least tried to. It doesn't matter if you assign to the over-ride directly or use += to append to it... it's still an over-ride which completely replaces the original value. > In this case, it's most likely doing it this way in > the .inc so it's possible for the recipe including it to define > DEPENDS_class-native alongside DEPENDS before the inclusion, but this is > largely pointless, since they can always += to it *after* the inclusion > instead. So I think you're good, most likely it's still fine to remove it, > but I wanted to clarify, as there *are* times when this is a useful thing to > do. Right. I did look into the recipe, the include and the various classes it uses fairly carefully and I'm pretty sure this is the right fix. As to whether allowing += with an over-ride is a useful feature of the language I'm not sure. There are other ways to achieve the same result but it's a huge trap for new users who assume that it behaves like a conditional append - I've seen that bug many times. > --> Christopher Larson > kergoth at gmail dot com > Founder - BitBake, OpenEmbedded, OpenZaurus > Senior Software Engineer, Mentor Graphics -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] oeqa/runtime/cases/parselog.py: ignore a message from weston
The following error message when starting core-image-weston is not critical as long as the image could start up correctly. So extend the common_errors list for parselog.py test case to ignore this message. logind: cannot setup systemd-logind helper (-61), using legacy fallback [YOCTO #12835] Signed-off-by: Chen Qi --- meta/lib/oeqa/runtime/cases/parselogs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py index 1cdea58..ba1bb71 100644 --- a/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/meta/lib/oeqa/runtime/cases/parselogs.py @@ -51,6 +51,7 @@ common_errors = [ "Cannot set xattr user.Librepo.DownloadInProgress", "Failed to read /var/lib/nfs/statd/state: Success", "error retry time-out =", +"logind: cannot setup systemd-logind helper (-61), using legacy fallback" ] video_related = [ -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] oeqa/runtime/cases/parselog.py: ignore a message from weston
The following changes since commit 0118f01787eaa91ec2760d0bb8540efadf5c2510: multilib: Tweak previous cross-canadian multilib fix (2018-07-04 00:02:17 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/parselogs-weston http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/parselogs-weston Chen Qi (1): oeqa/runtime/cases/parselog.py: ignore a message from weston meta/lib/oeqa/runtime/cases/parselogs.py | 1 + 1 file changed, 1 insertion(+) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libnss-nis: Limit parse skip only for target recipe on musl
on the host side we are glibc based therefore some native and nativesdk
recipes might need this package even when we target musl based systems
Signed-off-by: Khem Raj
---
meta/recipes-extended/libnss-nis/libnss-nis.bb | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/meta/recipes-extended/libnss-nis/libnss-nis.bb
b/meta/recipes-extended/libnss-nis/libnss-nis.bb
index e0f69b02ef..47447acd6c 100644
--- a/meta/recipes-extended/libnss-nis/libnss-nis.bb
+++ b/meta/recipes-extended/libnss-nis/libnss-nis.bb
@@ -28,9 +28,4 @@ BBCLASSEXTEND += "native nativesdk"
#
# We will skip parsing this packagegeoup for non-glibc systems
#
-python __anonymous () {
-if d.getVar('TCLIBC') != "glibc":
-raise bb.parse.SkipRecipe("incompatible with %s C library" %
- d.getVar('TCLIBC'))
-}
-
+COMPATIBLE_HOST_libc-musl = 'null'
--
2.18.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] python-setuptools.inc: avoid using += with an over-ride
On Tue, Jul 3, 2018 at 5:55 PM Andre McCurdy wrote: > An over-ride replaces the original value regardless of whether or > not it's set up with +=. As replacing the original value seems to be > the intention here, drop the += to make it more explicit. Also some > minor recipe formatting tweaks. > > Signed-off-by: Andre McCurdy > Technically this is not the case, not precisely. += is appending to any existing DEPENDS_class-native value, and only *then* is the override applied to replace DEPENDS. So it's not appending to DEPENDS, it's appending to DEPENDS_class-native. In this case, it's most likely doing it this way in the .inc so it's possible for the recipe including it to define DEPENDS_class-native alongside DEPENDS before the inclusion, but this is largely pointless, since they can always += to it *after* the inclusion instead. So I think you're good, most likely it's still fine to remove it, but I wanted to clarify, as there *are* times when this is a useful thing to do. -- Christopher Larson kergoth at gmail dot com Founder - BitBake, OpenEmbedded, OpenZaurus Senior Software Engineer, Mentor Graphics -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] git: 2.16.1 -> 2.18.0
* Removed code for "${D}${exec_prefix}/lib/perl-native/perl" since there is no
such a directory now.
* Fixed perl related code.
Signed-off-by: Robert Yang
---
meta/recipes-devtools/git/git.inc | 12 ++--
meta/recipes-devtools/git/git_2.16.1.bb | 11 ---
meta/recipes-devtools/git/git_2.18.0.bb | 11 +++
3 files changed, 13 insertions(+), 21 deletions(-)
delete mode 100644 meta/recipes-devtools/git/git_2.16.1.bb
create mode 100644 meta/recipes-devtools/git/git_2.18.0.bb
diff --git a/meta/recipes-devtools/git/git.inc
b/meta/recipes-devtools/git/git.inc
index dd9d792..26a22ac 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -52,13 +52,6 @@ perl_native_fixup () {
-e 's#${libdir}/perl-native/#${libdir}/#' \
${@d.getVar("PERLTOOLS").replace(' /',d.getVar('D') + '/')}
- # ${libdir} is not applicable here, perl-native files are always
- # installed to /usr/lib on both 32/64 bits targets.
-
- mkdir -p ${D}${libdir}
- mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir}
- rmdir -p ${D}${exec_prefix}/lib/perl-native || true
-
if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'cvsserver', d)}" ]; then
# Only install the git cvsserver command if explicitly requested
# as it requires the DBI Perl module, which does not exist in
@@ -72,8 +65,7 @@ perl_native_fixup () {
# if explicitly requested as they require the SVN::Core Perl
# module, which does not exist in OE-Core.
rm -r ${D}${libexecdir}/git-core/git-svn \
- ${D}${libdir}/perl/site_perl/*/Git/SVN*
- sed -i -e '/SVN/d'
${D}${libdir}/perl/site_perl/*/auto/Git/.packlist
+ ${D}${datadir}/perl5/Git/SVN*
fi
}
@@ -124,7 +116,7 @@ PACKAGES =+ "${PN}-perltools"
FILES_${PN}-perltools += " \
${PERLTOOLS} \
${libdir}/perl \
-${datadir}/perl \
+${datadir}/perl5 \
"
RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils"
diff --git a/meta/recipes-devtools/git/git_2.16.1.bb
b/meta/recipes-devtools/git/git_2.16.1.bb
deleted file mode 100644
index 9dc4eba..000
--- a/meta/recipes-devtools/git/git_2.16.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require git.inc
-
-EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
-
ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
- "
-EXTRA_OEMAKE += "NO_GETTEXT=1"
-
-SRC_URI[tarball.md5sum] = "37467da8e79e72f28598d667f219f75e"
-SRC_URI[tarball.sha256sum] =
"56cfa48af2b289bba172ca0a47c29f0083f5846cf4759978b70988e4f07fc9fd"
-SRC_URI[manpages.md5sum] = "5587407f3c28446af12fde3f3131ba34"
-SRC_URI[manpages.sha256sum] =
"d499e825f429d76862be415f579c20cc26b046573a3a39237acaf9682cb71be7"
diff --git a/meta/recipes-devtools/git/git_2.18.0.bb
b/meta/recipes-devtools/git/git_2.18.0.bb
new file mode 100644
index 000..72b43a7
--- /dev/null
+++ b/meta/recipes-devtools/git/git_2.18.0.bb
@@ -0,0 +1,11 @@
+require git.inc
+
+EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
+
ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
+ "
+EXTRA_OEMAKE += "NO_GETTEXT=1"
+
+SRC_URI[tarball.md5sum] = "3f210b2dd1613d90ded3b8732b052025"
+SRC_URI[tarball.sha256sum] =
"94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4"
+SRC_URI[manpages.md5sum] = "8251512320568a049192a8219c51e905"
+SRC_URI[manpages.sha256sum] =
"6cf38ab3ad43ccdcd6a73ffdcf2a016d56ab6b4b240a574b0bb96f520a04ff55"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] nfs-utils: 2.1.1 -> 2.3.1
* Removed 001-configure-Allow-to-explicitly-disable-nfsidmap.patch,
the nfsidmap is enabled when --enable-nfsv4, so I added a
PACKAGECONFIG[nfsv4], and default is no since keyutils is not in oe-core by
default.
* Removed 0001-include-stdint.h-for-UINT16_MAX-definition.patch and
nfs-utils-1.2.3-sm-notify-res_init.patch since they are already in the
source.
* Backported two patches from git://git.alpinelinux.org/aports to fix build
with musl, and the nfs-utils-musl-res_querydomain.patch is for musl only.
Signed-off-by: Robert Yang
---
...gure-Allow-to-explicitly-disable-nfsidmap.patch | 40 ---
...nclude-stdint.h-for-UINT16_MAX-definition.patch | 27 -
.../nfs-utils-1.2.3-sm-notify-res_init.patch | 37 --
.../nfs-utils/nfs-utils-musl-limits.patch | 133 +
.../nfs-utils/nfs-utils-musl-res_querydomain.patch | 22
.../{nfs-utils_2.1.1.bb => nfs-utils_2.3.1.bb} | 13 +-
6 files changed, 162 insertions(+), 110 deletions(-)
delete mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
delete mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
delete mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
create mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
create mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.1.1.bb =>
nfs-utils_2.3.1.bb} (92%)
diff --git
a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
deleted file mode 100644
index 26b558c..000
---
a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9b84cff305866abd150cf1a4c6e7e5ebf8a7eb3a Mon Sep 17 00:00:00 2001
-From: Martin Jansa
-Date: Fri, 15 Nov 2013 23:21:35 +0100
-Subject: [PATCH] configure: Allow to explicitly disable nfsidmap
-
-* keyutils availability is autodetected and builds aren't reproducible
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa
- configure.ac | 10 +-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-Index: nfs-utils-2.1.1/configure.ac
-===
nfs-utils-2.1.1.orig/configure.ac
-+++ nfs-utils-2.1.1/configure.ac
-@@ -92,6 +92,12 @@ AC_ARG_ENABLE(nfsv4,
- AC_SUBST(enable_nfsv4)
- AM_CONDITIONAL(CONFIG_NFSV4, [test "$enable_nfsv4" = "yes"])
-
-+AC_ARG_ENABLE(nfsidmap,
-+[AC_HELP_STRING([--enable-nfsidmap],
-+[enable support for NFSv4 idmapper
@<:@default=yes@:>@])],
-+enable_nfsidmap=$enableval,
-+enable_nfsidmap=yes)
-+
- AC_ARG_ENABLE(nfsv41,
- [AC_HELP_STRING([--disable-nfsv41],
- [disable support for NFSv41 @<:@default=no@:>@])],
-@@ -339,7 +345,7 @@ fi
-
- dnl enable nfsidmap when its support by libnfsidmap
- AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ])
--AM_CONDITIONAL(CONFIG_NFSIDMAP, [test
"$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
-+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test
"$enable_nfsidmap$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid"
= "yesyesyes"])
-
-
- if test "$knfsd_cv_glibc2" = no; then
diff --git
a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
deleted file mode 100644
index 235a2c7..000
---
a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 36b48057bce76dced335d67a2894a420967811c9 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Sat, 20 May 2017 14:07:53 -0700
-Subject: [PATCH] include stdint.h for UINT16_MAX definition
-
-Signed-off-by: Khem Raj
-Upstream-Status: Pending
-
- support/nsm/rpc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/support/nsm/rpc.c b/support/nsm/rpc.c
-index 4e5f40e..d91c6ea 100644
a/support/nsm/rpc.c
-+++ b/support/nsm/rpc.c
-@@ -40,6 +40,7 @@
-
- #include
- #include
-+#include
- #include
- #include
- #include
---
-2.13.0
-
diff --git
a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
deleted file mode 100644
index 89a8a57..000
---
a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fixes errors like
[OE-core] [PATCH 0/2 V2] Recipes upgrade
* V2:
- Remove the ones already on master-next
- Upgrade git to 2.18 rathar than 2.17
- Fix nfs-utils' build with glibc, I had tested it with glibc, then musl in
V1, but after I fixed it with musl, I forgot to test with glibc again, now
I tested with both glibc and musl.
// Robert
The following changes since commit 59a0a05235d80c86251cf45d7142bfc57f2e70d2:
multilib: Tweak previous cross-canadian multilib fix (2018-07-04 00:01:37
+0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/up_2
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/up_2
Robert Yang (2):
git: 2.16.1 -> 2.18.0
nfs-utils: 2.1.1 -> 2.3.1
...gure-Allow-to-explicitly-disable-nfsidmap.patch | 40 ---
...nclude-stdint.h-for-UINT16_MAX-definition.patch | 27 -
.../nfs-utils-1.2.3-sm-notify-res_init.patch | 37 --
.../nfs-utils/nfs-utils-musl-limits.patch | 133 +
.../nfs-utils/nfs-utils-musl-res_querydomain.patch | 22
.../{nfs-utils_2.1.1.bb => nfs-utils_2.3.1.bb} | 13 +-
meta/recipes-devtools/git/git.inc | 12 +-
meta/recipes-devtools/git/git_2.16.1.bb| 11 --
meta/recipes-devtools/git/git_2.18.0.bb| 11 ++
9 files changed, 175 insertions(+), 131 deletions(-)
delete mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
delete mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
delete mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
create mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
create mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.1.1.bb =>
nfs-utils_2.3.1.bb} (92%)
delete mode 100644 meta/recipes-devtools/git/git_2.16.1.bb
create mode 100644 meta/recipes-devtools/git/git_2.18.0.bb
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] libxml2: fix CVE-2017-8872
The htmlParseTryOrFinish function in HTMLparser.c in libxml2 2.9.4
allows attackers to cause a denial of service (buffer over-read) or
information disclosure.
https://bugzilla.gnome.org/show_bug.cgi?id=775200
Signed-off-by: Hongxu Jia
---
.../libxml/libxml2/fix-CVE-2017-8872.patch | 38 ++
meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 +
2 files changed, 39 insertions(+)
create mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch
diff --git a/meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch
b/meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch
new file mode 100644
index 000..b34479f
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch
@@ -0,0 +1,38 @@
+From b4bee17b158e289e5c4c9045e64e5374ccafe068 Mon Sep 17 00:00:00 2001
+From: Salvatore Bonaccorso
+Date: Tue, 3 Jul 2018 15:54:03 +0800
+Subject: [PATCH] Out-of-bounds read in htmlParseTryOrFinish (CVE-2017-8872)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=775200
+Fixes bug 775200.
+
+Signed-off-by: Salvatore Bonaccorso
+
+Upstream-Status: Submitted
+https://bug775200.bugzilla-attachments.gnome.org/attachment.cgi?id=366193
+CVE: CVE-2017-8872
+Signed-off-by: Hongxu Jia
+---
+ parser.c | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/parser.c b/parser.c
+index ca9fde2..fb4c889 100644
+--- a/parser.c
b/parser.c
+@@ -12464,7 +12464,11 @@ xmlHaltParser(xmlParserCtxtPtr ctxt) {
+ }
+ ctxt->input->cur = BAD_CAST"";
+ ctxt->input->base = ctxt->input->cur;
+-ctxt->input->end = ctxt->input->cur;
++ ctxt->input->end = ctxt->input->cur;
++ if (ctxt->input->buf)
++ xmlBufEmpty (ctxt->input->buf->buffer);
++ else
++ ctxt->input->length = 0;
+ }
+ }
+
+--
+2.7.4
+
diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb
b/meta/recipes-core/libxml/libxml2_2.9.8.bb
index d55e650..1f22bb0 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.8.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.8.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-2017-8872.patch \
"
SRC_URI[libtar.md5sum] = "b786e353e2aa1b872d70d5d1ca0c740d"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python-setuptools.inc: avoid using += with an over-ride
An over-ride replaces the original value regardless of whether or
not it's set up with +=. As replacing the original value seems to be
the intention here, drop the += to make it more explicit. Also some
minor recipe formatting tweaks.
Signed-off-by: Andre McCurdy
---
meta/recipes-devtools/python/python-setuptools.inc | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-devtools/python/python-setuptools.inc
b/meta/recipes-devtools/python/python-setuptools.inc
index bf654be..3f1bfaa 100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -2,7 +2,6 @@ SUMMARY = "Download, build, install, upgrade, and uninstall
Python packages"
HOMEPAGE = "https://pypi.python.org/pypi/setuptools;
SECTION = "devel/python"
LICENSE = "MIT"
-
LIC_FILES_CHKSUM =
"file://LICENSE;beginline=1;endline=19;md5=9a33897f1bca1160d7aad3835152e158"
PYPI_PACKAGE_EXT = "zip"
@@ -13,16 +12,12 @@ SRC_URI[md5sum] = "dd4e3fa83a21bf7bf9c51026dc8a4e59"
SRC_URI[sha256sum] =
"f7cddbb5f5c640311eb00eab6e849f7701fa70bf6a183fc8a2c33dd1d1672fb2"
DEPENDS += "${PYTHON_PN}"
-DEPENDS_class-native += "${PYTHON_PN}-native"
-DEPENDS_class-nativesdk += "nativesdk-${PYTHON_PN}"
+DEPENDS_class-native = "${PYTHON_PN}-native"
+DEPENDS_class-nativesdk = "nativesdk-${PYTHON_PN}"
DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR} \
--script-dir=${bindir}"
-RDEPENDS_${PN}_class-native = "\
- ${PYTHON_PN}-distutils \
- ${PYTHON_PN}-compression \
-"
RDEPENDS_${PN} = "\
${PYTHON_PN}-compile \
${PYTHON_PN}-compression \
@@ -41,6 +36,11 @@ RDEPENDS_${PN} = "\
${PYTHON_PN}-xml \
"
+RDEPENDS_${PN}_class-native = "\
+ ${PYTHON_PN}-compression \
+ ${PYTHON_PN}-distutils \
+"
+
do_install_prepend() {
install -d ${D}${PYTHON_SITEPACKAGES_DIR}
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] mesa: Fix bild with waylang and egl
When we have wayland enabled with egl then it enables the wayland
plugin which actually fails to build because its not finding wayland-protocol
xml templates in proper location which is recipe sysroot since
we are cross compiling
Fixes build errors e.g.
make[4]: *** No rule to make target
`//usr/share/wayland-protocols/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
needed by `drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h'. Stop.
make[4]: *** Waiting for unfinished jobs
Signed-off-by: Khem Raj
---
V2: Rebase on master
...ss-compile-WAYLAND_PROTOCOLS_DATADIR.patch | 24 +++
meta/recipes-graphics/mesa/mesa.inc | 2 ++
meta/recipes-graphics/mesa/mesa_18.1.3.bb | 1 +
3 files changed, 27 insertions(+)
create mode 100644
meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
diff --git
a/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
b/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
new file mode 100644
index 00..b4e3c4995f
--- /dev/null
+++
b/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
@@ -0,0 +1,24 @@
+use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
+
+This allows to override the wayland-protocols pkgdatadir with the
+WAYLAND_PROTOCOLS_DATADIR from environment.
+
+pkgconfig would return an absolute path in /usr/share/wayland-protocols
+for the pkgdatadir value, which is not suitable for cross-compiling.
+
+Signed-off-by: Khem Raj
+Upstream-Status: Pending
+
+Index: mesa-18.1.2/configure.ac
+===
+--- mesa-18.1.2.orig/configure.ac
mesa-18.1.2/configure.ac
+@@ -1808,7 +1808,7 @@ for plat in $platforms; do
+ PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >=
$WAYLAND_REQUIRED])
+ PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >=
$WAYLAND_REQUIRED])
+ PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >=
$WAYLAND_PROTOCOLS_REQUIRED])
+-WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir
wayland-protocols`
++PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >=
$WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)
+
+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
+
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index d1723e3506..fed2900577 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -109,6 +109,8 @@ FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS"
+EXTRA_OEMAKE +=
"WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols"
+
# Remove the mesa dependency on mesa-dev, as mesa is empty
RDEPENDS_${PN}-dev = ""
diff --git a/meta/recipes-graphics/mesa/mesa_18.1.3.bb
b/meta/recipes-graphics/mesa/mesa_18.1.3.bb
index c47c57e9d8..6af1216b79 100644
--- a/meta/recipes-graphics/mesa/mesa_18.1.3.bb
+++ b/meta/recipes-graphics/mesa/mesa_18.1.3.bb
@@ -9,6 +9,7 @@ SRC_URI =
"https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
file://0006-Use-Python-3-to-execute-the-scripts.patch \
file://0007-dri-i965-Add-missing-time.h-include.patch \
file://0008-egl-fix-build-race-in-automake.patch \
+ file://cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch \
"
SRC_URI[md5sum] = "b34273403a605f6f98ead00f0bdf8e0b"
--
2.18.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mesa: Fix bild with waylang and egl
When we have wayland enabled with egl then it enables the wayland
plugin which actually fails to build because its not finding wayland-protocol
xml templates in proper location which is recipe sysroot since
we are cross compiling
Fixes build errors e.g.
make[4]: *** No rule to make target
`//usr/share/wayland-protocols/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
needed by `drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h'. Stop.
make[4]: *** Waiting for unfinished jobs
Signed-off-by: Khem Raj
---
...ss-compile-WAYLAND_PROTOCOLS_DATADIR.patch | 24 +++
meta/recipes-graphics/mesa/mesa.inc | 2 ++
meta/recipes-graphics/mesa/mesa_18.1.2.bb | 1 +
3 files changed, 27 insertions(+)
create mode 100644
meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
diff --git
a/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
b/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
new file mode 100644
index 00..b4e3c4995f
--- /dev/null
+++
b/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch
@@ -0,0 +1,24 @@
+use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
+
+This allows to override the wayland-protocols pkgdatadir with the
+WAYLAND_PROTOCOLS_DATADIR from environment.
+
+pkgconfig would return an absolute path in /usr/share/wayland-protocols
+for the pkgdatadir value, which is not suitable for cross-compiling.
+
+Signed-off-by: Khem Raj
+Upstream-Status: Pending
+
+Index: mesa-18.1.2/configure.ac
+===
+--- mesa-18.1.2.orig/configure.ac
mesa-18.1.2/configure.ac
+@@ -1808,7 +1808,7 @@ for plat in $platforms; do
+ PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >=
$WAYLAND_REQUIRED])
+ PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >=
$WAYLAND_REQUIRED])
+ PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >=
$WAYLAND_PROTOCOLS_REQUIRED])
+-WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir
wayland-protocols`
++PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >=
$WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)
+
+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
+
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index d1723e3506..fed2900577 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -109,6 +109,8 @@ FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS"
+EXTRA_OEMAKE +=
"WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols"
+
# Remove the mesa dependency on mesa-dev, as mesa is empty
RDEPENDS_${PN}-dev = ""
diff --git a/meta/recipes-graphics/mesa/mesa_18.1.2.bb
b/meta/recipes-graphics/mesa/mesa_18.1.2.bb
index 9a9a2b2562..45f3b3d0d0 100644
--- a/meta/recipes-graphics/mesa/mesa_18.1.2.bb
+++ b/meta/recipes-graphics/mesa/mesa_18.1.2.bb
@@ -9,6 +9,7 @@ SRC_URI =
"https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
file://0006-Use-Python-3-to-execute-the-scripts.patch \
file://0007-dri-i965-Add-missing-time.h-include.patch \
file://parallel-make-race-fix.patch \
+ file://cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch \
"
SRC_URI[md5sum] = "a2d4f031eb6bd6111d44d84004476918"
--
2.18.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel-fitimage: add support for ext2.gz initramfs files
From: Chunrong Guo
Signed-off-by: Chunrong Guo
---
meta/classes/kernel-fitimage.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/kernel-fitimage.bbclass
b/meta/classes/kernel-fitimage.bbclass
index f84be44..8698022 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -404,7 +404,7 @@ fitimage_assemble() {
#
if [ "x${ramdiskcount}" = "x1" ] ; then
# Find and use the first initramfs image archive type we find
- for img in cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.gz cpio; do
+ for img in cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.gz ext2.gz
cpio; do
initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.${img}"
echo "Using $initramfs_path"
if [ -e "${initramfs_path}" ]; then
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [sumo, master][PATCH] busybox: Add patch to ignore -c on umount command
Fix error when umounting filesystem on shutdown with a systemd distro.
See more datails here: [https://github.com/systemd/systemd/issues/7786]
Signed-off-by: Fabio Berton
---
.../busybox/busybox/umount-ignore-c.patch | 37 +++
meta/recipes-core/busybox/busybox_1.27.2.bb | 1 +
2 files changed, 38 insertions(+)
create mode 100644 meta/recipes-core/busybox/busybox/umount-ignore-c.patch
diff --git a/meta/recipes-core/busybox/busybox/umount-ignore-c.patch
b/meta/recipes-core/busybox/busybox/umount-ignore-c.patch
new file mode 100644
index 00..16514200ee
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/umount-ignore-c.patch
@@ -0,0 +1,37 @@
+From 95ea12791c8623bf825bc711ac7790306e7e1adb Mon Sep 17 00:00:00 2001
+From: Shawn Landden
+Date: Mon, 8 Jan 2018 13:31:58 +0100
+Subject: [PATCH] umount: ignore -c
+Organization: O.S. Systems Software LTDA.
+
+"-c, --no-canonicalize: Do not canonicalize paths."
+
+As busybox doesn't canonicalize paths in the first place it is safe to ignore
+this option.
+
+See https://github.com/systemd/systemd/issues/7786
+
+Signed-off-by: Shawn Landden
+Signed-off-by: Denys Vlasenko
+---
+ util-linux/umount.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/util-linux/umount.c b/util-linux/umount.c
+index 0c50dc9ee..0425c5b76 100644
+--- a/util-linux/umount.c
b/util-linux/umount.c
+@@ -68,8 +68,8 @@ static struct mntent *getmntent_r(FILE* stream, struct
mntent* result,
+ }
+ #endif
+
+-/* ignored: -v -t -i */
+-#define OPTION_STRING "fldnra" "vt:i"
++/* ignored: -c -v -t -i */
++#define OPTION_STRING "fldnra" "cvt:i"
+ #define OPT_FORCE (1 << 0) // Same as MNT_FORCE
+ #define OPT_LAZY(1 << 1) // Same as MNT_DETACH
+ #define OPT_FREELOOP(1 << 2)
+--
+2.18.0
+
diff --git a/meta/recipes-core/busybox/busybox_1.27.2.bb
b/meta/recipes-core/busybox/busybox_1.27.2.bb
index 92678701fc..1ce4823d47 100644
--- a/meta/recipes-core/busybox/busybox_1.27.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.27.2.bb
@@ -46,6 +46,7 @@ SRC_URI =
"http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://CVE-2017-15873.patch \
file://busybox-CVE-2017-16544.patch \
file://busybox-fix-lzma-segfaults.patch \
+ file://umount-ignore-c.patch \
"
SRC_URI_append_libc-musl = " file://musl.cfg "
--
2.18.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [rocko][PATCH] busybox: Add patch to ignore -c on umount command
Fix error when umounting filesystem on shutdown with a systemd distro.
See more datails here: [https://github.com/systemd/systemd/issues/7786]
Signed-off-by: Fabio Berton
---
.../busybox/busybox/umount-ignore-c.patch | 47 +++
meta/recipes-core/busybox/busybox_1.24.1.bb | 1 +
2 files changed, 48 insertions(+)
create mode 100644 meta/recipes-core/busybox/busybox/umount-ignore-c.patch
diff --git a/meta/recipes-core/busybox/busybox/umount-ignore-c.patch
b/meta/recipes-core/busybox/busybox/umount-ignore-c.patch
new file mode 100644
index 00..563532bf52
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/umount-ignore-c.patch
@@ -0,0 +1,47 @@
+From d222d23433116088f15b6f9510e42d02744a0de2 Mon Sep 17 00:00:00 2001
+From: Fabio Berton
+Date: Tue, 3 Jul 2018 14:20:52 -0300
+Subject: [PATCH] umount: ignore -c
+Organization: O.S. Systems Software LTDA.
+
+"-c, --no-canonicalize: Do not canonicalize paths."
+
+As busybox doesn't canonicalize paths in the first place it is safe to ignore
+this option.
+
+See https://github.com/systemd/systemd/issues/7786
+
+Signed-off-by: Shawn Landden
+Signed-off-by: Denys Vlasenko
+Signed-off-by: Fabio Berton
+
+Upstream-Status: Backport
[https://git.busybox.net/busybox/commit/?id=426134128112738c97a665170b21153ef0764b7d]
+---
+ util-linux/umount.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/util-linux/umount.c b/util-linux/umount.c
+index c6c7441b8..e80266677 100644
+--- a/util-linux/umount.c
b/util-linux/umount.c
+@@ -44,7 +44,7 @@ static struct mntent *getmntent_r(FILE* stream, struct
mntent* result,
+ }
+ #endif
+
+-/* Ignored: -v -t -i
++/* Ignored: -c -v -t -i
+ * bbox always acts as if -d is present.
+ * -D can be used to suppress it (bbox extension).
+ * Rationale:
+@@ -52,7 +52,7 @@ static struct mntent *getmntent_r(FILE* stream, struct
mntent* result,
+ * thus, on many systems, bare umount _does_ drop loop devices.
+ * (2) many users request this feature.
+ */
+-#define OPTION_STRING "fldDnra" "vt:i"
++#define OPTION_STRING "fldDnra" "cvt:i"
+ #define OPT_FORCE (1 << 0) // Same as MNT_FORCE
+ #define OPT_LAZY(1 << 1) // Same as MNT_DETACH
+ //#define OPT_FREE_LOOP (1 << 2) // -d is assumed always present
+--
+2.18.0
+
diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb
b/meta/recipes-core/busybox/busybox_1.24.1.bb
index 1c8580876a..c5540bf4f0 100644
--- a/meta/recipes-core/busybox/busybox_1.24.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.24.1.bb
@@ -61,6 +61,7 @@ SRC_URI =
"http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://busybox-tar-add-IF_FEATURE_-checks.patch \
file://0001-iproute-support-scope-.-Closes-8561.patch \
file://0001-ip-fix-an-improper-optimization-req.r.rtm_scope-may-.patch \
+ file://umount-ignore-c.patch \
"
SRC_URI_append_libc-musl = " file://musl.cfg "
--
2.18.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] git: 2.16.1 -> 2.17.0
On 07/03/2018 08:42 PM, Otavio Salvador wrote:
On Tue, Jul 3, 2018 at 1:11 AM, Robert Yang wrote:
* Removed code for "${D}${exec_prefix}/lib/perl-native/perl" since there is no
such a directory now.
* Fixed perl related code.
Signed-off-by: Robert Yang
Latest release is 2.18.0, it makes sense to upgrade to it except if
there is a reason to avoid it.
Thanks, I will update it.
// Robert
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/5] nfs-utils: 2.1.1 -> 2.3.1
On 07/03/2018 07:53 PM, Burton, Ross wrote:
Failing for me:
| checking for res_querydomain in -lresolv... no
| configure: error: res_querydomain needed
| NOTE: The following config.log files may provide further information.
Ross
I'm sorry, that patch should be for musl only, I will fix it.
// Robert
On 3 July 2018 at 05:11, Robert Yang wrote:
* Removed 001-configure-Allow-to-explicitly-disable-nfsidmap.patch,
the nfsidmap is enabled when --enable-nfsv4, so I added a
PACKAGECONFIG[nfsv4], and default is no since keyutils is not in oe-core by
default.
* Removed 0001-include-stdint.h-for-UINT16_MAX-definition.patch and
nfs-utils-1.2.3-sm-notify-res_init.patch since they are already in the
source.
* Backported two patches from git://git.alpinelinux.org/aports to fix build
with musl
Signed-off-by: Robert Yang
---
...gure-Allow-to-explicitly-disable-nfsidmap.patch | 40 ---
...nclude-stdint.h-for-UINT16_MAX-definition.patch | 27 -
.../nfs-utils-1.2.3-sm-notify-res_init.patch | 37 --
.../nfs-utils/nfs-utils-musl-limits.patch | 133 +
.../nfs-utils/nfs-utils-musl-res_querydomain.patch | 22
.../{nfs-utils_2.1.1.bb => nfs-utils_2.3.1.bb} | 12 +-
6 files changed, 161 insertions(+), 110 deletions(-)
delete mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
delete mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
delete mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
create mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
create mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.1.1.bb =>
nfs-utils_2.3.1.bb} (92%)
diff --git
a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
deleted file mode 100644
index 26b558c..000
---
a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9b84cff305866abd150cf1a4c6e7e5ebf8a7eb3a Mon Sep 17 00:00:00 2001
-From: Martin Jansa
-Date: Fri, 15 Nov 2013 23:21:35 +0100
-Subject: [PATCH] configure: Allow to explicitly disable nfsidmap
-
-* keyutils availability is autodetected and builds aren't reproducible
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa
- configure.ac | 10 +-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-Index: nfs-utils-2.1.1/configure.ac
-===
nfs-utils-2.1.1.orig/configure.ac
-+++ nfs-utils-2.1.1/configure.ac
-@@ -92,6 +92,12 @@ AC_ARG_ENABLE(nfsv4,
- AC_SUBST(enable_nfsv4)
- AM_CONDITIONAL(CONFIG_NFSV4, [test "$enable_nfsv4" = "yes"])
-
-+AC_ARG_ENABLE(nfsidmap,
-+[AC_HELP_STRING([--enable-nfsidmap],
-+[enable support for NFSv4 idmapper
@<:@default=yes@:>@])],
-+enable_nfsidmap=$enableval,
-+enable_nfsidmap=yes)
-+
- AC_ARG_ENABLE(nfsv41,
- [AC_HELP_STRING([--disable-nfsv41],
- [disable support for NFSv41 @<:@default=no@:>@])],
-@@ -339,7 +345,7 @@ fi
-
- dnl enable nfsidmap when its support by libnfsidmap
- AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ])
--AM_CONDITIONAL(CONFIG_NFSIDMAP, [test
"$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
-+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test
"$enable_nfsidmap$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" =
"yesyesyes"])
-
-
- if test "$knfsd_cv_glibc2" = no; then
diff --git
a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
deleted file mode 100644
index 235a2c7..000
---
a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 36b48057bce76dced335d67a2894a420967811c9 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Sat, 20 May 2017 14:07:53 -0700
-Subject: [PATCH] include stdint.h for UINT16_MAX definition
-
-Signed-off-by: Khem Raj
-Upstream-Status: Pending
-
- support/nsm/rpc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/support/nsm/rpc.c b/support/nsm/rpc.c
-index 4e5f40e..d91c6ea 100644
a/support/nsm/rpc.c
-+++ b/support/nsm/rpc.c
-@@ -40,6 +40,7 @@
-
- #include
- #include
-+#include
- #include
- #include
- #include
---
-2.13.0
-
diff --git
Re: [OE-core] [PATCH 2/2] [meta] atk: Specify gettext-native dependency
What was missing all along is that we're talking specifically about
atk-native here, which disables NLS explicitly. As Meson doesn't yet
expose a way to turn off i18n we need to stop that. For now, adding
USE_NLS=yes is a suitable workaround (and what glib already does).
Marko, can you send this patch?
Arguably, meson.bbclass could do this, but that would be forcing a
gettext dependency on everything using Meson.
Ross
On 1 July 2018 at 19:20, Marko Lindqvist wrote:
> 3) Adding 'USE_NLS = "yes"' to atk recipe fixes the problem for me.
>
>
> - ML
>
>
> On 1 July 2018 at 21:03, Marko Lindqvist wrote:
>> I think the problem is not with INHIBIT_DEFAULT_DEPS, but with
>> USE_NLS on the next couple of lines. With USE_NLS disabled, the
>> automatic dependency is gettext-minimal-native (not providing
>> xgettext, I think), and not gettext-native.
>>
>> 1)
>> tmp-glibc/work/aarch64-oe-linux/atk/2.28.1-r0/recipe-sysroot-native/sysroot-providers/gettext-minimal-native
>> is there
>> 2) Adding gettext-minimal-native as atk dependency does not fix the
>> issue like adding gettext-native dependency does
>>
>>
>> - ML
>>
>>
>> On 30 June 2018 at 21:43, Marko Lindqvist wrote:
>>> This error happens to me with both qemux86 and qemuarm64. Haven't
>>> tested any others yet.
>>>
>>>
>>> - ML
>>>
>>> On 15 June 2018 at 20:40, Alistair Francis wrote:
On Mon, Jun 4, 2018 at 4:18 PM, Burton, Ross wrote:
> That implies that INHIBIT_DEFAULT_DEPS is also evaluating to true,
> which it shouldn't be in ATK.
>
> I'd definitely be checking if that is the case, and if you can
> replicate the failure with e.g. qemuarm.
I can't replicate it with qemuarm and checking with bitbake -e I can't
see anywhere that the variable is set. Any ideas on what to try to
figure out how it is set?
Alistair
>
> Ross
>
> On 4 June 2018 at 19:46, Alistair Francis wrote:
>> On Mon, Jun 4, 2018 at 10:20 AM, Alexander Kanavin
>> wrote:
>>> On 06/04/2018 08:17 PM, Alistair Francis wrote:
On Mon, Jun 4, 2018 at 3:06 AM, Burton, Ross
wrote:
>
> So why isn't the inherit gettext sufficient?
I'm not sure. Here is the error I see when compiling for RISC-V before
this patch:
>>>
>>>
>>> So is the error specific to risc-v? You should dig deeper in that
>>> direction
>>> then.
>>
>> Ok, it looks like the line: if d.getVar('INHIBIT_DEFAULT_DEPS') and
>> not oe.utils.inherits(d, 'cross-canadian'): is evaluating as true in
>> gettext.bbclass so we don't depend on gettext-native.
>>
>> Do I need to ensure cross-canadian is set for RISC-V builds then?
>>
>> Alistair
>>
>>>
>>> Alex
--
___
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
[OE-core] [PATCH] fstests: remove
These tests are very old and there are better benchmarking systems available
now.
Signed-off-by: Ross Burton
---
.../conf/distro/include/poky-floating-revisions.inc | 1 -
meta/conf/distro/include/distro_alias.inc | 1 -
meta/conf/distro/include/maintainers.inc | 1 -
.../packagegroups/packagegroup-core-tools-testapps.bb | 1 -
meta/recipes-graphics/fstests/fstests_git.bb | 19 ---
5 files changed, 23 deletions(-)
delete mode 100644 meta/recipes-graphics/fstests/fstests_git.bb
diff --git a/meta-poky/conf/distro/include/poky-floating-revisions.inc
b/meta-poky/conf/distro/include/poky-floating-revisions.inc
index a3da043d9d5..e4454db8d38 100644
--- a/meta-poky/conf/distro/include/poky-floating-revisions.inc
+++ b/meta-poky/conf/distro/include/poky-floating-revisions.inc
@@ -26,7 +26,6 @@ SRCREV_pn-sato-icon-theme ?= "${AUTOREV}"
SRCREV_pn-matchbox-desktop-sato ?= "${AUTOREV}"
SRCREV_pn-oh-puzzles ?= "${AUTOREV}"
SRCREV_pn-libowl ?= "${AUTOREV}"
-SRCREV_pn-fstests ?= "${AUTOREV}"
SRCREV_pn-xvideo-tests ?= "${AUTOREV}"
SRCREV_pn-clutter ?= "${AUTOREV}"
SRCREV_pn-clutter-gst ?= "${AUTOREV}"
diff --git a/meta/conf/distro/include/distro_alias.inc
b/meta/conf/distro/include/distro_alias.inc
index 68b731ab2b4..58c110dbe42 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -87,7 +87,6 @@ DISTRO_PN_ALIAS_pn-encodings = "Ubuntu=xfonts-encodings
Mandriva=x11-font-encodi
DISTRO_PN_ALIAS_pn-font-alias = "Fedora=xorg-x11-fonts-base
Mandriva=x11-font-alias Meego=xorg-x11-fonts"
DISTRO_PN_ALIAS_pn-font-util = "Meego=xorg-x11-font-utils
Fedora=xorg-x11-font-utils Ubuntu=xfonts-utils Mandriva=x11-font-util
Debian=xfonts-utils"
DISTRO_PN_ALIAS_pn-formfactor = "OE-Core"
-DISTRO_PN_ALIAS_pn-fstests = "OpenedHand"
DISTRO_PN_ALIAS_pn-gcc-cross-initial = "OE-Core"
DISTRO_PN_ALIAS_pn-gcc-cross-initial-i586 = "OE-Core"
DISTRO_PN_ALIAS_pn-gcc-crosssdk-initial = "OE-Core"
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 0bca773890c..c44f2b804aa 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -163,7 +163,6 @@ RECIPE_MAINTAINER_pn-fontconfig = "Maxin B. John
"
RECIPE_MAINTAINER_pn-foomatic-filters = "Chen Qi "
RECIPE_MAINTAINER_pn-formfactor = "Maxin B. John "
RECIPE_MAINTAINER_pn-freetype = "Maxin B. John "
-RECIPE_MAINTAINER_pn-fstests = "Alexander Kanavin "
RECIPE_MAINTAINER_pn-fts = "Khem Raj "
RECIPE_MAINTAINER_pn-gawk = "Chen Qi "
RECIPE_MAINTAINER_pn-gcc = "Khem Raj "
diff --git
a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index b8e507073ae..df43068fe56 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -25,7 +25,6 @@ X11GLTOOLS = "\
"
X11TOOLS = "\
-fstests \
gst-examples \
x11perf \
xrestop \
diff --git a/meta/recipes-graphics/fstests/fstests_git.bb
b/meta/recipes-graphics/fstests/fstests_git.bb
deleted file mode 100644
index 69f217830af..000
--- a/meta/recipes-graphics/fstests/fstests_git.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Various benchmarning tests for X"
-HOMEPAGE = "http://www.o-hand.com;
-SECTION = "devel"
-LICENSE = "Zlib"
-DEPENDS = "pango libxext libxft virtual/libx11 gtk+"
-
-SRCREV = "e5939ff608b95cdd4d0ab0e1935781ab9a276ac0"
-PV = "0.1+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
-UPSTREAM_CHECK_COMMITS = "1"
-
-LIC_FILES_CHKSUM =
"file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac6cc180f7655"
-
-S = "${WORKDIR}/git/tests"
-
-inherit autotools pkgconfig distro_features_check
-# depends on virtual/libx11
-REQUIRED_DISTRO_FEATURES = "x11"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mesa: enable surfaceless platform
This platform is enabled by default but as we override the platform list doesn't
get enabled.
Signed-off-by: Ross Burton
---
meta/recipes-graphics/mesa/mesa.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index fa99f7d50cc..cc01ea73b46 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -29,7 +29,8 @@ inherit autotools pkgconfig python3native gettext
distro_features_check
ANY_OF_DISTRO_FEATURES = "opengl vulkan"
PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \
- ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)}"
+ ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)} \
+ surfaceless"
export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE}"
export YOCTO_ALTERNATE_EXE_PATH =
"${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] libdrm: port to Meson
Drop the patch to install tests as the Meson build allows this. Drop the patch to disable cunit as this predates recipe-specific-sysroots and isn't required anymore. As Meson always builds the test suite (instead of building before running it), add a patch to fix compilation with musl. Signed-off-by: Ross Burton --- ...ac-Allow-explicit-enabling-of-cunit-tests.patch | 53 -- .../recipes-graphics/drm/libdrm/installtests.patch | 25 -- meta/recipes-graphics/drm/libdrm/musl-ioctl.patch | 35 ++ meta/recipes-graphics/drm/libdrm_2.4.92.bb | 22 - 4 files changed, 44 insertions(+), 91 deletions(-) delete mode 100644 meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch delete mode 100644 meta/recipes-graphics/drm/libdrm/installtests.patch create mode 100644 meta/recipes-graphics/drm/libdrm/musl-ioctl.patch diff --git a/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch b/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch deleted file mode 100644 index 40bebc0f50c..000 --- a/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e6bd4205b0b546afe991ae6f72256645f4404ad4 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Mon, 5 Sep 2016 14:41:37 +0300 -Subject: [PATCH libdrm] configure.ac: Allow explicit enabling of cunit tests - -Add --with-cunit to make it easier to do reproducible builds. Default -is still to probe cunit and build opportunistically. - -Signed-off-by: Jussi Kukkonen -Upstream-Status: Submitted [mailing list] - configure.ac | 14 -- - 1 file changed, 12 insertions(+), 2 deletions(-) - -Index: libdrm-2.4.91/configure.ac -=== libdrm-2.4.91.orig/configure.ac -+++ libdrm-2.4.91/configure.ac -@@ -163,6 +163,12 @@ AC_ARG_ENABLE(install-test-programs, - [Install test programs (default: no)]), - [INSTALL_TESTS=$enableval], [INSTALL_TESTS=no]) - -+AC_ARG_WITH([cunit], -+[AS_HELP_STRING([--with-cunit], -+[Build tests that use cunit (default: auto)])], -+[], -+[with_cunit=auto]) -+ - dnl === - dnl check compiler flags - AC_DEFUN([LIBDRM_CC_TRY_FLAG], [ -@@ -411,7 +417,7 @@ else - AC_DEFINE(HAVE_RADEON, 0) - fi - --if test "x$AMDGPU" != xno; then -+if test "x$with_cunit" != xno -a "x$AMDGPU" != xno; then - # Detect cunit library - PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no]) - # If pkg-config does not find cunit, check it using AC_CHECK_LIB. We -@@ -436,7 +442,11 @@ if test "x$AMDGPU" = xyes; then - AC_DEFINE(HAVE_AMDGPU, 1, [Have amdgpu support]) - - if test "x$have_cunit" = "xno"; then -- AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests]) -+ if test "x$with_cunit" = "xyes"; then -+ AC_MSG_ERROR([Could not find cunit library but --with-cunit was given]) -+ elif test "x$with_cunit" = "xauto"; then -+ AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests]) -+ fi - fi - else - AC_DEFINE(HAVE_AMDGPU, 0) diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch deleted file mode 100644 index ec1fb0236e4..000 --- a/meta/recipes-graphics/drm/libdrm/installtests.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5c6eb43c2f6e7f2ee7c25c92e42f4e4403fa0527 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Tue, 21 Feb 2017 14:37:52 +0200 -Subject: [PATCH] tests: also install test apps - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Yu Ke -Signed-off-by: Jussi Kukkonen - tests/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 0355a92..b4882cd 100644 a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -45,3 +45,4 @@ TESTS = \ - check_PROGRAMS = \ - $(TESTS) \ - drmdevice -+bin_PROGRAMS = $(check_PROGRAMS) --- -2.1.4 - diff --git a/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch b/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch new file mode 100644 index 000..e3d6c5b8537 --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch @@ -0,0 +1,35 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton + +From 46c0fd6c827a8cb4d04e067bf04fab579ac4712e Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Mon, 18 Jun 2018 15:07:03 +0100 +Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature + +POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to +use (int,
[OE-core] [PATCH 3/4] meson: validate cpu_family
Meson has a defined list of known CPU families but these are not currently
validated, so mistakes in cross files or new architectures are not noticed.
Backport a patch from upstream which warns on unknown architectures, but tweak
it to fatally error instead. When we upgrade to Meson 0.47 the first half of
this patch can be dropped.
Signed-off-by: Ross Burton
---
meta/recipes-devtools/meson/meson.inc | 1 +
.../meson/meson/validate-cpu.patch | 118 +
2 files changed, 119 insertions(+)
create mode 100644 meta/recipes-devtools/meson/meson/validate-cpu.patch
diff --git a/meta/recipes-devtools/meson/meson.inc
b/meta/recipes-devtools/meson/meson.inc
index 4c113dcaf73..b278d33b72e 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -11,6 +11,7 @@ SRC_URI =
"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0003-native_bindir.patch \
file://0004-Prettifying-some-output-with-pathlib.patch \
file://0005-Set-the-meson-command-to-use-when-we-know-what-it-is.patch \
+ file://validate-cpu.patch \
"
SRC_URI[md5sum] = "1698f6526574839de5dcdc45e3f7d582"
diff --git a/meta/recipes-devtools/meson/meson/validate-cpu.patch
b/meta/recipes-devtools/meson/meson/validate-cpu.patch
new file mode 100644
index 000..8bdb204ab04
--- /dev/null
+++ b/meta/recipes-devtools/meson/meson/validate-cpu.patch
@@ -0,0 +1,118 @@
+Validate the passed CPU family (US: backport) and turn the upstream warning to
+an error (US: inappropriate).
+
+Upstream-Status: Backport
+Signed-off-by: Ross Burton
+
+From 456f7ea48503731d50a2b7287a0f198b73b4fe61 Mon Sep 17 00:00:00 2001
+From: Ross Burton
+Date: Wed, 20 Jun 2018 13:45:44 +0100
+Subject: [PATCH 1/2] Validate cpu_family (#3753)
+
+* environment: validate cpu_family in cross file
+
+* run_unittests: add unittest to ensure CPU family list in docs and
environment matches
+
+* run_unittests: skip compiler options test if not in a git repository
+
+* environment: validate the detected cpu_family
+
+* docs: add 32-bit PowerPC and 32/64-bit MIPS to CPU Families table
+
+Names gathered by booting Linux in Qemu and running:
+
+$ python3
+import platform; platform.machine()
+
+Partial fix for #3751
+---
+ mesonbuild/environment.py | 24
+ 1 file changed, 24 insertions(+)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 6920b8d6..091d92dc 100644
+--- a/mesonbuild/environment.py
b/mesonbuild/environment.py
+@@ -72,6 +72,22 @@ from .compilers import (
+
+ build_filename = 'meson.build'
+
++known_cpu_families = (
++'aarch64',
++'arm',
++'e2k',
++'ia64',
++'mips',
++'mips64',
++'parisc',
++'ppc',
++'ppc64',
++'ppc64le',
++'sparc64',
++'x86',
++'x86_64'
++)
++
+ # Environment variables that each lang uses.
+ cflags_mapping = {'c': 'CFLAGS',
+ 'cpp': 'CXXFLAGS',
+@@ -210,6 +226,10 @@ def detect_cpu_family(compilers):
+ pass
+ return 'x86_64'
+ # Add fixes here as bugs are reported.
++
++if trial not in known_cpu_families:
++mlog.warning('Unknown CPU family %s, please report this at
https://github.com/mesonbuild/meson/issues/new' % trial)
++
+ return trial
+
+ def detect_cpu(compilers):
+@@ -1021,6 +1041,10 @@ class CrossBuildInfo:
+ res = eval(value, {'__builtins__': None}, {'true': True,
'false': False})
+ except Exception:
+ raise EnvironmentException('Malformed value in cross file
variable %s.' % entry)
++
++if entry == 'cpu_family' and res not in known_cpu_families:
++mlog.warning('Unknown CPU family %s, please report this
at https://github.com/mesonbuild/meson/issues/new' % value)
++
+ if self.ok_type(res):
+ self.config[s][entry] = res
+ elif isinstance(res, list):
+--
+2.11.0
+
+
+From 202e0199d3ffd2637f4dbee08f8351520f7dde3b Mon Sep 17 00:00:00 2001
+From: Ross Burton
+Date: Tue, 3 Jul 2018 13:59:09 +0100
+Subject: [PATCH 2/2] Make CPU family warnings fatal
+
+---
+ mesonbuild/environment.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 091d92dc..67177c1f 100644
+--- a/mesonbuild/environment.py
b/mesonbuild/environment.py
+@@ -228,7 +228,7 @@ def detect_cpu_family(compilers):
+ # Add fixes here as bugs are reported.
+
+ if trial not in known_cpu_families:
+-mlog.warning('Unknown CPU family %s, please report this at
https://github.com/mesonbuild/meson/issues/new' % trial)
++raise EnvironmentException('Unknown CPU family %s, please report this
at https://github.com/mesonbuild/meson/issues/new' % trial)
+
+ return trial
+
+@@ -1043,7 +1043,7 @@ class CrossBuildInfo:
+
[OE-core] [PATCH 2/4] meson: map architecture to correct values in cross file
The cross file specifies the host/target cpu_family, which should be one of a
defined set of values[1] but if it isn't Meson won't complain and instead
recipes may behave unexpectedly.
[1] http://mesonbuild.com/Reference-tables.html#cpu-families
Signed-off-by: Ross Burton
---
meta/classes/meson.bbclass | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index c36b634b43d..d615a84cfb0 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -45,6 +45,18 @@ def meson_array(var, d):
items = d.getVar(var).split()
return repr(items[0] if len(items) == 1 else items)
+# Map our ARCH values to what Meson expects:
+# http://mesonbuild.com/Reference-tables.html#cpu-families
+def meson_cpu_family(var, d):
+import re
+arch = d.getVar(var)
+if arch == 'powerpc':
+return 'ppc'
+elif re.match(r"i[3-6]86", arch):
+return "x86"
+else:
+return arch
+
addtask write_config before do_configure
do_write_config[vardeps] += "MESON_C_ARGS MESON_CPP_ARGS MESON_LINK_ARGS CC
CXX LD AR NM STRIP READELF"
do_write_config() {
@@ -70,13 +82,13 @@ gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper'
[host_machine]
system = '${HOST_OS}'
-cpu_family = '${HOST_ARCH}'
+cpu_family = '${@meson_cpu_family('HOST_ARCH', d)}'
cpu = '${HOST_ARCH}'
endian = '${MESON_HOST_ENDIAN}'
[target_machine]
system = '${TARGET_OS}'
-cpu_family = '${TARGET_ARCH}'
+cpu_family = '${@meson_cpu_family('TARGET_ARCH', d)}'
cpu = '${TARGET_ARCH}'
endian = '${MESON_TARGET_ENDIAN}'
EOF
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] meson: various class improvements
- Ensure that the PACKAGECONFIG arguments are always in EXTRA_OEMESON
- Log the arguments that are being passed in do_configure.
- Do verbose builds so the compile logs are useful for debugging build problems
Signed-off-by: Ross Burton
---
meta/classes/meson.bbclass | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index e572344bd20..c36b634b43d 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -35,7 +35,7 @@ MESON_LINK_ARGS = "${MESON_TOOLCHAIN_ARGS} ${LDFLAGS}"
MESON_HOST_ENDIAN = "bogus-endian"
MESON_TARGET_ENDIAN = "bogus-endian"
-EXTRA_OEMESON += "${PACKAGECONFIG_CONFARGS}"
+EXTRA_OEMESON_append = " ${PACKAGECONFIG_CONFARGS}"
MESON_CROSS_FILE = ""
MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross"
@@ -85,6 +85,7 @@ EOF
CONFIGURE_FILES = "meson.build"
meson_do_configure() {
+bbnote Executing meson ${EXTRA_OEMESON}...
if ! meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE}
${EXTRA_OEMESON}; then
cat ${B}/meson-logs/meson-log.txt
bbfatal_log meson failed
@@ -118,11 +119,11 @@ meson_do_configure_prepend_class-native() {
do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
meson_do_compile() {
-ninja ${PARALLEL_MAKE}
+ninja -v ${PARALLEL_MAKE}
}
meson_do_install() {
-DESTDIR='${D}' ninja ${PARALLEL_MAKEINST} install
+DESTDIR='${D}' ninja -v ${PARALLEL_MAKEINST} install
}
EXPORT_FUNCTIONS do_configure do_compile do_install
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH resend] wic: allow bitbake variables in kickstarter files
image_types_wic.bbclass has a mechanism for doing variable substitution
on .wks files by simply letting the input file be called
.wks.in. However, that doesn't allow using variables in files included
via the include directive. This is unfortunate, because lacking either
the ability to include other files or variable substitution leads to
fragile and error-prone duplication between kickstarter files and
recipes/configuration files used for various boards.
This adds (somewhat naive) support for variable substitution in all
files parsed by wic. The user should add all required variables to
WICVARS to get them exported appropriately.
Signed-off-by: Rasmus Villemoes
---
scripts/lib/wic/ksparser.py | 17 +
1 file changed, 17 insertions(+)
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
index e590b2fe3c..3dc17d7fde 100644
--- a/scripts/lib/wic/ksparser.py
+++ b/scripts/lib/wic/ksparser.py
@@ -28,14 +28,30 @@
import os
import shlex
import logging
+import re
from argparse import ArgumentParser, ArgumentError, ArgumentTypeError
from wic.engine import find_canned
from wic.partition import Partition
+from wic.misc import get_bitbake_var
logger = logging.getLogger('wic')
+__expand_var_regexp__ = re.compile(r"\${[^{}@\n\t :]+}")
+
+def expand_line(line):
+while True:
+m = __expand_var_regexp__.search(line)
+if not m:
+return line
+key = m.group()[2:-1]
+val = get_bitbake_var(key)
+if val is None:
+logger.warning("cannot expand variable %s" % key)
+return line
+line = line[:m.start()] + val + line[m.end():]
+
class KickStartError(Exception):
"""Custom exception."""
pass
@@ -189,6 +205,7 @@ class KickStart():
line = line.strip()
lineno += 1
if line and line[0] != '#':
+line = expand_line(line)
try:
line_args = shlex.split(line)
parsed = parser.parse_args(line_args)
--
2.16.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] git: 2.16.1 -> 2.17.0
On Tue, Jul 3, 2018 at 1:11 AM, Robert Yang wrote:
> * Removed code for "${D}${exec_prefix}/lib/perl-native/perl" since there is no
> such a directory now.
> * Fixed perl related code.
>
> Signed-off-by: Robert Yang
Latest release is 2.18.0, it makes sense to upgrade to it except if
there is a reason to avoid it.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [OE-Core][PATCH v2] openssh: Add dependency on ssh for sftp
Add missing dependency on the ssh binary for the sftp client to avoid
failure at runtime if it's not been installed through another dependency
chain.
This introduces a note if PREFERRED_RPROVIDER_ssh is not set and it
can be satisfied by multiple providers (e.g. openssh and dropbear).
Signed-off-by: Alex Kiernan
---
Changes in v2:
- Depend on ssh not ${PN}-ssh so it can be satisfied by openssh or dropbear
meta/recipes-connectivity/openssh/openssh_7.7p1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
index b3da5f6..3240f1e 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
@@ -146,6 +146,7 @@ FILES_${PN}-keygen = "${bindir}/ssh-keygen"
RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES',
'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}"
+RDEPENDS_${PN}-sftp += "ssh"
RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make"
RPROVIDES_${PN}-ssh = "ssh"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] go: Update 1.10.2 -> 1.10.3
go1.10.3 (released 2018/06/05) includes fixes to the go command, and
the crypto/tls, crypto/x509, and strings packages. In particular, it
adds minimal support to the go command for the vgo transition.
Signed-off-by: Otavio Salvador
---
meta/recipes-devtools/go/go-1.10.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/go/go-1.10.inc
b/meta/recipes-devtools/go/go-1.10.inc
index 3a135bf283..1df0fc5b6a 100644
--- a/meta/recipes-devtools/go/go-1.10.inc
+++ b/meta/recipes-devtools/go/go-1.10.inc
@@ -1,7 +1,7 @@
require go-common.inc
GO_BASEVERSION = "1.10"
-GO_MINOR = ".2"
+GO_MINOR = ".3"
PV .= "${GO_MINOR}"
FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
@@ -20,5 +20,5 @@ SRC_URI += "\
SRC_URI_append_libc-musl = "
file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"
-SRC_URI[main.md5sum] = "c63b35075bed693bbfc84d4a6262948a"
-SRC_URI[main.sha256sum] =
"6264609c6b9cd8ed8e02ca84605d727ce1898d74efa79841660b2e3e985a98bd"
+SRC_URI[main.md5sum] = "d15dfb264105c5e84fbe33f4a4aa5021"
+SRC_URI[main.sha256sum] =
"567b1cc66c9704d1c019c50bef946272e911ec6baf244310f87f4e678be155f2"
--
2.18.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] go: Update 1.9.6 -> 1.9.7
go1.9.7 (released 2018/06/05) includes fixes to the go command, and
the crypto/x509, and strings packages. In particular, it adds minimal
support to the go command for the vgo transition.
Signed-off-by: Otavio Salvador
---
meta/recipes-devtools/go/go-1.9.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/go/go-1.9.inc
b/meta/recipes-devtools/go/go-1.9.inc
index a942f6d8ab..329cee061c 100644
--- a/meta/recipes-devtools/go/go-1.9.inc
+++ b/meta/recipes-devtools/go/go-1.9.inc
@@ -1,7 +1,7 @@
require go-common.inc
GO_BASEVERSION = "1.9"
-GO_MINOR = ".6"
+GO_MINOR = ".7"
PV .= "${GO_MINOR}"
FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
@@ -22,5 +22,5 @@ SRC_URI += "\
"
SRC_URI_append_libc-musl = " file://set-external-linker.patch"
-SRC_URI[main.md5sum] = "52c1a3063291036597552d3fed0b2917"
-SRC_URI[main.sha256sum] =
"36f4059be658f7f07091e27fe04bb9e97a0c4836eb446e4c5bac3c90ff9e5828"
+SRC_URI[main.md5sum] = "3c2cf876ed6612a022574a565206c6ea"
+SRC_URI[main.sha256sum] =
"582814fa45e8ecb0859a208e517b48aa0ad951e3b36c7fff203d834e0ef27722"
--
2.18.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] rpm: Avoid leaking temporary scriplet files
Thanks, looks good now! Alex 2018-07-03 14:01 GMT+02:00 Olof Johansson : > On 18-06-30 08:37 +0200, Alexander Kanavin wrote: >> Ideally, "/" should've been replaced with rpmtsRootDir(ts), but ts is >> not accessible from the function, or from its parent, or parent >> parent. So yes, I concede this would be too invasive to pass that down >> the call stack. So if you can amend the above patch of mine with your >> change, commit message, and SOB, that should be best. These changes >> really belong together, as a custom fix for the oe build environment. > > Thanks for the feedback, I just sent a v2 of the patch. Hope it > is in line with what you asked for. > > -- > olofjn -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] rpm: Avoid leaking temporary scriplet files
On 18-06-30 08:37 +0200, Alexander Kanavin wrote: > Ideally, "/" should've been replaced with rpmtsRootDir(ts), but ts is > not accessible from the function, or from its parent, or parent > parent. So yes, I concede this would be too invasive to pass that down > the call stack. So if you can amend the above patch of mine with your > change, commit message, and SOB, that should be best. These changes > really belong together, as a custom fix for the oe build environment. Thanks for the feedback, I just sent a v2 of the patch. Hope it is in line with what you asked for. -- olofjn -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] rpm: Avoid leaking temporary scriplet files
RPM writes each package scriptlet (post-/preinstall) to
/var/tmp/rpm-tmp.XX --- a lot of files potentially gets created.
When debugging is enabled, these temporary scriptlet files aren't
cleaned up at all and after a while this results in the filesystem
resources are eaten up (like running out of available inodes).
Normally, the temporary files would have been written to the tmp
directory of the target sysroot (which we can easily clean up), but in
this tree, you can't necessarily run the scriptlets.
Fixes [YOCTO #12792]
Signed-off-by: Olof Johansson
---
...installing-execute-package-scriptlets-wit.patch | 35 ++
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git
a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
index 2be3cb5af3c..4020a310926 100644
---
a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
+++
b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
@@ -1,4 +1,4 @@
-From a6f269f879221f2777169c5f7291322afe6b661b Mon Sep 17 00:00:00 2001
+From a89daa75ac970d8e247edc762d1181e9a5b0c5d0 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Tue, 17 Jan 2017 14:07:17 +0200
Subject: [PATCH] When cross-installing, execute package scriptlets without
@@ -7,17 +7,42 @@ Subject: [PATCH] When cross-installing, execute package
scriptlets without
This is triggered only when RPM_NO_CHROOT_FOR_SCRIPTS environment variable is
defined.
Otherwise they will trigger an explosion of failures, obviously.
+Amended 2018-07-03 by Olof Johansson :
+
+ Remove leaking temporary scriptlet files
+
+ Since we tell dnf to run rpm with debug output, this will result in rpm not
+ cleaning up written temporary scriptlet files (same flag controls both
+ behaviors). This wouldn't have been a problem since we normally would use the
+ target sysroot also for temporary files, but we need to chroot out to be able
+ to actually run the rpm scriptlets (purpose of this patch), so the temporary
+ files are written to the host's /var/tmp/ directory, causing a gradual
+ resource leakage on the host system for every RPM based do_rootfs task
+ executed.
+
+ Signed-off-by: Olof Johansson
+
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin
---
- lib/rpmscript.c | 8 +++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
+ lib/rpmscript.c | 11 ---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/lib/rpmscript.c b/lib/rpmscript.c
-index 98d3f420d..b95b5d606 100644
+index cc98c4885..f8bd3df04 100644
--- a/lib/rpmscript.c
+++ b/lib/rpmscript.c
-@@ -467,7 +467,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2,
FD_t scriptFd,
+@@ -394,8 +394,7 @@ exit:
+ Fclose(out);/* XXX dup'd STDOUT_FILENO */
+
+ if (fn) {
+- if (!rpmIsDebug())
+- unlink(fn);
++ unlink(fn);
+ free(fn);
+ }
+ free(mline);
+@@ -428,7 +427,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2,
FD_t scriptFd,
if (rc != RPMRC_FAIL) {
if (script_type & RPMSCRIPTLET_EXEC) {
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/5] nfs-utils: 2.1.1 -> 2.3.1
Failing for me:
| checking for res_querydomain in -lresolv... no
| configure: error: res_querydomain needed
| NOTE: The following config.log files may provide further information.
Ross
On 3 July 2018 at 05:11, Robert Yang wrote:
> * Removed 001-configure-Allow-to-explicitly-disable-nfsidmap.patch,
> the nfsidmap is enabled when --enable-nfsv4, so I added a
> PACKAGECONFIG[nfsv4], and default is no since keyutils is not in oe-core by
> default.
>
> * Removed 0001-include-stdint.h-for-UINT16_MAX-definition.patch and
> nfs-utils-1.2.3-sm-notify-res_init.patch since they are already in the
> source.
>
> * Backported two patches from git://git.alpinelinux.org/aports to fix build
> with musl
>
> Signed-off-by: Robert Yang
> ---
> ...gure-Allow-to-explicitly-disable-nfsidmap.patch | 40 ---
> ...nclude-stdint.h-for-UINT16_MAX-definition.patch | 27 -
> .../nfs-utils-1.2.3-sm-notify-res_init.patch | 37 --
> .../nfs-utils/nfs-utils-musl-limits.patch | 133
> +
> .../nfs-utils/nfs-utils-musl-res_querydomain.patch | 22
> .../{nfs-utils_2.1.1.bb => nfs-utils_2.3.1.bb} | 12 +-
> 6 files changed, 161 insertions(+), 110 deletions(-)
> delete mode 100644
> meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
> delete mode 100644
> meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
> delete mode 100644
> meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
> create mode 100644
> meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
> create mode 100644
> meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
> rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.1.1.bb =>
> nfs-utils_2.3.1.bb} (92%)
>
> diff --git
> a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
>
> b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
> deleted file mode 100644
> index 26b558c..000
> ---
> a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -From 9b84cff305866abd150cf1a4c6e7e5ebf8a7eb3a Mon Sep 17 00:00:00 2001
> -From: Martin Jansa
> -Date: Fri, 15 Nov 2013 23:21:35 +0100
> -Subject: [PATCH] configure: Allow to explicitly disable nfsidmap
> -
> -* keyutils availability is autodetected and builds aren't reproducible
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Martin Jansa
>
> - configure.ac | 10 +-
> - 1 file changed, 9 insertions(+), 1 deletion(-)
> -
> -Index: nfs-utils-2.1.1/configure.ac
> -===
> nfs-utils-2.1.1.orig/configure.ac
> -+++ nfs-utils-2.1.1/configure.ac
> -@@ -92,6 +92,12 @@ AC_ARG_ENABLE(nfsv4,
> - AC_SUBST(enable_nfsv4)
> - AM_CONDITIONAL(CONFIG_NFSV4, [test "$enable_nfsv4" = "yes"])
> -
> -+AC_ARG_ENABLE(nfsidmap,
> -+[AC_HELP_STRING([--enable-nfsidmap],
> -+[enable support for NFSv4 idmapper
> @<:@default=yes@:>@])],
> -+enable_nfsidmap=$enableval,
> -+enable_nfsidmap=yes)
> -+
> - AC_ARG_ENABLE(nfsv41,
> - [AC_HELP_STRING([--disable-nfsv41],
> - [disable support for NFSv41 @<:@default=no@:>@])],
> -@@ -339,7 +345,7 @@ fi
> -
> - dnl enable nfsidmap when its support by libnfsidmap
> - AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ])
> --AM_CONDITIONAL(CONFIG_NFSIDMAP, [test
> "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
> -+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test
> "$enable_nfsidmap$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid"
> = "yesyesyes"])
> -
> -
> - if test "$knfsd_cv_glibc2" = no; then
> diff --git
> a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
>
> b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
> deleted file mode 100644
> index 235a2c7..000
> ---
> a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From 36b48057bce76dced335d67a2894a420967811c9 Mon Sep 17 00:00:00 2001
> -From: Khem Raj
> -Date: Sat, 20 May 2017 14:07:53 -0700
> -Subject: [PATCH] include stdint.h for UINT16_MAX definition
> -
> -Signed-off-by: Khem Raj
>
> -Upstream-Status: Pending
> -
> - support/nsm/rpc.c | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/support/nsm/rpc.c b/support/nsm/rpc.c
> -index 4e5f40e..d91c6ea 100644
> a/support/nsm/rpc.c
> -+++ b/support/nsm/rpc.c
> -@@ -40,6 +40,7 @@
> -
> - #include
> - #include
> -+#include
> - #include
> - #include
> - #include
>
Re: [OE-core] [PATCH] libxml2: fix CVE-2017-8872
This isn't a backport, it's just a patch that is in bugzilla so should
be marked as Submitted.
Ross
On 3 July 2018 at 09:10, Hongxu Jia wrote:
> The htmlParseTryOrFinish function in HTMLparser.c in libxml2 2.9.4
> allows attackers to cause a denial of service (buffer over-read) or
> information disclosure.
>
> https://bugzilla.gnome.org/show_bug.cgi?id=775200
>
> Signed-off-by: Hongxu Jia
> ---
> .../libxml/libxml2/fix-CVE-2017-8872.patch | 38
> ++
> meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 +
> 2 files changed, 39 insertions(+)
> create mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch
>
> diff --git a/meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch
> b/meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch
> new file mode 100644
> index 000..e34a48e
> --- /dev/null
> +++ b/meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch
> @@ -0,0 +1,38 @@
> +From b4bee17b158e289e5c4c9045e64e5374ccafe068 Mon Sep 17 00:00:00 2001
> +From: Salvatore Bonaccorso
> +Date: Tue, 3 Jul 2018 15:54:03 +0800
> +Subject: [PATCH] Out-of-bounds read in htmlParseTryOrFinish (CVE-2017-8872)
> +
> +https://bugzilla.gnome.org/show_bug.cgi?id=775200
> +Fixes bug 775200.
> +
> +Signed-off-by: Salvatore Bonaccorso
> +
> +Upstream-Status: Backport
> +https://bug775200.bugzilla-attachments.gnome.org/attachment.cgi?id=366193
> +CVE: CVE-2017-8872
> +Signed-off-by: Hongxu Jia
> +---
> + parser.c | 6 +-
> + 1 file changed, 5 insertions(+), 1 deletion(-)
> +
> +diff --git a/parser.c b/parser.c
> +index ca9fde2..fb4c889 100644
> +--- a/parser.c
> b/parser.c
> +@@ -12464,7 +12464,11 @@ xmlHaltParser(xmlParserCtxtPtr ctxt) {
> + }
> + ctxt->input->cur = BAD_CAST"";
> + ctxt->input->base = ctxt->input->cur;
> +-ctxt->input->end = ctxt->input->cur;
> ++ ctxt->input->end = ctxt->input->cur;
> ++ if (ctxt->input->buf)
> ++ xmlBufEmpty (ctxt->input->buf->buffer);
> ++ else
> ++ ctxt->input->length = 0;
> + }
> + }
> +
> +--
> +2.7.4
> +
> diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb
> b/meta/recipes-core/libxml/libxml2_2.9.8.bb
> index d55e650..1f22bb0 100644
> --- a/meta/recipes-core/libxml/libxml2_2.9.8.bb
> +++ b/meta/recipes-core/libxml/libxml2_2.9.8.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-2017-8872.patch \
> "
>
> SRC_URI[libtar.md5sum] = "b786e353e2aa1b872d70d5d1ca0c740d"
> --
> 2.7.4
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libxml2: fix CVE-2017-8872
The htmlParseTryOrFinish function in HTMLparser.c in libxml2 2.9.4
allows attackers to cause a denial of service (buffer over-read) or
information disclosure.
https://bugzilla.gnome.org/show_bug.cgi?id=775200
Signed-off-by: Hongxu Jia
---
.../libxml/libxml2/fix-CVE-2017-8872.patch | 38 ++
meta/recipes-core/libxml/libxml2_2.9.8.bb | 1 +
2 files changed, 39 insertions(+)
create mode 100644 meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch
diff --git a/meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch
b/meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch
new file mode 100644
index 000..e34a48e
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/fix-CVE-2017-8872.patch
@@ -0,0 +1,38 @@
+From b4bee17b158e289e5c4c9045e64e5374ccafe068 Mon Sep 17 00:00:00 2001
+From: Salvatore Bonaccorso
+Date: Tue, 3 Jul 2018 15:54:03 +0800
+Subject: [PATCH] Out-of-bounds read in htmlParseTryOrFinish (CVE-2017-8872)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=775200
+Fixes bug 775200.
+
+Signed-off-by: Salvatore Bonaccorso
+
+Upstream-Status: Backport
+https://bug775200.bugzilla-attachments.gnome.org/attachment.cgi?id=366193
+CVE: CVE-2017-8872
+Signed-off-by: Hongxu Jia
+---
+ parser.c | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/parser.c b/parser.c
+index ca9fde2..fb4c889 100644
+--- a/parser.c
b/parser.c
+@@ -12464,7 +12464,11 @@ xmlHaltParser(xmlParserCtxtPtr ctxt) {
+ }
+ ctxt->input->cur = BAD_CAST"";
+ ctxt->input->base = ctxt->input->cur;
+-ctxt->input->end = ctxt->input->cur;
++ ctxt->input->end = ctxt->input->cur;
++ if (ctxt->input->buf)
++ xmlBufEmpty (ctxt->input->buf->buffer);
++ else
++ ctxt->input->length = 0;
+ }
+ }
+
+--
+2.7.4
+
diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb
b/meta/recipes-core/libxml/libxml2_2.9.8.bb
index d55e650..1f22bb0 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.8.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.8.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-2017-8872.patch \
"
SRC_URI[libtar.md5sum] = "b786e353e2aa1b872d70d5d1ca0c740d"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] devshell problems after distro upgrade openSUSE Leap 42.3 -> 15.0
On 02.07.2018 20:25, Khem Raj wrote: > On Sun, Jul 1, 2018 at 11:39 PM Steffen Sledz wrote: >> >> After upgrading my build system from openSUSE Leap 42.3 to openSUSE Leap >> 15.0 a >> >> bitbake foo -c devshell >> >> no longer switches to the related work directory. The devshell is opened in >> the original directory without any error or warning instead. >> >> Any hints what's wrong here or how I can debug this behaviour? >> > > which terminal are you using, probably some default behavior changes there ? Main terminal is xterm. No special settings for the devshell terminal, so tmux is started like before. -- DResearch Fahrzeugelektronik GmbH Otto-Schmirgal-Str. 3, 10319 Berlin, Germany Tel: +49 30 515932-237 mailto:sl...@dresearch-fe.de Fax: +49 30 515932-299 Geschäftsführer: Dr. Michael Weber, Werner Mögle; Amtsgericht Berlin Charlottenburg; HRB 130120 B; Ust.-IDNr. DE273952058 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
