date:20181010

Re: [OE-core] [oe-commits] [openembedded-core] 02/09: glib-2.0: add missing locale dependencies to PN-ptest

2018-10-10 Thread Martin Jansa

This is causing a lot of QA errors like:

lib32-glib-2.0-2.58.0: lib32-glib-2.0-ptest rdepends on
lib32-locale-base-ru-ru, but it isn't a build dependency? [build-deps]
lib32-glib-2.0-2.58.0: lib32-glib-2.0-ptest rdepends on
lib32-locale-base-tr-tr, but it isn't a build dependency? [build-deps]

On Wed, Oct 10, 2018 at 2:18 PM  wrote:

> This is an automated email from the git hooks/post-receive script.
>
> rpurdie pushed a commit to branch master-next
> in repository openembedded-core.
>
> commit f1c122fdc14624a659f8d4b07e1ff1f21e472e50
> Author: Ross Burton 
> AuthorDate: Tue Oct 9 12:00:19 2018 +0100
>
> glib-2.0: add missing locale dependencies to PN-ptest
>
> The test suite skips several tests if the required locales are not
> found, so add
> them as dependencies of glib-2.0-ptest.
>
> (From OE-Core rev: b9317997bd4527b7873eb4f903cc4890b5b3580f)
>
> Signed-off-by: Ross Burton 
> Signed-off-by: Richard Purdie 
> ---
>  meta/recipes-core/glib-2.0/glib.inc | 14 ++
>  1 file changed, 14 insertions(+)
>
> diff --git a/meta/recipes-core/glib-2.0/glib.inc
> b/meta/recipes-core/glib-2.0/glib.inc
> index ad4f2ae..92dcf99 100644
> --- a/meta/recipes-core/glib-2.0/glib.inc
> +++ b/meta/recipes-core/glib-2.0/glib.inc
> @@ -140,6 +140,8 @@ RDEPENDS_${PN}-ptest += "\
>  shared-mime-info \
> "
>
> +# When https://gitlab.gnome.org/GNOME/glib/issues/1343 is
> +# fixed add locale-base-pl-pl
>  RDEPENDS_${PN}-ptest_append_libc-glibc = "\
>  glibc-gconv-utf-16 \
>  glibc-charmap-utf-8 \
> @@ -152,6 +154,18 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\
>  glibc-gconv-iso8859-15 \
>  glibc-charmap-invariant \
>  glibc-localedata-translit-cjk-variants \
> +locale-base-tr-tr \
> +locale-base-lt-lt \
> +locale-base-ja-jp.euc-jp \
> +locale-base-fa-ir \
> +locale-base-ru-ru \
> +locale-base-de-de \
> +locale-base-hr-hr \
> +locale-base-el-gr \
> +locale-base-fr-fr \
> +locale-base-fr-fr \
> +locale-base-es-es \
> +locale-base-en-gb \
> "
>
>  INSANE_SKIP_${PN}-ptest += "libdir"
>
> --
> To stop receiving notification emails like this one, please contact
> the administrator of this repository.
> --
> ___
> Openembedded-commits mailing list
> openembedded-comm...@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v2] wic: make engine.py:get_partitions() resilient to parted/dmidecode stderr output

2018-10-10 Thread geoffhp

From: Geoff Parker 

Running wic commands on Debian 10 systems fail in
scripts/lib/wic/engine.py:get_partitions() due to new stderr output captured
when trying to parse the output from /sbin/parted as a non-root user.

The parted command calls the dmidecode utility, which produces this error
as a non-root user:
/sys/firmware/dmi/tables/smbios_entry_point: Permission denied
/dev/mem: Permission denied

scripts/lib/wic/engine.py:get_partitions() calls misc.py:exec_cmd(),
a subprocess wrapper which returns a combined stderr and sdtdout.
These messages to stderr confuse the partition table parser in
get_partitions().

This patch has the partition table parser ignore lines before the expected
"BYT;" header string.

Running wic in Debian 9 does not have this issue.

Signed-off-by: Geoff Parker 
---
 scripts/lib/wic/engine.py | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index e6c830ce78..4662c665c0 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -266,10 +266,15 @@ class Disk:
 out = exec_cmd("%s -sm %s unit B print" % (self.parted, 
self.imagepath))
 parttype = namedtuple("Part", "pnum start end size fstype")
 splitted = out.splitlines()
-lsector_size, psector_size, self._ptable_format = 
splitted[1].split(":")[3:6]
+# skip over possible errors in exec_cmd output
+try:
+idx =splitted.index("BYT;")
+except ValueError:
+raise WicError("Error getting partition information from %s" % 
(self.parted))
+lsector_size, psector_size, self._ptable_format = splitted[idx + 
1].split(":")[3:6]
 self._lsector_size = int(lsector_size)
 self._psector_size = int(psector_size)
-for line in splitted[2:]:
+for line in splitted[idx + 2:]:
 pnum, start, end, size, fstype = line.split(':')[:5]
 partition = parttype(int(pnum), int(start[:-1]), int(end[:-1]),
  int(size[:-1]), fstype)
-- 
2.19.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/1] prelink: Fix Segmentation fault error when prelink qemu

2018-10-10 Thread Robert Yang

The info->resolvetls might be NULL according to src/prelink.c:
[snip]
 /* Dynamic linker does not depend on any other library,
all symbols resolve to themselves with the exception
of SHN_UNDEF symbols which resolve to 0.  */
if (info->symtab[r_sym].st_shndx == SHN_UNDEF)
  {
info->resolveent = NULL;
info->resolvetls = NULL;
[snip]

So we must check it before use its members, otherwise, there might be
Segmentation fault error.

Fixed:
MACHINE = "qemumips"
IMAGE_INSTALL_append = " qemu"
$ bitbake core-image-minimal
[snip]
| 
/path/to/qemumips-poky-linux/core-image-minimal/1.0-r0/temp/run.prelink_image.1000:
 line 111:  1010 Segmentation fault  (core dumped)
[snip]

Signed-off-by: Robert Yang 
---
 ...ps.c-check-info-resolvetls-before-use-its.patch | 51 ++
 meta/recipes-devtools/prelink/prelink_git.bb   |  1 +
 2 files changed, 52 insertions(+)
 create mode 100644 
meta/recipes-devtools/prelink/prelink/0001-src-arch-mips.c-check-info-resolvetls-before-use-its.patch

diff --git 
a/meta/recipes-devtools/prelink/prelink/0001-src-arch-mips.c-check-info-resolvetls-before-use-its.patch
 
b/meta/recipes-devtools/prelink/prelink/0001-src-arch-mips.c-check-info-resolvetls-before-use-its.patch
new file mode 100644
index 000..b168824
--- /dev/null
+++ 
b/meta/recipes-devtools/prelink/prelink/0001-src-arch-mips.c-check-info-resolvetls-before-use-its.patch
@@ -0,0 +1,51 @@
+From 2136969e3e196b9cf7f4788340efa4b1d9b39565 Mon Sep 17 00:00:00 2001
+From: Robert Yang 
+Date: Thu, 11 Oct 2018 10:05:52 +0800
+Subject: [PATCH] src/arch-mips.c: check info->resolvetls before use its member
+
+The info->resolvetls might be NULL according to src/prelink.c:
+[snip]
+ /* Dynamic linker does not depend on any other library,
+all symbols resolve to themselves with the exception
+of SHN_UNDEF symbols which resolve to 0.  */
+if (info->symtab[r_sym].st_shndx == SHN_UNDEF)
+  {
+info->resolveent = NULL;
+info->resolvetls = NULL;
+[snip]
+
+So we must check it before use its members, otherwise, there might be
+Segmentation fault error.
+
+Fixed:
+MACHINE = "qemumips"
+IMAGE_INSTALL_append = " qemu"
+$ bitbake core-image-minimal
+[snip]
+| 
/path/to/qemumips-poky-linux/core-image-minimal/1.0-r0/temp/run.prelink_image.1000:
 line 111:  1010 Segmentation fault  (core dumped)
+[snip]
+
+Upstream-Status: Submitted 
[https://lists.yoctoproject.org/pipermail/yocto/2018-October/042812.html]
+
+Signed-off-by: Robert Yang 
+---
+ src/arch-mips.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/arch-mips.c b/src/arch-mips.c
+index ccb1834..02c608f 100644
+--- a/src/arch-mips.c
 b/src/arch-mips.c
+@@ -567,7 +567,8 @@ mips_prelink_reloc (struct prelink_info *info, GElf_Addr 
r_offset,
+   if (dso->ehdr.e_type == ET_EXEC)
+   {
+ value = info->resolve (info, r_sym, r_type);
+-value += info->resolvetls->offset - TLS_TP_OFFSET;
++if (info->resolvetls != NULL)
++  value += info->resolvetls->offset - TLS_TP_OFFSET;
+ if (r_type == R_MIPS_TLS_TPREL32)
+   mips_prelink_32bit_reloc (dso, rela, value);
+ else
+-- 
+2.7.4
+
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb 
b/meta/recipes-devtools/prelink/prelink_git.bb
index 3f2a2e2..b1261d5 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -32,6 +32,7 @@ SRC_URI = 
"git://git.yoctoproject.org/prelink-cross.git;branch=cross_prelink_sta
file://prelink.cron.daily \
file://prelink.default \
file://macros.prelink \
+   
file://0001-src-arch-mips.c-check-info-resolvetls-before-use-its.patch \
 "
 UPSTREAM_CHECK_COMMITS = "1"
 
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 0/1] prelink: Fix Segmentation fault error when prelink qemu

2018-10-10 Thread Robert Yang

The following changes since commit d0d55add6cb01252a46d829ade75666920b676fa:

  libxml2: Make it compatible with externalsrc (2018-10-10 14:33:34 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/prelink
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/prelink

Robert Yang (1):
  prelink: Fix Segmentation fault error when prelink qemu

 ...ps.c-check-info-resolvetls-before-use-its.patch | 51 ++
 meta/recipes-devtools/prelink/prelink_git.bb   |  1 +
 2 files changed, 52 insertions(+)
 create mode 100644 
meta/recipes-devtools/prelink/prelink/0001-src-arch-mips.c-check-info-resolvetls-before-use-its.patch

-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] ltp: use 'ping -6' if ping6 is not avaliable in netns_helper.sh

2018-10-10 Thread Yi Zhao

The iputils-ping6 was dropped since the 'ping6' command had been merged
into ping command. Backport patch from upstream to let both 'ping6' and
'ping -6' work.

Signed-off-by: Yi Zhao 
---
 ...r.sh-use-ping-6-when-ping6-is-not-avaliab.patch | 45 ++
 meta/recipes-extended/ltp/ltp_20180515.bb  |  1 +
 2 files changed, 46 insertions(+)
 create mode 100644 
meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch

diff --git 
a/meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
 
b/meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
new file mode 100644
index 000..32e7a0e
--- /dev/null
+++ 
b/meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
@@ -0,0 +1,45 @@
+From 76d8343ad300f6507233abcdf97629290e35848a Mon Sep 17 00:00:00 2001
+From: Lei Yang 
+Date: Wed, 29 Aug 2018 11:51:24 +0800
+Subject: [PATCH] netns_helper.sh: use 'ping -6' when ping6 is not avaliable
+
+ping6 has been merged into ping since 2015 by using "ping -6"
+in some distributions (e.g. OpenEmbedded) they dropped ping6 completely
+this patch will let both "ping -6" and ping6 work.
+
+[pvorel: change was done in s20150815:
+ebad35f ("ping: merge `ping6` command into `ping`"),
+before that release switch '-6' didn't exist.
+Upstream leaves ping6 symlink to distributions.]
+
+Upstream-Status: Backport
+[https://github.com/linux-test-project/ltp/commit/76d8343ad300f6507233abcdf97629290e35848a]
+
+Signed-off-by: Lei Yang 
+Signed-off-by: Petr Vorel 
+Signed-off-by: Yi Zhao 
+---
+ testcases/kernel/containers/netns/netns_helper.sh | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/testcases/kernel/containers/netns/netns_helper.sh 
b/testcases/kernel/containers/netns/netns_helper.sh
+index 6aea10b..a9d0459 100755
+--- a/testcases/kernel/containers/netns/netns_helper.sh
 b/testcases/kernel/containers/netns/netns_helper.sh
+@@ -168,7 +168,12 @@ netns_setup()
+   ipv6)
+   IFCONF_IN6_ARG="inet6 add"
+   IP0=$6; IP1=$7;
+-  tping="ping6"; NETMASK=64
++  if which ping6 >/dev/null 2>&1; then
++  tping="ping6"
++  else
++  tping="ping -6"
++  fi
++  NETMASK=64
+   ;;
+   *)
+   tst_brkm TBROK "second argument must be an ip version 
(ipv4|ipv6)"
+-- 
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp_20180515.bb 
b/meta/recipes-extended/ltp/ltp_20180515.bb
index ba0e6a6..643239f 100644
--- a/meta/recipes-extended/ltp/ltp_20180515.bb
+++ b/meta/recipes-extended/ltp/ltp_20180515.bb
@@ -54,6 +54,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \

file://0043-open-creat-skip-S_ISGID-check-on-files-created-by-no.patch \

file://0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch \
file://0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch 
\
+   
file://0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch \
"
 
 S = "${WORKDIR}/git"
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/3] testimage: Ensure opkg/apt test suites are run

2018-10-10 Thread Richard Purdie

Currently only the dnf package manager tests are automatically added to the
list of tests to run. Improve the code to handle automatic addition of
the apt and opkg tests too.

Signed-off-by: Richard Purdie 
---
 meta/classes/testimage.bbclass | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 39de191a73b..e289b9343cd 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -40,7 +40,11 @@ TEST_NEEDED_PACKAGES_DIR ?= "${WORKDIR}/testimage/packages"
 TEST_EXTRACTED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/extracted"
 TEST_PACKAGED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/packaged"
 
-RPMTESTSUITE = "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'dnf rpm', '', 
d)}"
+PKGMANTESTSUITE = "\
+${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'dnf rpm', '', d)} \
+${@bb.utils.contains('IMAGE_PKGTYPE', 'ipk', 'opkg', '', d)} \
+${@bb.utils.contains('IMAGE_PKGTYPE', 'deb', 'apt', '', d)} \
+"
 SYSTEMDSUITE = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 MINTESTSUITE = "ping"
 NETTESTSUITE = "${MINTESTSUITE} ssh df date scp oe_syslog ${SYSTEMDSUITE}"
@@ -51,14 +55,14 @@ DEFAULT_TEST_SUITES_pn-core-image-minimal = 
"${MINTESTSUITE}"
 DEFAULT_TEST_SUITES_pn-core-image-minimal-dev = "${MINTESTSUITE}"
 DEFAULT_TEST_SUITES_pn-core-image-full-cmdline = "${NETTESTSUITE} perl python 
logrotate ptest"
 DEFAULT_TEST_SUITES_pn-core-image-x11 = "${MINTESTSUITE}"
-DEFAULT_TEST_SUITES_pn-core-image-lsb = "${NETTESTSUITE} pam parselogs 
${RPMTESTSUITE} ptest"
-DEFAULT_TEST_SUITES_pn-core-image-sato = "${NETTESTSUITE} connman xorg 
parselogs ${RPMTESTSUITE} \
+DEFAULT_TEST_SUITES_pn-core-image-lsb = "${NETTESTSUITE} pam parselogs 
${PKGMANTESTSUITE} ptest"
+DEFAULT_TEST_SUITES_pn-core-image-sato = "${NETTESTSUITE} connman xorg 
parselogs ${PKGMANTESTSUITE} \
 ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python', '', d)} ptest gi"
 DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${NETTESTSUITE} buildcpio 
buildlzip buildgalculator \
-connman ${DEVTESTSUITE} logrotate perl parselogs python ${RPMTESTSUITE} 
xorg ptest gi stap"
-DEFAULT_TEST_SUITES_pn-core-image-lsb-dev = "${NETTESTSUITE} pam perl python 
parselogs ${RPMTESTSUITE} ptest gi"
+connman ${DEVTESTSUITE} logrotate perl parselogs python ${PKGMANTESTSUITE} 
xorg ptest gi stap"
+DEFAULT_TEST_SUITES_pn-core-image-lsb-dev = "${NETTESTSUITE} pam perl python 
parselogs ${PKGMANTESTSUITE} ptest gi"
 DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${NETTESTSUITE} buildcpio 
buildlzip buildgalculator \
-connman ${DEVTESTSUITE} logrotate pam parselogs perl python 
${RPMTESTSUITE} ptest gi stap"
+connman ${DEVTESTSUITE} logrotate pam parselogs perl python 
${PKGMANTESTSUITE} ptest gi stap"
 DEFAULT_TEST_SUITES_pn-meta-toolchain = "auto"
 
 # aarch64 has no graphics
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/3] testimage: Ensure package-index is triggered for opkg/apt tests

2018-10-10 Thread Richard Purdie

If the opkg/apt tests are run without a package-index they will fail.
Trigger this here for now as a dependency until the code can be improved.

Signed-off-by: Richard Purdie 
---
 meta/classes/testimage.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 859b5f485ab..aaf5f44f061 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -87,8 +87,8 @@ TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 
'rpm', 'cpio-native:d
 TESTIMAGEDEPENDS_append_qemuall = " ${@bb.utils.contains('IMAGE_PKGTYPE', 
'rpm', 'cpio-native:do_populate_sysroot', '', d)}"
 TESTIMAGEDEPENDS_append_qemuall =  "${@bb.utils.contains('IMAGE_PKGTYPE', 
'rpm', 'createrepo-c-native:do_populate_sysroot', '', d)}"
 TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 
'dnf-native:do_populate_sysroot', '', d)}"
-TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'ipk', 
'opkg-utils-native:do_populate_sysroot', '', d)}"
-TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'deb', 
'apt-native:do_populate_sysroot', '', d)}"
+TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'ipk', 
'opkg-utils-native:do_populate_sysroot package-index:do_package_index', '', d)}"
+TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'deb', 
'apt-native:do_populate_sysroot  package-index:do_package_index', '', d)}"
 TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 
'createrepo-c-native:do_populate_sysroot', '', d)}"
 
 TESTIMAGELOCK = "${TMPDIR}/testimage.lock"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/3] testimage: Ensure TESTIMAGEDEPENDS is appended to for qemuall override

2018-10-10 Thread Richard Purdie

The current qemuall override overwrites other dependencies unintentionally.
Tweak the code to avoid this by appending to the variable.

Signed-off-by: Richard Purdie 
---
 meta/classes/testimage.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index e289b9343cd..859b5f485ab 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -82,10 +82,10 @@ TEST_QEMUBOOT_TIMEOUT ?= "1000"
 TEST_TARGET ?= "qemu"
 
 TESTIMAGEDEPENDS = ""
-TESTIMAGEDEPENDS_qemuall = "qemu-native:do_populate_sysroot 
qemu-helper-native:do_populate_sysroot 
qemu-helper-native:do_addto_recipe_sysroot"
+TESTIMAGEDEPENDS_append_qemuall = " qemu-native:do_populate_sysroot 
qemu-helper-native:do_populate_sysroot 
qemu-helper-native:do_addto_recipe_sysroot"
 TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 
'cpio-native:do_populate_sysroot', '', d)}"
-TESTIMAGEDEPENDS_qemuall += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 
'cpio-native:do_populate_sysroot', '', d)}"
-TESTIMAGEDEPENDS_qemuall += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 
'createrepo-c-native:do_populate_sysroot', '', d)}"
+TESTIMAGEDEPENDS_append_qemuall = " ${@bb.utils.contains('IMAGE_PKGTYPE', 
'rpm', 'cpio-native:do_populate_sysroot', '', d)}"
+TESTIMAGEDEPENDS_append_qemuall =  "${@bb.utils.contains('IMAGE_PKGTYPE', 
'rpm', 'createrepo-c-native:do_populate_sysroot', '', d)}"
 TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 
'dnf-native:do_populate_sysroot', '', d)}"
 TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'ipk', 
'opkg-utils-native:do_populate_sysroot', '', d)}"
 TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'deb', 
'apt-native:do_populate_sysroot', '', d)}"
-- 
2.17.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v3] lib/oe/utils: add eol to format_pkg_list()

2018-10-10 Thread Grygorii Tertychnyi via Openembedded-core



akuster808 writes:

> Grygorii,
>
>
> On 10/10/2018 09:26 AM, grygorii tertychnyi via Openembedded-core wrote:
>> Append '\n' to the non-empty formatted string before return. If you
>> write it to the (manifest) file, it will ensure file ends with a newline.
>>
>> Many GNU utilities have problems processing the last line of a file
>> if it is not '\n' terminated. E.g. if the last line is not terminated
>> by a newline character, then "read" will read it but return false,
>> leaving the broken partial line in the read variable(s).
>> It can also break or adversely affect some text processing tools,
>> that operate on the file.
>
> is this needed for the cve patches?

No

>
> - armin
>> Signed-off-by: grygorii tertychnyi 
>> ---
>>
>> Changes in v3:
>>  o write_image_manifest(): remove extra '\n'
>>
>> PASS bitbake buildtools-tarball
>> PASS bitbake core-image-minimal  
>> 
>> PASS bitbake core-image-sato -c do_populate_sdk_ext
>> PASS oe-selftest --run-tests 
>> manifest.VerifyManifest.test_image_manifest_entries
>>
>>  meta/classes/rootfs-postcommands.bbclass | 1 -
>>  meta/lib/oe/utils.py | 8 +++-
>>  2 files changed, 7 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/classes/rootfs-postcommands.bbclass 
>> b/meta/classes/rootfs-postcommands.bbclass
>> index e816824f28..bde58ad6cd 100644
>> --- a/meta/classes/rootfs-postcommands.bbclass
>> +++ b/meta/classes/rootfs-postcommands.bbclass
>> @@ -253,7 +253,6 @@ python write_image_manifest () {
>>  pkgs = image_list_installed_packages(d)
>>  with open(manifest_name, 'w+') as image_manifest:
>>  image_manifest.write(format_pkg_list(pkgs, "ver"))
>> -image_manifest.write("\n")
>>  
>>  if os.path.exists(manifest_name):
>>  manifest_link = deploy_dir + "/" + link_name + ".manifest"
>> diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
>> index 93b0763b0a..d05f517a70 100644
>> --- a/meta/lib/oe/utils.py
>> +++ b/meta/lib/oe/utils.py
>> @@ -347,7 +347,13 @@ def format_pkg_list(pkg_dict, ret_format=None):
>>  for pkg in sorted(pkg_dict):
>>  output.append(pkg)
>>  
>> -return '\n'.join(output)
>> +output_str = '\n'.join(output)
>> +
>> +if output_str:
>> +# make sure last line is newline terminated
>> +output_str += '\n'
>> +
>> +return output_str
>>  
>>  def host_gcc_version(d, taskcontextonly=False):
>>  import re, subprocess

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] meson.bbclass: Fix build issues with /tmp mounted with noexec

2018-10-10 Thread Nirbheek Chauhan

On Thu, Oct 11, 2018 at 1:50 AM Mark Asselstine
 wrote:
> Definitely a bug in that it doesn't propogate as an error.

Note that compiler checks currently never raise an exception, and -1
is the all-inclusive "error condition" for when the size of a variable
could not be determined. Perhaps we should add a kwarg to sizeof()
that forces it to error out if the size could not be determined, or if
an unexpected error occurs.

> On the need to
> always use meson-private, I am 50/50 on that. Since meson respects TMPDIR/TMP/
> TEMP does it really need to handle this directly?
>

The main advantage of using tmpfs for temporary files is obvious,
which is why we try to avoid writing that to meson-private inside the
builddir. As I just commented on the issue, `XDG_RUNTIME_DIR` might be
a good candidate for an exec tmpfs location.
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v3] lib/oe/utils: add eol to format_pkg_list()

2018-10-10 Thread akuster808

Grygorii,


On 10/10/2018 09:26 AM, grygorii tertychnyi via Openembedded-core wrote:
> Append '\n' to the non-empty formatted string before return. If you
> write it to the (manifest) file, it will ensure file ends with a newline.
>
> Many GNU utilities have problems processing the last line of a file
> if it is not '\n' terminated. E.g. if the last line is not terminated
> by a newline character, then "read" will read it but return false,
> leaving the broken partial line in the read variable(s).
> It can also break or adversely affect some text processing tools,
> that operate on the file.

is this needed for the cve patches?

- armin
> Signed-off-by: grygorii tertychnyi 
> ---
>
> Changes in v3:
>  o write_image_manifest(): remove extra '\n'
>
> PASS bitbake buildtools-tarball
> PASS bitbake core-image-minimal   
>
> PASS bitbake core-image-sato -c do_populate_sdk_ext
> PASS oe-selftest --run-tests 
> manifest.VerifyManifest.test_image_manifest_entries
>
>  meta/classes/rootfs-postcommands.bbclass | 1 -
>  meta/lib/oe/utils.py | 8 +++-
>  2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/rootfs-postcommands.bbclass 
> b/meta/classes/rootfs-postcommands.bbclass
> index e816824f28..bde58ad6cd 100644
> --- a/meta/classes/rootfs-postcommands.bbclass
> +++ b/meta/classes/rootfs-postcommands.bbclass
> @@ -253,7 +253,6 @@ python write_image_manifest () {
>  pkgs = image_list_installed_packages(d)
>  with open(manifest_name, 'w+') as image_manifest:
>  image_manifest.write(format_pkg_list(pkgs, "ver"))
> -image_manifest.write("\n")
>  
>  if os.path.exists(manifest_name):
>  manifest_link = deploy_dir + "/" + link_name + ".manifest"
> diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
> index 93b0763b0a..d05f517a70 100644
> --- a/meta/lib/oe/utils.py
> +++ b/meta/lib/oe/utils.py
> @@ -347,7 +347,13 @@ def format_pkg_list(pkg_dict, ret_format=None):
>  for pkg in sorted(pkg_dict):
>  output.append(pkg)
>  
> -return '\n'.join(output)
> +output_str = '\n'.join(output)
> +
> +if output_str:
> +# make sure last line is newline terminated
> +output_str += '\n'
> +
> +return output_str
>  
>  def host_gcc_version(d, taskcontextonly=False):
>  import re, subprocess

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] meson.bbclass: Fix build issues with /tmp mounted with noexec

2018-10-10 Thread Mark Asselstine

On Wednesday, October 10, 2018 3:54:10 PM EDT Khem Raj wrote:
> On Wed, Oct 10, 2018 at 12:36 PM Mark Asselstine
> 
>  wrote:
> > Since commit d297f7ebf3f6 [fribidi: use Meson instead of autotools]
> > build failures have been observed with this package. The immediate
> > issue was related to improperly named #defines per
> > https://github.com/fribidi/fribidi/commit/46f52d588ab5, however, the
> > root cause was FRIBIDI_SIZEOF_INT getting a value of "-1".
> > 
> > After searching the meson logs the following was found:
> >   Could not run: /tmp/tmp2fxe6ha1/output.exe (error: [Errno 13] Permission
> >   denied) Checking for size of "int": -1
> > 
> > Which pointed to the real root cause being /tmp mounted with noexec, a
> > common configuration on Redhat and other distros. This issues has been
> > raised in the meson community:
> > https://github.com/mesonbuild/meson/issues/2972 but is yet to be
> > addressed.
> > 
> > Using the discussion from issue#2972 and the fact that the underlying
> > code makes use of python 'tempfile' we can simply create a 'tmp'
> > directory and make use of TMPDIR to avoid this issue.
> > 
> > Signed-off-by: Mark Asselstine 
> > ---
> > 
> >  meta/classes/meson.bbclass | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
> > index ed08a40..7e63e12 100644
> > --- a/meta/classes/meson.bbclass
> > +++ b/meta/classes/meson.bbclass
> > @@ -109,6 +109,9 @@ EOF
> > 
> >  CONFIGURE_FILES = "meson.build"
> >  
> >  meson_do_configure() {
> > 
> > +# Work around "Meson fails if /tmp is mounted with noexec #2972"
> 
> I would call it a bug in meson not a workaround.

Definitely a bug in that it doesn't propogate as an error. On the need to 
always use meson-private, I am 50/50 on that. Since meson respects TMPDIR/TMP/
TEMP does it really need to handle this directly?

Anyway, not sure if Mark Hatle and the other build system experts will like my 
fix, I will adjust as needed if/when they weigh in.

MarkA

> 
> > +mkdir -p "${B}/meson-private/tmp"
> > +export TMPDIR="${B}/meson-private/tmp"
> > 
> >  bbnote Executing meson ${EXTRA_OEMESON}...
> >  if ! meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}"
> >  ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then>  
> >  bbfatal_log meson failed
> > 
> > --
> > 2.7.4
> > 
> > --
> > ___
> > 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] meson.bbclass: Fix build issues with /tmp mounted with noexec

2018-10-10 Thread Khem Raj

On Wed, Oct 10, 2018 at 12:36 PM Mark Asselstine
 wrote:
>
> Since commit d297f7ebf3f6 [fribidi: use Meson instead of autotools]
> build failures have been observed with this package. The immediate
> issue was related to improperly named #defines per
> https://github.com/fribidi/fribidi/commit/46f52d588ab5, however, the
> root cause was FRIBIDI_SIZEOF_INT getting a value of "-1".
>
> After searching the meson logs the following was found:
>
>   Could not run: /tmp/tmp2fxe6ha1/output.exe (error: [Errno 13] Permission 
> denied)
>   Checking for size of "int": -1
>
> Which pointed to the real root cause being /tmp mounted with noexec, a
> common configuration on Redhat and other distros. This issues has been
> raised in the meson community:
> https://github.com/mesonbuild/meson/issues/2972 but is yet to be
> addressed.
>
> Using the discussion from issue#2972 and the fact that the underlying
> code makes use of python 'tempfile' we can simply create a 'tmp'
> directory and make use of TMPDIR to avoid this issue.
>
> Signed-off-by: Mark Asselstine 
> ---
>  meta/classes/meson.bbclass | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
> index ed08a40..7e63e12 100644
> --- a/meta/classes/meson.bbclass
> +++ b/meta/classes/meson.bbclass
> @@ -109,6 +109,9 @@ EOF
>  CONFIGURE_FILES = "meson.build"
>
>  meson_do_configure() {
> +# Work around "Meson fails if /tmp is mounted with noexec #2972"

I would call it a bug in meson not a workaround.

> +mkdir -p "${B}/meson-private/tmp"
> +export TMPDIR="${B}/meson-private/tmp"
>  bbnote Executing meson ${EXTRA_OEMESON}...
>  if ! meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} 
> ${EXTRA_OEMESON}; then
>  bbfatal_log meson failed
> --
> 2.7.4
>
> --
> ___
> 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] meson.bbclass: Fix build issues with /tmp mounted with noexec

2018-10-10 Thread Mark Asselstine

Since commit d297f7ebf3f6 [fribidi: use Meson instead of autotools]
build failures have been observed with this package. The immediate
issue was related to improperly named #defines per
https://github.com/fribidi/fribidi/commit/46f52d588ab5, however, the
root cause was FRIBIDI_SIZEOF_INT getting a value of "-1".

After searching the meson logs the following was found:

  Could not run: /tmp/tmp2fxe6ha1/output.exe (error: [Errno 13] Permission 
denied)
  Checking for size of "int": -1

Which pointed to the real root cause being /tmp mounted with noexec, a
common configuration on Redhat and other distros. This issues has been
raised in the meson community:
https://github.com/mesonbuild/meson/issues/2972 but is yet to be
addressed.

Using the discussion from issue#2972 and the fact that the underlying
code makes use of python 'tempfile' we can simply create a 'tmp'
directory and make use of TMPDIR to avoid this issue.

Signed-off-by: Mark Asselstine 
---
 meta/classes/meson.bbclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index ed08a40..7e63e12 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -109,6 +109,9 @@ EOF
 CONFIGURE_FILES = "meson.build"
 
 meson_do_configure() {
+# Work around "Meson fails if /tmp is mounted with noexec #2972"
+mkdir -p "${B}/meson-private/tmp"
+export TMPDIR="${B}/meson-private/tmp"
 bbnote Executing meson ${EXTRA_OEMESON}...
 if ! meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} 
${EXTRA_OEMESON}; then
 bbfatal_log meson failed
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] ✗ patchtest: failure for wic: make engine.py:get_partitions() resilient to parted/dmidecode stderr output

2018-10-10 Thread Patchwork

== Series Details ==

Series: wic: make engine.py:get_partitions() resilient to parted/dmidecode 
stderr output
Revision: 1
URL   : https://patchwork.openembedded.org/series/14461/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series cannot be parsed correctly due to malformed diff 
lines [test_mbox_format] 
  Suggested fixCreate the series again using git-format-patch and ensure it 
can be applied using git am
  Diff lineself.imagepath))


* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at d0d55add6c)

* Patchwic: make engine.py:get_partitions() resilient to 
parted/dmidecode stderr output
 Issue Patch is missing Signed-off-by [test_signed_off_by_presence] 
  Suggested fixSign off the patch (either manually or with "git commit 
--amend -s")



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines: 
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] wic: make engine.py:get_partitions() resilient to parted/dmidecode stderr output

2018-10-10 Thread Geoff Parker

Running wic commands on Debian 10 systems fail in
scripts/lib/wic/engine.py:get_partitions() due to new stderr output captured
when trying to parse the output from /sbin/parted as a non-root user.

The parted command calls the dmidecode utility, which produces this error
as a non-root user:
  /sys/firmware/dmi/tables/smbios_entry_point: Permission denied
  /dev/mem: Permission denied

scripts/lib/wic/engine.py:get_partitions()
calls misc.py:exec_cmd(), a subprocess wrapper which returns a
combined stderr and sdtdout.
These messages to stderr confuse the partition table parser in get_partitions().

This patch has the partition table parser ignore lines before the
expected "BYT;"
header string.

Running wic in Debian 9 does not have this issue.
---
 scripts/lib/wic/engine.py | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index f0c5ff0aaf..52c9592b33 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -266,10 +266,15 @@ class Disk:
 out = exec_cmd("%s -sm %s unit B print" % (self.parted,
self.imagepath))
 parttype = namedtuple("Part", "pnum start end size fstype")
 splitted = out.splitlines()
-lsector_size, psector_size, self._ptable_format =
splitted[1].split(":")[3:6]
+# skip over possible errors in exec_cmd output
+try:
+idx =splitted.index("BYT;")
+except ValueError:
+raise WicError("Error getting partition information
from %s" % (self.parted))
+lsector_size, psector_size, self._ptable_format =
splitted[idx + 1].split(":")[3:6]
 self._lsector_size = int(lsector_size)
 self._psector_size = int(psector_size)
-for line in splitted[2:]:
+for line in splitted[idx + 2:]:
 pnum, start, end, size, fstype = line.split(':')[:5]
 partition = parttype(int(pnum), int(start[:-1]), int(end[:-1]),
  int(size[:-1]), fstype)
-- 
2.19.1
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] devtool-source.bbclass: Only create each patch branch once

2018-10-10 Thread Olof Johansson

On 18-10-10 17:48 +0200, Peter Kjellerstedt wrote:
> > Change-Id: I8adca0b54179793ca92478ad5b3b1b6e0448e26b
> 
> You probably want to remove the Change-Id before applying this...

Sorry! :( I'll probably forget to remove that again in the
future, I should try making git format-patch automatically strip
that. Thanks Peter!

-- 
olofjn
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v3] lib/oe/utils: add eol to format_pkg_list()

2018-10-10 Thread grygorii tertychnyi via Openembedded-core

Append '\n' to the non-empty formatted string before return. If you
write it to the (manifest) file, it will ensure file ends with a newline.

Many GNU utilities have problems processing the last line of a file
if it is not '\n' terminated. E.g. if the last line is not terminated
by a newline character, then "read" will read it but return false,
leaving the broken partial line in the read variable(s).
It can also break or adversely affect some text processing tools,
that operate on the file.

Signed-off-by: grygorii tertychnyi 
---

Changes in v3:
 o write_image_manifest(): remove extra '\n'

PASS bitbake buildtools-tarball
PASS bitbake core-image-minimal 
 
PASS bitbake core-image-sato -c do_populate_sdk_ext
PASS oe-selftest --run-tests manifest.VerifyManifest.test_image_manifest_entries

 meta/classes/rootfs-postcommands.bbclass | 1 -
 meta/lib/oe/utils.py | 8 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta/classes/rootfs-postcommands.bbclass 
b/meta/classes/rootfs-postcommands.bbclass
index e816824f28..bde58ad6cd 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -253,7 +253,6 @@ python write_image_manifest () {
 pkgs = image_list_installed_packages(d)
 with open(manifest_name, 'w+') as image_manifest:
 image_manifest.write(format_pkg_list(pkgs, "ver"))
-image_manifest.write("\n")
 
 if os.path.exists(manifest_name):
 manifest_link = deploy_dir + "/" + link_name + ".manifest"
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 93b0763b0a..d05f517a70 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -347,7 +347,13 @@ def format_pkg_list(pkg_dict, ret_format=None):
 for pkg in sorted(pkg_dict):
 output.append(pkg)
 
-return '\n'.join(output)
+output_str = '\n'.join(output)
+
+if output_str:
+# make sure last line is newline terminated
+output_str += '\n'
+
+return output_str
 
 def host_gcc_version(d, taskcontextonly=False):
 import re, subprocess
-- 
2.19.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v3 2/3] cvert-kernel - generate CVE report for the Linux kernel

2018-10-10 Thread grygorii tertychnyi via Openembedded-core

NVD entries for the Linux kernel are almost always outdated.
For example, https://nvd.nist.gov/vuln/detail/CVE-2018-1065
is shown as matched for "versions up to (including) 4.15.7",
however the patch 57ebd808a97d has been back ported for 4.14.

By default, it checks NVD Resource entries for the patch
URLs and looks for the commits in the local GIT tree.

Additionaly ("--resource") it checks other resources, that
may have up-to-date CVE data. You can combine resources and
decide which one you want to be based on.

Signed-off-by: grygorii tertychnyi 
---

Changes in v3:
 o "cvert-kernel" is a separate patch
 o add "--resources": rework NVD, add LKC resource:
   https://github.com/nluedtke/linux_kernel_cves
 o better logging ("--debug" sets all logging, including lib calls)
 o fix pylint warnings

 scripts/cvert-kernel | 379 +++
 1 file changed, 379 insertions(+)
 create mode 100755 scripts/cvert-kernel

diff --git a/scripts/cvert-kernel b/scripts/cvert-kernel
new file mode 100755
index ..adf26924d10c
--- /dev/null
+++ b/scripts/cvert-kernel
@@ -0,0 +1,379 @@
+#!/usr/bin/env python3
+#
+# Copyright (c) 2018 by Cisco Systems, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+""" Generate CVE report for the given Linux kernel GIT branch
+"""
+
+import re
+import sys
+import argparse
+import textwrap
+import subprocess
+import logging
+import logging.config
+import cvert
+
+
+def report_kernel():
+"""Generate Linux kernel CVE report"""
+
+parser = argparse.ArgumentParser(
+formatter_class=argparse.RawDescriptionHelpFormatter,
+description=textwrap.dedent("""
+Generate CVE report for the Linux kernel.
+Inspect Linux kernel GIT tree and find all CVE patches commits.
+"""),
+epilog=textwrap.dedent("""
+@ run examples:
+
+# Download (update) NVD feeds in "nvdfeed" directory
+# and prepare the report for the "kernel-sources" directory
+%% %(prog)s --feed-dir nvdfeed --output report-kernel.txt 
kernel-sources
+
+# Use existed NVD feeds in "nvdfeed" directory
+# and prepare the report for the "kernel-sources" directory
+%% %(prog)s --offline --feed-dir nvdfeed --output report-kernel.txt 
kernel-sources
+
+# (faster) Restore CVE dump from "cvedump" (must exist)
+# and prepare the report for the "kernel-sources" directory
+%% %(prog)s --restore cvedump --output report-kernel.txt kernel-sources
+
+# Restore CVE dump from "cvedump" (must exist)
+# and prepare the extended report for the "kernel-sources" directory
+%% %(prog)s --restore cvedump --show-description --show-reference 
--output report-kernel.txt kernel-sources
+
+@ report example output (NVD resource):
+
+# 2018-10-10 15:41:52,213 %% CVERT %% INFO %% kernel version: 
4.9.132
+. patched |  3.3 | CVE-2017-17807 | nvd: KEYS: add missing 
permission check for request_key() destination
+unpatched |  3.3 | CVE-2017-17864 | 
+unpatched |  4.4 | CVE-2016-9604  | 
+unpatched |  4.4 | CVE-2017-12153 | 
+unpatched |  4.4 | CVE-2017-14051 | 
+. patched |  4.6 | CVE-2017-8924  | nvd: USB: serial: io_ti: fix 
information leak in completion handler
+unpatched |  4.7 | CVE-2017-17449 | 
+. patched |  4.7 | CVE-2017-18203 | nvd: dm: fix race between 
dm_get_from_kobject() and __dm_destroy()
+. patched |  4.7 | CVE-2017-18224 | nvd: ocfs2: ip_alloc_sem 
should be taken in ocfs2_get_block()
+. patched |  4.7 | CVE-2018-1065  | nvd: netfilter: add back 
stackpointer size checks
+...
+
+@ report example output (NVD+LKC resource):
+
+# 2018-10-10 15:46:05,902 %% CVERT %% INFO %% kernel version: 
4.9.132
+. patched |  3.3 | CVE-2017-17807 | nvd: KEYS: add missing 
permission check for request_key() destination
+unpatched |  3.3 | CVE-2017-17864 | 
+. patched |  4.4 | CVE-2016-9604  | lkc: 
a5c6e0a76817a3751f58d761aaff7c0b0c4001ff
+. patched |  4.4 | CVE-2017-12153 | lkc: 
c820441a7a52e3626aede8df94069a50a9e4efdb
+. patched |  4.4 | CVE-2017-14051 | lkc: 
2a913aecc4f746ce15eb1bec98b134aff4190ae2
+. patched |  4.6 | CVE-2017-8924

[OE-core] [PATCH v3 3/3] cve-report.bbclass: add class

2018-10-10 Thread grygorii tertychnyi via Openembedded-core

Implements "report_cve" and "report_patched" tasks.

"report_patched" prepares image manifest with patched CVE info.
"report_cve" runs cvert-* scripts to generate kernel and package CVE reports.

You can configure it to set report filenames, reuse NVD feeds,
stop after manifest generation and ignore specific classes,
like native, nativesdk, etc.

Signed-off-by: grygorii tertychnyi 
---

Changes in v3:
 o no kernel part

 meta/classes/cve-report.bbclass | 216 
 1 file changed, 216 insertions(+)
 create mode 100644 meta/classes/cve-report.bbclass

diff --git a/meta/classes/cve-report.bbclass b/meta/classes/cve-report.bbclass
new file mode 100644
index ..35d58d0821a9
--- /dev/null
+++ b/meta/classes/cve-report.bbclass
@@ -0,0 +1,216 @@
+# Class to inherit when you want to generate a CVE reports.
+#
+# Generates package list file and package CVE report.
+#
+# Example:
+#   echo 'INHERIT += "cve-report"' >> conf/local.conf
+#   bitbake -c report_cve core-image-minimal
+#
+# Variables to be passed to "cvert-*" scripts:
+#
+# CVE_REPORT_MODE[foss]
+# Path to the CVE FOSS report to be generated.
+#
+# CVE_REPORT_MODE[restore]
+# Path to the CVE dump data file.
+#
+# E.g. for multiple MACHINEs:
+# (1) generate CVE dump:
+# cvert-update --store /path/to/cvedump $TEMP/nvdfeed
+# (2) for mach in $(get_machine_list); do
+# (source oe-init-build-env "build-$mach";
+# echo 'CVE_REPORT_MODE[restore] = "/path/to/cvedump"' >> 
conf/local.conf;
+# echo 'CVE_REPORT_MODE[foss] = "/path/to/report-foss-'${mach}'"' 
>> conf/local.conf;
+# MACHINE=$mach bitbake -c report_cve core-image-minimal)
+# done
+#
+# CVE_REPORT_MODE[offline]
+# Either "0" or "1". Offline mode ("--offline" parameter for cvert-* 
scripts).
+#
+# CVE_REPORT_MODE[feeddir]
+# Path to the NVD feed directory.
+#
+# CVE_REPORT_MODE[packagelist]
+# Path to the package list file to be generated.
+#
+# CVE_REPORT_MODE[packageonly]
+# Either "0" or "1". Generate package list file, then stop.
+#
+# CVE_REPORT_MODE[blacklist]
+# Ignore specific class.
+#
+
+CVE_REPORT_MODE[foss] ?= "${LOG_DIR}/cvert/report-foss.txt"
+CVE_REPORT_MODE[offline] ?= "0"
+CVE_REPORT_MODE[feeddir] ?= "${LOG_DIR}/nvdfeeds"
+CVE_REPORT_MODE[packagelist] ?= "${LOG_DIR}/cvert/package.lst"
+CVE_REPORT_MODE[packageonly] ?= "0"
+CVE_REPORT_MODE[blacklist] ?= 
"native,nativesdk,cross,crosssdk,cross-canadian,packagegroup,image"
+
+CVE_PRODUCT ??= "${BPN}"
+CVE_VERSION ??= "${PV}"
+
+addhandler generate_report_handler
+generate_report_handler[eventmask] = "bb.event.BuildCompleted"
+
+def cvert_update(d):
+"""Update NVD storage and prepare CVE dump"""
+
+import tempfile
+import subprocess
+
+bb.utils.export_proxies(d)
+
+dump = os.path.join(d.getVar("LOG_DIR"), "cvedump")
+
+bb.note("Updating CVE database: %s" % dump)
+
+cmd = [
+"cvert-update",
+"--store", dump,
+"--debug",
+d.getVarFlag("CVE_REPORT_MODE", "feeddir")
+]
+
+if d.getVarFlag("CVE_REPORT_MODE", "offline") != "0":
+cmd.append("--offline")
+
+try:
+bb.debug(2, "Call '%s'" % " ".join(cmd))
+output = subprocess.check_output(cmd, 
stderr=subprocess.STDOUT).decode()
+bb.debug(2, "Output: %s" % output)
+except subprocess.CalledProcessError as e:
+bb.error("Failed to run cvert-update: '%s'\n%s: %s" % (" ".join(cmd), 
e, e.output))
+
+return dump
+
+# copied from cve-check.bbclass
+def get_patches_cves(d):
+"""Get patches that solve CVEs using the "CVE: " tag"""
+
+import re
+
+pn = d.getVar("PN")
+cve_match = re.compile("CVE:( CVE\-\d{4}\-\d+)+")
+
+# Matches last CVE-1234-211432 in the file name, also if written
+# with small letters. Not supporting multiple CVE id's in a single
+# file name.
+cve_file_name_match = re.compile(".*([Cc][Vv][Ee]\-\d{4}\-\d+)")
+
+patched_cves = set()
+bb.debug(2, "Looking for patches that solves CVEs for %s" % pn)
+for url in src_patches(d):
+patch_file = bb.fetch.decodeurl(url)[2]
+
+# Check patch file name for CVE ID
+fname_match = cve_file_name_match.search(patch_file)
+if fname_match:
+cve = fname_match.group(1).upper()
+patched_cves.add(cve)
+bb.debug(2, "Found CVE %s from patch file name %s" % (cve, 
patch_file))
+
+with open(patch_file, "r", encoding="utf-8") as f:
+try:
+patch_text = f.read()
+except UnicodeDecodeError:
+bb.debug(1, "Failed to read patch %s using UTF-8 encoding"
+" trying with iso8859-1" %  patch_file)
+f.close()
+with open(patch_file, "r", encoding="iso8859-1") as f:
+patch_text = f.read()
+
+# Search for one or more "CVE: " lines
+text_match = False
+

[OE-core] [PATCH v3 1/3] cve-report: add scripts to generate CVE reports

2018-10-10 Thread grygorii tertychnyi via Openembedded-core

cvert-foss - generate CVE report for the list of packages.
  Analyze the whole image manifest to align with the complex
  CPE configurations.

cvert-update - update NVD feeds and store CVE structues dump.
  CVE dump is a pickled representation of the cve_struct dictionary.

cvert.py - python library used by cvert-* scripts.
  NVD JSON Vulnerability Feeds https://nvd.nist.gov/vuln/data-feeds#JSON_FEED

Usage examples:

  o Download CVE feeds to "nvdfeed" directory
% cvert-update nvdfeed
  o Update CVE feeds and store a dump in a file
% cvert-update --store cvedump nvdfeed
  o Generate a CVE report
% cvert-foss --feed-dir nvdfeed --output report-foss.txt cve-manifest
  o (faster) Use dump file to generate a CVE report
% cvert-foss --restore cvedump --output report-foss.txt cve-manifest
  o Generate a full report
% cvert-foss --restore cvedump --show-description --show-reference \
 --output report-foss-full.txt cve-manifest

Manifest example:

  bash,4.2,CVE-2014-7187
  python,2.7.35,
  python,3.5.5,CVE-2017-17522 CVE-2018-1061

Report example:

patched |  7.5 | CVE-2018-1061  | python | 3.5.5
patched | 10.0 | CVE-2014-7187  | bash | 4.2
patched |  8.8 | CVE-2017-17522 | python | 3.5.5
  unpatched | 10.0 | CVE-2014-6271  | bash | 4.2
  unpatched | 10.0 | CVE-2014-6277  | bash | 4.2
  unpatched | 10.0 | CVE-2014-6278  | bash | 4.2
  unpatched | 10.0 | CVE-2014-7169  | bash | 4.2
  unpatched | 10.0 | CVE-2014-7186  | bash | 4.2
  unpatched |  4.6 | CVE-2012-3410  | bash | 4.2
  unpatched |  8.4 | CVE-2016-7543  | bash | 4.2
  unpatched |  5.0 | CVE-2010-3492  | python | 2.7.35
  unpatched |  5.3 | CVE-2016-1494  | python | 2.7.35
  unpatched |  6.5 | CVE-2017-18207 | python | 3.5.5
  unpatched |  6.5 | CVE-2017-18207 | python | 2.7.35
  unpatched |  7.1 | CVE-2013-7338  | python | 2.7.35
  unpatched |  7.5 | CVE-2018-1060  | python | 3.5.5
  unpatched |  8.8 | CVE-2017-17522 | python | 2.7.35

Signed-off-by: grygorii tertychnyi 
---

Changes in v3:
 o better logging: cvert.py lib log messages are controlled by cvert-* scripts
 o add more examples
 o add short params ("-o" "--output", "-f", "--feed-dir", etc)
 o fix double entries in manifest
 o fix pylint warnings

 scripts/cvert-foss   | 151 
 scripts/cvert-update |  79 +
 scripts/cvert.py | 473 +++
 3 files changed, 703 insertions(+)
 create mode 100755 scripts/cvert-foss
 create mode 100755 scripts/cvert-update
 create mode 100644 scripts/cvert.py

diff --git a/scripts/cvert-foss b/scripts/cvert-foss
new file mode 100755
index ..00fbf2c0687b
--- /dev/null
+++ b/scripts/cvert-foss
@@ -0,0 +1,151 @@
+#!/usr/bin/env python3
+#
+# Copyright (c) 2018 by Cisco Systems, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+""" Generate CVE report for the given CVE manifest
+"""
+
+import sys
+import textwrap
+import argparse
+import logging
+import logging.config
+import cvert
+
+def report_foss():
+"""Generate CVE report"""
+
+parser = argparse.ArgumentParser(
+formatter_class=argparse.RawDescriptionHelpFormatter,
+description=textwrap.dedent("""
+Generate CVE report for the given CVE manifest.
+"""),
+epilog=textwrap.dedent("""
+@ run examples:
+
+# Download (update) NVD feeds in "nvdfeed" directory
+# and prepare the report for the "cve-manifest" file
+%% %(prog)s --feed-dir nvdfeed --output report-foss.txt cve-manifest
+
+# Use existed NVD feeds in "nvdfeed" directory
+# and prepare the report for the "cve-manifest" file
+%% %(prog)s --offline --feed-dir nvdfeed --output report-foss.txt 
cve-manifest
+
+# (faster) Restore CVE dump from "cvedump" (must exist)
+# and prepare the report for the "cve-manifest" file
+%% %(prog)s --restore cvedump --output report-foss.txt cve-manifest
+
+# Restore CVE dump from "cvedump" (must exist)
+# and prepare the extended report for the "cve-manifest" file
+%% %(prog)s --restore cvedump --show-description --show-reference 
--output report-foss.txt cve-manifest
+
+@ manifest example:
+
+bash,4.2,CVE-2014-7187
+python,2.7.35,
+python,3.5.5,CVE-2017-

Re: [OE-core] [PATCH] devtool-source.bbclass: Only create each patch branch once

2018-10-10 Thread Peter Kjellerstedt

> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org  core-boun...@lists.openembedded.org> On Behalf Of Olof Johansson
> Sent: den 10 oktober 2018 17:35
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH] devtool-source.bbclass: Only create each
> patch branch once
> 
> For conditonally applied patches based on SRC_URI overrides, the
> devtool-source class would try to create a new branch for each override
> assignment as a postfunc to do_patch, but if the same override was used
> multiple times, it would try to create the same branch multiple times,
> causing errors like
> 
> > Exception: bb.process.ExecutionError: Execution of
> \   'git checkout f0f0f0f0f0ff0f0f0f0f0f0f0f0f0f0f0ff0f0f0 -b 
> devtool-override-foo'
> \   failed with exit code 128:
> > fatal: A branch named 'devtool-override-foo' already exists.
> 
> This change makes sure that the devtool-source bbclass will only create
> one branch per override.
> 
> Change-Id: I8adca0b54179793ca92478ad5b3b1b6e0448e26b

You probably want to remove the Change-Id before applying this...

> Signed-off-by: Olof Johansson 
> ---
>  meta/classes/devtool-source.bbclass | 9 -
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/classes/devtool-source.bbclass 
> b/meta/classes/devtool-source.bbclass
> index 56882a4..fa4e999 100644
> --- a/meta/classes/devtool-source.bbclass
> +++ b/meta/classes/devtool-source.bbclass
> @@ -169,16 +169,15 @@ python devtool_post_patch() {
>  except bb.process.ExecutionError:
>  pass
> 
> -extra_overrides = d.getVar('DEVTOOL_EXTRA_OVERRIDES')
> -if extra_overrides:
> -extra_override_list = extra_overrides.split(':')
> +devtool_overrides = set(d.getVar('DEVTOOL_EXTRA_OVERRIDES').split(':') 
> or [])
> +if devtool_overrides:
>  devbranch = d.getVar('DEVTOOL_DEVBRANCH')
>  default_overrides = d.getVar('OVERRIDES').split(':')
>  no_overrides = []
>  # First, we may have some overrides that are referred to in the 
> recipe set in
>  # our configuration, so we need to make a branch that excludes those
>  for override in default_overrides:
> -if override not in extra_override_list:
> +if override not in devtool_overrides:
>  no_overrides.append(override)
>  if default_overrides != no_overrides:
>  # Some overrides are active in the current configuration, so
> @@ -196,7 +195,7 @@ python devtool_post_patch() {
>  else:
>  bb.process.run('git checkout %s -b devtool-no-overrides' % 
> devbranch, cwd=srcsubdir)
> 
> -for override in extra_override_list:
> +for override in devtool_overrides:
>  localdata = bb.data.createCopy(d)
>  if override in default_overrides:
>  bb.process.run('git branch devtool-override-%s %s' % 
> (override, devbranch), cwd=srcsubdir)
> --
> 2.11.0

//Peter
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/3] gobject-introspection: fix multilib install file conflicts

2018-10-10 Thread kai.kang

From: Kai Kang 

Fix multilib isntall file conflicts for gobject-introspection.
* use multilib_script.bbclass to handle ${bindir}/g-ir-annotation-tool
  and ${bindir}/g-ir-scanner
* add configure option to install .gir files to an alternative path and
  only set it when multilib is enabled

Signed-off-by: Kai Kang 
---
 ...nfigure.ac-make-GIR_DIR-configurable.patch | 68 +
 ...02-g-ir-tools-respect-gir_dir_prefix.patch | 76 +++
 .../gobject-introspection_1.58.0.bb   | 11 ++-
 3 files changed, 152 insertions(+), 3 deletions(-)
 create mode 100644 
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch
 create mode 100644 
meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch

diff --git 
a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch
 
b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch
new file mode 100644
index 00..e0402f8f49
--- /dev/null
+++ 
b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch
@@ -0,0 +1,68 @@
+configure.ac: make GIR_DIR configurable
+
+Some .gir files such as GLib-2.0.gir are arch related which contain such
+as lengths of pointers that they are different for 64 and 32 bit target.
+It causes install file conflicts for multilib when intall
+gobject-introspection and lib32-gobject-introspection both.
+
+Add configure option 'with-gir-dir-prefix' for autotools to make .gir
+could be installed to a configured path such as ${libdir}. And update
+girdir in .pc files as well.
+
+Upstream-Status: Accepted 
[https://gitlab.gnome.org/GNOME/gobject-introspection/commit/3301c7e]
+
+Signed-off-by: Kai Kang 
+---
+ configure.ac  | 7 +--
+ gobject-introspection-1.0.pc.in   | 2 +-
+ gobject-introspection-no-export-1.0.pc.in | 2 +-
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b4294c57..60506947 100644
+--- a/configure.ac
 b/configure.ac
+@@ -114,9 +114,12 @@ GIR_SUFFIX="gir-1.0"
+ AC_SUBST(GIR_SUFFIX)
+ AC_DEFINE_UNQUOTED(GIR_SUFFIX, "$GIR_SUFFIX", [Name of the gir directory])
+ 
+-GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX"
++AC_ARG_WITH([gir-dir-prefix],
++  [AS_HELP_STRING([--with-gir-dir-prefix], [Directory prefix for 
gir installation])],
++  [GIR_DIR_PREFIX="$withval"], 
[GIR_DIR_PREFIX="$EXPANDED_DATADIR"])
++GIR_DIR="$GIR_DIR_PREFIX/$GIR_SUFFIX"
+ AC_SUBST(GIR_DIR)
+-AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir 
installation])
++AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Directory prefix for gir 
installation])
+ 
+ PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.58.0])
+ 
+diff --git a/gobject-introspection-1.0.pc.in b/gobject-introspection-1.0.pc.in
+index a08b5d27..3409856c 100644
+--- a/gobject-introspection-1.0.pc.in
 b/gobject-introspection-1.0.pc.in
+@@ -10,7 +10,7 @@ g_ir_scanner=${bindir}/g-ir-scanner
+ g_ir_compiler=${bindir}/g-ir-compiler@EXEEXT@
+ g_ir_generate=${bindir}/g-ir-generate@EXEEXT@
+ gidatadir=${datadir}/gobject-introspection-1.0
+-girdir=${datadir}/gir-1.0
++girdir=@GIR_DIR@
+ typelibdir=${libdir}/girepository-1.0
+ 
+ Cflags: -I${includedir}/gobject-introspection-1.0 @FFI_PC_CFLAGS@
+diff --git a/gobject-introspection-no-export-1.0.pc.in 
b/gobject-introspection-no-export-1.0.pc.in
+index d214d22d..745aaade 100644
+--- a/gobject-introspection-no-export-1.0.pc.in
 b/gobject-introspection-no-export-1.0.pc.in
+@@ -9,7 +9,7 @@ includedir=@includedir@
+ g_ir_scanner=${bindir}/g-ir-scanner
+ g_ir_compiler=${bindir}/g-ir-compiler@EXEEXT@
+ g_ir_generate=${bindir}/g-ir-generate@EXEEXT@
+-girdir=${datadir}/gir-1.0
++girdir=@GIR_DIR@
+ typelibdir=${libdir}/girepository-1.0
+ 
+ Cflags: -I${includedir}/gobject-introspection-1.0 @FFI_PC_CFLAGS@
+-- 
+2.17.0
+
diff --git 
a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch
 
b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch
new file mode 100644
index 00..5e4176725c
--- /dev/null
+++ 
b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch
@@ -0,0 +1,76 @@
+g-ir-tools: respect gir_dir_prefix
+
+Configure option gir_dir_prefix is used to configure install dir for
+.gir files, so add its value to include file search paths.
+
+Upstream-Status: Accepted 
[https://gitlab.gnome.org/GNOME/gobject-introspection/commit/3fe995a]
+
+Signed-off-by: Kai Kang 
+---
+ Makefile-tools.am   |  2 +-
+ giscanner/transformer.py|  1 +
+ tests/warn/warningtester.py |  1 +
+ tools/g-ir-tool-template.in | 10 ++
+ 6 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/Mak

[OE-core] [PATCH 3/3] vala: update vapigen-wrapper

2018-10-10 Thread kai.kang

From: Kai Kang 

The .gir files from gobject-introspection are configured to install to
${libdir}/gir-1.0 when multilib is enabled. Update vapigen-wrapper accordingly.

Signed-off-by: Kai Kang 
---
 meta/recipes-devtools/vala/vala.inc | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/vala/vala.inc 
b/meta/recipes-devtools/vala/vala.inc
index b22faad780..f680640ca6 100644
--- a/meta/recipes-devtools/vala/vala.inc
+++ b/meta/recipes-devtools/vala/vala.inc
@@ -24,12 +24,15 @@ inherit autotools pkgconfig upstream-version-is-even
 FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi 
${libdir}/${BPN}-${SHRT_VER}/"
 FILES_${PN}-doc += "${datadir}/devhelp"
 
+# .gir files from gobject-introspection are installed to ${libdir} when 
multilib is enabled
+GIRDIR_OPT = "${@'--girdir=${STAGING_LIBDIR}/gir-1.0' if d.getVar('MULTILIBS') 
else ''}"
+
 do_configure_prepend_class-target() {
 # Write out a vapigen wrapper that will be provided by pkg-config file 
installed in target sysroot
 # The wrapper will call a native vapigen
 cat > ${B}/vapigen-wrapper << EOF
 #!/bin/sh
-vapigen-${SHRT_VER} "\$@"
+vapigen-${SHRT_VER} ${GIRDIR_OPT} "\$@"
 EOF
 chmod +x ${B}/vapigen-wrapper
 }
@@ -55,3 +58,5 @@ vapigen_sysroot_preprocess() {
-e "s|vapigen=.*|vapigen=${bindir}/vapigen-wrapper|" \
${SYSROOT_DESTDIR}${libdir}/pkgconfig/vapigen-${SHRT_VER}.pc
 }
+
+SSTATE_SCAN_FILES += "vapigen-wrapper"
-- 
2.18.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/3] gobject-introspection: add required python modules to rdepends

2018-10-10 Thread kai.kang

From: Kai Kang 

It fails to run g-ir-scanner from package gobject-introspection that
missing python modules 'xml' and 'pickle'. Add them to rdepends.

Signed-off-by: Kai Kang 
---
 .../gobject-introspection/gobject-introspection_1.58.0.bb   | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb 
b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb
index de898a788b..a08ccf2970 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb
@@ -194,4 +194,6 @@ FILES_${PN}-dev_append = " 
${datadir}/gobject-introspection-1.0/tests/*.c \
 FILES_${PN}-dbg += "${libdir}/gobject-introspection/giscanner/.debug/"
 FILES_${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a"
 
+RDEPENDS_${PN}_class-target = "python3-pickle python3-xml"
+
 BBCLASSEXTEND = "native"
-- 
2.18.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH V2 0/3] Fix multilib install file conflict of gobject-introspection

2018-10-10 Thread kai.kang

From: Kai Kang 

1 test steps
Set config in local.conf:

MACHINE = "qemux86-64"
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"

IMAGE_INSTALL_append = " packagegroup-core-buildessential ldd 
gobject-introspection lib32-gobject-introspection gobject-introspection-dev 
lib32-gobject-introspection-dev"

2 bitbake core-image-sato

3 runqemu qemux86-64

4 runtime test:
Prepare a simple c file:
// test.h
int test_foo();

// test.c
#include 

int test_foo()
{
printf("hello world.\n");

return 0;
}

4.1 verify /usr/lib64/gir-1.0 is searched
# mv /usr/lib64/gir-1.0/ /tmp
# g-ir-scanner --no-libtool --namespace=Test --nsversion=0 --library=test 
--output Test-0.gir --include=GObject-2.0 test.c test.h
Couldn't find include 'GObject-2.0.gir' (search path: '['gir-1.0', 
'/usr/share/gir-1.0', '/usr/lib64/gir-1.0', '/usr/share/gir-1.0', 
'/usr/share/gir-1.0']')

4.2 verify g-ir-scanner and g-ir-compiler work
# gcc -fPIC -shared test.c -o libtest.so
# g-ir-scanner --no-libtool --namespace=Test --nsversion=0 --library=test 
--output Test-0.gir --include=GObject-2.0 test.c test.h
# g-ir-compiler Test-0.gir -o Test-0.typelib


The following changes since commit 4806d533044011811e78ac41c6aeee3de4224a1e:

  bitbake: main: Fix environment handling for UI module imports (2018-10-10 
12:47:48 +0100)

are available in the Git repository at:

  git://git.pokylinux.org/poky-contrib kangkai/gir-ml
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/gir-ml

Kai Kang (3):
  gobject-introspection: add required python modules to rdepends
  gobject-introspection: fix multilib install file conflicts
  vala: update vapigen-wrapper

 meta/recipes-devtools/vala/vala.inc   |  7 +-
 ...nfigure.ac-make-GIR_DIR-configurable.patch | 68 +
 ...02-g-ir-tools-respect-gir_dir_prefix.patch | 76 +++
 .../gobject-introspection_1.58.0.bb   | 13 +++-
 4 files changed, 160 insertions(+), 4 deletions(-)
 create mode 100644 
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch
 create mode 100644 
meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch

--
2.18.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] devtool-source.bbclass: Only create each patch branch once

2018-10-10 Thread Olof Johansson

For conditonally applied patches based on SRC_URI overrides, the
devtool-source class would try to create a new branch for each override
assignment as a postfunc to do_patch, but if the same override was used
multiple times, it would try to create the same branch multiple times,
causing errors like

> Exception: bb.process.ExecutionError: Execution of
\   'git checkout f0f0f0f0f0ff0f0f0f0f0f0f0f0f0f0f0ff0f0f0 -b 
devtool-override-foo'
\   failed with exit code 128:
> fatal: A branch named 'devtool-override-foo' already exists.

This change makes sure that the devtool-source bbclass will only create
one branch per override.

Change-Id: I8adca0b54179793ca92478ad5b3b1b6e0448e26b
Signed-off-by: Olof Johansson 
---
 meta/classes/devtool-source.bbclass | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta/classes/devtool-source.bbclass 
b/meta/classes/devtool-source.bbclass
index 56882a4..fa4e999 100644
--- a/meta/classes/devtool-source.bbclass
+++ b/meta/classes/devtool-source.bbclass
@@ -169,16 +169,15 @@ python devtool_post_patch() {
 except bb.process.ExecutionError:
 pass
 
-extra_overrides = d.getVar('DEVTOOL_EXTRA_OVERRIDES')
-if extra_overrides:
-extra_override_list = extra_overrides.split(':')
+devtool_overrides = set(d.getVar('DEVTOOL_EXTRA_OVERRIDES').split(':') or 
[])
+if devtool_overrides:
 devbranch = d.getVar('DEVTOOL_DEVBRANCH')
 default_overrides = d.getVar('OVERRIDES').split(':')
 no_overrides = []
 # First, we may have some overrides that are referred to in the recipe 
set in
 # our configuration, so we need to make a branch that excludes those
 for override in default_overrides:
-if override not in extra_override_list:
+if override not in devtool_overrides:
 no_overrides.append(override)
 if default_overrides != no_overrides:
 # Some overrides are active in the current configuration, so
@@ -196,7 +195,7 @@ python devtool_post_patch() {
 else:
 bb.process.run('git checkout %s -b devtool-no-overrides' % 
devbranch, cwd=srcsubdir)
 
-for override in extra_override_list:
+for override in devtool_overrides:
 localdata = bb.data.createCopy(d)
 if override in default_overrides:
 bb.process.run('git branch devtool-override-%s %s' % 
(override, devbranch), cwd=srcsubdir)
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] libproxy: correctly disable the KDE module

2018-10-10 Thread Ross Burton

The configuration option is WITH_KDE now, as it supports both KDE4 and KDE5.

Signed-off-by: Ross Burton 
---
 meta/recipes-support/libproxy/libproxy_0.4.15.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/libproxy/libproxy_0.4.15.bb 
b/meta/recipes-support/libproxy/libproxy_0.4.15.bb
index 4633ca57816..dd7ad922d3b 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.15.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.15.bb
@@ -22,7 +22,7 @@ PACKAGECONFIG[gnome] = 
"-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf"
 PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no"
 
 EXTRA_OECMAKE += " \
--DWITH_KDE4=no \
+-DWITH_KDE=no \
 -DWITH_MOZJS=no \
 -DWITH_NM=no \
 -DWITH_PERL=no \
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] libproxy: disable python2 and python3 support

2018-10-10 Thread Pascal Bach

The option WITH_PYTHON got replaced by
WITH_PYTHON2 and WITH_PYTHON3.

Signed-off-by: Pascal Bach 
---
 meta/recipes-support/libproxy/libproxy_0.4.15.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/libproxy/libproxy_0.4.15.bb 
b/meta/recipes-support/libproxy/libproxy_0.4.15.bb
index 991c9d8320..4633ca5781 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.15.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.15.bb
@@ -26,7 +26,8 @@ EXTRA_OECMAKE += " \
 -DWITH_MOZJS=no \
 -DWITH_NM=no \
 -DWITH_PERL=no \
--DWITH_PYTHON=no \
+-DWITH_PYTHON2=no \
+-DWITH_PYTHON3=no \
 -DWITH_WEBKIT=no \
 -DLIB_INSTALL_DIR=${libdir} \
 -DLIBEXEC_INSTALL_DIR=${libexecdir} \
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [sumo][PATCH] libsdl2: Fix left rotated display for RaspPi/VC4/GLES2

2018-10-10 Thread Andreas Müller

On Wed, Oct 10, 2018 at 4:21 PM akuster808  wrote:
>
>
>
> On 10/10/2018 01:57 AM, Andreas Müller wrote:
> > On Thu, Sep 27, 2018 at 9:06 PM Andreas Müller  
> > wrote:
> >> The patch should increase performance for libsdl2 on GLES2 too.
> >>
> >> (From OE-Core rev: 52f9659f2bb44affec2f67935df01f13b6ff3e02)
> >>
> >> Signed-off-by: Andreas Müller 
> >> Signed-off-by: Richard Purdie 
> > ping
> Timing is everything. it just got merge to sumo proper ( Thanks RP)
>
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=sumo&id=3acc7a6e28a980cf662a7aa600d5503780c522e8
>
Thanks

Andreas
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [sumo][PATCH] libsdl2: Fix left rotated display for RaspPi/VC4/GLES2

2018-10-10 Thread akuster808



On 10/10/2018 01:57 AM, Andreas Müller wrote:
> On Thu, Sep 27, 2018 at 9:06 PM Andreas Müller  
> wrote:
>> The patch should increase performance for libsdl2 on GLES2 too.
>>
>> (From OE-Core rev: 52f9659f2bb44affec2f67935df01f13b6ff3e02)
>>
>> Signed-off-by: Andreas Müller 
>> Signed-off-by: Richard Purdie 
> ping
Timing is everything. it just got merge to sumo proper ( Thanks RP)

http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=sumo&id=3acc7a6e28a980cf662a7aa600d5503780c522e8

- armin

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCHv3 1/4] cmake.bbclass: use CMAKE_SYSTEM_LIBRARY_PATH instead of CMAKE_LIBRARY_PATH

2018-10-10 Thread Burton, Ross

On Wed, 10 Oct 2018 at 15:12, Pascal Bach  wrote:

> The problem is "cmake.bbclass: allow cmake to find hosttools" it has the
> side effect of making all hosttools available to all recipes.
> In the case of libproxy this leads to it finding python, which is included
> in hosttools, and thus building it's bindings.
>
> This kind of defeats the purpose of having recipe specific sysroots.
> Is there a way to make only selected hosttools available to a recipe. Like
> for example git? Maybe use git-native?
>
> I think the patch "cmake.bbclass: allow cmake to find hosttools" in this
> form does more harm then good. The rest of the series should be fine.
> Should I resubmit the series without this specific patch?
>
> One more thing for libproxy. It currently disables python explicitly via
> `-WITH_PYTHON=no`. But this option doesn't exist anymore as it got replaces
> by `-WITH_PYTHON2=no` `-WITH_PYTHON3=no`. This is why the auto detection
> kicks in. I will submit a patch to clean this recipe up too.


Per-recipe hosttools is an interesting idea but I'd say it's quite likely
too invasive.  This change has actually fixed cmake, and exposed the
problem that the recipe is broken and should be using
WITH_PYTHON2/WITH_PYTHON3: fixing that is the correct fix.

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCHv3 1/4] cmake.bbclass: use CMAKE_SYSTEM_LIBRARY_PATH instead of CMAKE_LIBRARY_PATH

2018-10-10 Thread Pascal Bach

On 10.10.2018 14:36, Richard Purdie wrote:
> On Wed, 2018-10-10 at 10:10 +0200, Pascal Bach wrote:
>> CMAKE_LIBRARY_PATH is intended to be set by projects.
>> CMAKE_SYSTEM_LIBRARY_PATH is better suited to be used in a toolchain
>> file.
>>
>> Signed-off-by: Pascal Bach 
>> ---
>>  meta/classes/cmake.bbclass | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> I have a feeling something in this series may have caused:
>
> https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/42753/raw
>
> but haven't bisected to confirm it is the cmake changes yet (it is from
> something in master-next).
>
The problem is "cmake.bbclass: allow cmake to find hosttools" it has the side 
effect of making all hosttools available to all recipes.
In the case of libproxy this leads to it finding python, which is included in 
hosttools, and thus building it's bindings.

This kind of defeats the purpose of having recipe specific sysroots.
Is there a way to make only selected hosttools available to a recipe. Like for 
example git? Maybe use git-native?

I think the patch "cmake.bbclass: allow cmake to find hosttools" in this form 
does more harm then good. The rest of the series should be fine.
Should I resubmit the series without this specific patch?

One more thing for libproxy. It currently disables python explicitly via 
`-WITH_PYTHON=no`. But this option doesn't exist anymore as it got replaces
by `-WITH_PYTHON2=no` `-WITH_PYTHON3=no`. This is why the auto detection kicks 
in. I will submit a patch to clean this recipe up too.

Pascal
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [yocto] OEDEM in Edinburgh in 2 weeks

2018-10-10 Thread Philip Balister

On 10/04/2018 08:20 AM, Philip Balister wrote:
> OEDEM is basically full at this time.
> 
> https://www.openembedded.org/wiki/OEDEM_2018
> 
> We have had the room rearranged to seat 45 people and I am not sure how
> we would handle anyone over this. If you know you can't make it, could
> you please remove your name from the attendee list. We'd like to get a
> better idea of how many people on the waiting list we can accommodate.
> There are some long time contributors on the wait list we'd like to get in.

OK, I've had the room arranged for 50 people. Everyone who is signed up
has a chair. Thanks for your interest in OpenEmbedded.

See you all soon!

Philip

> 
> Philip
> 
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] libarchive: fix bug1066

2018-10-10 Thread Andrej Valek

Fix out of bounds read on empty string filename for guntar, pax and v7tar

Signed-off-by: Andrej Valek 
---
 .../libarchive/libarchive/bug1066.patch| 54 ++
 .../libarchive/libarchive_3.3.3.bb |  1 +
 2 files changed, 55 insertions(+)
 create mode 100644 meta/recipes-extended/libarchive/libarchive/bug1066.patch

diff --git a/meta/recipes-extended/libarchive/libarchive/bug1066.patch 
b/meta/recipes-extended/libarchive/libarchive/bug1066.patch
new file mode 100644
index 00..0a662b57b4
--- /dev/null
+++ b/meta/recipes-extended/libarchive/libarchive/bug1066.patch
@@ -0,0 +1,54 @@
+libarchive-3.3.3: Fix bug1066
+
+[No upstream tracking] -- https://github.com/libarchive/libarchive/pull/1066
+
+archive_write_set_format_*.c: fix out of bounds read on empty string () 
filename
+for guntar, pax and v7tar
+
+There is an out of bounds read flaw in the archive_write_gnutar_header,
+archive_write_pax_header and archive_write_v7tar_header functions which
+could leds to cause a denial of service.
+
+Upstream-Status: Backport 
[https://github.com/libarchive/libarchive/commit/c246ec5d058a3f70a2d3fb765f92fe9db77b25df]
+Bug: 1066
+Signed-off-by: Andrej Valek 
+
+diff --git a/libarchive/archive_write_set_format_gnutar.c 
b/libarchive/archive_write_set_format_gnutar.c
+index 2d858c9..1966c53 100644
+--- a/libarchive/archive_write_set_format_gnutar.c
 b/libarchive/archive_write_set_format_gnutar.c
+@@ -339,7 +339,7 @@ archive_write_gnutar_header(struct archive_write *a,
+* case getting WCS failed. On POSIX, this is a
+* normal operation.
+*/
+-  if (p != NULL && p[strlen(p) - 1] != '/') {
++  if (p != NULL && p[0] != '\0' && p[strlen(p) - 1] != '/') {
+   struct archive_string as;
+ 
+   archive_string_init(&as);
+diff --git a/libarchive/archive_write_set_format_pax.c 
b/libarchive/archive_write_set_format_pax.c
+index 6a301ac..4cfa8ff 100644
+--- a/libarchive/archive_write_set_format_pax.c
 b/libarchive/archive_write_set_format_pax.c
+@@ -660,7 +660,7 @@ archive_write_pax_header(struct archive_write *a,
+* case getting WCS failed. On POSIX, this is a
+* normal operation.
+*/
+-  if (p != NULL && p[strlen(p) - 1] != '/') {
++  if (p != NULL && p[0] != '\0' && p[strlen(p) - 1] != 
'/') {
+   struct archive_string as;
+ 
+   archive_string_init(&as);
+diff --git a/libarchive/archive_write_set_format_v7tar.c 
b/libarchive/archive_write_set_format_v7tar.c
+index 62b1522..53c0db0 100644
+--- a/libarchive/archive_write_set_format_v7tar.c
 b/libarchive/archive_write_set_format_v7tar.c
+@@ -284,7 +284,7 @@ archive_write_v7tar_header(struct archive_write *a, struct 
archive_entry *entry)
+* case getting WCS failed. On POSIX, this is a
+* normal operation.
+*/
+-  if (p != NULL && p[strlen(p) - 1] != '/') {
++  if (p != NULL && p[0] != '\0' && p[strlen(p) - 1] != '/') {
+   struct archive_string as;
+ 
+   archive_string_init(&as);
diff --git a/meta/recipes-extended/libarchive/libarchive_3.3.3.bb 
b/meta/recipes-extended/libarchive/libarchive_3.3.3.bb
index eabab16770..46a3d43762 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.3.3.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.3.3.bb
@@ -33,6 +33,7 @@ EXTRA_OECONF += "--enable-largefile"
 
 SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
file://non-recursive-extract-and-list.patch \
+   file://bug1066.patch \
 "
 
 SRC_URI[md5sum] = "4038e366ca5b659dae3efcc744e72120"
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCHv3 1/4] cmake.bbclass: use CMAKE_SYSTEM_LIBRARY_PATH instead of CMAKE_LIBRARY_PATH

2018-10-10 Thread Pascal Bach




On 10.10.2018 14:36, Richard Purdie wrote:
> On Wed, 2018-10-10 at 10:10 +0200, Pascal Bach wrote:
>> CMAKE_LIBRARY_PATH is intended to be set by projects.
>> CMAKE_SYSTEM_LIBRARY_PATH is better suited to be used in a toolchain
>> file.
>>
>> Signed-off-by: Pascal Bach 
>> ---
>>  meta/classes/cmake.bbclass | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> I have a feeling something in this series may have caused:
>
> https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/42753/raw
>
> but haven't bisected to confirm it is the cmake changes yet (it is from
> something in master-next).
You are right the recipe is using cmake. I will investigate the issue.

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCHv3 1/4] cmake.bbclass: use CMAKE_SYSTEM_LIBRARY_PATH instead of CMAKE_LIBRARY_PATH

2018-10-10 Thread Richard Purdie

On Wed, 2018-10-10 at 10:10 +0200, Pascal Bach wrote:
> CMAKE_LIBRARY_PATH is intended to be set by projects.
> CMAKE_SYSTEM_LIBRARY_PATH is better suited to be used in a toolchain
> file.
> 
> Signed-off-by: Pascal Bach 
> ---
>  meta/classes/cmake.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

I have a feeling something in this series may have caused:

https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/42753/raw

but haven't bisected to confirm it is the cmake changes yet (it is from
something in master-next).

Cheers,

Richard

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [bitbake] How to fetch private github release

2018-10-10 Thread Måns Zigher

Hi again,

I have a workaround that I think is good enough but I would still like to
get any pointers regarding it and if it would be possible for fetch to
actually support downloading from private repo.

do_my_fetch() {
fetch --repo=${MY_REPO} \
--github-oauth-token=${GITHUB_TOKEN} \
--tag=${VERSION} \
--release-asset=asset.tar.gz ${WORKDIR} || {
bbfatal "Failed to download asset"
}
}
addtask my_fetch after do_fetch before do_unpack
do_my_fetch[depends] += "${PN}:do_prepare_recipe_sysroot"

In the recipe I have made sure to add fetch to DEPENDS so that the fetch
will be part of the sysroot. So the reason for do_fetch not working was
that it was not depending on do_prepare_recipe_sysroot and do_install was.

BR
Måns Zigher

Den ons 10 okt. 2018 kl 13:18 skrev Måns Zigher :

> Hi,
>
> I need to fetch a github release tar file. I think I have seen that it
> should be supported by default by setting the
>
> SRC_URI = "
> https://github.com/DynamicDevices/bbexample/releases/download/v1.0/bbexample-${PV}.tar.gz
> "
>
> The problem that I am facing is that the repo is private so I need to be
> able to specify a github token. Is this supported?
>
> I have also tried specify my own do_fetch to my recipe and from there
> making use of https://github.com/gruntwork-io/fetch but do_fetch cannot
> the binary. I have verified fetch binary is part of the package sysroot and
> I can call the fetch tool from do_install but that feels like a bad hack.
> Do you guys have any advice?
>
> BR
> Måns Zigher
>
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [bitbake] How to fetch private github release

2018-10-10 Thread Måns Zigher

Hi,

I need to fetch a github release tar file. I think I have seen that it
should be supported by default by setting the

SRC_URI = "
https://github.com/DynamicDevices/bbexample/releases/download/v1.0/bbexample-${PV}.tar.gz
"

The problem that I am facing is that the repo is private so I need to be
able to specify a github token. Is this supported?

I have also tried specify my own do_fetch to my recipe and from there
making use of https://github.com/gruntwork-io/fetch but do_fetch cannot the
binary. I have verified fetch binary is part of the package sysroot and I
can call the fetch tool from do_install but that feels like a bad hack. Do
you guys have any advice?

BR
Måns Zigher
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [sumo][PATCH] libsdl2: Fix left rotated display for RaspPi/VC4/GLES2

2018-10-10 Thread Andreas Müller

On Thu, Sep 27, 2018 at 9:06 PM Andreas Müller  wrote:
>
> The patch should increase performance for libsdl2 on GLES2 too.
>
> (From OE-Core rev: 52f9659f2bb44affec2f67935df01f13b6ff3e02)
>
> Signed-off-by: Andreas Müller 
> Signed-off-by: Richard Purdie 
ping
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/3] acl: Make it compatible with externalsrc

2018-10-10 Thread Peter Kjellerstedt

Except for the questions asked and answered below, is there 
anything else preventing these three patches from being merged?

//Peter

> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org  core-boun...@lists.openembedded.org> On Behalf Of Peter Kjellerstedt
> Sent: den 2 oktober 2018 12:26
> To: Richard Purdie ; openembedded-
> c...@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH 1/3] acl: Make it compatible with
> externalsrc
> 
> *ping*
> 
> //Peter
> 
> > -Original Message-
> > From: openembedded-core-boun...@lists.openembedded.org  > core-boun...@lists.openembedded.org> On Behalf Of Peter Kjellerstedt
> > Sent: den 25 september 2018 11:17
> > To: Richard Purdie ; 
> > openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH 1/3] acl: Make it compatible with externalsrc
> >
> > > -Original Message-
> > > From: openembedded-core-boun...@lists.openembedded.org  > > core-boun...@lists.openembedded.org> On Behalf Of Richard Purdie
> > > Sent: den 25 september 2018 10:13
> > > To: Peter Kjellerstedt ; openembedded-
> > > c...@lists.openembedded.org
> > > Subject: Re: [OE-core] [PATCH 1/3] acl: Make it compatible with
> > > externalsrc
> > >
> > > On Mon, 2018-09-24 at 21:03 +0200, Peter Kjellerstedt wrote:
> > > > Make the subdir fetch path for configure.ac relative. This avoids the
> > > > following error after having done `devtool modify acl`:
> > > >
> > > > ERROR: acl-2.2.52-r0 do_unpack: Unpack failure for URL:
> > > > 'file://configure.ac;subdir=.../builds/qemux86-64/workspace/sources/acl'.
> > > > subdir argument isn't a subdirectory of unpack root
> > > > .../builds/qemux86-64/tmp/work/core2-64-poky-linux/acl/2.2.52-r0
> > > >
> > > > Signed-off-by: Peter Kjellerstedt 
> > > > ---
> > > >  meta/recipes-support/attr/acl_2.2.52.bb | 2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/meta/recipes-support/attr/acl_2.2.52.bb 
> > > > b/meta/recipes-support/attr/acl_2.2.52.bb
> > > > index 8f3dc45cf7..8b89de9b42 100644
> > > > --- a/meta/recipes-support/attr/acl_2.2.52.bb
> > > > +++ b/meta/recipes-support/attr/acl_2.2.52.bb
> > > > @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = 
> > > > "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
> > > >  DEPENDS = "attr"
> > > >
> > > >  SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \
> > > > -   file://configure.ac;subdir=${S} \
> > > > +   file://configure.ac;subdir=${BP} \
> > > > file://run-ptest \
> > > > 
> > > > file://acl-fix-the-order-of-expected-output-of-getfacl.patch \
> > > > file://test-fix-insufficient-quoting-of.patch \
> > >
> > > This isn't making sense to me. Doesn't externalsrc set ${S} to the
> > > external source location?
> >
> > Yes, it does, but it does not change ${WORKDIR}. So when it tries
> > to unpack to the absolute path ${S}, which is outside ${WORKDIR}
> > when externalsrc is in use, then the above error occurs. Using a
> > relative path avoids the problem.
> >
> > > Also, doesn't it remove the do_unpack task?
> >
> > No, it keeps the task but removes everything except file:// URLs
> > and URLs with type=kmeta from the SRC_URI. This is also why I had
> > to check for externalsrc in the do_unpack task of lsof.
> >
> > > Cheers,
> > >
> > > Richard
> >
> > //Peter

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] cmake.bbclass: search both sysroot-native and host for native packages

2018-10-10 Thread Pascal Bach

I re submitted all 4 patches a series.

Sorry for the inconvenience, I miss-judged the conflicts between the patches.

Passcal


On 09.10.2018 17:07, Burton, Ross wrote:
> All but this one apply now... weird.
>
> If you can rebase on top of poky-contrib:ross/thud then that would be great.
>
> Ross
>
> On Tue, 9 Oct 2018 at 15:07, Pascal Bach  > wrote:
>
> Certain headers and libraries like `math.h` an `-m` are only available on 
> the
> host as they are provided by the host toolchain.
>
> This leads to issues that a find_library in CMake doesn't find the `m` 
> library
> of a find_path doesn't find `math.h`. This issue occurred in the 
> wireshark recipe
> for example.
>
> This change enables CMake to also look on the host for libraries and 
> includes when
> building a native package.
>
> Signed-off-by: Pascal Bach  >
> ---
>  meta/classes/cmake.bbclass | 12 ++--
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
> index 6e2c34e4c6..89a2a77a50 100644
> --- a/meta/classes/cmake.bbclass
> +++ b/meta/classes/cmake.bbclass
> @@ -43,8 +43,8 @@ OECMAKE_RPATH ?= ""
>  OECMAKE_PERLNATIVE_DIR ??= ""
>  OECMAKE_EXTRA_ROOT_PATH ?= ""
>
> -OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "ONLY"
> -OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH"
> +OECMAKE_FIND_ROOT_PATH_MODE = "ONLY"
> +OECMAKE_FIND_ROOT_PATH_MODE_class-native = "BOTH"
>
>  EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}"
>
> @@ -93,10 +93,10 @@ set( CMAKE_CXX_LINK_FLAGS "${OECMAKE_CXX_LINK_FLAGS}" 
> CACHE STRING "LDFLAGS" )
>  # only search in the paths provided so cmake doesnt pick
>  # up libraries and tools from the native build machine
>  set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} 
> ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} 
> ${EXTERNAL_TOOLCHAIN})
> -set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY )
> -set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM 
> ${OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM} )
> -set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
> -set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
> +set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ${OECMAKE_FIND_ROOT_PATH_MODE} )
> +set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE} )
> +set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ${OECMAKE_FIND_ROOT_PATH_MODE} )
> +set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ${OECMAKE_FIND_ROOT_PATH_MODE} )
>
>  $cmake_sysroot
>
> -- 
> 2.11.0
>
> -- 
> ___
> 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] [PATCHv3 2/4] cmake.bbclass: search both sysroot-native and host for native packages

2018-10-10 Thread Pascal Bach

Certain headers and libraries like `math.h` an `-m` are only available on the
host as they are provided by the host toolchain.

This leads to issues that a find_library in CMake doesn't find the `m` library
of a find_path doesn't find `math.h`. This issue occurred in the wireshark 
recipe
for example.

This change enables CMake to also look on the host for libraries and includes 
when
building a native package.

Signed-off-by: Pascal Bach 
---
 meta/classes/cmake.bbclass | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 86b1d0e9aa..ce3c0278ff 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -43,8 +43,8 @@ OECMAKE_RPATH ?= ""
 OECMAKE_PERLNATIVE_DIR ??= ""
 OECMAKE_EXTRA_ROOT_PATH ?= ""
 
-OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "ONLY"
-OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH"
+OECMAKE_FIND_ROOT_PATH_MODE = "ONLY"
+OECMAKE_FIND_ROOT_PATH_MODE_class-native = "BOTH"
 
 EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}"
 
@@ -90,10 +90,10 @@ set( CMAKE_CXX_LINK_FLAGS "${OECMAKE_CXX_LINK_FLAGS}" CACHE 
STRING "LDFLAGS" )
 # only search in the paths provided so cmake doesnt pick
 # up libraries and tools from the native build machine
 set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} 
${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} 
${EXTERNAL_TOOLCHAIN})
-set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY )
-set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM} )
-set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
-set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
+set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ${OECMAKE_FIND_ROOT_PATH_MODE} )
+set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE} )
+set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ${OECMAKE_FIND_ROOT_PATH_MODE} )
+set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ${OECMAKE_FIND_ROOT_PATH_MODE} )
 
 # Use qt.conf settings
 set( ENV{QT_CONF_PATH} ${WORKDIR}/qt.conf )
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv3 3/4] cmake.bbclass: move CMAKE_NO_SYSTEM_FROM_IMPORTED to toolchain.cmake

2018-10-10 Thread Pascal Bach

The setting influences the build like other settings already in toolchain.cmake.
It is more appropriate to set it there instead of providing it as a random
command line parameter to CMake.

It also makes it easier to use the toolchain.cmake file independent of bitbake.
Like the devshell for example.

Signed-off-by: Pascal Bach 
---
 meta/classes/cmake.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index ce3c0278ff..0ef63795eb 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -108,6 +108,9 @@ list(APPEND CMAKE_MODULE_PATH 
"${STAGING_DATADIR}/cmake/Modules/")
 # add for non /usr/lib libdir, e.g. /usr/lib64
 set( CMAKE_SYSTEM_LIBRARY_PATH ${libdir} ${base_libdir})
 
+# avoid treating imports as system includes
+set( CMAKE_NO_SYSTEM_FROM_IMPORTED ON)
+
 EOF
 }
 
@@ -152,7 +155,6 @@ cmake_do_configure() {
  -DCMAKE_INSTALL_SO_NO_EXE=0 \
  -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
  -DCMAKE_VERBOSE_MAKEFILE=1 \
- -DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \
  ${EXTRA_OECMAKE} \
  -Wno-dev
 }
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv3 4/4] cmake.bbclass: allow cmake to find hosttools

2018-10-10 Thread Pascal Bach

Currently the generated toolchain file is unable to find hosttools as they
do not appear in the search paths.

Just adding HOSTTOOLS_DIR is not enough as binaries are located directly under
${HOSTTOOLS_DIR}. Like ${HOSTTOOLS_DIR}/git for example.
CMake however only searches in [s]bin sub directories of the paths specified in
CMAKE_FIND_ROOT_PATH. Explicitly adding / to CMAKE_SYSTEM_PROGRAM_PATH makes
CMake look in the right location.

Signed-off-by: Pascal Bach 
---
 meta/classes/cmake.bbclass | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 0ef63795eb..c8a079c417 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -89,7 +89,7 @@ set( CMAKE_CXX_LINK_FLAGS "${OECMAKE_CXX_LINK_FLAGS}" CACHE 
STRING "LDFLAGS" )
 
 # only search in the paths provided so cmake doesnt pick
 # up libraries and tools from the native build machine
-set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} 
${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} 
${EXTERNAL_TOOLCHAIN})
+set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} 
${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} 
${EXTERNAL_TOOLCHAIN} ${HOSTTOOLS_DIR})
 set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ${OECMAKE_FIND_ROOT_PATH_MODE} )
 set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE} )
 set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ${OECMAKE_FIND_ROOT_PATH_MODE} )
@@ -108,6 +108,10 @@ list(APPEND CMAKE_MODULE_PATH 
"${STAGING_DATADIR}/cmake/Modules/")
 # add for non /usr/lib libdir, e.g. /usr/lib64
 set( CMAKE_SYSTEM_LIBRARY_PATH ${libdir} ${base_libdir})
 
+# by default CMake only looks in [s]bin subdirectories of CMAKE_FIND_ROOT_PATH
+# adding / makes CMake look for binaries in hosttools too.
+set( CMAKE_SYSTEM_PROGRAM_PATH /)
+
 # avoid treating imports as system includes
 set( CMAKE_NO_SYSTEM_FROM_IMPORTED ON)
 
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv3 1/4] cmake.bbclass: use CMAKE_SYSTEM_LIBRARY_PATH instead of CMAKE_LIBRARY_PATH

2018-10-10 Thread Pascal Bach

CMAKE_LIBRARY_PATH is intended to be set by projects.
CMAKE_SYSTEM_LIBRARY_PATH is better suited to be used in a toolchain
file.

Signed-off-by: Pascal Bach 
---
 meta/classes/cmake.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index fd40a9863e..86b1d0e9aa 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -106,7 +106,7 @@ set( CMAKE_INSTALL_RPATH ${OECMAKE_RPATH} )
 list(APPEND CMAKE_MODULE_PATH "${STAGING_DATADIR}/cmake/Modules/")
 
 # add for non /usr/lib libdir, e.g. /usr/lib64
-set( CMAKE_LIBRARY_PATH ${libdir} ${base_libdir})
+set( CMAKE_SYSTEM_LIBRARY_PATH ${libdir} ${base_libdir})
 
 EOF
 }
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] ✗ patchtest: failure for "webkitgtk: add opengl to REQUI..." and 1 more (rev4)

2018-10-10 Thread Patchwork

== Series Details ==

Series: "webkitgtk: add opengl to REQUI..." and 1 more (rev4)
Revision: 4
URL   : https://patchwork.openembedded.org/series/13867/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 417245923c)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines: 
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH V4] webkitgtk/epiphany: add opengl to REQUIRED_DISTRO_FEATURES

2018-10-10 Thread Hongxu Jia


Hi RP,

I saw you merged V3 to master-next, but I found epiphany depends
on webkitgtk, it also need to add opengl to REQUIRED_DISTRO_FEATURES

Please use V4 to replace

I test it with `bitbake world -n' without `opengl' in DISTRO_FEATURES

Sorry for so many revision, thanks for patchtest, mention
me to correct the error I introduced.

//Hongxu

On 2018年10月10日 15:16, Hongxu Jia wrote:

They can't be built without opengl in DISTRO_FEATURES.
[snip]
|webkitgtk-2.20.3/Source/WebCore/platform/graphics/OpenGLShims.h:23:10:
fatal error: GL/gl.h: No such file or directory
[snip]

Some sort of GL is needed yes. We indicate that with opengl loosely in OE

The epiphany depends on webkitgtk, add opengl to REQUIRED_DISTRO_FEATURES also.

Signed-off-by: Hongxu Jia 
---
  meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb | 2 +-
  meta/recipes-sato/webkit/webkitgtk_2.20.5.bb | 3 +--
  2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb 
b/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb
index 8837b9c..b46c9d3 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb
@@ -8,7 +8,7 @@ DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi 
libnotify gcr \
  
  GNOMEBASEBUILDCLASS = "meson"

  inherit gnomebase gsettings distro_features_check upstream-version-is-even 
gettext
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
  
  SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \

 file://0002-help-meson.build-disable-the-use-of-yelp.patch \
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb 
b/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
index c8d4f94..7f1ffce 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
@@ -30,8 +30,7 @@ SRC_URI[sha256sum] = 
"15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac
  
  inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
  
-# depends on libxt

-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
  
  DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \

 gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native 
gperf-native sqlite3 \



--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH V4] webkitgtk/epiphany: add opengl to REQUIRED_DISTRO_FEATURES

2018-10-10 Thread Hongxu Jia

They can't be built without opengl in DISTRO_FEATURES.
[snip]
|webkitgtk-2.20.3/Source/WebCore/platform/graphics/OpenGLShims.h:23:10:
fatal error: GL/gl.h: No such file or directory
[snip]

Some sort of GL is needed yes. We indicate that with opengl loosely in OE

The epiphany depends on webkitgtk, add opengl to REQUIRED_DISTRO_FEATURES also.

Signed-off-by: Hongxu Jia 
---
 meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb | 2 +-
 meta/recipes-sato/webkit/webkitgtk_2.20.5.bb | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb 
b/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb
index 8837b9c..b46c9d3 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb
@@ -8,7 +8,7 @@ DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi 
libnotify gcr \
 
 GNOMEBASEBUILDCLASS = "meson"
 inherit gnomebase gsettings distro_features_check upstream-version-is-even 
gettext
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
 SRC_URI = 
"${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive
 \
file://0002-help-meson.build-disable-the-use-of-yelp.patch \
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb 
b/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
index c8d4f94..7f1ffce 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.20.5.bb
@@ -30,8 +30,7 @@ SRC_URI[sha256sum] = 
"15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac
 
 inherit cmake pkgconfig gobject-introspection perlnative distro_features_check 
upstream-version-is-even gtk-doc
 
-# depends on libxt
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
 DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn libgcrypt \
gtk+3 gstreamer1.0 gstreamer1.0-plugins-base flex-native 
gperf-native sqlite3 \
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

49 matches

Mail list logo