[OE-core] Bug: warrior vs usrmerge vs chromium build

2019-09-09 Thread Böszörményi Zoltán via Openembedded-core 

Hi,

I was fighting with building chromium-x11 using our warrior
based custom distro that was always failing at the same spot.

That spot is when Chromium wants to run cross-compiled binaries
in the v8 directory. The binaries all failed with the same error:

python ../../v8/tools/run.py ./v8-qemu-wrapper.sh ./bytecode_builtins_list_generator 
gen/v8/builtins-generated/bytecodes-builtins-list.h
./bytecode_builtins_list_generator: relocation error: 
/data/OE/sicom-manifest-2.7/tmp-sicom-glibc/work/core2-32-sicom-linux/chromium-x11/76.0.3809.132-r0/recipe-sysroot
/usr/lib/libc.so.6: symbol _dl_exception_create, version GLIBC_PRIVATE not defined in file 
ld-linux.so.2 with link time reference


It turns out, all target binaries reference /lib/ld-linux.so.2
but there is no lib -> usr/lib symlink in recipe-sysroot, so the
binary running in Qemu will not find /lib/ld-linux.so.2, hence
the runtime failure.

It seems this symlink is only intended to get created during rootfs creation.

When I created this symlink manually after the failed build, the
second attempt succeeded.

Best regards,
Zoltán Böszörményi
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] populate_sdk: fix populate_sdk failed error

2019-09-09 Thread Changqing Li 

ping

Once we enabled multilib, and IMAGE_INSTALL_append packages that also 
provided by package target-sdk-provides-dummy,


task populate_sdk will failed, similar error like:

Problem: package 
target-sdk-provides-dummy-1.0-r0.sdk_provides_dummy_target conflicts 
with perl-dev provided by perl-dev-5.30.0-r0.core2_64


On 8/28/19 4:47 PM, Changqing Li wrote:

ping

On 8/19/19 11:22 AM, changqing...@windriver.com wrote:

From: Changqing Li 

Configuration:
IMAGE_INSTALL_append = " bash"

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

Reproduce cmd:
bitbake core-image-minimal -c populate_sdk

Error info:
--> Finished dependency resolution
Error:
  Problem: package 
target-sdk-provides-dummy-1.0-r0.sdk_provides_dummy_target conflicts 
with /bin/sh provided by bash-5.0-r0.core2_64
   - package 
target-sdk-provides-dummy-1.0-r0.sdk_provides_dummy_target conflicts 
with bash provided by bash-5.0-r0.core2_64
   - package 
target-sdk-provides-dummy-1.0-r0.sdk_provides_dummy_target conflicts 
with /bin/bash provided by bash-5.0-r0.core2_64
   - package 
target-sdk-provides-dummy-1.0-r0.sdk_provides_dummy_target obsoletes 
bash provided by bash-5.0-r0.core2_64

   - cannot install the best candidate for the job
   - conflicting requests

when do_populate_sdk, package target-sdk-provides-dummy provides
dummy /bin/sh, ... and package bash also provides this, we append
dummy arch sdk-provides-dummy-target to the end of 
ALL_MULTILIB_PACKAGE_ARCHS,

then reverted sdk-provides-dummy-target to the first arch
for dnf config  etc/dnf/vars/arch to make it high priority.

when multilib is enabled, below statement will not work as expected.
ALL_MULTILIB_PACKAGE_ARCHS = "${@all_multilib_tune_values(d, 
'PACKAGE_ARCHS')}"


Eg:
For lib32 variant, PACKAGE_ARCHS is:
all any noarch x86 qemux86_64 sdk-provides-dummy-target

For lib64 variant, PACKAGE_ARCHS is:
all any noarch x86_64 core2-64 qemux86_64 sdk-provides-dummy-target

Then:
ALL_MULTILIB_PACKAGE_ARCHS will be
x86 qemux86_64 sdk-provides-dummy-target x86_64 core2-64

Fixed by append sdk-provides-dummy-target during do_populate_sdk

Signed-off-by: Changqing Li 
---
  meta/classes/populate_sdk_base.bbclass | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/populate_sdk_base.bbclass 
b/meta/classes/populate_sdk_base.bbclass

index 59920a5..3362656 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -21,7 +21,6 @@ def complementary_globs(featurevar, d):
  SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs src-pkgs 
${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 
'doc-pkgs', '', d)}"
  SDKIMAGE_INSTALL_COMPLEMENTARY = 
'${@complementary_globs("SDKIMAGE_FEATURES", d)}'

  -PACKAGE_ARCHS_append_task-populate-sdk = " sdk-provides-dummy-target"
  SDK_PACKAGE_ARCHS += "sdk-provides-dummy-${SDKPKGSUFFIX}"
    # List of locales to install, or "all" for all of them, or unset 
for none.

@@ -130,6 +129,7 @@ def populate_sdk_common(d):
  inst_pkgs = (d.getVar("PACKAGE_INSTALL") or "").split()
  inst_attempt_pkgs = (d.getVar("PACKAGE_INSTALL_ATTEMPTONLY") or 
"").split()
  +    d.appendVar('ALL_MULTILIB_PACKAGE_ARCHS', ' 
sdk-provides-dummy-target')

  d.setVar('PACKAGE_INSTALL_ORIG', ' '.join(inst_pkgs))
  d.setVar('PACKAGE_INSTALL_ATTEMPTONLY', ' 
'.join(inst_attempt_pkgs))



--
BRs

Sandy(Li Changqing)

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

[OE-core] [PATCH v2 0/1] systemd: provides ${base_sbindir}/udevadm

2019-09-09 Thread kai.kang 
From: Kai Kang 

v2:
* update commit message

Kai Kang (1):
  systemd: provides ${base_sbindir}/udevadm

 meta/recipes-core/systemd/systemd_242.bb | 4 
 1 file changed, 4 insertions(+)

-- 
2.20.0

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

[OE-core] [PATCH v2 1/1] systemd: provides ${base_sbindir}/udevadm

2019-09-09 Thread kai.kang 
From: Kai Kang 

In some udev rules files such as 97-hid2hci.rules from bluez5, it calls
/sbin/udevadm in a rule. eudev provides /usr/bin/udevadm and
/sbin/udevadm which is a link to /usr/bin/udevadm. But systemd only
provides /bin/udevadm. It is not convenient to update the rule file that
udevadm reside in different directories for eudev and system.

So create link file ${base_sbindir}/udevadm in systemd just the same as
eudev to fix such kind of issues.

Signed-off-by: Kai Kang 
---
 meta/recipes-core/systemd/systemd_242.bb | 4 
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-core/systemd/systemd_242.bb 
b/meta/recipes-core/systemd/systemd_242.bb
index b368ca8a2c..4331263380 100644
--- a/meta/recipes-core/systemd/systemd_242.bb
+++ b/meta/recipes-core/systemd/systemd_242.bb
@@ -285,6 +285,9 @@ do_install() {
fi
fi
 
+   # create link for existing udev rules
+   ln -s ${base_bindir}/udevadm ${D}${base_sbindir}/udevadm
+
# duplicate udevadm for postinst script
install -d ${D}${libexecdir}
ln ${D}${base_bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm
@@ -602,6 +605,7 @@ FILES_udev += "${base_sbindir}/udevd \
${systemd_unitdir}/system/*udev* \
${systemd_unitdir}/system/*.wants/*udev* \
${base_bindir}/udevadm \
+   ${base_sbindir}/udevadm \
${libexecdir}/${MLPREFIX}udevadm \
${datadir}/bash-completion/completions/udevadm \
   "
-- 
2.20.0

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

[OE-core] Yocto Project Newcomer & Unassigned Bugs - Help Needed

2019-09-09 Thread sjolley.yp.pm 
All,

 

The triage team is starting to try and collect up and classify bugs which a
newcomer to the project would be able to work on in a way which means people
can find them. They're being listed on the triage page under the appropriate
heading:

 

https://wiki.yoctoproject.org/wiki/Bug_Triage#Newcomer_Bugs

 

The idea is these bugs should be straight forward for a person to help work
on who doesn't have deep experience with the project.  If anyone can help,
please take ownership of the bug and send patches!  If anyone needs
help/advice there are people on irc who can likely do so, or some of the
more experienced contributors will likely be happy to help too.

 

Also, the triage team meets weekly and does its best to handle the bugs
reported into the Bugzilla. The number of people attending that meeting has
fallen, as have the number of people available to help fix bugs. One of the
things we hear users report is they don't know how to help. We (the triage
team) are therefore going to start reporting out the currently 291
unassigned or newcomer bugs.

 

We're hoping people may be able to spare some time now and again to help out
with these.  Bugs are split into two types, "true bugs" where things don't
work as they should and "enhancements" which are features we'd want to add
to the system.  There are also roughly four different "priority" classes
right now, "2.8", "2.9', "2.99" and "Future", the more pressing/urgent
issues being in "2.8" and then "2.9".

 

Please review this link and if a bug is something you would be able to help
with either take ownership of the bug, or send me (sjolley.yp...@gmail.com
 ) an e-mail with the bug number you would
like and I will assign it to you (please make sure you have a Bugzilla
account).  The list is at:
https://wiki.yoctoproject.org/wiki/Bug_Triage#Unassigned_or_Newcomer_Bugs

 

Thanks,

 

Stephen K. Jolley

Yocto Project Program Manager

*Cell:(208) 244-4460

* Email:  sjolley.yp...@gmail.com
 

 

 

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

Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.

2019-09-09 Thread Zheng, Ruoqin 
Hi Alex:

Ok, I will send a V3 patch.

--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
   Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com

From: Alexander Kanavin [mailto:alex.kana...@gmail.com]
Sent: Monday, September 09, 2019 9:07 PM
To: Zheng, Ruoqin/郑 若钦 
Cc: OE-core 
Subject: Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.

On Mon, 9 Sep 2019 at 13:19, Zheng, Ruoqin 
mailto:zhengrq.f...@cn.fujitsu.com>> wrote:
->What do these two sed commands do? If we create /etc/rpmrc just above, can it 
have the right content from the beginning?

Well, in the environment in Yocto Build system, the value of ${PACKAGE_ARCHS} 
include “–nativesdk” as not needed in SDK environment.
And the ARCH name of core2-64 rpm is core2_64 like rpm-4.14.2.1-r0.core2_64.rpm.
So I modify the ARCH name in etc/rpmrc.

Thanks, can you put a comment in front of the sed commands explaining that? It 
would be useful to anyone who reads the recipe.

Alex


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

Re: [OE-core] [PATCH] libevent: don't treat test stats line as pass/fail in ptest

2019-09-09 Thread Richard Purdie 
On Mon, 2019-09-09 at 11:16 -0400, Trevor Gamblin wrote:
> From: Trevor Gamblin 
> 
> The libevent "regress" test outputs its own pass/fail results,
> e.g. "2/300 TESTS FAILED. (31 skipped)", which will be
> miscounted as an extra test fail in the ptest log. Fixed this
> to ignore the libevent results line when counting actual
> pass/fail results.
> 
> Also removed the for loop in run-ptest and targeted only the
> libevent "regress" test, as the other tests being run were
> related to performance and did not provide a relevant pass/fail
> output.

Can you put a comment into the runner script about why we're not
running these other tests please? This is so that someone looking at
the script in the future can immediately see we're not running them
intentionally.

Thanks,

Richard

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

Re: [OE-core] make-mod-scripts question

2019-09-09 Thread Andre McCurdy 
On Mon, Sep 9, 2019 at 2:01 PM Nicolas Dechesne
 wrote:
> On Mon, Sep 9, 2019 at 10:58 PM Andre McCurdy  wrote:
> >
> > On Mon, Sep 9, 2019 at 1:25 PM Nicolas Dechesne
> >  wrote:
> > >
> > > If this reasoning is correct that means that kernel signing + external
> > > module is broken. Note that I am working out of Thud for now, i am
> > > sending this email for now to get some feedback, and will try to
> > > reproduce without all our custom layers and with master.
> > >
> > > Should we deploy the keys/certificates in the kernel recipe instead of
> > > adding them in STAGING_KERNEL_DIR? Would that be enough?
> >
> > Maybe even better would be to have the module signing key provided by
> > a separate recipe and not rely on the kernel to auto generate it?
>
> that would create some serious patching in the kernel makefiles (and
> maintenance burden), no? since the keys are embedded in the kernel
> image.

I don't think any patching is required. See
Documentation/admin-guide/module-signing.rst in the kernel source tree
for various ways in which the module signing key can be provided.
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [thud] binutils: Fix 4 CVEs

2019-09-09 Thread akuster808 



On 9/9/19 10:31 AM, msft.dant...@gmail.com wrote:
> From: Dan Tran 
>
> Fixes CVE-2018-20623, CVE-2018-20651, CVE-2018-20-671, and
> CVE-2018-1000876 for binutils 2.31.1.

thanks. in thud test stagging.( contrib: stable/thud-nmut )

- armin
>
> Signed-off-by: Dan Tran 
> ---
>  meta/recipes-devtools/binutils/binutils-2.31.inc   |   4 +
>  .../binutils/binutils/CVE-2018-1000876.patch   | 180 
> +
>  .../binutils/binutils/CVE-2018-20623.patch |  74 +
>  .../binutils/binutils/CVE-2018-20651.patch |  35 
>  .../binutils/binutils/CVE-2018-20671.patch |  49 ++
>  5 files changed, 342 insertions(+)
>  create mode 100644 
> meta/recipes-devtools/binutils/binutils/CVE-2018-1000876.patch
>  create mode 100644 
> meta/recipes-devtools/binutils/binutils/CVE-2018-20623.patch
>  create mode 100644 
> meta/recipes-devtools/binutils/binutils/CVE-2018-20651.patch
>  create mode 100644 
> meta/recipes-devtools/binutils/binutils/CVE-2018-20671.patch
>
> diff --git a/meta/recipes-devtools/binutils/binutils-2.31.inc 
> b/meta/recipes-devtools/binutils/binutils-2.31.inc
> index 62acec5..ba9272a 100644
> --- a/meta/recipes-devtools/binutils/binutils-2.31.inc
> +++ b/meta/recipes-devtools/binutils/binutils-2.31.inc
> @@ -46,6 +46,10 @@ SRC_URI = "\
>   file://CVE-2018-18605.patch \
>   file://CVE-2018-18606.patch \
>   file://CVE-2018-18607.patch \
> + file://CVE-2018-20623.patch \
> + file://CVE-2018-20651.patch \
> + file://CVE-2018-20671.patch \
> + file://CVE-2018-1000876.patch \
>  "
>  S  = "${WORKDIR}/git"
>  
> diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-1000876.patch 
> b/meta/recipes-devtools/binutils/binutils/CVE-2018-1000876.patch
> new file mode 100644
> index 000..ff85351
> --- /dev/null
> +++ b/meta/recipes-devtools/binutils/binutils/CVE-2018-1000876.patch
> @@ -0,0 +1,180 @@
> +From efec0844fcfb5692f5a78f4082994d63e420ecd9 Mon Sep 17 00:00:00 2001
> +From: Alan Modra 
> +Date: Sun, 16 Dec 2018 23:02:50 +1030
> +Subject: [PATCH] PR23994, libbfd integer overflow
> +
> + PR 23994
> + * aoutx.h: Include limits.h.
> + (get_reloc_upper_bound): Detect long overflow and return a file
> + too big error if it occurs.
> + * elf.c: Include limits.h.
> + (_bfd_elf_get_symtab_upper_bound): Detect long overflow and return
> + a file too big error if it occurs.
> + (_bfd_elf_get_dynamic_symtab_upper_bound): Likewise.
> + (_bfd_elf_get_dynamic_reloc_upper_bound): Likewise.
> +
> +CVE: CVE-2018-1000876
> +Upstream-Status: Backport
> +[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=3a551c7a1b80fca579461774860574eabfd7f18f]
> +
> +Signed-off-by: Dan Tran 
> +---
> + bfd/aoutx.h | 40 +---
> + bfd/elf.c   | 32 
> + 2 files changed, 45 insertions(+), 27 deletions(-)
> +
> +diff --git a/bfd/aoutx.h b/bfd/aoutx.h
> +index 023843b0be..78eaa9c503 100644
> +--- a/bfd/aoutx.h
>  b/bfd/aoutx.h
> +@@ -117,6 +117,7 @@ DESCRIPTION
> + #define KEEPIT udata.i
> + 
> + #include "sysdep.h"
> ++#include 
> + #include "bfd.h"
> + #include "safe-ctype.h"
> + #include "bfdlink.h"
> +@@ -2491,6 +2492,8 @@ NAME (aout, canonicalize_reloc) (bfd *abfd,
> + long
> + NAME (aout, get_reloc_upper_bound) (bfd *abfd, sec_ptr asect)
> + {
> ++  bfd_size_type count;
> ++
> +   if (bfd_get_format (abfd) != bfd_object)
> + {
> +   bfd_set_error (bfd_error_invalid_operation);
> +@@ -2498,26 +2501,25 @@ NAME (aout, get_reloc_upper_bound) (bfd *abfd, 
> sec_ptr asect)
> + }
> + 
> +   if (asect->flags & SEC_CONSTRUCTOR)
> +-return sizeof (arelent *) * (asect->reloc_count + 1);
> +-
> +-  if (asect == obj_datasec (abfd))
> +-return sizeof (arelent *)
> +-  * ((exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd))
> +- + 1);
> +-
> +-  if (asect == obj_textsec (abfd))
> +-return sizeof (arelent *)
> +-  * ((exec_hdr (abfd)->a_trsize / obj_reloc_entry_size (abfd))
> +- + 1);
> +-
> +-  if (asect == obj_bsssec (abfd))
> +-return sizeof (arelent *);
> +-
> +-  if (asect == obj_bsssec (abfd))
> +-return 0;
> ++count = asect->reloc_count;
> ++  else if (asect == obj_datasec (abfd))
> ++count = exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd);
> ++  else if (asect == obj_textsec (abfd))
> ++count = exec_hdr (abfd)->a_trsize / obj_reloc_entry_size (abfd);
> ++  else if (asect == obj_bsssec (abfd))
> ++count = 0;
> ++  else
> ++{
> ++  bfd_set_error (bfd_error_invalid_operation);
> ++  return -1;
> ++}
> + 
> +-  bfd_set_error (bfd_error_invalid_operation);
> +-  return -1;
> ++  if (count >= LONG_MAX / sizeof (arelent *))
> ++{
> ++  bfd_set_error (bfd_error_file_too_big);
> ++  return -1;
> ++}
> ++  return (count + 1) * sizeof (arelent *);
> + }
> + 
> + long
> +diff --git a/bfd/elf.c b/bfd/elf.c
> +index 828241d48a..10037176a3 100644
>

Re: [OE-core] make-mod-scripts question

2019-09-09 Thread Nicolas Dechesne 
On Mon, Sep 9, 2019 at 10:58 PM Andre McCurdy  wrote:
>
> On Mon, Sep 9, 2019 at 1:25 PM Nicolas Dechesne
>  wrote:
> >
> > If this reasoning is correct that means that kernel signing + external
> > module is broken. Note that I am working out of Thud for now, i am
> > sending this email for now to get some feedback, and will try to
> > reproduce without all our custom layers and with master.
> >
> > Should we deploy the keys/certificates in the kernel recipe instead of
> > adding them in STAGING_KERNEL_DIR? Would that be enough?
>
> Maybe even better would be to have the module signing key provided by
> a separate recipe and not rely on the kernel to auto generate it?

that would create some serious patching in the kernel makefiles (and
maintenance burden), no? since the keys are embedded in the kernel
image.
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] make-mod-scripts question

2019-09-09 Thread Andre McCurdy 
On Mon, Sep 9, 2019 at 1:25 PM Nicolas Dechesne
 wrote:
>
> If this reasoning is correct that means that kernel signing + external
> module is broken. Note that I am working out of Thud for now, i am
> sending this email for now to get some feedback, and will try to
> reproduce without all our custom layers and with master.
>
> Should we deploy the keys/certificates in the kernel recipe instead of
> adding them in STAGING_KERNEL_DIR? Would that be enough?

Maybe even better would be to have the module signing key provided by
a separate recipe and not rely on the kernel to auto generate it?
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] make-mod-scripts question

2019-09-09 Thread Nicolas Dechesne 
hi,

things are getting worse , my initial problem was only the visible
piece of the iceberg ;)

On Thu, Sep 5, 2019 at 5:42 PM Bruce Ashfield  wrote:
>
> On Thu, Sep 5, 2019 at 10:43 AM Nicolas Dechesne
>  wrote:
> >
> > hi,
> >
> > I was looking into a build issue today, related to signing an external
> > kernel module. My build failed when calling the kernel utility
> > sign-file, the error was that libcrypto.so was not found.
> >
> > Looking a bit more into that, I realized that make-mod-scripts will
> > built some kernel utilities, including scripts/sign-file which link
> > against libcrypto, however we 'copy' sign-file into
> > STAGING_KERNEL_BUILDDIR.
>
> Indeed, the build and redirected output dir will get the binaries, but
> not the libraries. Either static linking of a smarter install of the
> binaries would be a good idea.
>
> >
> > Later on, when my own recipe uses sign-file from
> > STAGING_KERNEL_BUILDDIR, it still requires the libcrypto.so file which
> > is in the make-mod-scripts per recipe sysroot. So basically my recipe
> > needs a binary from STAGING_KERNEL_BUILDDIR and a shared library from
> > another recipe sysroot. That looks wrong to me.
> >
> > My problem is fixed by adding a dependency on make-mod-scripts, it
> > still feels wrong to reply on another recipe sysroot , doesn't it go
> > against the whole idea of per recipe sysroot?
>
> Agreed.
>
> I'm wondering make-mod-scripts should both create a package and
> install into the staged kernel build dir.
>
> That way if you had a dependency on make-mod-scripts, you'd use both
> the binary and the library from the recipe sysroot, but we'd also get
> that shared copy for the needs in the shared kernel build directory.
> Obviously the shared kernel build artifacts are a special case, and
> I'm not even sure if what I'm thinking is even possible .. or is worse
> than the symptom you are describing.
>
> Just thinking out loud. Hopefully someone with more knowledge on the
> packaging/internal/sstate internals will see this and have more
> details.

you are correct, and i hope we can fix that. However what I have now
realized is that building external modules with modules signing
enabled seems to be broken.

The kernel generates the keys pair and certificate when it's built and
the public key is embedded in the kernel image. The keys are put in
STAGING_KERNEL_DIR, where module_do_compile() expects it. And it works
just fine, until you delete TMPDIR, and build again. For example if
you have a change in your module recipe, and build again. Because it's
an external module, it has:
do_configure[depends] += "make-mod-scripts:do_compile"

and make-mod-scripts has the following depends:
do_configure[depends] += "virtual/kernel:do_shared_workdir
openssl-native:do_populate_sysroot"
do_compile[depends] += "virtual/kernel:do_compile_kernelmodules"

So the kernel will effectively be rebuilt , and a new pair of keys is
generated and placed in STAGING_KERNEL_DIR. Then the external module
is recompiled and signed with the *new* key. However since the kernel
recipe didn't change the kernel do_deploy() is not run, and artifacts
are used from the sstate-cache. So we eventually end up with
vmlinuz/Image built with the *old* key and the new kernel module
signed with the *new* key.

Here is a log of what happens in my build env that demonstrates this
sequence of task:

NOTE: recipe linux-msm-4.9-r5: task do_deploy_setscene: Started
NOTE: recipe linux-msm-4.9-r5: task do_populate_lic_setscene: Started
NOTE: recipe linux-msm-4.9-r5: task do_populate_lic_setscene: Succeeded
NOTE: recipe linux-msm-4.9-r5: task do_package_write_ipk_setscene: Started
NOTE: recipe linux-msm-4.9-r5: task do_package_write_ipk_setscene: Succeeded
NOTE: recipe linux-msm-4.9-r5: task do_deploy_setscene: Succeeded
NOTE: recipe linux-msm-4.9-r5: task do_package_qa_setscene: Started
NOTE: recipe linux-msm-4.9-r5: task do_package_qa_setscene: Succeeded
NOTE: recipe linux-msm-4.9-r5: task do_packagedata_setscene: Started
NOTE: recipe linux-msm-4.9-r5: task do_populate_sysroot_setscene: Started
NOTE: recipe linux-msm-4.9-r5: task do_populate_sysroot_setscene: Succeeded
NOTE: recipe linux-msm-4.9-r5: task do_packagedata_setscene: Succeeded

NOTE: recipe linux-msm-4.9-r5: task do_fetch: Started


[3/9744]
NOTE: recipe linux-msm-4.9-r5: task do_fetch: Succeeded
NOTE: recipe linux-msm-4.9-r5: task do_prepare_recipe_sysroot: Started
NOTE: recipe linux-msm-4.9-r5: task do_unpack: Started
NOTE: recipe qcacld-hl-git-r0: task do_fetch: Started
NOTE: recipe qcacld-hl-git-r0: task do_fetch: Succeeded
NOTE: recipe linux-msm-4.9-r5: task do_prepare_recipe_sysroot: Succeeded
NOTE: recipe linux-msm-4.9-r5: task do_unpack: Succeeded
NOTE: recipe linux-msm-4.9-r5: task do_patch: Started
NOTE: recipe linux-msm-4.9-r5: task do_patch: Succeeded
NOTE: recipe linux-msm-4.9-r5: task do_configure: Started
NOTE: recipe linux-msm-4.9-r5: task do_configure: Succeeded
NOTE: recipe linux-msm-4.9-r5: task

Re: [OE-core] [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

2019-09-09 Thread Alexander Kanavin 
On Mon, 9 Sep 2019 at 18:49, Ross Burton  wrote:

> > As I had previously suggested... can you try adding 'python3' to DEPENDS
> > of mesa, and see if that helps please? I think that would allow avoiding
> > this patch altogether.
>
> So why does Meson need *target* Python to be present when building Mesa?
>

Because mesa does this:

prog_python = import('python').find_installation('python3')

and find_installation() method of meson does not merely look for the native
python binary, it runs the binary with a meson-supplied python script
designed to obtain all sorts of information, including target-specific
things that we patch native python to report. If the target python
installation is not present in sysroot, the script will fail, and meson
will declare that 'there is no valid installation of python on your system'.

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

[OE-core] [thud][PATCH v2] libgpg-error: Fix build with gawk 5.x

2019-09-09 Thread Sean Nyekjaer 
Based on poky master, but for version 1.32

Signed-off-by: Sean Nyekjaer 
---
 .../libgpg-error-1.32-gawk5-support.patch | 161 ++
 .../libgpg-error/libgpg-error_1.32.bb |   1 +
 2 files changed, 162 insertions(+)
 create mode 100644 
meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.32-gawk5-support.patch

diff --git 
a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.32-gawk5-support.patch
 
b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.32-gawk5-support.patch
new file mode 100644
index 00..dc3d558e24
--- /dev/null
+++ 
b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.32-gawk5-support.patch
@@ -0,0 +1,161 @@
+Upstream-Status: Backport [https://dev.gnupg.org/T4459]
+Signed-off-by: Sean Nyekjaer 
+
+From 37069826e497d6af01e3e48fe5d2220ae7f85449 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka 
+Date: Mon, 15 Apr 2019 15:10:44 +0900
+Subject: [PATCH] awk: Prepare for Gawk 5.0.
+
+* src/Makefile.am: Use pkg_namespace (instead of namespace).
+* src/mkerrnos.awk: Likewise.
+* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
+* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
+
+--
+
+In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
+which only allows escaping specific characters.
+
+GnuPG-bug-id: 4459
+Reported-by: Marius Schamschula
+Signed-off-by: NIIBE Yutaka 
+---
+ lang/cl/mkerrcodes.awk |  2 +-
+ src/Makefile.am|  2 +-
+ src/mkerrcodes.awk |  2 +-
+ src/mkerrcodes1.awk|  2 +-
+ src/mkerrcodes2.awk|  2 +-
+ src/mkerrnos.awk   |  2 +-
+ src/mkstrtable.awk | 10 +-
+ 7 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
+index ae29043..9a1fc18 100644
+--- a/lang/cl/mkerrcodes.awk
 b/lang/cl/mkerrcodes.awk
+@@ -122,7 +122,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 42998e4..0ceac9f 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -281,7 +281,7 @@ code-from-errno.h: mkerrcodes Makefile
+ 
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+   $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+-  -v prefix=GPG_ERR_ -v namespace=errnos_ \
++  -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
+   $(srcdir)/errnos.in >$@
+ 
+ 
+diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
+index 46d436c..e9c857c 100644
+--- a/src/mkerrcodes.awk
 b/src/mkerrcodes.awk
+@@ -85,7 +85,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
+index a771a73..4578e29 100644
+--- a/src/mkerrcodes1.awk
 b/src/mkerrcodes1.awk
+@@ -81,7 +81,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
+index ea58503..188f7a4 100644
+--- a/src/mkerrcodes2.awk
 b/src/mkerrcodes2.awk
+@@ -91,7 +91,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
+index f79df66..15b1aad 100644
+--- a/src/mkerrnos.awk
 b/src/mkerrnos.awk
+@@ -83,7 +83,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
+index c9de9c1..285e45f 100644
+--- a/src/mkstrtable.awk
 b/src/mkstrtable.awk
+@@ -77,7 +77,7 @@
+ #
+ # The variable prefix can be used to prepend a string to each message.
+ #
+-# The variable namespace can be used to prepend a string to each
++# The variable pkg_namespace can be used to prepend a string to each
+ # variable and macro name.
+ 
+ BEGIN {
+@@ -102,7 +102,7 @@ header {
+   print "/* The purpose of this complex string table is to produce";
+   print "   optimal code with a minimum of relocations.  */";
+   print "";
+-  print "static const char " namespace "msgstr[] = ";
++  print "static const char " pkg_namespace "msgstr[] = ";
+   header = 0;
+ }
+   else
+@@ -110,7 +110,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+@@ -150,7 +150,7 @@ END {
+   else
+ print "  gettext_noop (\"" last_msgstr "\");";
+   print "";
+-  print "static const int " namespace "msgidx[] =";
++  print "static const int " pkg_namespace "msgidx[] =";
+   print "  {";
+   for (i = 0; i < coded_msgs; i++)
+

[OE-core] [warrior][PATCH v2] libgpg-error: Fix build with gawk 5.x

2019-09-09 Thread Sean Nyekjaer 
Based on poky master, but for version 1.35

Signed-off-by: Sean Nyekjaer 
---
 .../libgpg-error-1.35-gawk5-support.patch | 161 ++
 .../libgpg-error/libgpg-error_1.35.bb |   1 +
 2 files changed, 162 insertions(+)
 create mode 100644 
meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch

diff --git 
a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
 
b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
new file mode 100644
index 00..dc3d558e24
--- /dev/null
+++ 
b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
@@ -0,0 +1,161 @@
+Upstream-Status: Backport [https://dev.gnupg.org/T4459]
+Signed-off-by: Sean Nyekjaer 
+
+From 37069826e497d6af01e3e48fe5d2220ae7f85449 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka 
+Date: Mon, 15 Apr 2019 15:10:44 +0900
+Subject: [PATCH] awk: Prepare for Gawk 5.0.
+
+* src/Makefile.am: Use pkg_namespace (instead of namespace).
+* src/mkerrnos.awk: Likewise.
+* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
+* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
+
+--
+
+In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
+which only allows escaping specific characters.
+
+GnuPG-bug-id: 4459
+Reported-by: Marius Schamschula
+Signed-off-by: NIIBE Yutaka 
+---
+ lang/cl/mkerrcodes.awk |  2 +-
+ src/Makefile.am|  2 +-
+ src/mkerrcodes.awk |  2 +-
+ src/mkerrcodes1.awk|  2 +-
+ src/mkerrcodes2.awk|  2 +-
+ src/mkerrnos.awk   |  2 +-
+ src/mkstrtable.awk | 10 +-
+ 7 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
+index ae29043..9a1fc18 100644
+--- a/lang/cl/mkerrcodes.awk
 b/lang/cl/mkerrcodes.awk
+@@ -122,7 +122,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 42998e4..0ceac9f 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -281,7 +281,7 @@ code-from-errno.h: mkerrcodes Makefile
+ 
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+   $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+-  -v prefix=GPG_ERR_ -v namespace=errnos_ \
++  -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
+   $(srcdir)/errnos.in >$@
+ 
+ 
+diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
+index 46d436c..e9c857c 100644
+--- a/src/mkerrcodes.awk
 b/src/mkerrcodes.awk
+@@ -85,7 +85,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
+index a771a73..4578e29 100644
+--- a/src/mkerrcodes1.awk
 b/src/mkerrcodes1.awk
+@@ -81,7 +81,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
+index ea58503..188f7a4 100644
+--- a/src/mkerrcodes2.awk
 b/src/mkerrcodes2.awk
+@@ -91,7 +91,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
+index f79df66..15b1aad 100644
+--- a/src/mkerrnos.awk
 b/src/mkerrnos.awk
+@@ -83,7 +83,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
+index c9de9c1..285e45f 100644
+--- a/src/mkstrtable.awk
 b/src/mkstrtable.awk
+@@ -77,7 +77,7 @@
+ #
+ # The variable prefix can be used to prepend a string to each message.
+ #
+-# The variable namespace can be used to prepend a string to each
++# The variable pkg_namespace can be used to prepend a string to each
+ # variable and macro name.
+ 
+ BEGIN {
+@@ -102,7 +102,7 @@ header {
+   print "/* The purpose of this complex string table is to produce";
+   print "   optimal code with a minimum of relocations.  */";
+   print "";
+-  print "static const char " namespace "msgstr[] = ";
++  print "static const char " pkg_namespace "msgstr[] = ";
+   header = 0;
+ }
+   else
+@@ -110,7 +110,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+@@ -150,7 +150,7 @@ END {
+   else
+ print "  gettext_noop (\"" last_msgstr "\");";
+   print "";
+-  print "static const int " namespace "msgidx[] =";
++  print "static const int " pkg_namespace "msgidx[] =";
+   print "  {";
+   for (i = 0; i < coded_msgs; i++)
+

[OE-core] [thud] python: Fix 3 CVEs

2019-09-09 Thread msft . dantran 
From: Dan Tran 

Fixes CVE-2018-20852, CVE-2019-9740, and CVE-2019-9747

Signed-off-by: Dan Tran 
---
 .../python/python/bpo-30458-cve-2019-9740.patch| 219 +
 .../python/python/bpo-35121-cve-2018-20852.patch   | 127 
 meta/recipes-devtools/python/python_2.7.16.bb  |   2 +
 3 files changed, 348 insertions(+)
 create mode 100644 
meta/recipes-devtools/python/python/bpo-30458-cve-2019-9740.patch
 create mode 100644 
meta/recipes-devtools/python/python/bpo-35121-cve-2018-20852.patch

diff --git a/meta/recipes-devtools/python/python/bpo-30458-cve-2019-9740.patch 
b/meta/recipes-devtools/python/python/bpo-30458-cve-2019-9740.patch
new file mode 100644
index 000..f4c56bb
--- /dev/null
+++ b/meta/recipes-devtools/python/python/bpo-30458-cve-2019-9740.patch
@@ -0,0 +1,219 @@
+From 39815ee5bb7f2f9ca1f0d5e9f51e27a2877ec35b Mon Sep 17 00:00:00 2001
+From: Victor Stinner 
+Date: Tue, 21 May 2019 15:12:33 +0200
+Subject: [PATCH] bpo-30458: Disallow control chars in http URLs (GH-12755)
+ (GH-13154) (GH-13315)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Disallow control chars in http URLs in urllib2.urlopen.  This
+addresses a potential security problem for applications that do not
+sanity check their URLs where http request headers could be injected.
+
+Disable https related urllib tests on a build without ssl (GH-13032)
+These tests require an SSL enabled build. Skip these tests when
+python is built without SSL to fix test failures.
+
+Use httplib.InvalidURL instead of ValueError as the new error case's
+exception. (GH-13044)
+
+Backport Co-Authored-By: Miro Hrončok 
+
+(cherry picked from commit 7e200e0763f5b71c199aaf98bd5588f291585619)
+
+Notes on backport to Python 2.7:
+
+* test_urllib tests urllib.urlopen() which quotes the URL and so is
+  not vulerable to HTTP Header Injection.
+* Add tests to test_urllib2 on urllib2.urlopen().
+* Reject non-ASCII characters: range 0x80-0xff.
+
+CVE: CVE-2019-9740 CVE-2019-9747
+Upstream-Status: Accepted
+
+Signed-off-by: Dan Tran 
+---
+ Lib/httplib.py| 16 ++
+ Lib/test/test_urllib.py   | 25 +
+ Lib/test/test_urllib2.py  | 51 ++-
+ Lib/test/test_xmlrpc.py   |  8 ++-
+ .../2019-04-10-08-53-30.bpo-30458.51E-DA.rst  |  1 +
+ 5 files changed, 99 insertions(+), 2 deletions(-)
+ create mode 100644 
Misc/NEWS.d/next/Security/2019-04-10-08-53-30.bpo-30458.51E-DA.rst
+
+diff --git a/Lib/httplib.py b/Lib/httplib.py
+index 60a8fb4e35..1b41c346e0 100644
+--- a/Lib/httplib.py
 b/Lib/httplib.py
+@@ -247,6 +247,16 @@ _MAXHEADERS = 100
+ _is_legal_header_name = re.compile(r'\A[^:\s][^:\r\n]*\Z').match
+ _is_illegal_header_value = re.compile(r'\n(?![ \t])|\r(?![ \t\n])').search
+ 
++# These characters are not allowed within HTTP URL paths.
++#  See https://tools.ietf.org/html/rfc3986#section-3.3 and the
++#  https://tools.ietf.org/html/rfc3986#appendix-A pchar definition.
++# Prevents CVE-2019-9740.  Includes control characters such as \r\n.
++# Restrict non-ASCII characters above \x7f (0x80-0xff).
++_contains_disallowed_url_pchar_re = re.compile('[\x00-\x20\x7f-\xff]')
++# Arguably only these _should_ allowed:
++#  _is_allowed_url_pchars_re = 
re.compile(r"^[/!$&'()*+,;=:@%a-zA-Z0-9._~-]+$")
++# We are more lenient for assumed real world compatibility purposes.
++
+ # We always set the Content-Length header for these methods because some
+ # servers will otherwise respond with a 411
+ _METHODS_EXPECTING_BODY = {'PATCH', 'POST', 'PUT'}
+@@ -927,6 +937,12 @@ class HTTPConnection:
+ self._method = method
+ if not url:
+ url = '/'
++# Prevent CVE-2019-9740.
++match = _contains_disallowed_url_pchar_re.search(url)
++if match:
++raise InvalidURL("URL can't contain control characters. %r "
++ "(found at least %r)"
++ % (url, match.group()))
+ hdr = '%s %s %s' % (method, url, self._http_vsn_str)
+ 
+ self._output(hdr)
+diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
+index 1ce9201c06..d7778d4194 100644
+--- a/Lib/test/test_urllib.py
 b/Lib/test/test_urllib.py
+@@ -257,6 +257,31 @@ class urlopen_HttpTests(unittest.TestCase, FakeHTTPMixin):
+ finally:
+ self.unfakehttp()
+ 
++def test_url_with_control_char_rejected(self):
++for char_no in range(0, 0x21) + range(0x7f, 0x100):
++char = chr(char_no)
++schemeless_url = "//localhost:/test%s/" % char
++self.fakehttp(b"HTTP/1.1 200 OK\r\n\r\nHello.")
++try:
++# urllib quotes the URL so there is no injection.
++resp = urllib.urlopen("http:" + schemeless_url)
++self.assertNotIn(char, resp.geturl())
++finally:
++self.unfakehttp()
++
++

Re: [OE-core] [warrior][PATCH] libgpg-error: Fix build with gawk 5.x

2019-09-09 Thread akuster808 



On 9/8/19 10:31 AM, Sean Nyekjaer wrote:
> Based on poky master, but for version 1.35

thanks.

can you include the patch fixup in master too?

https://git.openembedded.org/openembedded-core/commit/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch?id=1418581aa22f37c5d7d9a686c1c387149954e9b2

- armin
> Signed-off-by: Sean Nyekjaer 
> ---
>  .../libgpg-error-1.35-gawk5-support.patch | 160 ++
>  .../libgpg-error/libgpg-error_1.35.bb |   1 +
>  2 files changed, 161 insertions(+)
>  create mode 100644 
> meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
>
> diff --git 
> a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
>  
> b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
> new file mode 100644
> index 00..bbb38a60ca
> --- /dev/null
> +++ 
> b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
> @@ -0,0 +1,160 @@
> +From 37069826e497d6af01e3e48fe5d2220ae7f85449 Mon Sep 17 00:00:00 2001
> +From: NIIBE Yutaka 
> +Date: Mon, 15 Apr 2019 15:10:44 +0900
> +Subject: [PATCH] awk: Prepare for Gawk 5.0.
> +
> +* src/Makefile.am: Use pkg_namespace (instead of namespace).
> +* src/mkerrnos.awk: Likewise.
> +* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
> +* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
> +
> +--
> +
> +In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
> +which only allows escaping specific characters.
> +
> +GnuPG-bug-id: 4459
> +Reported-by: Marius Schamschula
> +Signed-off-by: NIIBE Yutaka 
> +Upstream-Status: Backport [https://dev.gnupg.org/T4459]
> +(cherry picked from commit 7865041c77f4f7005282f10f9bb19072fbdf)
> +---
> + lang/cl/mkerrcodes.awk |  2 +-
> + src/Makefile.am|  2 +-
> + src/mkerrcodes.awk |  2 +-
> + src/mkerrcodes1.awk|  2 +-
> + src/mkerrcodes2.awk|  2 +-
> + src/mkerrnos.awk   |  2 +-
> + src/mkstrtable.awk | 10 +-
> + 7 files changed, 11 insertions(+), 11 deletions(-)
> +
> +diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
> +index ae29043..9a1fc18 100644
> +--- a/lang/cl/mkerrcodes.awk
>  b/lang/cl/mkerrcodes.awk
> +@@ -122,7 +122,7 @@ header {
> + }
> + 
> + !header {
> +-  sub (/\#.+/, "");
> ++  sub (/#.+/, "");
> +   sub (/[   ]+$/, ""); # Strip trailing space and tab characters.
> + 
> +   if (/^$/)
> +diff --git a/src/Makefile.am b/src/Makefile.am
> +index 42998e4..0ceac9f 100644
> +--- a/src/Makefile.am
>  b/src/Makefile.am
> +@@ -281,7 +281,7 @@ code-from-errno.h: mkerrcodes Makefile
> + 
> + errnos-sym.h: Makefile mkstrtable.awk errnos.in
> + $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
> +--v prefix=GPG_ERR_ -v namespace=errnos_ \
> ++-v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
> + $(srcdir)/errnos.in >$@
> + 
> + 
> +diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
> +index 46d436c..e9c857c 100644
> +--- a/src/mkerrcodes.awk
>  b/src/mkerrcodes.awk
> +@@ -85,7 +85,7 @@ header {
> + }
> + 
> + !header {
> +-  sub (/\#.+/, "");
> ++  sub (/#.+/, "");
> +   sub (/[   ]+$/, ""); # Strip trailing space and tab characters.
> + 
> +   if (/^$/)
> +diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
> +index a771a73..4578e29 100644
> +--- a/src/mkerrcodes1.awk
>  b/src/mkerrcodes1.awk
> +@@ -81,7 +81,7 @@ header {
> + }
> + 
> + !header {
> +-  sub (/\#.+/, "");
> ++  sub (/#.+/, "");
> +   sub (/[   ]+$/, ""); # Strip trailing space and tab characters.
> + 
> +   if (/^$/)
> +diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
> +index ea58503..188f7a4 100644
> +--- a/src/mkerrcodes2.awk
>  b/src/mkerrcodes2.awk
> +@@ -91,7 +91,7 @@ header {
> + }
> + 
> + !header {
> +-  sub (/\#.+/, "");
> ++  sub (/#.+/, "");
> +   sub (/[   ]+$/, ""); # Strip trailing space and tab characters.
> + 
> +   if (/^$/)
> +diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
> +index f79df66..15b1aad 100644
> +--- a/src/mkerrnos.awk
>  b/src/mkerrnos.awk
> +@@ -83,7 +83,7 @@ header {
> + }
> + 
> + !header {
> +-  sub (/\#.+/, "");
> ++  sub (/#.+/, "");
> +   sub (/[   ]+$/, ""); # Strip trailing space and tab characters.
> + 
> +   if (/^$/)
> +diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
> +index c9de9c1..285e45f 100644
> +--- a/src/mkstrtable.awk
>  b/src/mkstrtable.awk
> +@@ -77,7 +77,7 @@
> + #
> + # The variable prefix can be used to prepend a string to each message.
> + #
> +-# The variable namespace can be used to prepend a string to each
> ++# The variable pkg_namespace can be used to prepend a string to each
> + # variable and macro name.
> + 
> + BEGIN {
> +@@ -102,7 +102,7 @@ header {
> +   print "/* The purpose of this complex string table is to produce";
> +   print "   optimal code with a minimum of relocations.  */";
> +   print "";
> +-  print

[OE-core] [thud] binutils: Fix 4 CVEs

2019-09-09 Thread msft . dantran 
From: Dan Tran 

Fixes CVE-2018-20623, CVE-2018-20651, CVE-2018-20-671, and
CVE-2018-1000876 for binutils 2.31.1.

Signed-off-by: Dan Tran 
---
 meta/recipes-devtools/binutils/binutils-2.31.inc   |   4 +
 .../binutils/binutils/CVE-2018-1000876.patch   | 180 +
 .../binutils/binutils/CVE-2018-20623.patch |  74 +
 .../binutils/binutils/CVE-2018-20651.patch |  35 
 .../binutils/binutils/CVE-2018-20671.patch |  49 ++
 5 files changed, 342 insertions(+)
 create mode 100644 
meta/recipes-devtools/binutils/binutils/CVE-2018-1000876.patch
 create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2018-20623.patch
 create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2018-20651.patch
 create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2018-20671.patch

diff --git a/meta/recipes-devtools/binutils/binutils-2.31.inc 
b/meta/recipes-devtools/binutils/binutils-2.31.inc
index 62acec5..ba9272a 100644
--- a/meta/recipes-devtools/binutils/binutils-2.31.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.31.inc
@@ -46,6 +46,10 @@ SRC_URI = "\
  file://CVE-2018-18605.patch \
  file://CVE-2018-18606.patch \
  file://CVE-2018-18607.patch \
+ file://CVE-2018-20623.patch \
+ file://CVE-2018-20651.patch \
+ file://CVE-2018-20671.patch \
+ file://CVE-2018-1000876.patch \
 "
 S  = "${WORKDIR}/git"
 
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-1000876.patch 
b/meta/recipes-devtools/binutils/binutils/CVE-2018-1000876.patch
new file mode 100644
index 000..ff85351
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2018-1000876.patch
@@ -0,0 +1,180 @@
+From efec0844fcfb5692f5a78f4082994d63e420ecd9 Mon Sep 17 00:00:00 2001
+From: Alan Modra 
+Date: Sun, 16 Dec 2018 23:02:50 +1030
+Subject: [PATCH] PR23994, libbfd integer overflow
+
+   PR 23994
+   * aoutx.h: Include limits.h.
+   (get_reloc_upper_bound): Detect long overflow and return a file
+   too big error if it occurs.
+   * elf.c: Include limits.h.
+   (_bfd_elf_get_symtab_upper_bound): Detect long overflow and return
+   a file too big error if it occurs.
+   (_bfd_elf_get_dynamic_symtab_upper_bound): Likewise.
+   (_bfd_elf_get_dynamic_reloc_upper_bound): Likewise.
+
+CVE: CVE-2018-1000876
+Upstream-Status: Backport
+[https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=3a551c7a1b80fca579461774860574eabfd7f18f]
+
+Signed-off-by: Dan Tran 
+---
+ bfd/aoutx.h | 40 +---
+ bfd/elf.c   | 32 
+ 2 files changed, 45 insertions(+), 27 deletions(-)
+
+diff --git a/bfd/aoutx.h b/bfd/aoutx.h
+index 023843b0be..78eaa9c503 100644
+--- a/bfd/aoutx.h
 b/bfd/aoutx.h
+@@ -117,6 +117,7 @@ DESCRIPTION
+ #define KEEPIT udata.i
+ 
+ #include "sysdep.h"
++#include 
+ #include "bfd.h"
+ #include "safe-ctype.h"
+ #include "bfdlink.h"
+@@ -2491,6 +2492,8 @@ NAME (aout, canonicalize_reloc) (bfd *abfd,
+ long
+ NAME (aout, get_reloc_upper_bound) (bfd *abfd, sec_ptr asect)
+ {
++  bfd_size_type count;
++
+   if (bfd_get_format (abfd) != bfd_object)
+ {
+   bfd_set_error (bfd_error_invalid_operation);
+@@ -2498,26 +2501,25 @@ NAME (aout, get_reloc_upper_bound) (bfd *abfd, sec_ptr 
asect)
+ }
+ 
+   if (asect->flags & SEC_CONSTRUCTOR)
+-return sizeof (arelent *) * (asect->reloc_count + 1);
+-
+-  if (asect == obj_datasec (abfd))
+-return sizeof (arelent *)
+-  * ((exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd))
+-   + 1);
+-
+-  if (asect == obj_textsec (abfd))
+-return sizeof (arelent *)
+-  * ((exec_hdr (abfd)->a_trsize / obj_reloc_entry_size (abfd))
+-   + 1);
+-
+-  if (asect == obj_bsssec (abfd))
+-return sizeof (arelent *);
+-
+-  if (asect == obj_bsssec (abfd))
+-return 0;
++count = asect->reloc_count;
++  else if (asect == obj_datasec (abfd))
++count = exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd);
++  else if (asect == obj_textsec (abfd))
++count = exec_hdr (abfd)->a_trsize / obj_reloc_entry_size (abfd);
++  else if (asect == obj_bsssec (abfd))
++count = 0;
++  else
++{
++  bfd_set_error (bfd_error_invalid_operation);
++  return -1;
++}
+ 
+-  bfd_set_error (bfd_error_invalid_operation);
+-  return -1;
++  if (count >= LONG_MAX / sizeof (arelent *))
++{
++  bfd_set_error (bfd_error_file_too_big);
++  return -1;
++}
++  return (count + 1) * sizeof (arelent *);
+ }
+ 
+ long
+diff --git a/bfd/elf.c b/bfd/elf.c
+index 828241d48a..10037176a3 100644
+--- a/bfd/elf.c
 b/bfd/elf.c
+@@ -35,6 +35,7 @@ SECTION
+ /* For sparc64-cross-sparc32.  */
+ #define _SYSCALL32
+ #include "sysdep.h"
++#include 
+ #include "bfd.h"
+ #include "bfdlink.h"
+ #include "libbfd.h"
+@@ -8114,11 +8115,16 @@ error_return:
+ long
+ _bfd_elf_get_symtab_upper_bound (bfd *abfd)
+ {
+-  long symcount;
++  bfd_size_type symcount;
+   long symtab_size;
+

Re: [OE-core] [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

2019-09-09 Thread Ross Burton 

On 06/09/2019 20:07, Alexander Kanavin wrote:
As I had previously suggested... can you try adding 'python3' to DEPENDS 
of mesa, and see if that helps please? I think that would allow avoiding 
this patch altogether.


So why does Meson need *target* Python to be present when building Mesa?

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

[OE-core] [PATCH] gstreamer1.0-libav: enable gtk-doc again

2019-09-09 Thread Ross Burton 
Remove the broken piece of the API documentation template so the documentation
can be generated again.

Signed-off-by: Ross Burton 
---
 .../gstreamer1.0-libav/gtkdoc-no-tree.patch   | 24 +++
 .../gstreamer/gstreamer1.0-libav_1.16.0.bb|  6 +
 2 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/gtkdoc-no-tree.patch

diff --git 
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/gtkdoc-no-tree.patch 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/gtkdoc-no-tree.patch
new file mode 100644
index 000..5ea9232c265
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/gtkdoc-no-tree.patch
@@ -0,0 +1,24 @@
+gtk-doc can't find a type hierarchy when scanning gst-libav, and the new 
gtk-doc
+doesn't write a file if it will be empty. This results in the gtk-doc 
generation
+failing.
+
+This could be investigated further but upstream has moved away from gtk-doc, so
+in the next release this will be moot anyway.
+
+Upstream-Status: Inappropriate [upstream moved away from gtk-doc]
+Signed-off-by: Ross Burton 
+
+diff --git a/docs/plugins/gst-libav-plugins-docs.sgml 
b/docs/plugins/gst-libav-plugins-docs.sgml
+index 75c68f4..f68d554 100644
+--- a/docs/plugins/gst-libav-plugins-docs.sgml
 b/docs/plugins/gst-libav-plugins-docs.sgml
+@@ -32,9 +32,4 @@
+ gst-libav Plugins
+ 
+   
+-
+-  
+-Object Hierarchy
+-
+-  
+ 
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb
index d94c3215dc4..d2629b506d7 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb
@@ -18,6 +18,7 @@ SRC_URI = 
"http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz
file://mips64_cpu_detection.patch \
file://0001-configure-check-for-armv7ve-variant.patch \
file://0001-fix-host-contamination.patch \
+   file://gtkdoc-no-tree.patch \
"
 SRC_URI[md5sum] = "e3a201a45985ddc1327cd496046ca818"
 SRC_URI[sha256sum] = 
"dfac119043a9cfdcacd7acde77f674ab172cf2537b5812be52f49e9cddc53d9a"
@@ -28,11 +29,6 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 
xz"
 
 inherit autotools pkgconfig upstream-version-is-even gtk-doc
 
-# Disable documentation for now as it is failing with gtk-doc 1.30:
-# gst-libav-plugins-docs.sgml:38: element include: XInclude error:
-# could not load xml/tree_index.sgml, and no fallback was found
-GTKDOC_ENABLED = "False"
-
 # CAUTION: Using the system libav is not recommended. Since the libav API is 
changing all the time,
 # compilation errors (and other, more subtle bugs) can happen. It is usually 
better to rely on the
 # libav copy included in the gst-libav package.
-- 
2.20.1

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

Re: [OE-core] [PATCH] libevent: don't treat test stats line as pass/fail in ptest

2019-09-09 Thread Trevor Gamblin 

On 9/9/19 11:16 AM, Trevor Gamblin wrote:

From: Trevor Gamblin 

The libevent "regress" test outputs its own pass/fail results,
e.g. "2/300 TESTS FAILED. (31 skipped)", which will be
miscounted as an extra test fail in the ptest log. Fixed this
to ignore the libevent results line when counting actual
pass/fail results.

Also removed the for loop in run-ptest and targeted only the
libevent "regress" test, as the other tests being run were
related to performance and did not provide a relevant pass/fail
output.

Signed-off-by: Trevor Gamblin 
---
  meta/recipes-support/libevent/libevent/run-ptest | 5 +
  1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/recipes-support/libevent/libevent/run-ptest 
b/meta/recipes-support/libevent/libevent/run-ptest
index 080806dea9..259fe56fe5 100644
--- a/meta/recipes-support/libevent/libevent/run-ptest
+++ b/meta/recipes-support/libevent/libevent/run-ptest
@@ -10,10 +10,7 @@ LOG="${LIBEVENTLIB}/ptest/libevent_ptest_$(date 
+%Y%m%d-%H%M%S).log"
  
  cd ${LIBEVENTLIB}/ptest
  
-for test in ./test/*

-do
-$test 2>&1| sed -e '/OK/ s/^/PASS: / ; /FAILED/ s/^/FAIL: / ; /SKIPPED/ 
s/^/SKIP: / ; /DISABLED/ s/^/SKIP: /' | cut -f1,2 -d ':' | tee -a ${LOG}
-done
+./test/regress 2>&1| sed -e '/TESTS/d' -e '/tests/d' -e '/OK/ s/^/PASS: / ; 
/FAILED/ s/^/FAIL: / ; /SKIPPED/ s/^/SKIP: / ; /DISABLED/ s/^/SKIP: /' | cut -f1,2 -d 
':' | tee -a ${LOG}
  
  passed=`grep PASS ${LOG}|wc -l`

  failed=`grep FAIL ${LOG}|wc -l`
Forgot to mention in commit message - this is a follow-up to fb17b46e2 
after seeing the autobuilder test results with that commit.

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

[OE-core] [PATCH] libevent: don't treat test stats line as pass/fail in ptest

2019-09-09 Thread Trevor Gamblin 
From: Trevor Gamblin 

The libevent "regress" test outputs its own pass/fail results,
e.g. "2/300 TESTS FAILED. (31 skipped)", which will be
miscounted as an extra test fail in the ptest log. Fixed this
to ignore the libevent results line when counting actual
pass/fail results.

Also removed the for loop in run-ptest and targeted only the
libevent "regress" test, as the other tests being run were
related to performance and did not provide a relevant pass/fail
output.

Signed-off-by: Trevor Gamblin 
---
 meta/recipes-support/libevent/libevent/run-ptest | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/recipes-support/libevent/libevent/run-ptest 
b/meta/recipes-support/libevent/libevent/run-ptest
index 080806dea9..259fe56fe5 100644
--- a/meta/recipes-support/libevent/libevent/run-ptest
+++ b/meta/recipes-support/libevent/libevent/run-ptest
@@ -10,10 +10,7 @@ LOG="${LIBEVENTLIB}/ptest/libevent_ptest_$(date 
+%Y%m%d-%H%M%S).log"
 
 cd ${LIBEVENTLIB}/ptest 
 
-for test in ./test/*
-do
-$test 2>&1| sed -e '/OK/ s/^/PASS: / ; /FAILED/ s/^/FAIL: / ; /SKIPPED/ 
s/^/SKIP: / ; /DISABLED/ s/^/SKIP: /' | cut -f1,2 -d ':' | tee -a ${LOG}
-done
+./test/regress 2>&1| sed -e '/TESTS/d' -e '/tests/d' -e '/OK/ s/^/PASS: / ; 
/FAILED/ s/^/FAIL: / ; /SKIPPED/ s/^/SKIP: / ; /DISABLED/ s/^/SKIP: /' | cut 
-f1,2 -d ':' | tee -a ${LOG}
 
 passed=`grep PASS ${LOG}|wc -l`
 failed=`grep FAIL ${LOG}|wc -l`
-- 
2.21.0

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

Re: [OE-core] [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

2019-09-09 Thread Alexander Kanavin 
Thanks, now it's future-proof :)

Alex

On Mon, 9 Sep 2019 at 16:54, Fabio Berton 
wrote:

> Hi Alexander!
>
> I sent a v2 with python3 in depends and dropped the patch.
>
> Thanks!
>
> On Fri, Sep 6, 2019 at 5:33 PM Alexander Kanavin 
> wrote:
> >
> > On Fri, 6 Sep 2019 at 22:12, Otavio Salvador <
> otavio.salva...@ossystems.com.br> wrote:
> >>
> >> > As I had previously suggested... can you try adding 'python3' to
> DEPENDS of mesa, and see if that helps please? I think that would allow
> avoiding this patch altogether.
> >>
> >> Why a new build dependency if this works just fine?
> >
> >
> > 1. Less patches is always better than more patches, especially if they
> are non-upstreamable.
> >
> > 2. The patch reverts to something that meson has deprecated and will
> likely remove in the future.
> >
> https://github.com/mesonbuild/meson/blob/master/docs/markdown/Python-3-module.md
> >
> > 3. Meson's currently supported way of detecting python does in fact rely
> on python's target configuration being available, as it picks up settings
> from it. I had fixed a similar issue elsewhere recently.
> >
> > Alex
> >
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

2019-09-09 Thread Fabio Berton 
Hi Alexander!

I sent a v2 with python3 in depends and dropped the patch.

Thanks!

On Fri, Sep 6, 2019 at 5:33 PM Alexander Kanavin  wrote:
>
> On Fri, 6 Sep 2019 at 22:12, Otavio Salvador 
>  wrote:
>>
>> > As I had previously suggested... can you try adding 'python3' to DEPENDS 
>> > of mesa, and see if that helps please? I think that would allow avoiding 
>> > this patch altogether.
>>
>> Why a new build dependency if this works just fine?
>
>
> 1. Less patches is always better than more patches, especially if they are 
> non-upstreamable.
>
> 2. The patch reverts to something that meson has deprecated and will likely 
> remove in the future.
> https://github.com/mesonbuild/meson/blob/master/docs/markdown/Python-3-module.md
>
> 3. Meson's currently supported way of detecting python does in fact rely on 
> python's target configuration being available, as it picks up settings from 
> it. I had fixed a similar issue elsewhere recently.
>
> Alex
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [OE-Core][PATCH v2] mesa: Upgrade 19.1.1 -> 19.1.6

2019-09-09 Thread Fabio Berton 
From: Otavio Salvador 

  - Add python3 to DEPENDS: mesa commit cb3072488c changed function
that verifies python installation and to this new function works
we need to have Python3 in DEPENDS.

This is a bugfix only set of releases. Check following links for the
relevant release notes:

  - https://www.mesa3d.org/relnotes/19.1.2.html
  - https://www.mesa3d.org/relnotes/19.1.3.html
  - https://www.mesa3d.org/relnotes/19.1.4.html
  - https://www.mesa3d.org/relnotes/19.1.5.html
  - https://www.mesa3d.org/relnotes/19.1.6.html

Signed-off-by: Otavio Salvador 
Signed-off-by: Fabio Berton 
---
 ...k-for-all-linux-host_os-combinations.patch | 37 +++
 ...on.build-make-TLS-GLX-optional-again.patch | 12 +++---
 ...Allow-enable-DRI-without-DRI-drivers.patch | 10 ++---
 .../{mesa-gl_19.1.1.bb => mesa-gl_19.1.6.bb}  |  0
 meta/recipes-graphics/mesa/mesa.inc   |  2 +-
 .../mesa/{mesa_19.1.1.bb => mesa_19.1.6.bb}   |  4 +-
 6 files changed, 25 insertions(+), 40 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-gl_19.1.1.bb => mesa-gl_19.1.6.bb} 
(100%)
 rename meta/recipes-graphics/mesa/{mesa_19.1.1.bb => mesa_19.1.6.bb} (85%)

diff --git 
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
 
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
index 0064dc643c..9fba5da4b2 100644
--- 
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
+++ 
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -1,7 +1,7 @@
-From da6b9188f29942684d4262f0c6264d09bb6fe7de Mon Sep 17 00:00:00 2001
+From ea966884e39aae9571c038fab55f3c1663d17850 Mon Sep 17 00:00:00 2001
 From: Fabio Berton 
 Date: Wed, 12 Jun 2019 13:40:20 -0300
-Subject: [PATCH 1/3] meson.build: check for all linux host_os combinations
+Subject: [PATCH] meson.build: check for all linux host_os combinations
 Organization: O.S. Systems Software LTDA.
 
 Make sure that we are also looking for our host_os combinations like
@@ -13,41 +13,30 @@ Upstream-Status: Pending
 
 Signed-off-by: Anuj Mittal 
 Signed-off-by: Fabio Berton 
+Signed-off-by: Otavio Salvador 
 ---
- meson.build | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 8ab8a550f56..e11880f2902 100644
+index 567a81afd6f..b33b430aed4 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -34,6 +34,8 @@ cpp = meson.get_compiler('cpp')
- 
- null_dep = dependency('', required : false)
- 
-+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 
'dragonfly'].contains(host_machine.system()) or 
host_machine.system().startswith('linux')
-+
- # Arguments for the preprocessor, put these in a separate array from the C and
- # C++ (cpp in meson terminology) arguments since they need to be added to the
- # default arguments for both C and C++.
-@@ -107,8 +109,6 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
+@@ -107,7 +107,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
  # Only build shared_glapi if at least one OpenGL API is enabled
  with_shared_glapi = get_option('shared-glapi') and with_any_opengl
  
--system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 
'linux'].contains(host_machine.system())
--
+-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 
'dragonfly', 'linux'].contains(host_machine.system())
++system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 
'dragonfly'].contains(host_machine.system()) or 
host_machine.system().startswith('linux')
+ 
  dri_drivers = get_option('dri-drivers')
  if dri_drivers.contains('auto')
-   if system_has_kms_drm
-@@ -836,7 +836,7 @@ if cc.compiles('int foo(void) 
__attribute__((__noreturn__));',
+@@ -845,7 +845,7 @@ if cc.compiles('int foo(void) 
__attribute__((__noreturn__));',
  endif
  
  # TODO: this is very incomplete
--if ['linux', 'cygwin', 'gnu'].contains(host_machine.system())
-+if ['cygwin', 'gnu'].contains(host_machine.system()) or 
host_machine.system().startswith('linux')
+-if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system())
++if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or 
host_machine.system().startswith('linux')
pre_args += '-D_GNU_SOURCE'
  endif
  
--- 
-2.22.0
-
diff --git 
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
 
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
index 81454aaa29..641bacf1d9 100644
--- 
a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
+++ 
b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
@@ -1,7 +1,7 @@
-From d31718999797ffc4dd177d14760ef7b8fd95ac2f Mon Sep 17 00:00:00 2001
+From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00

Re: [OE-core] [PATCH] elfutils: Fix build on ppc/musl

2019-09-09 Thread Khem Raj 
On Mon, Sep 9, 2019 at 2:52 AM Ross Burton  wrote:
>
> There's a 0.177 upgrade on the list (and in mut), is this required for
> that too?
>

if the patch which we are removing with this change is used
then yes it is needed.

> Ross
>
> On 09/09/2019 00:23, Khem Raj wrote:
> > musl relies on the pt_regs definitions from kernel ptrace headers
> >
> > Signed-off-by: Khem Raj 
> > ---
> >   .../elfutils/elfutils_0.176.bb|  1 +
> >   ...cliude-asm-ptrace.h-for-pt_regs-defi.patch | 32 +++
> >   2 files changed, 33 insertions(+)
> >   create mode 100644 
> > meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
> >
> > diff --git a/meta/recipes-devtools/elfutils/elfutils_0.176.bb 
> > b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> > index d98457e3f9..fe810282bc 100644
> > --- a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> > +++ b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> > @@ -29,6 +29,7 @@ SRC_URI = 
> > "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
> >  file://debian/disable_werror.patch \
> >  file://debian/testsuite-ignore-elflint.diff \
> >  file://0001-skip-the-test-when-gcc-not-deployed.patch \
> > +   
> > file://0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch \
> >  file://run-ptest \
> >  file://ptest.patch \
> >  "
> > diff --git 
> > a/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
> >  
> > b/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
> > new file mode 100644
> > index 00..330c45
> > --- /dev/null
> > +++ 
> > b/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
> > @@ -0,0 +1,32 @@
> > +From 2e2232d0935bf8ef6e66ebffba3be68a73b5b3e5 Mon Sep 17 00:00:00 2001
> > +From: Khem Raj 
> > +Date: Sun, 8 Sep 2019 15:57:59 -0700
> > +Subject: [PATCH] ppc_initreg.c: Incliude asm/ptrace.h for pt_regs 
> > definition
> > +
> > +Fixes
> > +| ../../elfutils-0.176/backends/ppc_initreg.c:79:22: error: field 'r' has 
> > incomplete type
> > +|   struct pt_regs r;
> > +|  ^
> > +
> > +Upstream-Status: Pending
> > +
> > +Signed-off-by: Khem Raj 
> > +---
> > + backends/ppc_initreg.c | 1 +
> > + 1 file changed, 1 insertion(+)
> > +
> > +diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c
> > +index 0e0d359..e5cca7e 100644
> > +--- a/backends/ppc_initreg.c
> >  b/backends/ppc_initreg.c
> > +@@ -33,6 +33,7 @@
> > + #include 
> > + #if defined(__powerpc__) && defined(__linux__)
> > + # include 
> > ++# include 
> > + # include 
> > + #endif
> > +
> > +--
> > +2.23.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

Re: [OE-core] [PATCH] python3native, pythonnative: Separate definition and export of PYTHON_LIBRARY and PYTHON_INCLUDE_DIR

2019-09-09 Thread Khem Raj 
On Mon, Sep 9, 2019 at 12:44 AM Richard Purdie
 wrote:
>
> On Sun, 2019-09-08 at 20:16 -0700, Khem Raj wrote:
> > This helps recipes where they need to explicitly pass the variable
> > and
> > does not entertain the ones from environment
> >
> > Signed-off-by: Khem Raj 
> > ---
> >  meta/classes/python3native.bbclass | 6 --
> >  meta/classes/pythonnative.bbclass  | 6 --
> >  2 files changed, 8 insertions(+), 4 deletions(-)
> >
> > diff --git a/meta/classes/python3native.bbclass
> > b/meta/classes/python3native.bbclass
> > index d98fb4c758..bed04bd941 100644
> > --- a/meta/classes/python3native.bbclass
> > +++ b/meta/classes/python3native.bbclass
> > @@ -14,8 +14,8 @@ export STAGING_LIBDIR
> >  # find_package(PythonLibs REQUIRED)
> >  # which ends up using libs/includes from build host
> >  # Therefore pre-empt that effort
> > -export
> > PYTHON_LIBRARY="${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so"
> > -export
> > PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}"
> > +PYTHON_LIBRARY="${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so"
> > +PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}"
> >
> >  export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata"
> >
> > @@ -24,3 +24,5 @@ export PYTHONNOUSERSITE = "1"
> >
> >  # autoconf macros will use their internal default preference
> > otherwise
> >  export PYTHON
> > +export PYTHON_LIBRARY
> > +export PYTHON_INCLUDE_DIR
>
> I'm confused as this makes no difference to bitbake and is equivalent.
> exported variables are always set in the datastore...
>

I was still seeing it unset on am ARM builder, I, however, did a
composite change where this change along with another change where
this was used went in together so I need to test this separately

second reeason was to make it adhere to same convention in the
bbclass like other variable e.g. PYTHON which inself could be reeason
good for this change even if it is a nop

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

[OE-core] ✗ patchtest: failure for libevent: add granularity to ptest log (rev2)

2019-09-09 Thread Patchwork 
== Series Details ==

Series: libevent: add granularity to ptest log (rev2)
Revision: 2
URL   : https://patchwork.openembedded.org/series/19759/
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 d41606244c)



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 v3] libevent: add granularity to ptest log

2019-09-09 Thread Trevor Gamblin 

On 9/9/19 9:35 AM, Trevor Gamblin wrote:


From: Trevor Gamblin 

The libevent ptest used to report only a global pass or a fail result.
Count individual PASS, FAIL, SKIP results. The SKIP results now
include tests that are disabled in the libevent code.

libevent's ptest output did not comply with the automake-style output
"result: testname", and reported a FAIL status at the end of the test
run if any of the libevent tests failed. This patch makes the log
consistent with the automake style:

 PASS: http/cancel_by_host_no_ns
 PASS: http/cancel_inactive_server
 PASS: http/cancel_by_host_no_ns_inactive_server
 SKIP: http/cancel_by_host_server_timeout
 SKIP: http/cancel_server_timeout

and provides a summary as follows:

 === Test Summary ===
 TOTAL: 316
 PASSED: 300
 FAILED: 0
 SKIPPED: 16
 DURATION: 87
 END: /usr/lib/libevent/ptest

Signed-off-by: Trevor Gamblin 
---
  .../libevent/libevent/run-ptest   | 43 ---
  .../libevent/libevent_2.1.11.bb   |  3 ++
  2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/meta/recipes-support/libevent/libevent/run-ptest 
b/meta/recipes-support/libevent/libevent/run-ptest
index 0241851c70..79d6da3ee1 100644
--- a/meta/recipes-support/libevent/libevent/run-ptest
+++ b/meta/recipes-support/libevent/libevent/run-ptest
@@ -1,18 +1,31 @@
  #!/bin/sh
  
-fail=0

-for test in ./test/*
-do
-   $test
-   if [ $? -ne 0 ]
-   then
-   fail=1
-   fi
-done
+# run-ptest - 'ptest' test infrastructure shell script that
+#   wraps the libevent test scripts
+#
+# Trevor Gamblin 
+###
+LIBEVENTLIB=@libdir@/libevent
+LOG="${LIBEVENTLIB}/ptest/libevent_ptest_$(date +%Y%m%d-%H%M%S).log"
  
-if [ $fail -eq 0 ]

-then
-   echo "PASS: libevent"
-else
-   echo "FAIL: libevent"
-fi
+cd ${LIBEVENTLIB}/ptest
+
+# Run the libevent regress test, but format the pass/fail outputs so
+# that ptest can count them. Ignore the line containing "tests or
+# "TESTS" as that line is the libevent total at the end of the test
+# and is counted as an extra test failure, e.g.
+# "2/300 TESTS FAILED. (31 skipped)" will be seen as a test failure
+# rather than a total
+./test/regress 2>&1| sed -e '/TESTS/d' -e '/tests/d' -e '/OK/ s/^/PASS: / ; 
/FAILED/ s/^/FAIL: / ; /SKIPPED/ s/^/SKIP: / ; /DISABLED/ s/^/SKIP: /' | cut -f1,2 -d 
':' | tee -a ${LOG}
+
+passed=`grep PASS ${LOG}|wc -l`
+failed=`grep FAIL ${LOG}|wc -l`
+skipped=`grep -E SKIP ${LOG}|wc -l`
+all=$((passed + failed + skipped))
+
+(   echo "=== Test Summary ==="
+echo "TOTAL: ${all}"
+echo "PASSED: ${passed}"
+echo "FAILED: ${failed}"
+echo "SKIPPED: ${skipped}"
+) | tee -a ${LOG}
diff --git a/meta/recipes-support/libevent/libevent_2.1.11.bb 
b/meta/recipes-support/libevent/libevent_2.1.11.bb
index 1e18f0ab2c..f005ab8bda 100644
--- a/meta/recipes-support/libevent/libevent_2.1.11.bb
+++ b/meta/recipes-support/libevent/libevent_2.1.11.bb
@@ -43,4 +43,7 @@ do_install_ptest() {
do
install -m 0755 $file ${D}${PTEST_PATH}/test
done
+
+# handle multilib
+sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest
  }
Noticed that the autobuilder results using v2 were detecting libevent's 
"2/300 TESTS FAILED. (31 skipped)" line at the end of the regress test 
as an extra failure. Fixed that up and reduced the ptest to just running 
"regress", as the other scripts in the test folder are more 
performance-oriented and don't provide a pass/fail result that can be used.

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

[OE-core] [PATCH v3] libevent: add granularity to ptest log

2019-09-09 Thread Trevor Gamblin 
From: Trevor Gamblin 

The libevent ptest used to report only a global pass or a fail result.
Count individual PASS, FAIL, SKIP results. The SKIP results now
include tests that are disabled in the libevent code.

libevent's ptest output did not comply with the automake-style output
"result: testname", and reported a FAIL status at the end of the test
run if any of the libevent tests failed. This patch makes the log
consistent with the automake style:

PASS: http/cancel_by_host_no_ns
PASS: http/cancel_inactive_server
PASS: http/cancel_by_host_no_ns_inactive_server
SKIP: http/cancel_by_host_server_timeout
SKIP: http/cancel_server_timeout

and provides a summary as follows:

=== Test Summary ===
TOTAL: 316
PASSED: 300
FAILED: 0
SKIPPED: 16
DURATION: 87
END: /usr/lib/libevent/ptest

Signed-off-by: Trevor Gamblin 
---
 .../libevent/libevent/run-ptest   | 43 ---
 .../libevent/libevent_2.1.11.bb   |  3 ++
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/meta/recipes-support/libevent/libevent/run-ptest 
b/meta/recipes-support/libevent/libevent/run-ptest
index 0241851c70..79d6da3ee1 100644
--- a/meta/recipes-support/libevent/libevent/run-ptest
+++ b/meta/recipes-support/libevent/libevent/run-ptest
@@ -1,18 +1,31 @@
 #!/bin/sh
 
-fail=0
-for test in ./test/*
-do
-   $test
-   if [ $? -ne 0 ]
-   then
-   fail=1
-   fi
-done
+# run-ptest - 'ptest' test infrastructure shell script that
+#   wraps the libevent test scripts 
+#
+# Trevor Gamblin 
+###
+LIBEVENTLIB=@libdir@/libevent
+LOG="${LIBEVENTLIB}/ptest/libevent_ptest_$(date +%Y%m%d-%H%M%S).log"
 
-if [ $fail -eq 0 ]
-then
-   echo "PASS: libevent"
-else
-   echo "FAIL: libevent"
-fi
+cd ${LIBEVENTLIB}/ptest 
+
+# Run the libevent regress test, but format the pass/fail outputs so
+# that ptest can count them. Ignore the line containing "tests or 
+# "TESTS" as that line is the libevent total at the end of the test 
+# and is counted as an extra test failure, e.g. 
+# "2/300 TESTS FAILED. (31 skipped)" will be seen as a test failure 
+# rather than a total
+./test/regress 2>&1| sed -e '/TESTS/d' -e '/tests/d' -e '/OK/ s/^/PASS: / ; 
/FAILED/ s/^/FAIL: / ; /SKIPPED/ s/^/SKIP: / ; /DISABLED/ s/^/SKIP: /' | cut 
-f1,2 -d ':' | tee -a ${LOG}
+
+passed=`grep PASS ${LOG}|wc -l`
+failed=`grep FAIL ${LOG}|wc -l`
+skipped=`grep -E SKIP ${LOG}|wc -l`
+all=$((passed + failed + skipped))
+
+(   echo "=== Test Summary ==="
+echo "TOTAL: ${all}"
+echo "PASSED: ${passed}"
+echo "FAILED: ${failed}"
+echo "SKIPPED: ${skipped}"
+) | tee -a ${LOG}
diff --git a/meta/recipes-support/libevent/libevent_2.1.11.bb 
b/meta/recipes-support/libevent/libevent_2.1.11.bb
index 1e18f0ab2c..f005ab8bda 100644
--- a/meta/recipes-support/libevent/libevent_2.1.11.bb
+++ b/meta/recipes-support/libevent/libevent_2.1.11.bb
@@ -43,4 +43,7 @@ do_install_ptest() {
do
install -m 0755 $file ${D}${PTEST_PATH}/test
done
+
+# handle multilib
+sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest
 }
-- 
2.21.0

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

Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.

2019-09-09 Thread Alexander Kanavin 
On Mon, 9 Sep 2019 at 13:19, Zheng, Ruoqin 
wrote:

> ->What do these two sed commands do? If we create /etc/rpmrc just above,
> can it have the right content from the beginning?
>
>
>
> Well, in the environment in Yocto Build system, the value of
> ${PACKAGE_ARCHS} include “–nativesdk” as not needed in SDK environment.
>
> And the ARCH name of core2-64 rpm is core2_64 like
> rpm-4.14.2.1-r0.core2_64.rpm.
>
> So I modify the ARCH name in etc/rpmrc.
>

Thanks, can you put a comment in front of the sed commands explaining that?
It would be useful to anyone who reads the recipe.

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

Re: [OE-core] [PATCH] bootchart2: switch to add patch from change source in do_install

2019-09-09 Thread Ross Burton 

On 09/09/2019 14:02, Ross Burton wrote:

On 05/09/2019 12:19, changqing...@windriver.com wrote:
+   
${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-bootchart2-support-usrmerge.patch','',d)} 
\


Conditionally applying patches is rarely a good move. Why not always 
apply this?


Ignore this, you beat me to it with V2 already.

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

Re: [OE-core] [PATCH] bootchart2: switch to add patch from change source in do_install

2019-09-09 Thread Ross Burton 

On 05/09/2019 12:19, changqing...@windriver.com wrote:

+   
${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-bootchart2-support-usrmerge.patch','',d)}
 \


Conditionally applying patches is rarely a good move. Why not always 
apply this?


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

[OE-core] [PATCH] libtasn1: fix build with api-documentation enabled

2019-09-09 Thread Ross Burton 
Signed-off-by: Ross Burton 
---
 .../gnutls/libtasn1/fix-gtkdoc.patch  | 38 +++
 meta/recipes-support/gnutls/libtasn1_4.14.bb  |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch

diff --git a/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch 
b/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch
new file mode 100644
index 000..a8327faef6f
--- /dev/null
+++ b/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch
@@ -0,0 +1,38 @@
+Upstream-Status: Submitted 
[https://gitlab.com/gnutls/libtasn1/merge_requests/49]
+Signed-off-by: Ross Burton 
+
+From ebd4f871b5241809f6a5b461444a6d331e15c949 Mon Sep 17 00:00:00 2001
+From: Ross Burton 
+Date: Mon, 9 Sep 2019 13:11:39 +0100
+Subject: [PATCH] doc/reference: don't add empty object hierarchy chapter
+
+The object hierarchy section is empty because there are no GObjects in the
+libtasn1 API.  With gtk-doc 1.30 onwards if there are no objects then the 
object
+hierarchy file won't exist, resulting in a failure when building the
+documentation:
+
+| ../libtasn1-docs.xml:39: element include: XInclude error : could not load 
../xml/tree_index.sgml, and no fallback was found
+
+Signed-off-by: Ross Burton 
+---
+ doc/reference/libtasn1-docs.xml | 4 
+ 1 file changed, 4 deletions(-)
+
+diff --git a/doc/reference/libtasn1-docs.xml b/doc/reference/libtasn1-docs.xml
+index accdb85..f88b888 100644
+--- a/doc/reference/libtasn1-docs.xml
 b/doc/reference/libtasn1-docs.xml
+@@ -34,10 +34,6 @@
+ 
+ 
+   
+-  
+-Object Hierarchy
+-
+-  
+   
+ API Index
+ 
+-- 
+2.20.1
+
diff --git a/meta/recipes-support/gnutls/libtasn1_4.14.bb 
b/meta/recipes-support/gnutls/libtasn1_4.14.bb
index 7158e483e98..ef2c1956a24 100644
--- a/meta/recipes-support/gnutls/libtasn1_4.14.bb
+++ b/meta/recipes-support/gnutls/libtasn1_4.14.bb
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = 
"file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \
file://dont-depend-on-help2man.patch \
file://fix-ldflags.patch \
+   file://fix-gtkdoc.patch \
"
 
 DEPENDS = "bison-native"
-- 
2.20.1

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

[OE-core] [PATCH v2] rpm: make rpm work in toolchain.

2019-09-09 Thread Zheng Ruoqin 
We need to configure rpm to use package architecture from yocto build system.

Install rpmrc and rpm/platform to ${SDKTARGETSYSROOT} because config file in 
host-sysroot as /opt/poky/2.7+snapshot/sysroots/x86_64-pokysdk-linux will be 
covered by another ARCH which result in prvious config settings inefficacy.

To resolve it, put config file in target-sysroot like 
/opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH has its own 
target-sysroot, config file will not be covered.

Signed-off-by: Zheng Ruoqin 
---
 meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb 
b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
index 063f4269a5..af8e144f96 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
@@ -102,6 +102,9 @@ do_install_append_class-native() {
 done
 }
 
+REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
+SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
+
 do_install_append_class-nativesdk() {
 for tool in ${WRAPPER_TOOLS}; do
 create_wrapper ${D}$tool \
@@ -112,6 +115,16 @@ do_install_append_class-nativesdk() {
 done
 
 rm -rf ${D}/var
+install -d ${D}/${SDKTARGETSYSROOT}/etc/rpm
+
+cat >${D}/${SDKTARGETSYSROOT}/etc/rpmrc <${D}/${SDKTARGETSYSROOT}/etc/rpm/platform

Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.

2019-09-09 Thread Zheng, Ruoqin 
Hi Alex

I’d like to explain it.

->Why not simply ${D}/etc/rpm?


As you see, ${SDKTARGETSYSROOT} for x86_64 is 
/opt/poky/2.7+snapshot/sysroots/core2-64-pokysdk-linux.



I make it because config file in host-sysroot as 
/opt/poky/2.7+snapshot/sysroots/x86_64-pokysdk-linux  will be covered by 
another ARCH.

For example, first install SDK for x86_64, and next install SDK for x86, as 
host-sysroot is same, the same config file will be covered. In that case config 
settings for x86_64 will be inefficacy.



To resolve that problem, I put config file in target-sysroot like 
/opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH has its own 
target-sysroot, config file will not be covered.


That was also why I put config file in meta-environment in last patch.

->What do these two sed commands do? If we create /etc/rpmrc just above, can it 
have the right content from the beginning?

Well, in the environment in Yocto Build system, the value of ${PACKAGE_ARCHS} 
include “–nativesdk” as not needed in SDK environment.
And the ARCH name of core2-64 rpm is core2_64 like rpm-4.14.2.1-r0.core2_64.rpm.
So I modify the ARCH name in etc/rpmrc.

--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
   Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com

From: Alexander Kanavin [mailto:alex.kana...@gmail.com]
Sent: Monday, September 09, 2019 7:07 PM
To: Zheng, Ruoqin/郑 若钦 
Cc: OE-core 
Subject: Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.

On Mon, 9 Sep 2019 at 12:58, Zheng Ruoqin 
mailto:zhengrq.f...@cn.fujitsu.com>> wrote:
 rm -rf ${D}/var
+install -d ${D}/${SDKTARGETSYSROOT}/etc/rpm

Why not simply ${D}/etc/rpm?

+sed -i 's/-nativesdk//g' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
+sed -i 's/-/_/' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc

What do these two sed commands do? If we create /etc/rpmrc just above, can it 
have the right content from the beginning?
  "
+FILES_${PN}_append_class-nativesdk += "${SDKTARGETSYSROOT}"

Same question: why is ${SDKTARGETSYSROOT} needed? The configuration files 
should be in /etc, and rpm should be instructed to pick them up from there, 
same way as it is done for -native variant when building an image.

Alex


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

Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.

2019-09-09 Thread Alexander Kanavin 
On Mon, 9 Sep 2019 at 13:08, Zheng, Ruoqin 
wrote:

> I'd like to explain the path ${SDKTARGETSYSROOT} in this patch.
>
> As you see, ${SDKTARGETSYSROOT} for x86_64 is
> /opt/poky/2.7+snapshot/sysroots/core2-64-pokysdk-linux.
>
> I make it because config file in host-sysroot as
> /opt/poky/2.7+snapshot/sysroots/x86_64-pokysdk-linux  will be covered by
> another ARCH.
> For example, first install SDK for x86_64, and next install SDK for x86,
> as host-sysroot is same, the same config file will be covered. In that case
> config settings for x86_64 will be inefficacy.
>
> To resolve that problem, I put config file in target-sysroot like
> /opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH has its
> own target-sysroot, config file will not be covered.
>

I see, thanks. Can you add this information to the patch please?

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

Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.

2019-09-09 Thread Zheng, Ruoqin 
Hi Alex

I'd like to explain the path ${SDKTARGETSYSROOT} in this patch.

As you see, ${SDKTARGETSYSROOT} for x86_64 is 
/opt/poky/2.7+snapshot/sysroots/core2-64-pokysdk-linux.

I make it because config file in host-sysroot as 
/opt/poky/2.7+snapshot/sysroots/x86_64-pokysdk-linux  will be covered by 
another ARCH.
For example, first install SDK for x86_64, and next install SDK for x86, as 
host-sysroot is same, the same config file will be covered. In that case config 
settings for x86_64 will be inefficacy.

To resolve that problem, I put config file in target-sysroot like 
/opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH has its own 
target-sysroot, config file will not be covered.

--
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
   Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com


> -Original Message-
> From: Zheng, Ruoqin/郑 若钦
> Sent: Monday, September 09, 2019 6:57 PM
> To: openembedded-core@lists.openembedded.org
> Cc: Zheng, Ruoqin/郑 若钦 
> Subject: [OE-core][PATCH] rpm: make rpm work in toolchain.
> 
> We need to configure rpm to use package architecture from yocto build system.
> 
> Signed-off-by: Zheng Ruoqin 
> ---
>  meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 15 +++
>  1 file changed, 15 insertions(+)
> 
> diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb b/meta/recipes-
> devtools/rpm/rpm_4.14.2.1.bb
> index 063f4269a5..af8e144f96 100644
> --- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> +++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> @@ -102,6 +102,9 @@ do_install_append_class-native() {
>  done
>  }
> 
> +REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-
> ${TARGET_OS}"
> +SDKTARGETSYSROOT =
> "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
> +
>  do_install_append_class-nativesdk() {
>  for tool in ${WRAPPER_TOOLS}; do
>  create_wrapper ${D}$tool \ @@ -112,6 +115,16 @@
> do_install_append_class-nativesdk() {
>  done
> 
>  rm -rf ${D}/var
> +install -d ${D}/${SDKTARGETSYSROOT}/etc/rpm
> +
> +cat >${D}/${SDKTARGETSYSROOT}/etc/rpmrc < +arch_compat: ${MACHINE_ARCH}: ${PACKAGE_ARCHS} EOF
> +sed -i 's/-nativesdk//g' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
> +sed -i 's/-/_/' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
> +cat >${D}/${SDKTARGETSYSROOT}/etc/rpm/platform < +${MACHINE_ARCH}-pc-linux EOF
>  }
> 
>  # Rpm's make install creates var/tmp which clashes with base-files packaging
> @@ -133,6 +146,8 @@ FILES_${PN} += "${libdir}/rpm-plugins/*.so \
> 
>  FILES_${PN}-dev += "${libdir}/rpm-plugins/*.la \
>  "
> +FILES_${PN}_append_class-nativesdk += "${SDKTARGETSYSROOT}"
> +
> 
>  PACKAGES += "python3-rpm"
>  PROVIDES += "python3-rpm"
> --
> 2.17.1



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

Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.

2019-09-09 Thread Alexander Kanavin 
On Mon, 9 Sep 2019 at 12:58, Zheng Ruoqin 
wrote:

>  rm -rf ${D}/var
> +install -d ${D}/${SDKTARGETSYSROOT}/etc/rpm
>

Why not simply ${D}/etc/rpm?


> +sed -i 's/-nativesdk//g' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
> +sed -i 's/-/_/' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
>

What do these two sed commands do? If we create /etc/rpmrc just above, can
it have the right content from the beginning?
  "

> +FILES_${PN}_append_class-nativesdk += "${SDKTARGETSYSROOT}"
>

Same question: why is ${SDKTARGETSYSROOT} needed? The configuration files
should be in /etc, and rpm should be instructed to pick them up from there,
same way as it is done for -native variant when building an image.

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

[OE-core] [PATCH] rpm: make rpm work in toolchain.

2019-09-09 Thread Zheng Ruoqin 
We need to configure rpm to use package architecture from yocto build
system.

Signed-off-by: Zheng Ruoqin 
---
 meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb 
b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
index 063f4269a5..af8e144f96 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
@@ -102,6 +102,9 @@ do_install_append_class-native() {
 done
 }
 
+REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
+SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
+
 do_install_append_class-nativesdk() {
 for tool in ${WRAPPER_TOOLS}; do
 create_wrapper ${D}$tool \
@@ -112,6 +115,16 @@ do_install_append_class-nativesdk() {
 done
 
 rm -rf ${D}/var
+install -d ${D}/${SDKTARGETSYSROOT}/etc/rpm
+
+cat >${D}/${SDKTARGETSYSROOT}/etc/rpmrc <${D}/${SDKTARGETSYSROOT}/etc/rpm/platform

[OE-core] [warrior][PATCH] libxcrypt: Fix the build with -Os

2019-09-09 Thread Adrian Bunk 
| In file included from ../git/lib/alg-des.c:66:
| ../git/lib/alg-des.c: In function '_crypt_des_set_key':
| ../git/lib/byteorder.h:24:1: error: inlining failed in call to 'be32_to_cpu': 
call is unlikely and code size would grow [-Werror=inline]
|  be32_to_cpu (const unsigned char *buf)
|  ^~~
| ../git/lib/alg-des.c:81:13: note: called from here
|rawkey1 = be32_to_cpu ([4]);
|  ^

Signed-off-by: Adrian Bunk 
Signed-off-by: Richard Purdie 
---
 meta/recipes-core/libxcrypt/libxcrypt.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/libxcrypt/libxcrypt.bb 
b/meta/recipes-core/libxcrypt/libxcrypt.bb
index 3b9af6d739..a712e72914 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt.bb
@@ -24,7 +24,7 @@ FILES_${PN} = "${libdir}/libcrypt*.so.* 
${libdir}/libcrypt-*.so ${libdir}/libowc
 S = "${WORKDIR}/git"
 
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE} -std=gnu99"
-TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} 
-Wno-error=missing-attributes"
-CPPFLAGS_append_class-nativesdk = " -Wno-error=missing-attributes"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error"
+CPPFLAGS_append_class-nativesdk = " -Wno-error"
 
 BBCLASSEXTEND = "nativesdk"
-- 
2.17.1

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

Re: [OE-core] [PATCH] libxcrypt:upgrade 4.4.8 -> 4.4.9

2019-09-09 Thread Ross Burton 

On 09/09/2019 06:41, Zang Ruochen wrote:

Signed-off-by: Zang Ruochen 
---
  meta/recipes-core/libxcrypt/{libxcrypt_4.4.8.bb => libxcrypt_4.4.9.bb} | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
  rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.8.bb => libxcrypt_4.4.9.bb} 
(94%)

diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb 
b/meta/recipes-core/libxcrypt/libxcrypt_4.4.9.bb
similarity index 94%
rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb
rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.9.bb
index 1787f69..1ffa0af 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.8.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt_4.4.9.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM ?= 
"file://LICENSING;md5=3bb6614cf5880cbf1b9dbd9e3d145e2c \
  inherit autotools pkgconfig
  
  SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}"

-SRCREV = "acd84997a5a8b2badd28b70a642abee11272fad2"
+SRCREV = "b503e2fb3a0271986b6b2756404f0593467cf5d7"
  SRCBRANCH ?= "develop"
  
  PROVIDES = "virtual/crypt"



Do you test these upgrade?

ERROR: ParseError at 
[...]/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.8.bb:5: 
Could not include required file libxcrypt_4.4.8.bb


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

Re: [OE-core] [PATCH] elfutils: Fix build on ppc/musl

2019-09-09 Thread Ross Burton 
There's a 0.177 upgrade on the list (and in mut), is this required for 
that too?


Ross

On 09/09/2019 00:23, Khem Raj wrote:

musl relies on the pt_regs definitions from kernel ptrace headers

Signed-off-by: Khem Raj 
---
  .../elfutils/elfutils_0.176.bb|  1 +
  ...cliude-asm-ptrace.h-for-pt_regs-defi.patch | 32 +++
  2 files changed, 33 insertions(+)
  create mode 100644 
meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch

diff --git a/meta/recipes-devtools/elfutils/elfutils_0.176.bb 
b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
index d98457e3f9..fe810282bc 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
@@ -29,6 +29,7 @@ SRC_URI = 
"https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
 file://debian/disable_werror.patch \
 file://debian/testsuite-ignore-elflint.diff \
 file://0001-skip-the-test-when-gcc-not-deployed.patch \
+   
file://0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch \
 file://run-ptest \
 file://ptest.patch \
 "
diff --git 
a/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
 
b/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
new file mode 100644
index 00..330c45
--- /dev/null
+++ 
b/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch
@@ -0,0 +1,32 @@
+From 2e2232d0935bf8ef6e66ebffba3be68a73b5b3e5 Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Sun, 8 Sep 2019 15:57:59 -0700
+Subject: [PATCH] ppc_initreg.c: Incliude asm/ptrace.h for pt_regs definition
+
+Fixes
+| ../../elfutils-0.176/backends/ppc_initreg.c:79:22: error: field 'r' has 
incomplete type
+|   struct pt_regs r;
+|  ^
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj 
+---
+ backends/ppc_initreg.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c
+index 0e0d359..e5cca7e 100644
+--- a/backends/ppc_initreg.c
 b/backends/ppc_initreg.c
+@@ -33,6 +33,7 @@
+ #include 
+ #if defined(__powerpc__) && defined(__linux__)
+ # include 
++# include 
+ # include 
+ #endif
+
+--
+2.23.0
+




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

Re: [OE-core] [PATCH] python3native, pythonnative: Separate definition and export of PYTHON_LIBRARY and PYTHON_INCLUDE_DIR

2019-09-09 Thread Richard Purdie 
On Sun, 2019-09-08 at 20:16 -0700, Khem Raj wrote:
> This helps recipes where they need to explicitly pass the variable
> and
> does not entertain the ones from environment
> 
> Signed-off-by: Khem Raj 
> ---
>  meta/classes/python3native.bbclass | 6 --
>  meta/classes/pythonnative.bbclass  | 6 --
>  2 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/classes/python3native.bbclass
> b/meta/classes/python3native.bbclass
> index d98fb4c758..bed04bd941 100644
> --- a/meta/classes/python3native.bbclass
> +++ b/meta/classes/python3native.bbclass
> @@ -14,8 +14,8 @@ export STAGING_LIBDIR
>  # find_package(PythonLibs REQUIRED)
>  # which ends up using libs/includes from build host
>  # Therefore pre-empt that effort
> -export
> PYTHON_LIBRARY="${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so"
> -export
> PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}"
> +PYTHON_LIBRARY="${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so"
> +PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}"
>  
>  export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata"
>  
> @@ -24,3 +24,5 @@ export PYTHONNOUSERSITE = "1"
>  
>  # autoconf macros will use their internal default preference
> otherwise
>  export PYTHON
> +export PYTHON_LIBRARY
> +export PYTHON_INCLUDE_DIR

I'm confused as this makes no difference to bitbake and is equivalent.
exported variables are always set in the datastore...

Cheers,

Richard

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