Re: [oe] [meta-multimedia][PATCH v2] x265: add x265 recipe

[Khem Raj]

On Tue, Mar 3, 2020 at 10:42 PM Khem Raj  wrote:
>
> Hi Scott
>
> I am getting a textrel issue reported on musl builds see
> https://errors.yoctoproject.org/Errors/Details/393681/
>
> this recipe is already applied but would be good to root cause this issue
> and find appropriate fix
>
> https://errors.yoctoproject.org/Errors/Details/393681/

disabling asm helps on 32bit x86

EXTRA_OECMAKE_append_i686 = " -DENABLE_ASSEMBLY=OFF"

can you test this fix and see if this will be ok ?

>
> On Fri, Feb 14, 2020 at 4:54 PM Scott Branden via Openembedded-devel
>  wrote:
> >
> > Add x265 recipe for latest tag of Release_3.2 branch (3.2.1).
> >
> > Signed-off-by: Scott Branden 
> > ---
> >  .../recipes-multimedia/x265/x265_3.2.1.bb | 22 +++
> >  1 file changed, 22 insertions(+)
> >  create mode 100644 
> > meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
> >
> > diff --git 
> > a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb 
> > b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
> > new file mode 100644
> > index 00..21ae596e05
> > --- /dev/null
> > +++ 
> > b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
> > @@ -0,0 +1,22 @@
> > +SUMMARY = "H.265/HEVC video encoder"
> > +DESCRIPTION = "A free software library and application for encoding video 
> > streams into the H.265/HEVC format."
> > +HOMEPAGE = "http://www.videolan.org/developers/x265.html;
> > +
> > +LICENSE = "GPLv2"
> > +LICENSE_FLAGS = "commercial"
> > +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091"
> > +
> > +DEPENDS = "nasm-native gnutls zlib libpcre"
> > +
> > +SRC_URI = "http://ftp.videolan.org/pub/videolan/x265/x265_${PV}.tar.gz;
> > +
> > +S = "${WORKDIR}/x265_${PV}/source"
> > +
> > +SRC_URI[md5sum] = "94808045a34d88a857e5eaf3f68f4bca"
> > +SRC_URI[sha256sum] = 
> > "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc"
> > +
> > +inherit lib_package pkgconfig cmake
> > +
> > +AS[unexport] = "1"
> > +
> > +COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
> > --
> > 2.17.1
> >
> > --
> > ___
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [oe] [meta-multimedia][PATCH v2] x265: add x265 recipe

[Khem Raj]

Hi Scott

I am getting a textrel issue reported on musl builds see
https://errors.yoctoproject.org/Errors/Details/393681/

this recipe is already applied but would be good to root cause this issue
and find appropriate fix

https://errors.yoctoproject.org/Errors/Details/393681/

On Fri, Feb 14, 2020 at 4:54 PM Scott Branden via Openembedded-devel
 wrote:
>
> Add x265 recipe for latest tag of Release_3.2 branch (3.2.1).
>
> Signed-off-by: Scott Branden 
> ---
>  .../recipes-multimedia/x265/x265_3.2.1.bb | 22 +++
>  1 file changed, 22 insertions(+)
>  create mode 100644 
> meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
>
> diff --git 
> a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb 
> b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
> new file mode 100644
> index 00..21ae596e05
> --- /dev/null
> +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb
> @@ -0,0 +1,22 @@
> +SUMMARY = "H.265/HEVC video encoder"
> +DESCRIPTION = "A free software library and application for encoding video 
> streams into the H.265/HEVC format."
> +HOMEPAGE = "http://www.videolan.org/developers/x265.html;
> +
> +LICENSE = "GPLv2"
> +LICENSE_FLAGS = "commercial"
> +LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091"
> +
> +DEPENDS = "nasm-native gnutls zlib libpcre"
> +
> +SRC_URI = "http://ftp.videolan.org/pub/videolan/x265/x265_${PV}.tar.gz;
> +
> +S = "${WORKDIR}/x265_${PV}/source"
> +
> +SRC_URI[md5sum] = "94808045a34d88a857e5eaf3f68f4bca"
> +SRC_URI[sha256sum] = 
> "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc"
> +
> +inherit lib_package pkgconfig cmake
> +
> +AS[unexport] = "1"
> +
> +COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
> --
> 2.17.1
>
> --
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [V2][master][zeus][PATCH] gd: fix CVE-2017-6363

[Haiqing Bai]

Backport the CVE patch from the upstream to fix the heap-based buffer
over-read in tiffWriter.

Signed-off-by: Haiqing Bai 
---
 meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch | 35 +++
 meta-oe/recipes-support/gd/gd_2.2.5.bb|  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch

diff --git a/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch 
b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
new file mode 100644
index 000..25b5880
--- /dev/null
+++ b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
@@ -0,0 +1,35 @@
+From 8f7b60ea7db87de5df76169e3f3918e401ef8bf7 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Wed, 31 Jan 2018 14:50:16 -0500
+Subject: [PATCH] gd/gd2: make sure transparent palette index is within bounds
+ #383
+
+The gd image formats allow for a palette of 256 colors,
+so if the transparent index is out of range, disable it.
+
+Upstream-Status: Backport
+[https://github.com/libgd/libgd.git 
commit:0be86e1926939a98afbd2f3a23c673dfc4df2a7c]
+CVE-2017-6363
+
+Signed-off-by: Haiqing Bai 
+---
+ src/gd_gd.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/gd_gd.c b/src/gd_gd.c
+index f8d39cb..5a86fc3 100644
+--- a/src/gd_gd.c
 b/src/gd_gd.c
+@@ -54,7 +54,8 @@ _gdGetColors (gdIOCtx * in, gdImagePtr im, int gd2xFlag)
+   if (!gdGetWord (>transparent, in)) {
+   goto fail1;
+   }
+-  if (im->transparent == 257) {
++  /* Make sure transparent index is within bounds of the palette. 
*/
++  if (im->transparent >= 256 || im->transparent < 0) {
+   im->transparent = (-1);
+   }
+   }
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-support/gd/gd_2.2.5.bb 
b/meta-oe/recipes-support/gd/gd_2.2.5.bb
index 35f9bb2..dda2e67 100644
--- a/meta-oe/recipes-support/gd/gd_2.2.5.bb
+++ b/meta-oe/recipes-support/gd/gd_2.2.5.bb
@@ -17,6 +17,7 @@ SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \

file://0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch \
file://CVE-2018-1000222.patch \
file://CVE-2019-6978.patch \
+   file://CVE-2017-6363.patch \
   "
 
 SRCREV = "8255231b68889597d04d451a72438ab92a405aba"
-- 
1.9.1

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

Re: [oe] [zeus][PATCH] gd: fix CVE-2017-6363

[akuster808]

On 3/3/20 7:20 PM, Haiqing Bai wrote:
> Backport the CVE patch from the upstream to fix the heap-based buffer
> over-read in tiffWriter.
Did I miss the patch for master?

- armin
>
> Signed-off-by: Haiqing Bai 
> ---
>  .../recipes-support/gd/gd/CVE-2017-6363.patch | 35 +++
>  meta-oe/recipes-support/gd/gd_2.2.5.bb|  1 +
>  2 files changed, 36 insertions(+)
>  create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
>
> diff --git a/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch 
> b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
> new file mode 100644
> index 0..25b5880ff
> --- /dev/null
> +++ b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
> @@ -0,0 +1,35 @@
> +From 8f7b60ea7db87de5df76169e3f3918e401ef8bf7 Mon Sep 17 00:00:00 2001
> +From: Mike Frysinger 
> +Date: Wed, 31 Jan 2018 14:50:16 -0500
> +Subject: [PATCH] gd/gd2: make sure transparent palette index is within bounds
> + #383
> +
> +The gd image formats allow for a palette of 256 colors,
> +so if the transparent index is out of range, disable it.
> +
> +Upstream-Status: Backport
> +[https://github.com/libgd/libgd.git 
> commit:0be86e1926939a98afbd2f3a23c673dfc4df2a7c]
> +CVE-2017-6363
> +
> +Signed-off-by: Haiqing Bai 
> +---
> + src/gd_gd.c | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/src/gd_gd.c b/src/gd_gd.c
> +index f8d39cb..5a86fc3 100644
> +--- a/src/gd_gd.c
>  b/src/gd_gd.c
> +@@ -54,7 +54,8 @@ _gdGetColors (gdIOCtx * in, gdImagePtr im, int gd2xFlag)
> + if (!gdGetWord (>transparent, in)) {
> + goto fail1;
> + }
> +-if (im->transparent == 257) {
> ++/* Make sure transparent index is within bounds of the palette. 
> */
> ++if (im->transparent >= 256 || im->transparent < 0) {
> + im->transparent = (-1);
> + }
> + }
> +-- 
> +1.9.1
> +
> diff --git a/meta-oe/recipes-support/gd/gd_2.2.5.bb 
> b/meta-oe/recipes-support/gd/gd_2.2.5.bb
> index 35f9bb251..dda2e67d6 100644
> --- a/meta-oe/recipes-support/gd/gd_2.2.5.bb
> +++ b/meta-oe/recipes-support/gd/gd_2.2.5.bb
> @@ -17,6 +17,7 @@ SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \
> 
> file://0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch \
> file://CVE-2018-1000222.patch \
> file://CVE-2019-6978.patch \
> +   file://CVE-2017-6363.patch \
>"
>  
>  SRCREV = "8255231b68889597d04d451a72438ab92a405aba"

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

Re: [oe] [meta-oe][PATCH v4] luajit: Upgrade to 2.1.0-beta3

[Khem Raj]

On Tue, Mar 3, 2020 at 8:43 PM Martin Jansa  wrote:
>
> You can use something like:
> 2.0.99+2.1.0-beta3
> to make sure it doesn't go backwards.
>
> 2.1.0+beta3 seems wrong, because it would sort higher than final 2.1.0 
> (without the +git${SRCPV} suffix).
>
> 2.1.0~beta3 might work, but it's not used by many recipes.
>

this came out to work well and is concise too, so I went with this

> On Wed, Mar 4, 2020 at 4:01 AM Leo Yan  wrote:
>>
>> Hi Khem,
>>
>> On Thu, Feb 27, 2020 at 07:27:21AM -0800, Khem Raj wrote:
>> > I am seeing version going backward errors still
>> >
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-src went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dbg went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-staticdev
>> > went backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dev went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-doc went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-locale
>> > went backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit went
>> > backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-common
>> > went backwards which would break package feeds (from
>> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
>> > [version-going-backwards]
>>
>> I googled for this issue, the backwards issue is likely caused by the
>> PV: from "2.0.5+git${SRCPV}" to "2.0.5+2.1.0-beta3".
>>
>> So how about change PV to "2.1.0+beta3" and later for version 2.1.0,
>> we can use the format "2.1.0+git${SRCPV}"?  At the end we can get the
>> version sequence as:
>>
>> Old:   2.0.5+git${SRCPV}
>> Now:   2.1.0+beta3
>> Later: 2.1.0+git${SRCPV}
>>
>> Does this make sense for you?
>>
>> Thanks,
>> Leo
>>
>> > On Wed, Feb 26, 2020 at 4:26 AM Leo Yan  wrote:
>> > >
>> > > Since luajit 2.1.0-beta3 can support architecture aarch64 and the old
>> > > misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3.
>> > >
>> > > Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded
>> > > at 436 with fuzz 1 (offset 123 lines)."
>> > >
>> > > Signed-off-by: Leo Yan 
>> > > ---
>> > >  meta-oe/recipes-devtools/luajit/luajit/clang.patch  |  4 ++--
>> > >  .../luajit/{luajit_2.0.5.bb => luajit_git.bb}   | 13 ++---
>> > >  2 files changed, 8 insertions(+), 9 deletions(-)
>> > >  rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb => 
>> > > luajit_git.bb} (90%)
>> > >
>> > > diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch 
>> > > b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
>> > > index c39ef6fd4..807cc4417 100644
>> > > --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
>> > > +++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
>> > > @@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h
>> > >  ===
>> > >  --- LuaJIT-2.0.5.orig/src/lj_arch.h
>> > >  +++ LuaJIT-2.0.5/src/lj_arch.h
>> > > -@@ -313,7 +313,7 @@
>> > > - #error "Need at least GCC 4.2 or newer"
>> > > +@@ -436,7 +436,7 @@
>> > > + #endif
>> > >   #endif
>> > >   #elif !LJ_TARGET_PS3
>> > >  -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
>> > > diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb 
>> > > b/meta-oe/recipes-devtools/luajit/luajit_git.bb
>> > > similarity index 90%
>> > > rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
>> > > rename to meta-oe/recipes-devtools/luajit/luajit_git.bb
>> > > index 93128dda8..2a7243842 100644
>> > > --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
>> > > +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
>> > > @@ -1,14 +1,14 @@
>> > >  SUMMARY = "Just-In-Time Compiler for Lua"
>> > >  LICENSE = "MIT"
>> > > -LIC_FILES_CHKSUM = 
>> > > "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22"
>> > > +LIC_FILES_CHKSUM = 
>> > > "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771"
>> > >  

Re: [oe] [meta-oe][PATCH v4] luajit: Upgrade to 2.1.0-beta3

[Martin Jansa]

You can use something like:
2.0.99+2.1.0-beta3
to make sure it doesn't go backwards.

2.1.0+beta3 seems wrong, because it would sort higher than final 2.1.0
(without the +git${SRCPV} suffix).

2.1.0~beta3 might work, but it's not used by many recipes.

On Wed, Mar 4, 2020 at 4:01 AM Leo Yan  wrote:

> Hi Khem,
>
> On Thu, Feb 27, 2020 at 07:27:21AM -0800, Khem Raj wrote:
> > I am seeing version going backward errors still
> >
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-src went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dbg went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-staticdev
> > went backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dev went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-doc went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-locale
> > went backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-common
> > went backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
>
> I googled for this issue, the backwards issue is likely caused by the
> PV: from "2.0.5+git${SRCPV}" to "2.0.5+2.1.0-beta3".
>
> So how about change PV to "2.1.0+beta3" and later for version 2.1.0,
> we can use the format "2.1.0+git${SRCPV}"?  At the end we can get the
> version sequence as:
>
> Old:   2.0.5+git${SRCPV}
> Now:   2.1.0+beta3
> Later: 2.1.0+git${SRCPV}
>
> Does this make sense for you?
>
> Thanks,
> Leo
>
> > On Wed, Feb 26, 2020 at 4:26 AM Leo Yan  wrote:
> > >
> > > Since luajit 2.1.0-beta3 can support architecture aarch64 and the old
> > > misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3.
> > >
> > > Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded
> > > at 436 with fuzz 1 (offset 123 lines)."
> > >
> > > Signed-off-by: Leo Yan 
> > > ---
> > >  meta-oe/recipes-devtools/luajit/luajit/clang.patch  |  4 ++--
> > >  .../luajit/{luajit_2.0.5.bb => luajit_git.bb}   | 13
> ++---
> > >  2 files changed, 8 insertions(+), 9 deletions(-)
> > >  rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb =>
> luajit_git.bb} (90%)
> > >
> > > diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > > index c39ef6fd4..807cc4417 100644
> > > --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > > +++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > > @@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h
> > >  ===
> > >  --- LuaJIT-2.0.5.orig/src/lj_arch.h
> > >  +++ LuaJIT-2.0.5/src/lj_arch.h
> > > -@@ -313,7 +313,7 @@
> > > - #error "Need at least GCC 4.2 or newer"
> > > +@@ -436,7 +436,7 @@
> > > + #endif
> > >   #endif
> > >   #elif !LJ_TARGET_PS3
> > >  -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
> > > diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> > > similarity index 90%
> > > rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> > > rename to meta-oe/recipes-devtools/luajit/luajit_git.bb
> > > index 93128dda8..2a7243842 100644
> > > --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> > > +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> > > @@ -1,14 +1,14 @@
> > >  SUMMARY = "Just-In-Time Compiler for Lua"
> > >  LICENSE = "MIT"
> > > -LIC_FILES_CHKSUM =
> "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22"
> > > +LIC_FILES_CHKSUM =
> "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771"
> > >  HOMEPAGE = "http://luajit.org;
> > >
> > > -PV .= "+git${SRCPV}"
> > > -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2"
> > > -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \
> > > +PV = "2.0.5+2.1.0-beta3"
> > > +SRCREV = 

Re: [oe] [meta-oe][PATCH v4] luajit: Upgrade to 2.1.0-beta3

[Leo Yan]

On Tue, Mar 03, 2020 at 07:25:07PM -0800, Khem Raj wrote:
> I have pushed a fix with ~

Ah, I see that: PV = "2.1.0~beta3".  Thanks a lot!

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

Re: [oe] [meta-oe][PATCH v4] luajit: Upgrade to 2.1.0-beta3

[Khem Raj]

I have pushed a fix with ~

On Tue, Mar 3, 2020 at 7:00 PM Leo Yan  wrote:

> Hi Khem,
>
> On Thu, Feb 27, 2020 at 07:27:21AM -0800, Khem Raj wrote:
> > I am seeing version going backward errors still
> >
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-src went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dbg went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-staticdev
> > went backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dev went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-doc went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-locale
> > went backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit went
> > backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
> > luajit-2.0.5+2.1.0-beta3: Package version for package luajit-common
> > went backwards which would break package feeds (from
> > 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> > [version-going-backwards]
>
> I googled for this issue, the backwards issue is likely caused by the
> PV: from "2.0.5+git${SRCPV}" to "2.0.5+2.1.0-beta3".
>
> So how about change PV to "2.1.0+beta3" and later for version 2.1.0,
> we can use the format "2.1.0+git${SRCPV}"?  At the end we can get the
> version sequence as:
>
> Old:   2.0.5+git${SRCPV}
> Now:   2.1.0+beta3
> Later: 2.1.0+git${SRCPV}
>
> Does this make sense for you?
>
> Thanks,
> Leo
>
> > On Wed, Feb 26, 2020 at 4:26 AM Leo Yan  wrote:
> > >
> > > Since luajit 2.1.0-beta3 can support architecture aarch64 and the old
> > > misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3.
> > >
> > > Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded
> > > at 436 with fuzz 1 (offset 123 lines)."
> > >
> > > Signed-off-by: Leo Yan 
> > > ---
> > >  meta-oe/recipes-devtools/luajit/luajit/clang.patch  |  4 ++--
> > >  .../luajit/{luajit_2.0.5.bb => luajit_git.bb}   | 13
> ++---
> > >  2 files changed, 8 insertions(+), 9 deletions(-)
> > >  rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb =>
> luajit_git.bb} (90%)
> > >
> > > diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > > index c39ef6fd4..807cc4417 100644
> > > --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > > +++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > > @@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h
> > >  ===
> > >  --- LuaJIT-2.0.5.orig/src/lj_arch.h
> > >  +++ LuaJIT-2.0.5/src/lj_arch.h
> > > -@@ -313,7 +313,7 @@
> > > - #error "Need at least GCC 4.2 or newer"
> > > +@@ -436,7 +436,7 @@
> > > + #endif
> > >   #endif
> > >   #elif !LJ_TARGET_PS3
> > >  -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
> > > diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> > > similarity index 90%
> > > rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> > > rename to meta-oe/recipes-devtools/luajit/luajit_git.bb
> > > index 93128dda8..2a7243842 100644
> > > --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> > > +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> > > @@ -1,14 +1,14 @@
> > >  SUMMARY = "Just-In-Time Compiler for Lua"
> > >  LICENSE = "MIT"
> > > -LIC_FILES_CHKSUM =
> "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22"
> > > +LIC_FILES_CHKSUM =
> "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771"
> > >  HOMEPAGE = "http://luajit.org;
> > >
> > > -PV .= "+git${SRCPV}"
> > > -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2"
> > > -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \
> > > +PV = "2.0.5+2.1.0-beta3"
> > > +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22"
> > > +SRC_URI = "git://
> luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
> > >
>  file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
> > > file://clang.patch \
> > 

[oe] [zeus][PATCH] gd: fix CVE-2017-6363

[Haiqing Bai]

Backport the CVE patch from the upstream to fix the heap-based buffer
over-read in tiffWriter.

Signed-off-by: Haiqing Bai 
---
 .../recipes-support/gd/gd/CVE-2017-6363.patch | 35 +++
 meta-oe/recipes-support/gd/gd_2.2.5.bb|  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch

diff --git a/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch 
b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
new file mode 100644
index 0..25b5880ff
--- /dev/null
+++ b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch
@@ -0,0 +1,35 @@
+From 8f7b60ea7db87de5df76169e3f3918e401ef8bf7 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Wed, 31 Jan 2018 14:50:16 -0500
+Subject: [PATCH] gd/gd2: make sure transparent palette index is within bounds
+ #383
+
+The gd image formats allow for a palette of 256 colors,
+so if the transparent index is out of range, disable it.
+
+Upstream-Status: Backport
+[https://github.com/libgd/libgd.git 
commit:0be86e1926939a98afbd2f3a23c673dfc4df2a7c]
+CVE-2017-6363
+
+Signed-off-by: Haiqing Bai 
+---
+ src/gd_gd.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/gd_gd.c b/src/gd_gd.c
+index f8d39cb..5a86fc3 100644
+--- a/src/gd_gd.c
 b/src/gd_gd.c
+@@ -54,7 +54,8 @@ _gdGetColors (gdIOCtx * in, gdImagePtr im, int gd2xFlag)
+   if (!gdGetWord (>transparent, in)) {
+   goto fail1;
+   }
+-  if (im->transparent == 257) {
++  /* Make sure transparent index is within bounds of the palette. 
*/
++  if (im->transparent >= 256 || im->transparent < 0) {
+   im->transparent = (-1);
+   }
+   }
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-support/gd/gd_2.2.5.bb 
b/meta-oe/recipes-support/gd/gd_2.2.5.bb
index 35f9bb251..dda2e67d6 100644
--- a/meta-oe/recipes-support/gd/gd_2.2.5.bb
+++ b/meta-oe/recipes-support/gd/gd_2.2.5.bb
@@ -17,6 +17,7 @@ SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \

file://0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch \
file://CVE-2018-1000222.patch \
file://CVE-2019-6978.patch \
+   file://CVE-2017-6363.patch \
   "
 
 SRCREV = "8255231b68889597d04d451a72438ab92a405aba"
-- 
2.23.0

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

Re: [oe] [meta-oe][PATCH v4] luajit: Upgrade to 2.1.0-beta3

[Leo Yan]

Hi Khem,

On Thu, Feb 27, 2020 at 07:27:21AM -0800, Khem Raj wrote:
> I am seeing version going backward errors still
> 
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit-src went
> backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dbg went
> backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit-staticdev
> went backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit-dev went
> backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit-doc went
> backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit-locale
> went backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit went
> backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]
> luajit-2.0.5+2.1.0-beta3: Package version for package luajit-common
> went backwards which would break package feeds (from
> 0:2.0.5+git0+02b521981a-r0.7 to 0:2.0.5+2.1.0-beta3-r0.0)
> [version-going-backwards]

I googled for this issue, the backwards issue is likely caused by the
PV: from "2.0.5+git${SRCPV}" to "2.0.5+2.1.0-beta3".

So how about change PV to "2.1.0+beta3" and later for version 2.1.0,
we can use the format "2.1.0+git${SRCPV}"?  At the end we can get the
version sequence as:

Old:   2.0.5+git${SRCPV}
Now:   2.1.0+beta3
Later: 2.1.0+git${SRCPV}

Does this make sense for you?

Thanks,
Leo

> On Wed, Feb 26, 2020 at 4:26 AM Leo Yan  wrote:
> >
> > Since luajit 2.1.0-beta3 can support architecture aarch64 and the old
> > misses to support aarch64, the patch upgrades to luajit 2.1.0-beta3.
> >
> > Also updated clang.patch to dismiss patch warning: "Hunk #1 succeeded
> > at 436 with fuzz 1 (offset 123 lines)."
> >
> > Signed-off-by: Leo Yan 
> > ---
> >  meta-oe/recipes-devtools/luajit/luajit/clang.patch  |  4 ++--
> >  .../luajit/{luajit_2.0.5.bb => luajit_git.bb}   | 13 ++---
> >  2 files changed, 8 insertions(+), 9 deletions(-)
> >  rename meta-oe/recipes-devtools/luajit/{luajit_2.0.5.bb => luajit_git.bb} 
> > (90%)
> >
> > diff --git a/meta-oe/recipes-devtools/luajit/luajit/clang.patch 
> > b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > index c39ef6fd4..807cc4417 100644
> > --- a/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > +++ b/meta-oe/recipes-devtools/luajit/luajit/clang.patch
> > @@ -8,8 +8,8 @@ Index: LuaJIT-2.0.5/src/lj_arch.h
> >  ===
> >  --- LuaJIT-2.0.5.orig/src/lj_arch.h
> >  +++ LuaJIT-2.0.5/src/lj_arch.h
> > -@@ -313,7 +313,7 @@
> > - #error "Need at least GCC 4.2 or newer"
> > +@@ -436,7 +436,7 @@
> > + #endif
> >   #endif
> >   #elif !LJ_TARGET_PS3
> >  -#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
> > diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb 
> > b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> > similarity index 90%
> > rename from meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> > rename to meta-oe/recipes-devtools/luajit/luajit_git.bb
> > index 93128dda8..2a7243842 100644
> > --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
> > +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb
> > @@ -1,14 +1,14 @@
> >  SUMMARY = "Just-In-Time Compiler for Lua"
> >  LICENSE = "MIT"
> > -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=10a96c93403affcc34765f4c2612bc22"
> > +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d739bb9250a55c124a545b588fd76771"
> >  HOMEPAGE = "http://luajit.org;
> >
> > -PV .= "+git${SRCPV}"
> > -SRCREV = "02b521981a1ab919ff2cd4d9bcaee80baf77dce2"
> > -SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http \
> > +PV = "2.0.5+2.1.0-beta3"
> > +SRCREV = "0ad60ccbc3768fa8e3e726858adf261950edbc22"
> > +SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \
> > 
> > file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
> > file://clang.patch \
> > -"
> > +   "
> >
> >  S = "${WORKDIR}/git"
> >
> > @@ -90,8 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \
> >  "
> >  FILES_luajit-common = "${datadir}/${BPN}-${PV}"
> >
> > -# Aarch64/mips64/ppc/ppc64/riscv64 is not supported in this release
> > 

[oe] [meta-networking][PATCH] dlm: Fix host-user-contaminated QA errors

[Khem Raj]

- Drop unused 0001-dlm-fix-package-qa-error.patch
- Merge appends into main task
- remove explicitly mentioning systemd in deps, systemd bbclass will add it
- Add a patch to fix install using cp cmd to preserve file permissions

Fixes
dlm: /usr/lib/libdlmcontrol.so.3 is owned by uid 1000, which is the same as the 
user running bitbake. This may be due to host contamination 
[host-user-contaminated]

Signed-off-by: Khem Raj 
---
 .../dlm/0001-dlm-fix-package-qa-error.patch   | 32 
 ...ce-cp-a-with-mode-preserving-options.patch | 51 +++
 .../recipes-extended/dlm/dlm_4.0.9.bb | 24 +++--
 3 files changed, 59 insertions(+), 48 deletions(-)
 delete mode 100644 
meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch
 create mode 100644 
meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch

diff --git 
a/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch 
b/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch
deleted file mode 100644
index 3e384f7d97..00
--- 
a/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1fb68433bde97d571fc781b52c9521b17fbb8df0 Mon Sep 17 00:00:00 2001
-From: Changqing Li 
-Date: Tue, 24 Jul 2018 17:42:43 +0800
-Subject: [PATCH] dlm: fix package qa error
-
-pass LDFLAG to makefile to fix below error:
-do_package_qa: QA Issue: No GNU_HASH in the elf binary:
-/packages-split/dlm/usr/sbin/dlm_stonith' [ldflags]
-
-Upstream-Status: Inappropriate[oe-specific]
-
-Signed-off-by: Changqing Li 

- fence/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fence/Makefile b/fence/Makefile
-index cca0b2c..2b3963c 100644
 a/fence/Makefile
-+++ b/fence/Makefile
-@@ -33,7 +33,7 @@ BIN_CFLAGS += -fPIE -DPIE
- BIN_CFLAGS += `pkg-config libxml-2.0 --cflags`
- BIN_CFLAGS += -I../include
- 
--BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
-+BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie
- BIN_LDFLAGS += `pkg-config libxml-2.0 --libs`
- BIN_LDFLAGS += -ldl
- 
--- 
-2.7.4
-
diff --git 
a/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch
 
b/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch
new file mode 100644
index 00..e6a37579ed
--- /dev/null
+++ 
b/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch
@@ -0,0 +1,51 @@
+From 2f72f9271b8dd61ca5092e025b0f8243c6fd68f2 Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Tue, 3 Mar 2020 12:38:19 -0800
+Subject: [PATCH] make: Replace cp -a with mode preserving options
+
+Helps fix permissions in staging area
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj 
+---
+ dlm_controld/Makefile | 4 ++--
+ libdlm/Makefile   | 8 
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile
+index 6081cf8..fe71be2 100644
+--- a/dlm_controld/Makefile
 b/dlm_controld/Makefile
+@@ -88,8 +88,8 @@ install: all
+   $(INSTALL) -d $(DESTDIR)/$(PKGDIR)
+   $(INSTALL) -m 755 $(BIN_TARGET) $(DESTDIR)/$(BINDIR)
+   $(INSTALL) -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR)
+-  cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR)
+-  cp -a $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR)
++  cp -R --no-dereference --preserve=mode,links $(LIB_SO) 
$(DESTDIR)/$(LIBDIR)
++  cp -R --no-dereference --preserve=mode,links $(LIB_SMAJOR) 
$(DESTDIR)/$(LIBDIR)
+   $(INSTALL) -m 644 $(LIB_PC) $(DESTDIR)/$(PKGDIR)
+   $(INSTALL) -m 644 libdlmcontrol.h $(DESTDIR)/$(HDRDIR)
+   $(INSTALL) -m 644 dlm_controld.8 $(DESTDIR)/$(MANDIR)/man8/
+diff --git a/libdlm/Makefile b/libdlm/Makefile
+index ab32761..8820bf8 100644
+--- a/libdlm/Makefile
 b/libdlm/Makefile
+@@ -125,10 +125,10 @@ install: all
+   $(INSTALL) -d $(DESTDIR)/$(UDEVDIR)
+   $(INSTALL) -c -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR)
+   $(INSTALL) -c -m 755 $(LLT_TARGET) $(DESTDIR)/$(LIBDIR)
+-  cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR)
+-  cp -a $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR)
+-  cp -a $(LLT_SO) $(DESTDIR)/$(LIBDIR)
+-  cp -a $(LLT_SMAJOR) $(DESTDIR)/$(LIBDIR)
++  cp -R --no-dereference --preserve=mode,links $(LIB_SO) 
$(DESTDIR)/$(LIBDIR)
++  cp -R --no-dereference --preserve=mode,links $(LIB_SMAJOR) 
$(DESTDIR)/$(LIBDIR)
++  cp -R --no-dereference --preserve=mode,links $(LLT_SO) 
$(DESTDIR)/$(LIBDIR)
++  cp -R --no-dereference --preserve=mode,links $(LLT_SMAJOR) 
$(DESTDIR)/$(LIBDIR)
+   $(INSTALL) -m 644 $(LIB_PC) $(DESTDIR)/$(PKGDIR)
+   $(INSTALL) -m 644 $(LLT_PC) $(DESTDIR)/$(PKGDIR)
+   $(INSTALL) -c -m 644 $(HDR_TARGET) $(DESTDIR)/$(HDRDIR)
+-- 
+2.25.1
+
diff --git a/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb 
b/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb
index 4bf9944aad..577db7087f 

Re: [oe] [meta-oe][master-next][PATCH v2 1/2] nodejs: drop 'gyp' PACKAGECONFIG

[André Draszik]

On Tue, 2020-03-03 at 10:00 -0800, Khem Raj wrote:
> 
> On 3/3/20 9:28 AM, André Draszik wrote:
> > From: André Draszik 
> > 
> > During the python3 / nodejs update, the dependencies weren't updated, so
> > using system-gyp ends up trying to use the python2 version of system-
> > gyp, which will of course fail.
> > Fixing this to depend on the python3 version of gyp still doesn't
> > doesn't make things work, though:
> >  ERROR: nodejs-native-12.14.1-r0 do_configure: Execution of 
> > '.../nodejs-native/12.14.1-
> > r0/temp/run.do_configure.26054' failed with exit code 1:
> >  gyp: Error importing pymod_do_mainmodule (ForEachFormat): No module 
> > named 'ForEachFormat' while loading
> > dependencies of .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp while 
> > trying to load .../nodejs-native/12.14.1-
> > r0/node-v12.14.1/node.gyp
> >  Error running GYP
> > 
> > The reason is the following patch nodejs has applied to its version of gyp 
> > as
> > of NodeJS v12 (commit fff922afee6e ("deps,build: compute torque_outputs in 
> > v8.gyp")
> > upstream):
> > 
> > --- gyp/pylib/gyp/input.py  2020-03-02 12:36:30.788248197 +
> > +++ node.git/tools/gyp/pylib/gyp/input.py2020-03-02 12:16:09.956707788 
> > +
> > @@ -890,6 +881,7 @@ def ExpandVariables(input, phase, variab
> > oldwd = os.getcwd()  # Python doesn't like os.open('.'): no 
> > fchdir.
> > if build_file_dir:  # build_file_dir may be None (see above).
> >   os.chdir(build_file_dir)
> > +  sys.path.append(os.getcwd())
> > try:
> > 
> >   parsed_contents = shlex.split(contents)
> > @@ -900,6 +892,7 @@ def ExpandVariables(input, phase, variab
> >"module (%s): %s" % (parsed_contents[0], e))
> >   replacement = 
> > str(py_module.DoMain(parsed_contents[1:])).rstrip()
> > finally:
> > +sys.path.pop()
> >   os.chdir(oldwd)
> > assert replacement != None
> >   elif command_string:
> 
> Please avoid adding diffs to commit message, this confuses git am
> perhaps better to express the change with few words.

Sorry Khem, I didn't think of that... Done.

A.

> 
> > Since I'm not sure how to deal with that when using system-gyp, and because
> > the original intention for using system-gyp was to make the previous nodejs
> > version compatible with python3 by ultimately switching to the python3 
> > version
> > of system-gyp which isn't necessary anymore, and given nobody else seems to
> > be using this PACKAGECONFIG, just drop it.
> > 
> > Signed-off-by: André Draszik 
> > ---
> >   meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 3 ---
> >   1 file changed, 3 deletions(-)
> > 
> > diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb 
> > b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> > index 6eb52c209..49bb71e28 100644
> > --- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> > +++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> > @@ -53,7 +53,6 @@ ARCHFLAGS ?= ""
> >   
> >   PACKAGECONFIG ??= "ares icu libuv zlib"
> >   PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
> > -PACKAGECONFIG[gyp] = ",,gyp-py2-native"
> >   PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
> >   PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
> >   PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
> > @@ -82,8 +81,6 @@ python do_unpack() {
> >   shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
> >   if 'ares' in d.getVar('PACKAGECONFIG'):
> >   shutil.rmtree(d.getVar('S') + '/deps/cares', True)
> > -if 'gyp' in d.getVar('PACKAGECONFIG'):
> > -shutil.rmtree(d.getVar('S') + '/tools/gyp', True)
> >   if 'libuv' in d.getVar('PACKAGECONFIG'):
> >   shutil.rmtree(d.getVar('S') + '/deps/uv', True)
> >   if 'nghttp2' in d.getVar('PACKAGECONFIG'):
> > 

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

[oe] [meta-oe][master-next][PATCH v3] nodejs: drop 'gyp' PACKAGECONFIG

[André Draszik]

From: André Draszik 

During the python3 / nodejs update, the dependencies weren't updated, so
using system-gyp ends up trying to use the python2 version of system-
gyp, which will of course fail.
Fixing this to depend on the python3 version of gyp still doesn't
doesn't make things work, though:
ERROR: nodejs-native-12.14.1-r0 do_configure: Execution of 
'.../nodejs-native/12.14.1-r0/temp/run.do_configure.26054' failed with exit 
code 1:
gyp: Error importing pymod_do_mainmodule (ForEachFormat): No module named 
'ForEachFormat' while loading dependencies of 
.../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp while trying to load 
.../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp
Error running GYP

The reason is commit fff922afee6e ("deps,build: compute torque_outputs in 
v8.gyp")
in NodeJS v12, where they modified their bundled version of gyp to
become incompatible with the upstream version of gyp by adding extra /
unusual search paths to gyp.

Since I'm not sure how to deal with that when using system-gyp, and because
the original intention for using system-gyp was to make the previous nodejs
version compatible with python3 by ultimately switching to the python3 version
of system-gyp which isn't necessary anymore, and given nobody else seems to
be using this PACKAGECONFIG, just drop it.

Signed-off-by: André Draszik 
---
 meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb 
b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
index 6eb52c209..49bb71e28 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
@@ -53,7 +53,6 @@ ARCHFLAGS ?= ""
 
 PACKAGECONFIG ??= "ares icu libuv zlib"
 PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
-PACKAGECONFIG[gyp] = ",,gyp-py2-native"
 PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
 PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
 PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
@@ -82,8 +81,6 @@ python do_unpack() {
 shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
 if 'ares' in d.getVar('PACKAGECONFIG'):
 shutil.rmtree(d.getVar('S') + '/deps/cares', True)
-if 'gyp' in d.getVar('PACKAGECONFIG'):
-shutil.rmtree(d.getVar('S') + '/tools/gyp', True)
 if 'libuv' in d.getVar('PACKAGECONFIG'):
 shutil.rmtree(d.getVar('S') + '/deps/uv', True)
 if 'nghttp2' in d.getVar('PACKAGECONFIG'):
-- 
2.23.0.rc1

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

Re: [oe] [meta-oe][master-next][PATCH v2 1/2] nodejs: drop 'gyp' PACKAGECONFIG

[Khem Raj]

On 3/3/20 9:28 AM, André Draszik wrote:

From: André Draszik 

During the python3 / nodejs update, the dependencies weren't updated, so
using system-gyp ends up trying to use the python2 version of system-
gyp, which will of course fail.
Fixing this to depend on the python3 version of gyp still doesn't
doesn't make things work, though:
 ERROR: nodejs-native-12.14.1-r0 do_configure: Execution of 
'.../nodejs-native/12.14.1-r0/temp/run.do_configure.26054' failed with exit 
code 1:
 gyp: Error importing pymod_do_mainmodule (ForEachFormat): No module named 
'ForEachFormat' while loading dependencies of 
.../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp while trying to load 
.../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp
 Error running GYP

The reason is the following patch nodejs has applied to its version of gyp as
of NodeJS v12 (commit fff922afee6e ("deps,build: compute torque_outputs in 
v8.gyp")
upstream):

--- gyp/pylib/gyp/input.py  2020-03-02 12:36:30.788248197 +
+++ node.git/tools/gyp/pylib/gyp/input.py2020-03-02 12:16:09.956707788 +
@@ -890,6 +881,7 @@ def ExpandVariables(input, phase, variab
oldwd = os.getcwd()  # Python doesn't like os.open('.'): no fchdir.
if build_file_dir:  # build_file_dir may be None (see above).
  os.chdir(build_file_dir)
+  sys.path.append(os.getcwd())
try:

  parsed_contents = shlex.split(contents)
@@ -900,6 +892,7 @@ def ExpandVariables(input, phase, variab
   "module (%s): %s" % (parsed_contents[0], e))
  replacement = str(py_module.DoMain(parsed_contents[1:])).rstrip()
finally:
+sys.path.pop()
  os.chdir(oldwd)
assert replacement != None
  elif command_string:



Please avoid adding diffs to commit message, this confuses git am
perhaps better to express the change with few words.



Since I'm not sure how to deal with that when using system-gyp, and because
the original intention for using system-gyp was to make the previous nodejs
version compatible with python3 by ultimately switching to the python3 version
of system-gyp which isn't necessary anymore, and given nobody else seems to
be using this PACKAGECONFIG, just drop it.

Signed-off-by: André Draszik 
---
  meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 3 ---
  1 file changed, 3 deletions(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb 
b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
index 6eb52c209..49bb71e28 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
@@ -53,7 +53,6 @@ ARCHFLAGS ?= ""
  
  PACKAGECONFIG ??= "ares icu libuv zlib"

  PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
-PACKAGECONFIG[gyp] = ",,gyp-py2-native"
  PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
  PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
  PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
@@ -82,8 +81,6 @@ python do_unpack() {
  shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
  if 'ares' in d.getVar('PACKAGECONFIG'):
  shutil.rmtree(d.getVar('S') + '/deps/cares', True)
-if 'gyp' in d.getVar('PACKAGECONFIG'):
-shutil.rmtree(d.getVar('S') + '/tools/gyp', True)
  if 'libuv' in d.getVar('PACKAGECONFIG'):
  shutil.rmtree(d.getVar('S') + '/deps/uv', True)
  if 'nghttp2' in d.getVar('PACKAGECONFIG'):


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

[oe] [meta-oe][master-next][PATCH v2 1/2] nodejs: drop 'gyp' PACKAGECONFIG

[André Draszik]

From: André Draszik 

During the python3 / nodejs update, the dependencies weren't updated, so
using system-gyp ends up trying to use the python2 version of system-
gyp, which will of course fail.
Fixing this to depend on the python3 version of gyp still doesn't
doesn't make things work, though:
ERROR: nodejs-native-12.14.1-r0 do_configure: Execution of 
'.../nodejs-native/12.14.1-r0/temp/run.do_configure.26054' failed with exit 
code 1:
gyp: Error importing pymod_do_mainmodule (ForEachFormat): No module named 
'ForEachFormat' while loading dependencies of 
.../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp while trying to load 
.../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp
Error running GYP

The reason is the following patch nodejs has applied to its version of gyp as
of NodeJS v12 (commit fff922afee6e ("deps,build: compute torque_outputs in 
v8.gyp")
upstream):

--- gyp/pylib/gyp/input.py  2020-03-02 12:36:30.788248197 +
+++ node.git/tools/gyp/pylib/gyp/input.py2020-03-02 12:16:09.956707788 +
@@ -890,6 +881,7 @@ def ExpandVariables(input, phase, variab
   oldwd = os.getcwd()  # Python doesn't like os.open('.'): no fchdir.
   if build_file_dir:  # build_file_dir may be None (see above).
 os.chdir(build_file_dir)
+  sys.path.append(os.getcwd())
   try:

 parsed_contents = shlex.split(contents)
@@ -900,6 +892,7 @@ def ExpandVariables(input, phase, variab
  "module (%s): %s" % (parsed_contents[0], e))
 replacement = str(py_module.DoMain(parsed_contents[1:])).rstrip()
   finally:
+sys.path.pop()
 os.chdir(oldwd)
   assert replacement != None
 elif command_string:

Since I'm not sure how to deal with that when using system-gyp, and because
the original intention for using system-gyp was to make the previous nodejs
version compatible with python3 by ultimately switching to the python3 version
of system-gyp which isn't necessary anymore, and given nobody else seems to
be using this PACKAGECONFIG, just drop it.

Signed-off-by: André Draszik 
---
 meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb 
b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
index 6eb52c209..49bb71e28 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
@@ -53,7 +53,6 @@ ARCHFLAGS ?= ""
 
 PACKAGECONFIG ??= "ares icu libuv zlib"
 PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
-PACKAGECONFIG[gyp] = ",,gyp-py2-native"
 PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
 PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
 PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
@@ -82,8 +81,6 @@ python do_unpack() {
 shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
 if 'ares' in d.getVar('PACKAGECONFIG'):
 shutil.rmtree(d.getVar('S') + '/deps/cares', True)
-if 'gyp' in d.getVar('PACKAGECONFIG'):
-shutil.rmtree(d.getVar('S') + '/tools/gyp', True)
 if 'libuv' in d.getVar('PACKAGECONFIG'):
 shutil.rmtree(d.getVar('S') + '/deps/uv', True)
 if 'nghttp2' in d.getVar('PACKAGECONFIG'):
-- 
2.23.0.rc1

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

[oe] [meta-oe][master-next][PATCH v2 2/2] nodejs: allow use of system brotli (and make default)

[André Draszik]

From: André Draszik 

Use system brotli via PACKAGECONFIG by default. So far,
nodejs had been built using its embedded copy of brotli,
which we generally try to avoid, for the known reasons
(independent updates, cve & license checks, etc).

The nodejs patches to enable this have been submitted.
brotli is in meta-oe, so enabling this by default should
not be a problem.

Signed-off-by: André Draszik 
---
 ...-passing-multiple-libs-to-pkg_config.patch | 41 
 ...allow-use-of-system-installed-brotli.patch | 66 +++
 .../recipes-devtools/nodejs/nodejs_12.14.1.bb |  7 +-
 3 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 
meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
 create mode 100644 
meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch

diff --git 
a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
 
b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
new file mode 100644
index 0..13edf229b
--- /dev/null
+++ 
b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
@@ -0,0 +1,41 @@
+From fdaa0e3bef93c5c72a7258b5f1e30718e7d81f9b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= 
+Date: Mon, 2 Mar 2020 12:17:09 +
+Subject: [PATCH 1/2] build: allow passing multiple libs to pkg_config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Sometimes it's necessary to pass multiple library names to pkg-config,
+e.g. the brotli shared libraries can be pulled in with
+pkg-config libbrotlienc libbrotlidec
+
+Update the code to handle both, strings (as used so far), and lists
+of strings.
+
+Signed-off-by: André Draszik 
+---
+Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046]
+ configure.py | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.py b/configure.py
+index beb08df088..e3f78f2fed 100755
+--- a/configure.py
 b/configure.py
+@@ -680,7 +680,11 @@ def pkg_config(pkg):
+   retval = ()
+   for flag in ['--libs-only-l', '--cflags-only-I',
+'--libs-only-L', '--modversion']:
+-args += [flag, pkg]
++args += [flag]
++if isinstance(pkg, list):
++  args += pkg
++else:
++  args += [pkg]
+ try:
+   proc = subprocess.Popen(shlex.split(pkg_config) + args,
+   stdout=subprocess.PIPE)
+-- 
+2.25.0
+
diff --git 
a/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
 
b/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
new file mode 100644
index 0..fc038f3aa
--- /dev/null
+++ 
b/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
@@ -0,0 +1,66 @@
+From f0f927feee8cb1fb173835d5c3f6beb6bf7d5e54 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= 
+Date: Mon, 2 Mar 2020 12:17:35 +
+Subject: [PATCH 2/2] build: allow use of system-installed brotli
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+brotli is available as a shared library since 2016, so it makes sense
+to allow its use as a system-installed version.
+
+Some of the infrastructure was in place already (node.gyp and
+node.gypi), but some bits in the configure script here were missing.
+
+Add them, keeping the default as before, to use the bundled version.
+
+Refs: https://github.com/google/brotli/pull/421
+Signed-off-by: André Draszik 
+---
+Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046]
+ configure.py | 22 ++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/configure.py b/configure.py
+index e3f78f2fed..0190e31b41 100755
+--- a/configure.py
 b/configure.py
+@@ -301,6 +301,27 @@ shared_optgroup.add_option('--shared-zlib-libpath',
+ dest='shared_zlib_libpath',
+ help='a directory to search for the shared zlib DLL')
+ 
++shared_optgroup.add_option('--shared-brotli',
++action='store_true',
++dest='shared_brotli',
++help='link to a shared brotli DLL instead of static linking')
++
++shared_optgroup.add_option('--shared-brotli-includes',
++action='store',
++dest='shared_brotli_includes',
++help='directory containing brotli header files')
++
++shared_optgroup.add_option('--shared-brotli-libname',
++action='store',
++dest='shared_brotli_libname',
++default='brotlidec,brotlienc',
++help='alternative lib name to link to [default: %default]')
++
++shared_optgroup.add_option('--shared-brotli-libpath',
++action='store',
++dest='shared_brotli_libpath',
++help='a directory to search for the shared brotli DLL')
++
+ shared_optgroup.add_option('--shared-cares',
+ action='store_true',
+ dest='shared_cares',

Re: [oe] [meta-oe][PATCH 3/3] nodejs: allow use of system brotli (and make default)

[Khem Raj]

can you rebase it on top of master-next and resend

On Tue, Mar 3, 2020 at 5:46 AM André Draszik  wrote:
>
> From: André Draszik 
>
> Use system brotli via PACKAGECONFIG by default. So far,
> nodejs had been built using its embedded copy of brotli,
> which we generally try to avoid, for the known reasons
> (independent updates, cve & license checks, etc).
>
> The nodejs patches to enable this have been submitted.
> brotli is in meta-oe, so enabling this by default should
> not be a problem.
>
> Signed-off-by: André Draszik 
> ---
>  ...-passing-multiple-libs-to-pkg_config.patch | 41 
>  ...allow-use-of-system-installed-brotli.patch | 66 +++
>  .../recipes-devtools/nodejs/nodejs_12.14.1.bb |  7 +-
>  3 files changed, 113 insertions(+), 1 deletion(-)
>  create mode 100644 
> meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
>  create mode 100644 
> meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
>
> diff --git 
> a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
>  
> b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
> new file mode 100644
> index 0..13edf229b
> --- /dev/null
> +++ 
> b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
> @@ -0,0 +1,41 @@
> +From fdaa0e3bef93c5c72a7258b5f1e30718e7d81f9b Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= 
> +Date: Mon, 2 Mar 2020 12:17:09 +
> +Subject: [PATCH 1/2] build: allow passing multiple libs to pkg_config
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Sometimes it's necessary to pass multiple library names to pkg-config,
> +e.g. the brotli shared libraries can be pulled in with
> +pkg-config libbrotlienc libbrotlidec
> +
> +Update the code to handle both, strings (as used so far), and lists
> +of strings.
> +
> +Signed-off-by: André Draszik 
> +---
> +Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046]
> + configure.py | 6 +-
> + 1 file changed, 5 insertions(+), 1 deletion(-)
> +
> +diff --git a/configure.py b/configure.py
> +index beb08df088..e3f78f2fed 100755
> +--- a/configure.py
>  b/configure.py
> +@@ -680,7 +680,11 @@ def pkg_config(pkg):
> +   retval = ()
> +   for flag in ['--libs-only-l', '--cflags-only-I',
> +'--libs-only-L', '--modversion']:
> +-args += [flag, pkg]
> ++args += [flag]
> ++if isinstance(pkg, list):
> ++  args += pkg
> ++else:
> ++  args += [pkg]
> + try:
> +   proc = subprocess.Popen(shlex.split(pkg_config) + args,
> +   stdout=subprocess.PIPE)
> +--
> +2.25.0
> +
> diff --git 
> a/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
>  
> b/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
> new file mode 100644
> index 0..fc038f3aa
> --- /dev/null
> +++ 
> b/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
> @@ -0,0 +1,66 @@
> +From f0f927feee8cb1fb173835d5c3f6beb6bf7d5e54 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= 
> +Date: Mon, 2 Mar 2020 12:17:35 +
> +Subject: [PATCH 2/2] build: allow use of system-installed brotli
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +brotli is available as a shared library since 2016, so it makes sense
> +to allow its use as a system-installed version.
> +
> +Some of the infrastructure was in place already (node.gyp and
> +node.gypi), but some bits in the configure script here were missing.
> +
> +Add them, keeping the default as before, to use the bundled version.
> +
> +Refs: https://github.com/google/brotli/pull/421
> +Signed-off-by: André Draszik 
> +---
> +Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046]
> + configure.py | 22 ++
> + 1 file changed, 22 insertions(+)
> +
> +diff --git a/configure.py b/configure.py
> +index e3f78f2fed..0190e31b41 100755
> +--- a/configure.py
>  b/configure.py
> +@@ -301,6 +301,27 @@ shared_optgroup.add_option('--shared-zlib-libpath',
> + dest='shared_zlib_libpath',
> + help='a directory to search for the shared zlib DLL')
> +
> ++shared_optgroup.add_option('--shared-brotli',
> ++action='store_true',
> ++dest='shared_brotli',
> ++help='link to a shared brotli DLL instead of static linking')
> ++
> ++shared_optgroup.add_option('--shared-brotli-includes',
> ++action='store',
> ++dest='shared_brotli_includes',
> ++help='directory containing brotli header files')
> ++
> ++shared_optgroup.add_option('--shared-brotli-libname',
> ++action='store',
> ++dest='shared_brotli_libname',
> ++

Re: [oe] [meta-oe][PATCH 1/3] nodejs: drop 'gyp' PACKAGECONFIG

[Khem Raj]

can you rebase it on top of master-next and resend

On Tue, Mar 3, 2020 at 5:45 AM André Draszik  wrote:
>
> From: André Draszik 
>
> During the python3 / nodejs update, the dependencies weren't updated, so
> using system-gyp ends up trying to use the python2 version of system-
> gyp, which will of course fail.
> Fixing this to depend on the python3 version of gyp still doesn't
> doesn't make things work, though:
> ERROR: nodejs-native-12.14.1-r0 do_configure: Execution of 
> '.../nodejs-native/12.14.1-r0/temp/run.do_configure.26054' failed with exit 
> code 1:
> gyp: Error importing pymod_do_mainmodule (ForEachFormat): No module named 
> 'ForEachFormat' while loading dependencies of 
> .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp while trying to load 
> .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp
> Error running GYP
>
> The reason is the following patch nodejs has applied to its version of gyp as
> of NodeJS v12 (commit fff922afee6e ("deps,build: compute torque_outputs in 
> v8.gyp")
> upstream):
>
> --- gyp/pylib/gyp/input.py  2020-03-02 12:36:30.788248197 +
> +++ node.git/tools/gyp/pylib/gyp/input.py2020-03-02 12:16:09.956707788 
> +
> @@ -890,6 +881,7 @@ def ExpandVariables(input, phase, variab
>oldwd = os.getcwd()  # Python doesn't like os.open('.'): no fchdir.
>if build_file_dir:  # build_file_dir may be None (see above).
>  os.chdir(build_file_dir)
> +  sys.path.append(os.getcwd())
>try:
>
>  parsed_contents = shlex.split(contents)
> @@ -900,6 +892,7 @@ def ExpandVariables(input, phase, variab
>   "module (%s): %s" % (parsed_contents[0], e))
>  replacement = str(py_module.DoMain(parsed_contents[1:])).rstrip()
>finally:
> +sys.path.pop()
>  os.chdir(oldwd)
>assert replacement != None
>  elif command_string:
>
> Since I'm not sure how to deal with that when using system-gyp, and because
> the original intention for using system-gyp was to make the previous nodejs
> version compatible with python3 by ultimately switching to the python3 version
> of system-gyp which isn't necessary anymore, and given nobody else seems to
> be using this PACKAGECONFIG, just drop it.
>
> Signed-off-by: André Draszik 
> ---
>  meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb 
> b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> index 6eb52c209..49bb71e28 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
> @@ -53,7 +53,6 @@ ARCHFLAGS ?= ""
>
>  PACKAGECONFIG ??= "ares icu libuv zlib"
>  PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
> -PACKAGECONFIG[gyp] = ",,gyp-py2-native"
>  PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
>  PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
>  PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
> @@ -82,8 +81,6 @@ python do_unpack() {
>  shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
>  if 'ares' in d.getVar('PACKAGECONFIG'):
>  shutil.rmtree(d.getVar('S') + '/deps/cares', True)
> -if 'gyp' in d.getVar('PACKAGECONFIG'):
> -shutil.rmtree(d.getVar('S') + '/tools/gyp', True)
>  if 'libuv' in d.getVar('PACKAGECONFIG'):
>  shutil.rmtree(d.getVar('S') + '/deps/uv', True)
>  if 'nghttp2' in d.getVar('PACKAGECONFIG'):
> --
> 2.23.0.rc1
>
> --
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-oe][meta-networking][PATCH] grpc: move from meta-networking to meta-oe

[Martin Jansa]

* because sysdig from meta-oe depends on it now, since:
  commit ed798c764319d83ad9eb1b963bfc99b1fa1a791a
  Author: Khem Raj 
  Date:   Wed Jan 2 17:59:20 2019 -0800

sysdig: Upgrade to 0.26.5

Signed-off-by: Martin Jansa 
---
 .../recipes-core/packagegroups/packagegroup-meta-networking.bb  | 2 +-
 meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb  | 2 +-
 ...1-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch | 0
 ...01-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch | 0
 .../recipes-devtools/grpc/grpc_1.24.3.bb| 0
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename {meta-networking => 
meta-oe}/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
 (100%)
 rename {meta-networking => 
meta-oe}/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
 (100%)
 rename {meta-networking => meta-oe}/recipes-devtools/grpc/grpc_1.24.3.bb (100%)

diff --git 
a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb 
b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
index 103c99bb17..1e10c3085f 100644
--- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
+++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
@@ -55,7 +55,7 @@ RDEPENDS_packagegroup-meta-networking-daemons = "\
 RDEPENDS_packagegroup-meta-networking-daemons_remove_libc-musl = "opensaf"
 
 RDEPENDS_packagegroup-meta-networking-devtools = "\
-python3-ldap grpc \
+python3-ldap \
 "
 
 RDEPENDS_packagegroup-meta-networking-extended = "\
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb 
b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index d09653901c..e04b48f85a 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -110,7 +110,7 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\
 android-tools android-tools-conf bootchart breakpad \
 capnproto cgdb cscope ctags \
 debootstrap dmalloc flatbuffers \
-giflib icon-slicer iptraf-ng jq jsoncpp jsonrpc json-spirit \
+giflib grpc icon-slicer iptraf-ng jq jsoncpp jsonrpc json-spirit \
 kconfig-frontends lemon libedit libgee libsombok3 \
 libubox log4cplus lshw ltrace lua mcpp memstat mercurial \
 mpich msgpack-c nlohmann-json openocd pax-utils \
diff --git 
a/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
 
b/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
similarity index 100%
rename from 
meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
rename to 
meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
diff --git 
a/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
 
b/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
similarity index 100%
rename from 
meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
rename to 
meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb 
b/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb
similarity index 100%
rename from meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb
rename to meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb
-- 
2.20.1

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

Re: [oe] [meta-oe][PATCH] sysdig: Upgrade to 0.26.5

[Khem Raj]

On Tue, Mar 3, 2020 at 5:53 AM Martin Jansa  wrote:

> Should I send the patch to move grpc from meta-networking to meta-oe to
> fix this or do you have it already?
>

Please send I don’t have it ready

>
> On Mon, Mar 2, 2020 at 6:22 PM Khem Raj  wrote:
>
>> On Mon, Mar 2, 2020 at 4:27 AM Martin Jansa 
>> wrote:
>> >
>> > Hi,
>> >
>> > added dependency on grpc exists only in meta-networking, so this fails
>> to parse now.
>> >
>>
>> I think grpc is common enough to belong to meta-oe as well.
>>
>> > Cheers,
>>
>
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [oe] [meta-ota][PATCH] meta-ota: add support for binary-delta images in a new layer

[Bartosz Golaszewski]

pon., 2 mar 2020 o 19:25 Khem Raj  napisał(a):
>
> >
> > Khem, Armin: any thoughts?
>
> there are many ota layers on OE, most of them are self-contained, so a
> question arises, how is this different, somethings here say it could be
> a base layer for all OTAs, which actually seems quite valuable, but it
> has to be such that the existing OTA layers start using pieces from this

No, it's actually the other way around. The existing OTA layers are
focused on supporting specific tools and they usually provide full
support for some reference platforms. However in every custom project
I worked on we needed to extend those layers and those extensions
became quite repetitive, hence the idea for a layer that gathers
common elements but that is independent from project-specific layers.

If anything the goal is to use this *in conjunction* with specialized
OTA layers.

> layer, Other part seems to be that its yet another OTA using binary
> delta update techniques, so in such a case, it should be thought of as
> another OTA and perhaps maintained independendently, if there are
> features which are common across all OTAs we can host them in core or
> meta-oe,
>

No, this is not an OTA on its own and the generation of binary delta
patches is just one of the features.

Let me give you more context on why I started to do this. We've had a
downstream layer for a client's project compatible with thud with a
complete verified boot chain of trust including dm-verity protected
rootfs mounted by an initramfs stored in signed fitImage + OTA
support. Generating this image required us to alter a couple
inter-task dependencies (fitImage needs to wait for initramfs, but
initramfs needs the dm-verity meta-data which needs the rootfs
partition, and then we need to sign the fitImage etc. etc.).

Then some time during warrior development commit 67628ea66b7d
("uboot-sign.bbclass: fix signature and deployment") was merged in
OE-core which caused us a lot of trouble with our dependencies when
trying to update the layer. In order to not make the same mistake
twice - we thought it's best to upstream our development too for
others to use and to be able to object when someone breaks it for us
(I'm mostly a kernel developer and this is how it works in linux, I'm
not sure if it's the same for yocto).

BTW I'm also preparing a series of patches for meta-security with
dm-verity images as part of this effort.

If this is not something that should be part of meta-openembedded - is
there any way to have it hosted at https://git.yoctoproject.org/cgit/
as an official yocto layer? I'm sorry if this is a dumb question, I
don't know exactly what the policy is for that.

Best regards,
Bartosz
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [oe] [meta-oe][PATCH] sysdig: Upgrade to 0.26.5

[Martin Jansa]

Should I send the patch to move grpc from meta-networking to meta-oe to fix
this or do you have it already?

On Mon, Mar 2, 2020 at 6:22 PM Khem Raj  wrote:

> On Mon, Mar 2, 2020 at 4:27 AM Martin Jansa 
> wrote:
> >
> > Hi,
> >
> > added dependency on grpc exists only in meta-networking, so this fails
> to parse now.
> >
>
> I think grpc is common enough to belong to meta-oe as well.
>
> > Cheers,
>
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-oe][PATCH 2/3] brotli: allow building a -native version

[André Draszik]

From: André Draszik 

nodejs (-native) can be built against a system-installed version of
the brotli libraries. Allow doing that by provide a -native version
of brotli.

Signed-off-by: André Draszik 
---
 meta-oe/recipes-extended/brotli/brotli_1.0.7.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb 
b/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
index e4e454bda..70dbcaffb 100644
--- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
+++ b/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb
@@ -18,3 +18,5 @@ do_install_append () {
mv -v "${lib}" "$(echo ${lib} | sed s/-static//)"
done
 }
+
+BBCLASSEXTEND = "native"
-- 
2.23.0.rc1

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

[oe] [meta-oe][PATCH 3/3] nodejs: allow use of system brotli (and make default)

[André Draszik]

From: André Draszik 

Use system brotli via PACKAGECONFIG by default. So far,
nodejs had been built using its embedded copy of brotli,
which we generally try to avoid, for the known reasons
(independent updates, cve & license checks, etc).

The nodejs patches to enable this have been submitted.
brotli is in meta-oe, so enabling this by default should
not be a problem.

Signed-off-by: André Draszik 
---
 ...-passing-multiple-libs-to-pkg_config.patch | 41 
 ...allow-use-of-system-installed-brotli.patch | 66 +++
 .../recipes-devtools/nodejs/nodejs_12.14.1.bb |  7 +-
 3 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 
meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
 create mode 100644 
meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch

diff --git 
a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
 
b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
new file mode 100644
index 0..13edf229b
--- /dev/null
+++ 
b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch
@@ -0,0 +1,41 @@
+From fdaa0e3bef93c5c72a7258b5f1e30718e7d81f9b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= 
+Date: Mon, 2 Mar 2020 12:17:09 +
+Subject: [PATCH 1/2] build: allow passing multiple libs to pkg_config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Sometimes it's necessary to pass multiple library names to pkg-config,
+e.g. the brotli shared libraries can be pulled in with
+pkg-config libbrotlienc libbrotlidec
+
+Update the code to handle both, strings (as used so far), and lists
+of strings.
+
+Signed-off-by: André Draszik 
+---
+Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046]
+ configure.py | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.py b/configure.py
+index beb08df088..e3f78f2fed 100755
+--- a/configure.py
 b/configure.py
+@@ -680,7 +680,11 @@ def pkg_config(pkg):
+   retval = ()
+   for flag in ['--libs-only-l', '--cflags-only-I',
+'--libs-only-L', '--modversion']:
+-args += [flag, pkg]
++args += [flag]
++if isinstance(pkg, list):
++  args += pkg
++else:
++  args += [pkg]
+ try:
+   proc = subprocess.Popen(shlex.split(pkg_config) + args,
+   stdout=subprocess.PIPE)
+-- 
+2.25.0
+
diff --git 
a/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
 
b/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
new file mode 100644
index 0..fc038f3aa
--- /dev/null
+++ 
b/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch
@@ -0,0 +1,66 @@
+From f0f927feee8cb1fb173835d5c3f6beb6bf7d5e54 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= 
+Date: Mon, 2 Mar 2020 12:17:35 +
+Subject: [PATCH 2/2] build: allow use of system-installed brotli
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+brotli is available as a shared library since 2016, so it makes sense
+to allow its use as a system-installed version.
+
+Some of the infrastructure was in place already (node.gyp and
+node.gypi), but some bits in the configure script here were missing.
+
+Add them, keeping the default as before, to use the bundled version.
+
+Refs: https://github.com/google/brotli/pull/421
+Signed-off-by: André Draszik 
+---
+Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046]
+ configure.py | 22 ++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/configure.py b/configure.py
+index e3f78f2fed..0190e31b41 100755
+--- a/configure.py
 b/configure.py
+@@ -301,6 +301,27 @@ shared_optgroup.add_option('--shared-zlib-libpath',
+ dest='shared_zlib_libpath',
+ help='a directory to search for the shared zlib DLL')
+ 
++shared_optgroup.add_option('--shared-brotli',
++action='store_true',
++dest='shared_brotli',
++help='link to a shared brotli DLL instead of static linking')
++
++shared_optgroup.add_option('--shared-brotli-includes',
++action='store',
++dest='shared_brotli_includes',
++help='directory containing brotli header files')
++
++shared_optgroup.add_option('--shared-brotli-libname',
++action='store',
++dest='shared_brotli_libname',
++default='brotlidec,brotlienc',
++help='alternative lib name to link to [default: %default]')
++
++shared_optgroup.add_option('--shared-brotli-libpath',
++action='store',
++dest='shared_brotli_libpath',
++help='a directory to search for the shared brotli DLL')
++
+ shared_optgroup.add_option('--shared-cares',
+ action='store_true',
+ dest='shared_cares',

[oe] [meta-oe][PATCH 1/3] nodejs: drop 'gyp' PACKAGECONFIG

[André Draszik]

From: André Draszik 

During the python3 / nodejs update, the dependencies weren't updated, so
using system-gyp ends up trying to use the python2 version of system-
gyp, which will of course fail.
Fixing this to depend on the python3 version of gyp still doesn't
doesn't make things work, though:
ERROR: nodejs-native-12.14.1-r0 do_configure: Execution of 
'.../nodejs-native/12.14.1-r0/temp/run.do_configure.26054' failed with exit 
code 1:
gyp: Error importing pymod_do_mainmodule (ForEachFormat): No module named 
'ForEachFormat' while loading dependencies of 
.../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp while trying to load 
.../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp
Error running GYP

The reason is the following patch nodejs has applied to its version of gyp as
of NodeJS v12 (commit fff922afee6e ("deps,build: compute torque_outputs in 
v8.gyp")
upstream):

--- gyp/pylib/gyp/input.py  2020-03-02 12:36:30.788248197 +
+++ node.git/tools/gyp/pylib/gyp/input.py2020-03-02 12:16:09.956707788 +
@@ -890,6 +881,7 @@ def ExpandVariables(input, phase, variab
   oldwd = os.getcwd()  # Python doesn't like os.open('.'): no fchdir.
   if build_file_dir:  # build_file_dir may be None (see above).
 os.chdir(build_file_dir)
+  sys.path.append(os.getcwd())
   try:

 parsed_contents = shlex.split(contents)
@@ -900,6 +892,7 @@ def ExpandVariables(input, phase, variab
  "module (%s): %s" % (parsed_contents[0], e))
 replacement = str(py_module.DoMain(parsed_contents[1:])).rstrip()
   finally:
+sys.path.pop()
 os.chdir(oldwd)
   assert replacement != None
 elif command_string:

Since I'm not sure how to deal with that when using system-gyp, and because
the original intention for using system-gyp was to make the previous nodejs
version compatible with python3 by ultimately switching to the python3 version
of system-gyp which isn't necessary anymore, and given nobody else seems to
be using this PACKAGECONFIG, just drop it.

Signed-off-by: André Draszik 
---
 meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb 
b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
index 6eb52c209..49bb71e28 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb
@@ -53,7 +53,6 @@ ARCHFLAGS ?= ""
 
 PACKAGECONFIG ??= "ares icu libuv zlib"
 PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
-PACKAGECONFIG[gyp] = ",,gyp-py2-native"
 PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
 PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
 PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
@@ -82,8 +81,6 @@ python do_unpack() {
 shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
 if 'ares' in d.getVar('PACKAGECONFIG'):
 shutil.rmtree(d.getVar('S') + '/deps/cares', True)
-if 'gyp' in d.getVar('PACKAGECONFIG'):
-shutil.rmtree(d.getVar('S') + '/tools/gyp', True)
 if 'libuv' in d.getVar('PACKAGECONFIG'):
 shutil.rmtree(d.getVar('S') + '/deps/uv', True)
 if 'nghttp2' in d.getVar('PACKAGECONFIG'):
-- 
2.23.0.rc1

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

Re: [oe] [meta-networking][PATCH] meta-networking: s|${COREBASE}/meta/files/common-licenses|${COMMON_LICENSE_DIR}

[Peter Kjellerstedt]

> -Original Message-
> From: openembedded-devel-boun...@lists.openembedded.org  devel-boun...@lists.openembedded.org> On Behalf Of Peter Kjellerstedt
> Sent: den 3 mars 2020 12:03
> To: André Draszik ; openembedded-
> de...@lists.openembedded.org
> Subject: Re: [oe] [meta-networking][PATCH] meta-networking:
> s|${COREBASE}/meta/files/common-licenses|${COMMON_LICENSE_DIR}
> 
> > -Original Message-
> > From: André Draszik 
> > Sent: den 29 februari 2020 08:08
> > To: Peter Kjellerstedt ; openembedded-
> > de...@lists.openembedded.org
> > Subject: Re: [oe] [meta-networking][PATCH] meta-networking:
> > s|${COREBASE}/meta/files/common-licenses|${COMMON_LICENSE_DIR}
> >
> > On Fri, 2020-02-28 at 19:55 +, Peter Kjellerstedt wrote:
> > > > -Original Message-
> > > > From: openembedded-devel-boun...@lists.openembedded.org
>  > devel-boun...@lists.openembedded.org> On
> > > > Behalf Of André Draszik
> > > > Sent: den 27 februari 2020 17:42
> > > > To: openembedded-devel@lists.openembedded.org
> > > > Subject: [oe] [meta-networking][PATCH] meta-networking:
> > s|${COREBASE}/meta/files/common-
> > > > licenses|${COMMON_LICENSE_DIR}
> > > >
> > > > Signed-off-by: André Draszik 
> > > > ---
> > > >  meta-networking/recipes-connectivity/samba/samba_4.10.13.bb | 4 ++-
> -
> > > >  meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb| 2 +-
> > > >  meta-networking/recipes-support/arptables/arptables_git.bb  | 2 +-
> > > >  meta-networking/recipes-support/ncp/ncp_1.2.4.bb| 2 +-
> > > >  4 files changed, 5 insertions(+), 5 deletions(-)
> > > >
> > > > diff --git a/meta-networking/recipes-
> > connectivity/samba/samba_4.10.13.bb b/meta-networking/recipes-
> > > > connectivity/samba/samba_4.10.13.bb
> > > > index 71d8fa2f8..4d57255f1 100644
> > > > --- a/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb
> > > > +++ b/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb
> > > > @@ -3,8 +3,8 @@ SECTION = "console/network"
> > > >
> > > >  LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+"
> > > >  LIC_FILES_CHKSUM =
> > "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> > > > -file://${COREBASE}/meta/files/common-
> > licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
> > > > -file://${COREBASE}/meta/files/common-
> > licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 "
> > > > +file://${COMMON_LICENSE_DIR}/LGPL-
> > 3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
> > > > +file://${COMMON_LICENSE_DIR}/GPL-
> > 2.0;md5=801f80980d171dd6425610833a22dbe6 "
> > >
> > > These two are pointless since there is a provided COPYING file.
> > > Just remove them.
> > >
> > > >  SAMBA_MIRROR = "http://samba.org/samba/ftp;
> > > >  MIRRORS += "\
> > > > diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb
> > b/meta-networking/recipes-
> > > > daemons/lldpd/lldpd_1.0.4.bb
> > > > index 8fdaf848f..21b02687f 100644
> > > > --- a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb
> > > > +++ b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb
> > > > @@ -1,7 +1,7 @@
> > > >  SUMMARY = "A 802.1ab implementation (LLDP) to help you locate
> > neighbors of all your equipments"
> > > >  SECTION = "net/misc"
> > > >  LICENSE = "ISC"
> > > > -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> > licenses/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d"
> > > > +LIC_FILES_CHKSUM =
> > "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d"
> > >
> > > There is a LICENSE file in the tar ball. Please use it instead.
> > >
> > > >  DEPENDS = "libbsd libevent"
> > > >
> > > > diff --git a/meta-networking/recipes-
> > support/arptables/arptables_git.bb b/meta-networking/recipes-
> > > > support/arptables/arptables_git.bb
> > > > index cec1d1f77..e88631e08 100644
> > > > --- a/meta-networking/recipes-support/arptables/arptables_git.bb
> > > > +++ b/meta-networking/recipes-support/arptables/arptables_git.bb
> > > > @@ -1,7 +1,7 @@
> > > >  SUMMARY = "Administration tool for arp packet filtering"
> > > >  SECTION = "net"
> > > >  LICENSE = "GPL-2.0"
> > > > -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> > licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> > > > +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-
> > 2.0;md5=801f80980d171dd6425610833a22dbe6"
> > >
> > > There is a COPYING file in the Git repository. Please use it instead.
> > >
> > > >  SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f"
> > > >  PV = "0.0.4+git${SRCPV}"
> > > >
> > > > diff --git a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> b/meta-
> > networking/recipes-support/ncp/ncp_1.2.4.bb
> > > > index f42223b1f..ba6e23e86 100644
> > > > --- a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> > > > +++ b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> > > > @@ -4,7 +4,7 @@ security or integrity checking, no throttling, no
> > features, except \
> > > >  one: you don't have 

Re: [oe] [meta-networking][PATCH] meta-networking: s|${COREBASE}/meta/files/common-licenses|${COMMON_LICENSE_DIR}

[Peter Kjellerstedt]

> -Original Message-
> From: André Draszik 
> Sent: den 29 februari 2020 08:08
> To: Peter Kjellerstedt ; openembedded-
> de...@lists.openembedded.org
> Subject: Re: [oe] [meta-networking][PATCH] meta-networking:
> s|${COREBASE}/meta/files/common-licenses|${COMMON_LICENSE_DIR}
> 
> On Fri, 2020-02-28 at 19:55 +, Peter Kjellerstedt wrote:
> > > -Original Message-
> > > From: openembedded-devel-boun...@lists.openembedded.org  devel-boun...@lists.openembedded.org> On
> > > Behalf Of André Draszik
> > > Sent: den 27 februari 2020 17:42
> > > To: openembedded-devel@lists.openembedded.org
> > > Subject: [oe] [meta-networking][PATCH] meta-networking:
> s|${COREBASE}/meta/files/common-
> > > licenses|${COMMON_LICENSE_DIR}
> > >
> > > Signed-off-by: André Draszik 
> > > ---
> > >  meta-networking/recipes-connectivity/samba/samba_4.10.13.bb | 4 ++--
> > >  meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb| 2 +-
> > >  meta-networking/recipes-support/arptables/arptables_git.bb  | 2 +-
> > >  meta-networking/recipes-support/ncp/ncp_1.2.4.bb| 2 +-
> > >  4 files changed, 5 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/meta-networking/recipes-
> connectivity/samba/samba_4.10.13.bb b/meta-networking/recipes-
> > > connectivity/samba/samba_4.10.13.bb
> > > index 71d8fa2f8..4d57255f1 100644
> > > --- a/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb
> > > +++ b/meta-networking/recipes-connectivity/samba/samba_4.10.13.bb
> > > @@ -3,8 +3,8 @@ SECTION = "console/network"
> > >
> > >  LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+"
> > >  LIC_FILES_CHKSUM =
> "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> > > -file://${COREBASE}/meta/files/common-
> licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
> > > -file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 "
> > > +file://${COMMON_LICENSE_DIR}/LGPL-
> 3.0;md5=bfccfe952269fff2b407dd11f2f3083b \
> > > +file://${COMMON_LICENSE_DIR}/GPL-
> 2.0;md5=801f80980d171dd6425610833a22dbe6 "
> >
> > These two are pointless since there is a provided COPYING file.
> > Just remove them.
> >
> > >  SAMBA_MIRROR = "http://samba.org/samba/ftp;
> > >  MIRRORS += "\
> > > diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb
> b/meta-networking/recipes-
> > > daemons/lldpd/lldpd_1.0.4.bb
> > > index 8fdaf848f..21b02687f 100644
> > > --- a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb
> > > +++ b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.4.bb
> > > @@ -1,7 +1,7 @@
> > >  SUMMARY = "A 802.1ab implementation (LLDP) to help you locate
> neighbors of all your equipments"
> > >  SECTION = "net/misc"
> > >  LICENSE = "ISC"
> > > -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d"
> > > +LIC_FILES_CHKSUM =
> "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d"
> >
> > There is a LICENSE file in the tar ball. Please use it instead.
> >
> > >  DEPENDS = "libbsd libevent"
> > >
> > > diff --git a/meta-networking/recipes-
> support/arptables/arptables_git.bb b/meta-networking/recipes-
> > > support/arptables/arptables_git.bb
> > > index cec1d1f77..e88631e08 100644
> > > --- a/meta-networking/recipes-support/arptables/arptables_git.bb
> > > +++ b/meta-networking/recipes-support/arptables/arptables_git.bb
> > > @@ -1,7 +1,7 @@
> > >  SUMMARY = "Administration tool for arp packet filtering"
> > >  SECTION = "net"
> > >  LICENSE = "GPL-2.0"
> > > -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> > > +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-
> 2.0;md5=801f80980d171dd6425610833a22dbe6"
> >
> > There is a COPYING file in the Git repository. Please use it instead.
> >
> > >  SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f"
> > >  PV = "0.0.4+git${SRCPV}"
> > >
> > > diff --git a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-
> networking/recipes-support/ncp/ncp_1.2.4.bb
> > > index f42223b1f..ba6e23e86 100644
> > > --- a/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> > > +++ b/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
> > > @@ -4,7 +4,7 @@ security or integrity checking, no throttling, no
> features, except \
> > >  one: you don't have to type the coordinates of your peer."
> > >  HOMEPAGE = "http://www.fefe.de/ncp;
> > >  LICENSE = "GPLv2"
> >
> > I can find no information about license either in the code or at
> > http://www.fefe.de/ncp. How do you know this license is correct?
> 
> Please see attached email.

Hmm, ok. I think it would be good if this was actually documented in 
the recipe itself then.

> Cheers,
> Andre'
> 
> >
> > > -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-
> licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> > > +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-
>