Re: [oe][meta-oe][PATCH] android-tools: fix adb OpenSSL patch (really make compatible with >= v1.1)
On Thu, 2024-05-30 at 10:11 +0100, André Draszik via lists.openembedded.org wrote: > As per the inlined patch commit message, gcc 14 is highlighting a few > issues with the existing patch and it doesn't compile. > > Update the patch to fix. > > Note there are two recipes for android-tools in this layer - the recipe > here and another one in > meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools. A patch > for the alternative android-tools version had already been posted, so > this patch only deals with the remaining one. > > Signed-off-by: André Draszik I can see this has also been fixed shortly after I had last checked, please ignore this patch. Cheers, Andre' -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110654): https://lists.openembedded.org/g/openembedded-devel/message/110654 Mute This Topic: https://lists.openembedded.org/mt/106385291/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH v2] android-tools-configfs: Fix build-time warning about S being non-existent
Hi,
I believe similar recipe updates in e.g. oe-core also update do_install() and
friends to reference S again instead of UNPACKDIR, i.e. something like the
following should also be done to be consistent (sorry for the formatting):
do_install() {
install -d ${D}${bindir}
-install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir}
-install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir}
-install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir}
+install -m 0755 ${S}/android-gadget-setup ${D}${bindir}
+install -m 0755 ${S}/android-gadget-start ${D}${bindir}
+install -m 0755 ${S}/android-gadget-cleanup ${D}${bindir}
-if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then
+if [ -r ${S}/android-gadget-setup.machine ] ; then
install -d ${D}${sysconfdir}
- install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine
${D}${sysconfdir}
+ install -m 0644 ${S}/android-gadget-setup.machine ${D}${sysconfdir}
fi
install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
-install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf
${D}${systemd_unitdir}/system/android-tools-adbd.service.d
+install -m 0644 ${S}/10-adbd-configfs.conf
${D}${systemd_unitdir}/system/android-tools-adbd.service.d
}
Cheers,
Andre'
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110625):
https://lists.openembedded.org/g/openembedded-devel/message/110625
Mute This Topic: https://lists.openembedded.org/mt/106351864/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[oe][meta-oe][PATCH] android-tools: fix adb OpenSSL patch (really make compatible with >= v1.1)
As per the inlined patch commit message, gcc 14 is highlighting a few
issues with the existing patch and it doesn't compile.
Update the patch to fix.
Note there are two recipes for android-tools in this layer - the recipe
here and another one in
meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools. A patch
for the alternative android-tools version had already been posted, so
this patch only deals with the remaining one.
Signed-off-by: André Draszik
---
.../android-tools/core/adb_libssl_11.diff | 68 ++-
1 file changed, 50 insertions(+), 18 deletions(-)
diff --git
a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
index 177d69a97a3e..5ba576fe84d4 100644
---
a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
+++
b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
@@ -1,29 +1,54 @@
-Description: adb: Make compatible with openssl 1.1
- OpenSSL version 1.1 brought some API changes which broke the build here,
- fix that by accessing rsa->n (and e) directly, using RSA_get0_key instead.
-Author: Chirayu Desai
+Date: Mon, 27 May 2024 10:54:08 +0100
+Subject: [PATCH] adb: (really) make compatible with openssl 1.1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Upstream-Status: Pending
+Compiling using gcc 14 results in the following:
+
+| .../android-tools/5.1.1.r37/git/system/core/adb/adb_auth_host.c:86:23:
error: passing argument 2 of 'RSA_get0_key' from incompatible pointer type
[-Wincompatible-pointer-types]
+|86 | RSA_get0_key(rsa, , , NULL);
+| | ^~
+| | |
+| | BIGNUM ** {aka struct bignum_st **}
+| .../android-tools/5.1.1.r37/recipe-sysroot/usr/include/openssl/rsa.h:229:56:
note: expected 'const BIGNUM **' {aka 'const struct bignum_st **'} but argument
is of type 'BIGNUM **' {aka 'struct bignum_st **'}
+| 229 | const BIGNUM **n, const
BIGNUM **e,
+| | ~~~^
+| .../android-tools/5.1.1.r37/git/system/core/adb/adb_auth_host.c:86:27:
error: passing argument 3 of 'RSA_get0_key' from incompatible pointer type
[-Wincompatible-pointer-types]
+|86 | RSA_get0_key(rsa, , , NULL);
+| | ^~
+| | |
+| | BIGNUM ** {aka struct bignum_st **}
+| .../android-tools/5.1.1.r37/recipe-sysroot/usr/include/openssl/rsa.h:229:74:
note: expected 'const BIGNUM **' {aka 'const struct bignum_st **'} but argument
is of type 'BIGNUM **' {aka 'struct bignum_st **'}
+| 229 | const BIGNUM **n, const
BIGNUM **e,
+| |
~~~^
+
+Update the code to correct usage of the OpenSSL APIs.
- system/core/adb/adb_auth_host.c |5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+Signed-off-by: André Draszik
+---
+Upstream-Status: Inappropriate (ancient version of android-tools)
+---
+ adb/adb_auth_host.c | 7 +++
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/adb/adb_auth_host.c b/adb/adb_auth_host.c
+index dd839001b5a3..a24e9bd89a7a 100644
--- a/adb/adb_auth_host.c
+++ b/adb/adb_auth_host.c
-@@ -75,6 +75,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
+@@ -73,7 +73,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+ BIGNUM* rr = BN_new();
+ BIGNUM* r = BN_new();
BIGNUM* rem = BN_new();
- BIGNUM* n = BN_new();
+-BIGNUM* n = BN_new();
++const BIGNUM* n = NULL, *e = NULL;
BIGNUM* n0inv = BN_new();
-+BIGNUM* e = BN_new();
if (RSA_size(rsa) != RSANUMBYTES) {
- ret = 0;
-@@ -82,7 +83,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
+@@ -82,7 +82,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
}
BN_set_bit(r32, 32);
@@ -32,7 +57,7 @@ Upstream-Status: Pending
BN_set_bit(r, RSANUMWORDS * 32);
BN_mod_sqr(rr, r, n, ctx);
BN_div(NULL, rem, n, r32, ctx);
-@@ -96,7 +97,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
+@@ -96,11 +96,10 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey
*pkey)
BN_div(n, rem, n, r32, ctx);
pkey->n[i] = BN_get_word(rem);
}
@@ -41,3 +66,10 @@ Upstream-Status: Pending
out:
BN_free(n0inv);
+-BN_free(n);
+ BN_free(rem);
+ BN_free(r);
+ BN_free(rr);
+--
+2.45.1.288.g0e0cd299f1-goog
+
--
2.45.1.288.g0e0cd299f1-goog
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#110623):
https://lists.openembedded.org/g/openembedded-devel/message/110623
Mute This Topic:
Re: [oe] [meta-oe][PATCH] smem: remove numpy dependency on armv4 and armv5
Please ignore this patch, it's not that simple...
On Sat, 2020-03-14 at 19:50 +, André Draszik wrote:
> numpy doesn't build on those.
>
> Signed-off-by: André Draszik
> ---
> meta-oe/recipes-support/smem/smem_1.5.bb | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/meta-oe/recipes-support/smem/smem_1.5.bb
> b/meta-oe/recipes-support/smem/smem_1.5.bb
> index 90db9c3f3..77179906e 100644
> --- a/meta-oe/recipes-support/smem/smem_1.5.bb
> +++ b/meta-oe/recipes-support/smem/smem_1.5.bb
> @@ -35,6 +35,9 @@ do_install() {
>
> RDEPENDS_${PN} = "python3-core python3-compression"
> RRECOMMENDS_${PN} = "python3-matplotlib python3-numpy"
> +# numpy doesn't work on those.
> +RRECOMMENDS_${PN}_remove_armv4 = "python3-matplotlib python3-numpy"
> +RRECOMMENDS_${PN}_remove_armv5 = "python3-matplotlib python3-numpy"
>
> PACKAGE_BEFORE_PN = "smemcap"
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] smem: remove numpy dependency on armv4 and armv5
numpy doesn't build on those.
Signed-off-by: André Draszik
---
meta-oe/recipes-support/smem/smem_1.5.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-oe/recipes-support/smem/smem_1.5.bb
b/meta-oe/recipes-support/smem/smem_1.5.bb
index 90db9c3f3..77179906e 100644
--- a/meta-oe/recipes-support/smem/smem_1.5.bb
+++ b/meta-oe/recipes-support/smem/smem_1.5.bb
@@ -35,6 +35,9 @@ do_install() {
RDEPENDS_${PN} = "python3-core python3-compression"
RRECOMMENDS_${PN} = "python3-matplotlib python3-numpy"
+# numpy doesn't work on those.
+RRECOMMENDS_${PN}_remove_armv4 = "python3-matplotlib python3-numpy"
+RRECOMMENDS_${PN}_remove_armv5 = "python3-matplotlib python3-numpy"
PACKAGE_BEFORE_PN = "smemcap"
--
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][PATCH] smem: matplotlib is an optional depencency
On Wed, 2020-03-11 at 09:43 +, André Draszik wrote:
> On Wed, 2020-03-11 at 07:55 +, Nicola Lunghi wrote:
> > smem doesn't need matplotlib and numpy to run, is an optional dependency
> > only
> > needed to produce graphs.
>
> Right, that's why it's an RRECOMMENDS. If you don't want it in the image,
> just do
> BAD_RECOMMENDATIONS as per usual practice :-)
Also, smem really wants those to produce graphs. If you want something simple on
the target to just capture the data, there is smemcap as a separate utility
(and package).
A.
>
> Cheers,
> Andre'
>
> > This is needed to avoid to include and build matplotlib and numpy by default
> >
> > Signed-off-by: Nicola Lunghi
> > ---
> > meta-oe/recipes-support/smem/smem_1.5.bb | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta-oe/recipes-support/smem/smem_1.5.bb
> > b/meta-oe/recipes-support/smem/smem_1.5.bb
> > index 90db9c3f3..446325e93 100644
> > --- a/meta-oe/recipes-support/smem/smem_1.5.bb
> > +++ b/meta-oe/recipes-support/smem/smem_1.5.bb
> > @@ -20,6 +20,9 @@ UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)"
> >
> > S = "${WORKDIR}/${BPN}-${HG_CHANGESET}"
> >
> > +#PACKAGECONFIG ?= "graph"
> > +PACKAGECONFIG[graph] = ",,,python3-matplotlib python3-numpy"
> > +
> > do_compile() {
> > ${CC} ${CFLAGS} ${LDFLAGS} smemcap.c -o smemcap
> > }
> > @@ -34,7 +37,6 @@ do_install() {
> > }
> >
> > RDEPENDS_${PN} = "python3-core python3-compression"
> > -RRECOMMENDS_${PN} = "python3-matplotlib python3-numpy"
> >
> > PACKAGE_BEFORE_PN = "smemcap"
> >
> > --
> > 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] smem: matplotlib is an optional depencency
On Wed, 2020-03-11 at 07:55 +, Nicola Lunghi wrote:
> smem doesn't need matplotlib and numpy to run, is an optional dependency only
> needed to produce graphs.
Right, that's why it's an RRECOMMENDS. If you don't want it in the image, just
do
BAD_RECOMMENDATIONS as per usual practice :-)
Cheers,
Andre'
> This is needed to avoid to include and build matplotlib and numpy by default
>
> Signed-off-by: Nicola Lunghi
> ---
> meta-oe/recipes-support/smem/smem_1.5.bb | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-support/smem/smem_1.5.bb
> b/meta-oe/recipes-support/smem/smem_1.5.bb
> index 90db9c3f3..446325e93 100644
> --- a/meta-oe/recipes-support/smem/smem_1.5.bb
> +++ b/meta-oe/recipes-support/smem/smem_1.5.bb
> @@ -20,6 +20,9 @@ UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)"
>
> S = "${WORKDIR}/${BPN}-${HG_CHANGESET}"
>
> +#PACKAGECONFIG ?= "graph"
> +PACKAGECONFIG[graph] = ",,,python3-matplotlib python3-numpy"
> +
> do_compile() {
> ${CC} ${CFLAGS} ${LDFLAGS} smemcap.c -o smemcap
> }
> @@ -34,7 +37,6 @@ do_install() {
> }
>
> RDEPENDS_${PN} = "python3-core python3-compression"
> -RRECOMMENDS_${PN} = "python3-matplotlib python3-numpy"
>
> PACKAGE_BEFORE_PN = "smemcap"
>
> --
> 2.20.1
>
--
___
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
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
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
[oe] [meta-oe][master-next][PATCH v2 1/2] nodejs: drop 'gyp' PACKAGECONFIG
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)
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_c
[oe] [meta-oe][PATCH 2/3] brotli: allow building a -native version
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)
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_c
[oe] [meta-oe][PATCH 1/3] nodejs: drop 'gyp' PACKAGECONFIG
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}
On Fri, 2020-02-28 at 19:55 +, Peter Kjellerstedt wrote:
> > -Original Message-
> > From: openembedded-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 attache
Re: [oe] [meta-multimedia][PATCH] meta-multimedia: s|${COREBASE}/meta/files/common-licenses|${COMMON_LICENSE_DIR}
On Thu, 2020-02-27 at 09:08 -0800, Khem Raj wrote:
> Hi André
>
> Thanks for doing this cleanup, but perhaps subject could be more simple
> and readable and this detail of sed operation could be in details.
Done (although I left out the sed arguments, as it's trivial :-)
Cheers,
Andre'
>
> On 2/27/20 8:41 AM, André Draszik wrote:
> > Signed-off-by: André Draszik
> > ---
> > .../recipes-multimedia/sample-content/bigbuckbunny-1080p.bb | 2 +-
> > .../recipes-multimedia/sample-content/bigbuckbunny-480p.bb | 2 +-
> > .../recipes-multimedia/sample-content/bigbuckbunny-720p.bb | 2 +-
> > .../recipes-multimedia/sample-content/tearsofsteel-1080p.bb | 2 +-
> > 4 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git
> > a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
> > b/meta-multimedia/recipes-
> > multimedia/sample-content/bigbuckbunny-1080p.bb
> > index cee386c2a..70eb6e4be 100644
> > ---
> > a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
> > +++
> > b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
> > @@ -1,7 +1,7 @@
> > SUMMARY = "Big Buck Bunny movie - 1080P"
> > LICENSE = "CC-BY-3.0"
> > # http://www.bigbuckbunny.org/index.php/about/
> > -LIC_FILES_CHKSUM =
> > "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
> > +LIC_FILES_CHKSUM =
> > "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
> >
> > SRC_URI = "http://themazzone.com/big_buck_bunny_1080p_surround.avi;
> > SRC_URI[md5sum] = "223991c8b33564eb77988a4c13c1c76a"
> > diff --git
> > a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
> > b/meta-multimedia/recipes-
> > multimedia/sample-content/bigbuckbunny-480p.bb
> > index d395b9206..df2368996 100644
> > --- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
> > +++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
> > @@ -1,7 +1,7 @@
> > SUMMARY = "Big Buck Bunny movie - 480P"
> > LICENSE = "CC-BY-3.0"
> > # http://www.bigbuckbunny.org/index.php/about/
> > -LIC_FILES_CHKSUM =
> > "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
> > +LIC_FILES_CHKSUM =
> > "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
> >
> > SRC_URI =
> > "https://archive.org/download/BigBuckBunny/big_buck_bunny_480p_surround-fix.avi;
> > SRC_URI[md5sum] = "ed7ed01e9aefba8ddd77c13332cec120"
> > diff --git
> > a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
> > b/meta-multimedia/recipes-
> > multimedia/sample-content/bigbuckbunny-720p.bb
> > index 20d562749..cb8ece0cb 100644
> > --- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
> > +++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
> > @@ -1,7 +1,7 @@
> > SUMMARY = "Big Buck Bunny movie - 720P"
> > LICENSE = "CC-BY-3.0"
> > # http://www.bigbuckbunny.org/index.php/about/
> > -LIC_FILES_CHKSUM =
> > "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
> > +LIC_FILES_CHKSUM =
> > "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
> >
> > SRC_URI =
> > "https://archive.org/download/BigBuckBunny/big_buck_bunny_720p_surround.avi;
> > SRC_URI[md5sum] = "0da8fe124595f5b206d64cb1400bbefc"
> > diff --git
> > a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
> > b/meta-multimedia/recipes-
> > multimedia/sample-content/tearsofsteel-1080p.bb
> > index 0582a4856..04cbd2e34 100644
> > ---
> > a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
> > +++
> > b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
> > @@ -1,6 +1,6 @@
> > SUMMARY = "Tears of Steel movie - 1080P"
> > LICENSE = "CC-BY-3.0"
> > -LIC_FILES_CHKSUM =
> > "file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
> > +LIC_FILES_CHKSUM =
> > "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
> >
> > SRC_URI =
> > "http://ftp.nluug.nl/pub/graphics/blender/demo/movies/ToS/ToS-4k-1920.mov;
> > SRC_URI[md5sum] = "e3fee55b1779c553e37b1d3988e6fad6"
> >
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] meta-networking: use COMMON_LICENSE_DIR for license file location
COMMON_LICENSE_DIR is the official location for license files
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 "
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"
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"
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"
-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"
DEPENDS = "libowfat"
SRC_URI = "https://dl.fefe.de/${BP}.tar.bz2;
--
2.23.0.rc1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-multimedia][PATCH] meta-multimedia: use COMMON_LICENSE_DIR for license file location
COMMON_LICENSE_DIR is the official location for license files
Signed-off-by: André Draszik
---
.../recipes-multimedia/sample-content/bigbuckbunny-1080p.bb | 2 +-
.../recipes-multimedia/sample-content/bigbuckbunny-480p.bb | 2 +-
.../recipes-multimedia/sample-content/bigbuckbunny-720p.bb | 2 +-
.../recipes-multimedia/sample-content/tearsofsteel-1080p.bb | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
index cee386c2a..70eb6e4be 100644
--- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
+++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
@@ -1,7 +1,7 @@
SUMMARY = "Big Buck Bunny movie - 1080P"
LICENSE = "CC-BY-3.0"
# http://www.bigbuckbunny.org/index.php/about/
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
SRC_URI = "http://themazzone.com/big_buck_bunny_1080p_surround.avi;
SRC_URI[md5sum] = "223991c8b33564eb77988a4c13c1c76a"
diff --git
a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
index d395b9206..df2368996 100644
--- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
+++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
@@ -1,7 +1,7 @@
SUMMARY = "Big Buck Bunny movie - 480P"
LICENSE = "CC-BY-3.0"
# http://www.bigbuckbunny.org/index.php/about/
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
SRC_URI =
"https://archive.org/download/BigBuckBunny/big_buck_bunny_480p_surround-fix.avi;
SRC_URI[md5sum] = "ed7ed01e9aefba8ddd77c13332cec120"
diff --git
a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
index 20d562749..cb8ece0cb 100644
--- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
+++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
@@ -1,7 +1,7 @@
SUMMARY = "Big Buck Bunny movie - 720P"
LICENSE = "CC-BY-3.0"
# http://www.bigbuckbunny.org/index.php/about/
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
SRC_URI =
"https://archive.org/download/BigBuckBunny/big_buck_bunny_720p_surround.avi;
SRC_URI[md5sum] = "0da8fe124595f5b206d64cb1400bbefc"
diff --git
a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
index 0582a4856..04cbd2e34 100644
--- a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
+++ b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
@@ -1,6 +1,6 @@
SUMMARY = "Tears of Steel movie - 1080P"
LICENSE = "CC-BY-3.0"
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
SRC_URI =
"http://ftp.nluug.nl/pub/graphics/blender/demo/movies/ToS/ToS-4k-1920.mov;
SRC_URI[md5sum] = "e3fee55b1779c553e37b1d3988e6fad6"
--
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] meta-oe: use COMMON_LICENSE_DIR for license file location
COMMON_LICENSE_DIR is the official location for license files
Signed-off-by: André Draszik
---
meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb | 2 +-
.../gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb | 4 ++--
meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb | 2 +-
meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb| 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
index 17e8c700c..39a0ccc8c 100644
--- a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
+++ b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
@@ -1,6 +1,6 @@
SUMMARY = "Dhrystone CPU benchmark"
LICENSE = "PD"
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d12946881e13cb3b548d1173851"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/PD;md5=b3597d12946881e13cb3b548d1173851"
SRC_URI = "http://www.netlib.org/benchmark/dhry-c;downloadfilename=dhry-c.shar
\
file://dhrystone.patch"
diff --git
a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
index d6da51b0d..9c16da416 100644
--- a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
+++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "This recipe provides m4 macros from
gnome-doc-utils project, so \
that dependent recipes can build. Gnome-doc-utils itself is no longer packaged
because \
it requires libxml2 and python 2 at the same time, which can no longer be
satisfied. "
LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6
\
-
file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
+
file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
SRC_URI = "file://gnome-doc-utils.m4"
PROVIDES = "gnome-doc-utils"
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
b/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
index d2058ba57..fae760bbf 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
@@ -1,6 +1,6 @@
SUMMARY = "Machine specific gpsd config"
LICENSE = "BSD"
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb"
# empty by default
# BSP layers can add stuff like meta-openmoko example:
diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb
b/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb
index 39629cce0..44679c047 100644
--- a/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb
+++ b/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Very fast, header only, C++ logging library."
HOMEPAGE = "https://github.com/gabime/spdlog/wiki;
LICENSE = "MIT"
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
SRCREV = "cf6f1dd01e660d5865d68bf5fa78f6376b89470a"
SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;"
--
2.23.0.rc1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] libowfat: fix sdk installation
From: André Draszik
Building an SDK with this included fails:
* calculate_dependencies_for: Cannot satisfy the following dependencies for
ncp-dev:
* libowfat (= 0.32-r0) *
* opkg_solver_install: Cannot install package ncp-dev.
libowfat only provides a static library, so there no
${PN} package is created by default.
Add ALLOW_EMPTY_${PN} = "1" to allow creation of an empty
${PN} package.
Signed-off-by: André Draszik
---
meta-networking/recipes-support/ncp/libowfat_0.32.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-networking/recipes-support/ncp/libowfat_0.32.bb
b/meta-networking/recipes-support/ncp/libowfat_0.32.bb
index 24f413555..d2f4df78e 100644
--- a/meta-networking/recipes-support/ncp/libowfat_0.32.bb
+++ b/meta-networking/recipes-support/ncp/libowfat_0.32.bb
@@ -26,4 +26,6 @@ do_install() {
MAN3DIR=${mandir}/man3
}
+ALLOW_EMPTY_${PN} = "1"
+
BBCLASSEXTEND = "native nativesdk"
--
2.23.0.rc1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[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 "
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"
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"
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"
-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"
DEPENDS = "libowfat"
SRC_URI = "https://dl.fefe.de/${BP}.tar.bz2;
--
2.23.0.rc1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-multimedia][PATCH] meta-multimedia: s|${COREBASE}/meta/files/common-licenses|${COMMON_LICENSE_DIR}
Signed-off-by: André Draszik
---
.../recipes-multimedia/sample-content/bigbuckbunny-1080p.bb | 2 +-
.../recipes-multimedia/sample-content/bigbuckbunny-480p.bb | 2 +-
.../recipes-multimedia/sample-content/bigbuckbunny-720p.bb | 2 +-
.../recipes-multimedia/sample-content/tearsofsteel-1080p.bb | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
index cee386c2a..70eb6e4be 100644
--- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
+++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
@@ -1,7 +1,7 @@
SUMMARY = "Big Buck Bunny movie - 1080P"
LICENSE = "CC-BY-3.0"
# http://www.bigbuckbunny.org/index.php/about/
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
SRC_URI = "http://themazzone.com/big_buck_bunny_1080p_surround.avi;
SRC_URI[md5sum] = "223991c8b33564eb77988a4c13c1c76a"
diff --git
a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
index d395b9206..df2368996 100644
--- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
+++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
@@ -1,7 +1,7 @@
SUMMARY = "Big Buck Bunny movie - 480P"
LICENSE = "CC-BY-3.0"
# http://www.bigbuckbunny.org/index.php/about/
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
SRC_URI =
"https://archive.org/download/BigBuckBunny/big_buck_bunny_480p_surround-fix.avi;
SRC_URI[md5sum] = "ed7ed01e9aefba8ddd77c13332cec120"
diff --git
a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
index 20d562749..cb8ece0cb 100644
--- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
+++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
@@ -1,7 +1,7 @@
SUMMARY = "Big Buck Bunny movie - 720P"
LICENSE = "CC-BY-3.0"
# http://www.bigbuckbunny.org/index.php/about/
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
SRC_URI =
"https://archive.org/download/BigBuckBunny/big_buck_bunny_720p_surround.avi;
SRC_URI[md5sum] = "0da8fe124595f5b206d64cb1400bbefc"
diff --git
a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
index 0582a4856..04cbd2e34 100644
--- a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
+++ b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
@@ -1,6 +1,6 @@
SUMMARY = "Tears of Steel movie - 1080P"
LICENSE = "CC-BY-3.0"
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
SRC_URI =
"http://ftp.nluug.nl/pub/graphics/blender/demo/movies/ToS/ToS-4k-1920.mov;
SRC_URI[md5sum] = "e3fee55b1779c553e37b1d3988e6fad6"
--
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] meta-oe: s|${COREBASE}/meta/files/common-licenses|${COMMON_LICENSE_DIR}
Signed-off-by: André Draszik
---
meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb | 2 +-
.../gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb | 4 ++--
meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb | 2 +-
meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb| 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
index 17e8c700c..39a0ccc8c 100644
--- a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
+++ b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
@@ -1,6 +1,6 @@
SUMMARY = "Dhrystone CPU benchmark"
LICENSE = "PD"
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d12946881e13cb3b548d1173851"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/PD;md5=b3597d12946881e13cb3b548d1173851"
SRC_URI = "http://www.netlib.org/benchmark/dhry-c;downloadfilename=dhry-c.shar
\
file://dhrystone.patch"
diff --git
a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
index d6da51b0d..9c16da416 100644
--- a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
+++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "This recipe provides m4 macros from
gnome-doc-utils project, so \
that dependent recipes can build. Gnome-doc-utils itself is no longer packaged
because \
it requires libxml2 and python 2 at the same time, which can no longer be
satisfied. "
LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6
\
-
file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
+
file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
SRC_URI = "file://gnome-doc-utils.m4"
PROVIDES = "gnome-doc-utils"
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
b/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
index d2058ba57..fae760bbf 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
@@ -1,6 +1,6 @@
SUMMARY = "Machine specific gpsd config"
LICENSE = "BSD"
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb"
# empty by default
# BSP layers can add stuff like meta-openmoko example:
diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb
b/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb
index 39629cce0..44679c047 100644
--- a/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb
+++ b/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Very fast, header only, C++ logging library."
HOMEPAGE = "https://github.com/gabime/spdlog/wiki;
LICENSE = "MIT"
-LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+LIC_FILES_CHKSUM =
"file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
SRCREV = "cf6f1dd01e660d5865d68bf5fa78f6376b89470a"
SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;"
--
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][PATCH] smem: use python 3
Hi,
Interestingly I had been looking at this today as well...
On Wed, 2020-02-05 at 00:40 +0100, Max Krummenacher wrote:
> There seems to be no user of python-textutils python-shell python-codecs
> in the script, so these rdepends are dropped.
>
> On a i.MX6 based machine smem runs with just python3-compression and
> its dependencies installed.
Upstream has released v1.5 with almost complete python3 support.
I'd say any patches should go on top of that.
Also, I don't think smem --source= will work with your version? Did you test
that?
>
> Signed-off-by: Max Krummenacher
> ---
> .../smem/0001-smem-convert-to-python-3.patch | 161 ++
> meta-oe/recipes-support/smem/smem_1.4.bb | 7 +-
> 2 files changed, 166 insertions(+), 2 deletions(-)
> create mode 100644
> meta-oe/recipes-support/smem/smem/0001-smem-convert-to-python-3.patch
>
> diff --git
> a/meta-oe/recipes-support/smem/smem/0001-smem-convert-to-python-3.patch
> b/meta-oe/recipes-
> support/smem/smem/0001-smem-convert-to-python-3.patch
> new file mode 100644
> index 0..85f35be44
> --- /dev/null
> +++ b/meta-oe/recipes-support/smem/smem/0001-smem-convert-to-python-3.patch
> @@ -0,0 +1,161 @@
> +From 5535a524f6db57c0b2e4a539db733fd9e840c97e Mon Sep 17 00:00:00 2001
> +From: Max Krummenacher
> +Date: Mon, 3 Feb 2020 21:04:42 +
> +Subject: [PATCH] smem: convert to python 3
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Max Krummenacher
> +---
> + smem | 41 ++---
> + 1 file changed, 22 insertions(+), 19 deletions(-)
> +
> +diff --git a/smem b/smem
> +index 0cbd925..577d27b 100755
> +--- a/smem
> b/smem
> +@@ -1,4 +1,4 @@
> +-#!/usr/bin/env python
> ++#!/usr/bin/env python3
> + #
> + # smem - a tool for meaningful memory reporting
> + #
> +@@ -21,7 +21,10 @@ class procdata(object):
> + def _list(self):
> + return os.listdir(self.source + "/proc")
> + def _read(self, f):
> +-return file(self.source + '/proc/' + f).read()
> ++afile = open(self.source + '/proc/' + f)
> ++ret = afile.read()
> ++afile.close()
> ++return ret
> + def _readlines(self, f):
> + return self._read(f).splitlines(True)
> + def _stat(self, f):
> +@@ -209,7 +212,7 @@ def fromunits(x):
> + s = dict(k=2**10, K=2**10, kB=2**10, KB=2**10,
> + M=2**20, MB=2**20, G=2**30, GB=2**30,
> + T=2**40, TB=2**40)
> +-for k,v in s.items():
> ++for k,v in list(s.items()):
> + if x.endswith(k):
> + return int(float(x[:-len(k)])*v)
> + sys.stderr.write("Memory size should be written with units, for example
> 1024M\n")
> +@@ -240,7 +243,7 @@ def pidtotals(pid):
> + maps = pidmaps(pid)
> + t = dict(size=0, rss=0, pss=0, shared_clean=0, shared_dirty=0,
> + private_clean=0, private_dirty=0, referenced=0, swap=0)
> +-for m in maps.iterkeys():
> ++for m in maps.keys():
> + for k in t:
> + t[k] += maps[m].get(k, 0)
> +
> +@@ -296,7 +299,7 @@ def showpids():
> + )
> + columns = options.columns or 'pid user command swap uss pss rss'
> +
> +-showtable(pt.keys(), fields, columns.split(), options.sort or 'pss')
> ++showtable(list(pt.keys()), fields, columns.split(), options.sort or
> 'pss')
> +
> + def maptotals(pids):
> + totals = {}
> +@@ -307,7 +310,7 @@ def maptotals(pids):
> + try:
> + maps = pidmaps(pid)
> + seen = {}
> +-for m in maps.iterkeys():
> ++for m in maps.keys():
> + name = maps[m]['name']
> + if name not in totals:
> + t = dict(size=0, rss=0, pss=0, shared_clean=0,
> +@@ -361,7 +364,7 @@ def showmaps():
> + )
> + columns = options.columns or 'map pids avgpss pss'
> +
> +-showtable(pt.keys(), fields, columns.split(), options.sort or 'pss')
> ++showtable(list(pt.keys()), fields, columns.split(), options.sort or
> 'pss')
> +
> + def usertotals(pids):
> + totals = {}
> +@@ -383,7 +386,7 @@ def usertotals(pids):
> + else:
> + t = totals[user]
> +
> +-for m in maps.iterkeys():
> ++for m in maps.keys():
> + for k in t:
> + t[k] += maps[m].get(k, 0)
> +
> +@@ -419,7 +422,7 @@ def showusers():
> + )
> + columns = options.columns or 'user count swap uss pss rss'
> +
> +-showtable(pt.keys(), fields, columns.split(), options.sort or 'pss')
> ++showtable(list(pt.keys()), fields, columns.split(), options.sort or
> 'pss')
> +
> + def showsystem():
> + t = totalmem()
> +@@ -460,14 +463,14 @@ def showsystem():
> + 'area not reclaimable'))
> +
> + columns = options.columns or 'area used cache noncache'
> +-showtable(range(len(l)), fields, columns.split(), options.sort or
> 'order')
> ++showtable(list(range(len(l))), fields, columns.split(), options.sort or
>
[oe] [meta-oe][master-next][PATCH 2/2] smem: update to v1.5 (python3 compatibility)
smem generally works using the upstream code, but
the --source argument still throws exceptions - add
a patch to resolve those as well.
There is no release on the downloads URL, but a tag
in mercurial - so this now downloads the snapshot that
tag is pointing to.
Signed-off-by: André Draszik
---
...ix-support-for-source-option-python3.patch | 53 +++
.../smem/{smem_1.4.bb => smem_1.5.bb} | 20 +--
2 files changed, 68 insertions(+), 5 deletions(-)
create mode 100644
meta-oe/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch
rename meta-oe/recipes-support/smem/{smem_1.4.bb => smem_1.5.bb} (56%)
diff --git
a/meta-oe/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch
b/meta-oe/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch
new file mode 100644
index 0..5c1be5a0a
--- /dev/null
+++
b/meta-oe/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch
@@ -0,0 +1,53 @@
+From 3ff78f1f00973393d1a7ee4e467a2bacf1c807f3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?=
+Date: Wed, 5 Feb 2020 16:14:21 +
+Subject: [PATCH] smem: fix support for --source option (python3)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Using --source doesn't work without this patch:
+Traceback (most recent call last):
+ File "./smem", line 727, in
+showpids()
+ File "./smem", line 299, in showpids
+showtable(pt.keys(), fields, columns.split(), options.sort or 'pss')
+ File "./smem", line 519, in showtable
+mt = totalmem()
+ File "./smem", line 118, in totalmem
+_totalmem = memory()['memtotal']
+ File "./smem", line 193, in memory
+m = f.match(l)
+TypeError: cannot use a string pattern on a bytes-like object
+
+python3's tarfile returns bytes, whereas all of the rest of
+the code assumes str.
+
+Fix the tarfile usage to convert to str before returning the
+results.
+
+Signed-off-by: André Draszik
+Upstream-Status: Inappropriate [upstream wants to support python2 & python3]
+---
+ smem | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/smem b/smem
+index 46a3189..54d40dd 100755
+--- a/smem
b/smem
+@@ -90,9 +90,9 @@ class tardata(procdata):
+ d,f = ti.name.split('/')
+ yield d
+ def _read(self, f):
+-return self.tar.extractfile(f).read()
++return self.tar.extractfile(f).read().decode()
+ def _readlines(self, f):
+-return self.tar.extractfile(f).readlines()
++return [l.decode() for l in self.tar.extractfile(f).readlines()]
+ def piduser(self, p):
+ t = self.tar.getmember("%d" % p)
+ if t.uname:
+--
+2.23.0.rc1
+
diff --git a/meta-oe/recipes-support/smem/smem_1.4.bb
b/meta-oe/recipes-support/smem/smem_1.5.bb
similarity index 56%
rename from meta-oe/recipes-support/smem/smem_1.4.bb
rename to meta-oe/recipes-support/smem/smem_1.5.bb
index 947c47b0f..90db9c3f3 100644
--- a/meta-oe/recipes-support/smem/smem_1.4.bb
+++ b/meta-oe/recipes-support/smem/smem_1.5.bb
@@ -9,9 +9,16 @@ SECTION = "Applications/System"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRC_URI = "http://www.selenic.com/${BPN}/download/${BP}.tar.gz;
-SRC_URI[md5sum] = "fe79435c3930389bfdb560255c802162"
-SRC_URI[sha256sum] =
"2ea9f878f4cf3c276774c3f7e2a41977a1f2d64f98d2dcb6a15f1f3d84df61ec"
+HG_CHANGESET = "98273ce331bb"
+SRC_URI =
"https://selenic.com/repo/${BPN}/archive/${HG_CHANGESET}.tar.bz2;downloadfilename=${BP}.tar.bz2
\
+ file://0001-smem-fix-support-for-source-option-python3.patch"
+SRC_URI[md5sum] = "51c3989779360f42b42ef46b2831be3a"
+SRC_URI[sha256sum] =
"161131c686a6d9962a0e96912526dd46308e022d62e3f8acaed5a56fda8e08ce"
+
+UPSTREAM_CHECK_URI = "https://selenic.com/repo/smem/tags;
+UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)"
+
+S = "${WORKDIR}/${BPN}-${HG_CHANGESET}"
do_compile() {
${CC} ${CFLAGS} ${LDFLAGS} smemcap.c -o smemcap
@@ -21,12 +28,15 @@ do_install() {
install -d ${D}/${bindir}/
install -d ${D}/${mandir}/man8
install -m 0755 ${S}/smem ${D}${bindir}/
+sed -i -e '1s,#!.*python.*,#!${USRBINPATH}/env python3,'
${D}${bindir}/smem
install -m 0755 ${S}/smemcap ${D}${bindir}/
install -m 0644 ${S}/smem.8 ${D}/${mandir}/man8/
}
-RDEPENDS_${PN} += "python-textutils python-compression python-shell
python-codecs"
-PACKAGES =+ "smemcap"
+RDEPENDS_${PN} = "python3-core python3-compression"
+RRECOMMENDS_${PN} = "python3-matplotlib python3-numpy"
+
+PACKAGE_BEFORE_PN = "smemcap"
FILES_smemcap = "${bindir}/smemcap"
--
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 1/2] python3-matplotlib: provide a -native variant
From: André Draszik This is useful e.g. for smem-native. Signed-off-by: André Draszik --- meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb index 9b86ccc83..824680c24 100644 --- a/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.1.1.bb @@ -15,3 +15,5 @@ SRC_URI[sha256sum] = "1febd22afe1489b13c6749ea059d392c03261b2950d1d45c17e3aed812 PYPI_PACKAGE = "matplotlib" inherit pypi setuptools3 + +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] smem: add a native variant
The native variant is useful to e.g. examine captures of a
running target on the host system.
Signed-off-by: André Draszik
---
meta-oe/recipes-support/smem/smem_1.4.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-support/smem/smem_1.4.bb
b/meta-oe/recipes-support/smem/smem_1.4.bb
index 702217a33..947c47b0f 100644
--- a/meta-oe/recipes-support/smem/smem_1.4.bb
+++ b/meta-oe/recipes-support/smem/smem_1.4.bb
@@ -29,3 +29,5 @@ RDEPENDS_${PN} += "python-textutils python-compression
python-shell python-codec
PACKAGES =+ "smemcap"
FILES_smemcap = "${bindir}/smemcap"
+
+BBCLASSEXTEND = "native"
--
2.23.0.rc1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 3/4] openjre-8: fix debuginfo fixup in do_install
Hi,
On Mon, 2020-01-27 at 12:24 +0100, Richard Leitner wrote:
> Based on a patch sent by Jacob Kroon.
>
> Signed-off-by: Richard Leitner
> Cc: Jacob Kroon
> ---
> recipes-core/openjdk/openjre-8_242.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-core/openjdk/openjre-8_242.bb
> b/recipes-core/openjdk/openjre-8_242.bb
> index 4ed2e6b..2c8a6a5 100644
> --- a/recipes-core/openjdk/openjre-8_242.bb
> +++ b/recipes-core/openjdk/openjre-8_242.bb
> @@ -11,7 +11,7 @@ do_install() {
> cp -rp ${B}/images/j2re-image/* ${D}${JRE_HOME}
> chown -R root:root ${D}${JRE_HOME}
> install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/
> -find ${D}${JDK_HOME} -name "*.debuginfo" -exec rm {} \;
> +[ -d ${D}${JDK_HOME} ] && find ${D}${JDK_HOME} -name "*.debuginfo" -exec
> rm {} \;
Does this line make sense? The JRE build should not produce any files in the
JDK_HOME
directory, I think?
So the only 'fix' this is doing is to silence 'find' to not print a warning
about a
directory it can't find?
Shouldn't the line be dropped completely instead?
Should we worry if the JRE build (sometimes?) places files into JDK_HOME?
A.
> }
>
> FILES_${PN}_append = "\
> --
> 2.24.1
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] nodejs: 10.17.0 -> 12.14.0
> > > @@ -92,5 +91,5 @@ index 028c32e..bf443c4 100755
> > > if 'true' == variables.get('node_use_dtrace'):
> > > action(['out/Release/node.d'], 'lib/dtrace/node.d')
> > > --
> > > -2.23.0
> > > +2.20.1
> > >
> > > diff --git
> > > a/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
> > > b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
> > > deleted file mode 100644
> > > index 925c085e9..0
> > > ---
> > > a/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
> > > +++ /dev/null
> > > @@ -1,69 +0,0 @@
> > > -Implement function as wrapper for std::make_unique
> > > -method to be compatible with gcc < 4.9 .
> > > -"error::make_unique is not a member of 'std'"
> > > -
> > > -Signed-off-by: Andrej Valek
> > > -Signed-off-by: Brad Bishop
> > > -
> > > -diff -Naur node-v10.15.1/src/cares_wrap.cc
> > > node-v10.15.1/src/cares_wrap.cc
> > > node-v10.15.1/src/cares_wrap.cc2019-01-29 08:20:50.0
> > > +0100
> > > -+++ node-v10.15.1/src/cares_wrap.cc2019-02-21 16:22:25.489131665
> > > +0100
> > > -@@ -52,6 +52,16 @@
> > > - # define AI_V4MAPPED 0
> > > - #endif
> > > -
> > > -+#ifndef __cpp_lib_make_unique
> > > -+namespace std {
> > > -+ /// make_unique implementation
> > > -+ template
> > > -+ std::unique_ptr make_unique(Args&&... args) {
> > > -+return std::unique_ptr(new T(std::forward(args)...));
> > > -+ }
> > > -+}
> > > -+#endif
> > > -+
> > > - namespace node {
> > > - namespace cares_wrap {
> > > -
> > > -diff -Naur node-v10.15.1/src/inspector_agent.cc
> > > node-v10.15.1/src/inspector_agent.cc
> > > node-v10.15.1/src/inspector_agent.cc 2019-01-29
> > > 08:20:50.0 +0100
> > > -+++ node-v10.15.1/src/inspector_agent.cc 2019-02-21
> > > 16:22:09.000185992 +0100
> > > -@@ -24,6 +24,16 @@
> > > - #include
> > > - #endif // __POSIX__
> > > -
> > > -+#ifndef __cpp_lib_make_unique
> > > -+namespace std {
> > > -+ /// make_unique implementation
> > > -+ template
> > > -+ std::unique_ptr make_unique(Args&&... args) {
> > > -+return std::unique_ptr(new T(std::forward(args)...));
> > > -+ }
> > > -+}
> > > -+#endif
> > > -+
> > > - namespace node {
> > > - namespace inspector {
> > > - namespace {
> > > -
> > > -diff --git a/src/inspector/main_thread_interface.cc
> > > b/src/inspector/main_thread_interface.cc
> > > -index e374c0fd70..05d7d8c60f 100644
> > > a/src/inspector/main_thread_interface.cc
> > > -+++ b/src/inspector/main_thread_interface.cc
> > > -@@ -6,6 +6,16 @@
> > > - #include
> > > - #include
> > > -
> > > -+#ifndef __cpp_lib_make_unique
> > > -+namespace std {
> > > -+ /// make_unique implementation
> > > -+ template
> > > -+ std::unique_ptr make_unique(Args&&... args) {
> > > -+return std::unique_ptr(new T(std::forward(args)...));
> > > -+ }
> > > -+}
> > > -+#endif
> > > -+
> > > - namespace node {
> > > - namespace inspector {
> > > - namespace {
> > > diff --git
> > > a/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch
> > > b/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch
> > > similarity index 92%
> > > rename from
> > > meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch
> > > rename to
> > > meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch
> > > index eb2cbfb8b..97ed972ce 100644
> > > ---
> > > a/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch
> > > +++
> > > b/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch
> > > @@ -24,14 +24,14 @@ problems have been noted during compilation or
> > > runtime.
> > > Upstream-Status: Inappropriate [oe-specific]
> > > Signed-off-by: André Draszik
> > > ---
> > > - deps/v8/gypfiles/toolchain.gypi | 52 ++---
> > > + tools/v8_gypfiles/toolcha
Re: [oe] [meta-java][PATCH] java.bbclass: oe_makeclasspath does nothing without -s
On Tue, 2020-01-21 at 07:44 +0100, Richard Leitner wrote:
> Hi,
> this is a note to let you know that I've just added this patch to the
> master-next branch of the meta-java repository at
> git://git.yoctoproject.org/meta-java
>
> As soon as it has gone through some more testing it will likely be
> merged to the master branch.
>
> If you have any questions, please let me know.
>
> regards;Richard.L
>
> On Mon, Jan 20, 2020 at 08:28:31PM +, Davis, Michael wrote:
> > oe_makeclasspath is supposed to output for the target platform by default
> > and the staging platform with -s.
> > However it checks if the file exists even if -s is not defined which is
> > always false.
> > Additionaly remove comment around an error that never occurs.
> >
> > Signed-off-by: Michael Davis
> > ---
> > classes/java.bbclass | 10 +-
> > 1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/classes/java.bbclass b/classes/java.bbclass
> > index fc97295..7b9677a 100644
> > --- a/classes/java.bbclass
> > +++ b/classes/java.bbclass
> > @@ -80,8 +80,6 @@ oe_makeclasspath() {
> ># in variable "bootcp".
> >#
> ># Provide the -s at the beginning otherwise strange things happen.
> > - # If -s is given the function checks whether the requested jar file
> > exists
> > - # and exits with an error message if it cannot be found.
> >#
> ># Note: In order to encourage usage of the DEPENDS variable, the function
> ># can accept recipe names. If a recipe has no corresponding Jar file it
> > @@ -91,6 +89,7 @@ oe_makeclasspath() {
> >classpath=
> >delimiter=
> >retval=$1
> > + staging=false
> >
> >shift
> >
> > @@ -106,6 +105,7 @@ oe_makeclasspath() {
> >dir=${STAGING_DATADIR_JAVA}
> >;;
> >esac
> > + staging=true
> >;;
> >-*)
> >bbfatal "oe_makeclasspath: unknown option: $1"
> > @@ -113,9 +113,9 @@ oe_makeclasspath() {
> >*)
> >file=$dir/$1.jar
> >
> > - if [ -e $file ]; then
> > - classpath=$classpath$delimiter$file
> > - delimiter=":"
> > + if [ $staging == false ] || [ -e $file ]; then
^^
Can you please remove this bashism. One '=' is enough.
Cheers,
Andre'
> > +classpath=$classpath$delimiter$file
> > +delimiter=":"
> >fi
> >
> >;;
> > --
> > 2.24.1
> >
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-python2][PATCH] python-beautifulsoup4: fix target RDEPENDS
On Sun, 2020-01-19 at 15:24 -0800, Tim Orling wrote:
> * target has run-time dependencies on:
> - python-html
> - python-logging
Any reason -native doesn't depend on those?
> Unexpectedly, class-target += override is wiping out
> RDEPENDS_${PN}, so explicitly add the rest of the
> run-time dependencies (python-html5lib, python-lxml,
> python-soupsieve).
This is expected, you should instead do:
RDEPENDS_${PN}_append_class-target = "\
${PYTHON_PN}-html \
${PYTHON_PN}-logging"
So as to avoid duplication and having to maintain two distinct lists.
Cheers,
Andre'
>
> Signed-off-by: Tim Orling
> ---
> recipes-devtools/python/python-beautifulsoup4_4.8.1.bb | 10 ++
> 1 file changed, 10 insertions(+)
>
> diff --git a/recipes-devtools/python/python-beautifulsoup4_4.8.1.bb
> b/recipes-devtools/python/python-
> beautifulsoup4_4.8.1.bb
> index 86482714..8ac9c8c5 100644
> --- a/recipes-devtools/python/python-beautifulsoup4_4.8.1.bb
> +++ b/recipes-devtools/python/python-beautifulsoup4_4.8.1.bb
> @@ -19,4 +19,14 @@ RDEPENDS_${PN} = "\
> ${PYTHON_PN}-soupsieve \
>
> +# class override, which is not
> +# inheriting from above (FIXME?)
> +RDEPENDS_${PN}_class-target += "\
> +${PYTHON_PN}-html \
> +${PYTHON_PN}-html5lib \
> +${PYTHON_PN}-logging \
> +${PYTHON_PN}-lxml \
> +${PYTHON_PN}-soupsieve \
> +"
> +
> BBCLASSEXTEND = "native nativesdk"
> --
> 2.25.0
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 1/2 v2] oniguruma: update to v6.9.4
Khem, I got the subject line wrong originally - not sure if it's too late already... Cheers, Andre' On Wed, 2020-01-08 at 08:55 +, André Draszik wrote: > The version meta-oe is carrying is more than 4 years old, > from 2015, with numerous CVEs fixed and more than 2000 > commits since. > > The license checksum changed because it contains the > year (which is at 2019 now). > > Onigurama can now also be built using CMake, but for > now this recipe stays with using autotools as only > autotools builds support testing (which the next > patch adds support for). > > Signed-off-by: André Draszik > > --- > v2: > * fix typo in subject line > * fix SUMMARY > --- > .../onig/files/configure.patch| 13 -- > .../files/do-not-use-system-headers.patch | 44 --- > ...t-link-against-host-system-libraries.patch | 42 ++ > meta-oe/recipes-support/onig/onig_5.9.6.bb| 19 > meta-oe/recipes-support/onig/onig_6.9.4.bb| 22 ++ > 5 files changed, 64 insertions(+), 76 deletions(-) > delete mode 100644 meta-oe/recipes-support/onig/files/configure.patch > delete mode 100644 > meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch > create mode 100644 > meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch > delete mode 100644 meta-oe/recipes-support/onig/onig_5.9.6.bb > create mode 100644 meta-oe/recipes-support/onig/onig_6.9.4.bb > > diff --git a/meta-oe/recipes-support/onig/files/configure.patch > b/meta-oe/recipes-support/onig/files/configure.patch > deleted file mode 100644 > index 5fa700f19..0 > --- a/meta-oe/recipes-support/onig/files/configure.patch > +++ /dev/null > @@ -1,13 +0,0 @@ > -Index: onig-5.9.3/configure.in > -=== > onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.0 + > -+++ onig-5.9.3/configure.in 2014-07-18 08:02:52.701574484 + > -@@ -3,7 +3,7 @@ > - > - AC_CONFIG_MACRO_DIR([m4]) > - > --AM_INIT_AUTOMAKE > -+AM_INIT_AUTOMAKE([foreign]) > - AC_CONFIG_HEADER(config.h) > - > - > diff --git > a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch > b/meta-oe/recipes- > support/onig/files/do-not-use-system-headers.patch > deleted file mode 100644 > index b93602a26..0 > --- a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -Author: Marcin Juszkiewicz > - > -When build on host with older eglibc (Ubuntu 12.04) build fails with: > - > -/tmp/OE/build/tmp-eglibc/sysroots/genericarmv8/usr/include/bits/predefs.h:23:3: > error: #error "Never use > directly; include instead." > - > -Signed-off-by: Marcin Juszkiewicz > - > -Upstream-Status: Inappropriate [embedded specific] > - > > - Makefile.am|2 +- > - sample/Makefile.am |2 +- > - 2 files changed, 2 insertions(+), 2 deletions(-) > - > onig-5.9.3.orig/Makefile.am > -+++ onig-5.9.3/Makefile.am > -@@ -4,11 +4,11 @@ sampledir = $(top_srcdir)/sample > - libname = libonig.la > - > - ACLOCAL_AMFLAGS = -I m4 > - #AM_CFLAGS = -DNOT_RUBY > - AM_CFLAGS = > --INCLUDES = -I$(top_srcdir) -I$(includedir) > -+INCLUDES = -I$(top_srcdir) > - > - SUBDIRS = . sample > - > - include_HEADERS = oniguruma.h oniggnu.h onigposix.h > - lib_LTLIBRARIES = $(libname) > onig-5.9.3.orig/sample/Makefile.am > -+++ onig-5.9.3/sample/Makefile.am > -@@ -1,10 +1,10 @@ > - noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl > - > - libname = $(top_builddir)/libonig.la > - LDADD = $(libname) > --INCLUDES = -I$(top_srcdir) -I$(includedir) > -+INCLUDES = -I$(top_srcdir) > - > - encode_SOURCES = encode.c > - listcap_SOURCES = listcap.c > - names_SOURCES = names.c > - posix_SOURCES = posix.c > diff --git > a/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch > b/meta- > oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch > new file mode 100644 > index 0..891592650 > --- /dev/null > +++ > b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch > @@ -0,0 +1,42 @@ > +From 78103ecd18efcd0966531d8718f6e94dcb7a5abf Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= > +Date: Mon, 6 Jan 2020 16:56:31 + > +Subject: [PATCH] build: don't link against (host) system libraries > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Upstream-Status: Inappropriate [O
Re: [oe] [meta-oe][PATCH 2/2 v3] oniguruma: enable ptest
Khem,
I got the subject line wrong originally - not sure how that works with
patchwork.
Can you still pick this up please?
Cheers,
Andre'
On Wed, 2020-01-08 at 08:56 +, André Draszik wrote:
> All tests (with 3400 subtests) are passing (on musl+arm).
>
> Signed-off-by: André Draszik
>
> ---
> v3:
> * fix subject line
>
> v2:
> * remove useless line in run-ptest
> * update commit message
> ---
> ...rial-tests-automake-option-for-ptest.patch | 36 ++
> meta-oe/recipes-support/onig/onig/run-ptest | 47 +++
> meta-oe/recipes-support/onig/onig_6.9.4.bb| 12 -
> 3 files changed, 94 insertions(+), 1 deletion(-)
> create mode 100644
> meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
> create mode 100755 meta-oe/recipes-support/onig/onig/run-ptest
>
> diff --git
> a/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
> b/meta-
> oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
> new file mode 100644
> index 0..587e5ac1b
> --- /dev/null
> +++
> b/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
> @@ -0,0 +1,36 @@
> +From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andr=C3=A9=20Draszik?=
> +Date: Mon, 6 Jan 2020 15:10:30 +
> +Subject: [PATCH] build: enable serial-tests automake option (for ptest)
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +For ptest, we need to be able to compile the tests without
> +running them.
> +
> +Enabling the serial-tests automake option will add
> +buildtest-TESTS and runtest-TESTS makefile targets, the
> +former being what we want.
> +
> +Signed-off-by: André Draszik
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index ac51e85..48e63ce 100644
> +--- a/configure.ac
> b/configure.ac
> +@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4)
> +
> + AC_CONFIG_MACRO_DIR([m4])
> +
> +-AM_INIT_AUTOMAKE([-Wno-portability])
> ++AM_INIT_AUTOMAKE([-Wno-portability serial-tests])
> + AC_CONFIG_HEADERS([src/config.h])
> +
> +
> +--
> +2.23.0.rc1
> +
> diff --git a/meta-oe/recipes-support/onig/onig/run-ptest
> b/meta-oe/recipes-support/onig/onig/run-ptest
> new file mode 100755
> index 0..2574d7efa
> --- /dev/null
> +++ b/meta-oe/recipes-support/onig/onig/run-ptest
> @@ -0,0 +1,47 @@
> +#!/bin/sh -eu
> +
> +my_cleanup() {
> +[ -n "${workdir:-}" ] && rm -rf "${workdir}"
> +}
> +
> +trap "my_cleanup" EXIT
> +for sig in INT TERM ; do
> +# We want sig to expand right here and now, as it's
> +# a loop variable, not when signalled. For $$ it
> +# doesn't matter.
> +# shellcheck disable=SC2064
> +trap "my_cleanup ; trap - EXIT ; trap - ${sig} ; kill -s ${sig} $$"
> ${sig}
> +done
> +
> +workdir=$(mktemp -d -t onig.ptest.XX)
> +status="${workdir}/failed"
> +touch "${status}"
> +
> +find tests/ -perm -111 -type f -exec sh -c '
> +workdir="${1}"
> +status="${2}"
> +t="${3}"
> +t_log="${workdir}/$(basename ${t}).log"
> +
> +res=0
> +./${t} > "${t_log}" 2>&1 \
> +|| res=$?
> +if [ $res -eq 0 ] ; then
> +echo "PASS: ${t}"
> +else
> +echo "FAIL: ${t}"
> +echo "$(basename ${t}): ${t_log}" >> "${status}"
> +fi
> +' _ "${workdir}" "${status}" {} \;
> +
> +if [ $(stat -c '%s' "${status}") -ne 0 ] ; then
> +exec >&2
> +while IFS=': ' read -r t t_log ; do
> +printf "\n=\n"
> +printf "ERROR: %s:\n" "${t}"
> +printf -- "-\n"
> +cat "${t_log}"
> +done < "${status}"
> +fi
> +
> +[ $(stat -c '%s' "${status}") -eq 0 ]
> diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb
> b/meta-oe/recipes-support/onig/onig_6.9.4.bb
> index d873088fe..cfa86f04c 100644
> --- a/meta-oe/recipes-support/onig/onig_6.9.4.bb
> +++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb
> @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b"
> SRC_URI = "\
> https://github.com/kkos/oniguruma/releases/download
[oe] [meta-oe][PATCH 2/2 v3] oniguruma: enable ptest
All tests (with 3400 subtests) are passing (on musl+arm).
Signed-off-by: André Draszik
---
v3:
* fix subject line
v2:
* remove useless line in run-ptest
* update commit message
---
...rial-tests-automake-option-for-ptest.patch | 36 ++
meta-oe/recipes-support/onig/onig/run-ptest | 47 +++
meta-oe/recipes-support/onig/onig_6.9.4.bb| 12 -
3 files changed, 94 insertions(+), 1 deletion(-)
create mode 100644
meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
create mode 100755 meta-oe/recipes-support/onig/onig/run-ptest
diff --git
a/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
b/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
new file mode 100644
index 0..587e5ac1b
--- /dev/null
+++
b/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
@@ -0,0 +1,36 @@
+From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?=
+Date: Mon, 6 Jan 2020 15:10:30 +
+Subject: [PATCH] build: enable serial-tests automake option (for ptest)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For ptest, we need to be able to compile the tests without
+running them.
+
+Enabling the serial-tests automake option will add
+buildtest-TESTS and runtest-TESTS makefile targets, the
+former being what we want.
+
+Signed-off-by: André Draszik
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ac51e85..48e63ce 100644
+--- a/configure.ac
b/configure.ac
+@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4)
+
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE([-Wno-portability])
++AM_INIT_AUTOMAKE([-Wno-portability serial-tests])
+ AC_CONFIG_HEADERS([src/config.h])
+
+
+--
+2.23.0.rc1
+
diff --git a/meta-oe/recipes-support/onig/onig/run-ptest
b/meta-oe/recipes-support/onig/onig/run-ptest
new file mode 100755
index 0..2574d7efa
--- /dev/null
+++ b/meta-oe/recipes-support/onig/onig/run-ptest
@@ -0,0 +1,47 @@
+#!/bin/sh -eu
+
+my_cleanup() {
+[ -n "${workdir:-}" ] && rm -rf "${workdir}"
+}
+
+trap "my_cleanup" EXIT
+for sig in INT TERM ; do
+# We want sig to expand right here and now, as it's
+# a loop variable, not when signalled. For $$ it
+# doesn't matter.
+# shellcheck disable=SC2064
+trap "my_cleanup ; trap - EXIT ; trap - ${sig} ; kill -s ${sig} $$" ${sig}
+done
+
+workdir=$(mktemp -d -t onig.ptest.XX)
+status="${workdir}/failed"
+touch "${status}"
+
+find tests/ -perm -111 -type f -exec sh -c '
+workdir="${1}"
+status="${2}"
+t="${3}"
+t_log="${workdir}/$(basename ${t}).log"
+
+res=0
+./${t} > "${t_log}" 2>&1 \
+|| res=$?
+if [ $res -eq 0 ] ; then
+echo "PASS: ${t}"
+else
+echo "FAIL: ${t}"
+echo "$(basename ${t}): ${t_log}" >> "${status}"
+fi
+' _ "${workdir}" "${status}" {} \;
+
+if [ $(stat -c '%s' "${status}") -ne 0 ] ; then
+exec >&2
+while IFS=': ' read -r t t_log ; do
+printf "\n=\n"
+printf "ERROR: %s:\n" "${t}"
+printf -- "-\n"
+cat "${t_log}"
+done < "${status}"
+fi
+
+[ $(stat -c '%s' "${status}") -eq 0 ]
diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb
b/meta-oe/recipes-support/onig/onig_6.9.4.bb
index d873088fe..cfa86f04c 100644
--- a/meta-oe/recipes-support/onig/onig_6.9.4.bb
+++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b"
SRC_URI = "\
https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \
file://0001-build-don-t-link-against-host-system-libraries.patch \
+file://0001-build-enable-serial-tests-automake-option-for-ptest.patch \
+file://run-ptest \
"
SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
@@ -17,6 +19,14 @@ SRC_URI[sha256sum] =
"4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f
BINCONFIG = "${bindir}/onig-config"
-inherit autotools binconfig-disabled
+inherit autotools binconfig-disabled ptest
BBCLASSEXTEND = "native"
+
+do_compile_ptest() {
+oe_runmake -C test buildtest-TESTS
+}
+
+do_install_ptest() {
+install -Dm0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/*
+}
--
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 1/2 v2] oniguruma: update to v6.9.4
The version meta-oe is carrying is more than 4 years old, from 2015, with numerous CVEs fixed and more than 2000 commits since. The license checksum changed because it contains the year (which is at 2019 now). Onigurama can now also be built using CMake, but for now this recipe stays with using autotools as only autotools builds support testing (which the next patch adds support for). Signed-off-by: André Draszik --- v2: * fix typo in subject line * fix SUMMARY --- .../onig/files/configure.patch| 13 -- .../files/do-not-use-system-headers.patch | 44 --- ...t-link-against-host-system-libraries.patch | 42 ++ meta-oe/recipes-support/onig/onig_5.9.6.bb| 19 meta-oe/recipes-support/onig/onig_6.9.4.bb| 22 ++ 5 files changed, 64 insertions(+), 76 deletions(-) delete mode 100644 meta-oe/recipes-support/onig/files/configure.patch delete mode 100644 meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch delete mode 100644 meta-oe/recipes-support/onig/onig_5.9.6.bb create mode 100644 meta-oe/recipes-support/onig/onig_6.9.4.bb diff --git a/meta-oe/recipes-support/onig/files/configure.patch b/meta-oe/recipes-support/onig/files/configure.patch deleted file mode 100644 index 5fa700f19..0 --- a/meta-oe/recipes-support/onig/files/configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: onig-5.9.3/configure.in -=== onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.0 + -+++ onig-5.9.3/configure.in2014-07-18 08:02:52.701574484 + -@@ -3,7 +3,7 @@ - - AC_CONFIG_MACRO_DIR([m4]) - --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADER(config.h) - - diff --git a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch b/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch deleted file mode 100644 index b93602a26..0 --- a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch +++ /dev/null @@ -1,44 +0,0 @@ -Author: Marcin Juszkiewicz - -When build on host with older eglibc (Ubuntu 12.04) build fails with: - -/tmp/OE/build/tmp-eglibc/sysroots/genericarmv8/usr/include/bits/predefs.h:23:3: error: #error "Never use directly; include instead." - -Signed-off-by: Marcin Juszkiewicz - -Upstream-Status: Inappropriate [embedded specific] - - Makefile.am|2 +- - sample/Makefile.am |2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - onig-5.9.3.orig/Makefile.am -+++ onig-5.9.3/Makefile.am -@@ -4,11 +4,11 @@ sampledir = $(top_srcdir)/sample - libname = libonig.la - - ACLOCAL_AMFLAGS = -I m4 - #AM_CFLAGS = -DNOT_RUBY - AM_CFLAGS = --INCLUDES = -I$(top_srcdir) -I$(includedir) -+INCLUDES = -I$(top_srcdir) - - SUBDIRS = . sample - - include_HEADERS = oniguruma.h oniggnu.h onigposix.h - lib_LTLIBRARIES = $(libname) onig-5.9.3.orig/sample/Makefile.am -+++ onig-5.9.3/sample/Makefile.am -@@ -1,10 +1,10 @@ - noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl - - libname = $(top_builddir)/libonig.la - LDADD = $(libname) --INCLUDES = -I$(top_srcdir) -I$(includedir) -+INCLUDES = -I$(top_srcdir) - - encode_SOURCES = encode.c - listcap_SOURCES = listcap.c - names_SOURCES = names.c - posix_SOURCES = posix.c diff --git a/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch new file mode 100644 index 0..891592650 --- /dev/null +++ b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch @@ -0,0 +1,42 @@ +From 78103ecd18efcd0966531d8718f6e94dcb7a5abf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Mon, 6 Jan 2020 16:56:31 + +Subject: [PATCH] build: don't link against (host) system libraries +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: André Draszik +--- + sample/Makefile.am | 1 - + test/Makefile.am | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/sample/Makefile.am b/sample/Makefile.am +index 22a4989..e935bf0 100644 +--- a/sample/Makefile.am b/sample/Makefile.am +@@ -3,7 +3,6 @@ + lib_onig = ../src/libonig.la + LDADD = $(lib_onig) + +-AM_LDFLAGS = -L$(prefix)/lib + AM_CPPFLAGS = -I$(top_srcdir)/src + + if ENABLE_POSIX_API +diff --git a/test/Makefile.am b/test/Makefile.am +index 4d62568..b7a2105 100644 +--- a/test/Makefile.am b/test/Makefile.am +@@ -1,7 +1,6 @@ + ## Makefile.am for Oniguruma + lib_onig = ../src/libonig.la + +-AM_LDFLAGS = -L$(prefix)/lib + AM_CFLAGS = -Wall -Wno-invalid-source-encoding + AM_CPPFLAGS = -I$(top_srcdir)/src + +-- +2.23.0.rc1 +
[oe] [meta-oe][PATCH 2/2 v2] onigurama: enable ptest
All tests (with 3400 subtests) are passing (on musl+arm).
Signed-off-by: André Draszik
---
v2:
* remove useless line in run-ptest
* update commit message
---
...rial-tests-automake-option-for-ptest.patch | 36 ++
meta-oe/recipes-support/onig/onig/run-ptest | 47 +++
meta-oe/recipes-support/onig/onig_6.9.4.bb| 12 -
3 files changed, 94 insertions(+), 1 deletion(-)
create mode 100644
meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
create mode 100755 meta-oe/recipes-support/onig/onig/run-ptest
diff --git
a/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
b/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
new file mode 100644
index 0..587e5ac1b
--- /dev/null
+++
b/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
@@ -0,0 +1,36 @@
+From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?=
+Date: Mon, 6 Jan 2020 15:10:30 +
+Subject: [PATCH] build: enable serial-tests automake option (for ptest)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For ptest, we need to be able to compile the tests without
+running them.
+
+Enabling the serial-tests automake option will add
+buildtest-TESTS and runtest-TESTS makefile targets, the
+former being what we want.
+
+Signed-off-by: André Draszik
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ac51e85..48e63ce 100644
+--- a/configure.ac
b/configure.ac
+@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4)
+
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE([-Wno-portability])
++AM_INIT_AUTOMAKE([-Wno-portability serial-tests])
+ AC_CONFIG_HEADERS([src/config.h])
+
+
+--
+2.23.0.rc1
+
diff --git a/meta-oe/recipes-support/onig/onig/run-ptest
b/meta-oe/recipes-support/onig/onig/run-ptest
new file mode 100755
index 0..2574d7efa
--- /dev/null
+++ b/meta-oe/recipes-support/onig/onig/run-ptest
@@ -0,0 +1,47 @@
+#!/bin/sh -eu
+
+my_cleanup() {
+[ -n "${workdir:-}" ] && rm -rf "${workdir}"
+}
+
+trap "my_cleanup" EXIT
+for sig in INT TERM ; do
+# We want sig to expand right here and now, as it's
+# a loop variable, not when signalled. For $$ it
+# doesn't matter.
+# shellcheck disable=SC2064
+trap "my_cleanup ; trap - EXIT ; trap - ${sig} ; kill -s ${sig} $$" ${sig}
+done
+
+workdir=$(mktemp -d -t onig.ptest.XX)
+status="${workdir}/failed"
+touch "${status}"
+
+find tests/ -perm -111 -type f -exec sh -c '
+workdir="${1}"
+status="${2}"
+t="${3}"
+t_log="${workdir}/$(basename ${t}).log"
+
+res=0
+./${t} > "${t_log}" 2>&1 \
+|| res=$?
+if [ $res -eq 0 ] ; then
+echo "PASS: ${t}"
+else
+echo "FAIL: ${t}"
+echo "$(basename ${t}): ${t_log}" >> "${status}"
+fi
+' _ "${workdir}" "${status}" {} \;
+
+if [ $(stat -c '%s' "${status}") -ne 0 ] ; then
+exec >&2
+while IFS=': ' read -r t t_log ; do
+printf "\n=\n"
+printf "ERROR: %s:\n" "${t}"
+printf -- "-\n"
+cat "${t_log}"
+done < "${status}"
+fi
+
+[ $(stat -c '%s' "${status}") -eq 0 ]
diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb
b/meta-oe/recipes-support/onig/onig_6.9.4.bb
index ce9eab9e8..16a8be5a2 100644
--- a/meta-oe/recipes-support/onig/onig_6.9.4.bb
+++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b"
SRC_URI = "\
https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \
file://0001-build-don-t-link-against-host-system-libraries.patch \
+file://0001-build-enable-serial-tests-automake-option-for-ptest.patch \
+file://run-ptest \
"
SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
@@ -17,6 +19,14 @@ SRC_URI[sha256sum] =
"4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f
BINCONFIG = "${bindir}/onig-config"
-inherit autotools binconfig-disabled
+inherit autotools binconfig-disabled ptest
BBCLASSEXTEND = "native"
+
+do_compile_ptest() {
+oe_runmake -C test buildtest-TESTS
+}
+
+do_install_ptest() {
+install -Dm0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/*
+}
--
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 2/2] onigurama: enable ptest
Signed-off-by: André Draszik
---
...rial-tests-automake-option-for-ptest.patch | 36 ++
meta-oe/recipes-support/onig/onig/run-ptest | 48 +++
meta-oe/recipes-support/onig/onig_6.9.4.bb| 12 -
3 files changed, 95 insertions(+), 1 deletion(-)
create mode 100644
meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
create mode 100755 meta-oe/recipes-support/onig/onig/run-ptest
diff --git
a/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
b/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
new file mode 100644
index 0..587e5ac1b
--- /dev/null
+++
b/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
@@ -0,0 +1,36 @@
+From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?=
+Date: Mon, 6 Jan 2020 15:10:30 +
+Subject: [PATCH] build: enable serial-tests automake option (for ptest)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For ptest, we need to be able to compile the tests without
+running them.
+
+Enabling the serial-tests automake option will add
+buildtest-TESTS and runtest-TESTS makefile targets, the
+former being what we want.
+
+Signed-off-by: André Draszik
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ac51e85..48e63ce 100644
+--- a/configure.ac
b/configure.ac
+@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4)
+
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE([-Wno-portability])
++AM_INIT_AUTOMAKE([-Wno-portability serial-tests])
+ AC_CONFIG_HEADERS([src/config.h])
+
+
+--
+2.23.0.rc1
+
diff --git a/meta-oe/recipes-support/onig/onig/run-ptest
b/meta-oe/recipes-support/onig/onig/run-ptest
new file mode 100755
index 0..ffc855d61
--- /dev/null
+++ b/meta-oe/recipes-support/onig/onig/run-ptest
@@ -0,0 +1,48 @@
+#!/bin/sh -eu
+
+my_cleanup() {
+[ -n "${workdir:-}" ] && rm -rf "${workdir}"
+}
+
+trap "my_cleanup" EXIT
+for sig in INT TERM ; do
+# We want sig to expand right here and now, as it's
+# a loop variable, not when signalled. For $$ it
+# doesn't matter.
+# shellcheck disable=SC2064
+trap "my_cleanup ; trap - EXIT ; trap - ${sig} ; kill -s ${sig} $$" ${sig}
+done
+
+workdir=$(mktemp -d -t onig.ptest.XX)
+status="${workdir}/failed"
+touch "${status}"
+
+#find test/.libs -perm -111 -type f -exec sh -c '
+find tests/ -perm -111 -type f -exec sh -c '
+workdir="${1}"
+status="${2}"
+t="${3}"
+t_log="${workdir}/$(basename ${t}).log"
+
+res=0
+./${t} > "${t_log}" 2>&1 \
+|| res=$?
+if [ $res -eq 0 ] ; then
+echo "PASS: ${t}"
+else
+echo "FAIL: ${t}"
+echo "$(basename ${t}): ${t_log}" >> "${status}"
+fi
+' _ "${workdir}" "${status}" {} \;
+
+if [ $(stat -c '%s' "${status}") -ne 0 ] ; then
+exec >&2
+while IFS=': ' read -r t t_log ; do
+printf "\n=\n"
+printf "ERROR: %s:\n" "${t}"
+printf -- "-\n"
+cat "${t_log}"
+done < "${status}"
+fi
+
+[ $(stat -c '%s' "${status}") -eq 0 ]
diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb
b/meta-oe/recipes-support/onig/onig_6.9.4.bb
index ce9eab9e8..16a8be5a2 100644
--- a/meta-oe/recipes-support/onig/onig_6.9.4.bb
+++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b"
SRC_URI = "\
https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \
file://0001-build-don-t-link-against-host-system-libraries.patch \
+file://0001-build-enable-serial-tests-automake-option-for-ptest.patch \
+file://run-ptest \
"
SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
@@ -17,6 +19,14 @@ SRC_URI[sha256sum] =
"4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f
BINCONFIG = "${bindir}/onig-config"
-inherit autotools binconfig-disabled
+inherit autotools binconfig-disabled ptest
BBCLASSEXTEND = "native"
+
+do_compile_ptest() {
+oe_runmake -C test buildtest-TESTS
+}
+
+do_install_ptest() {
+install -Dm0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/*
+}
--
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 1/2] onigurama: update to v6.9.4
The version meta-oe is carrying is more than 4 years old, from 2015, with numerous CVEs fixed and more than 2000 commits since. The license checksum changed because it contains the year (which is at 2019 now). Onigurama can now also be built using CMake, but for now this recipe stays with using autotools as only autotools builds support testing (which the next patch adds support for). Signed-off-by: André Draszik --- .../onig/files/configure.patch| 13 -- .../files/do-not-use-system-headers.patch | 44 --- ...t-link-against-host-system-libraries.patch | 42 ++ meta-oe/recipes-support/onig/onig_5.9.6.bb| 19 meta-oe/recipes-support/onig/onig_6.9.4.bb| 22 ++ 5 files changed, 64 insertions(+), 76 deletions(-) delete mode 100644 meta-oe/recipes-support/onig/files/configure.patch delete mode 100644 meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch delete mode 100644 meta-oe/recipes-support/onig/onig_5.9.6.bb create mode 100644 meta-oe/recipes-support/onig/onig_6.9.4.bb diff --git a/meta-oe/recipes-support/onig/files/configure.patch b/meta-oe/recipes-support/onig/files/configure.patch deleted file mode 100644 index 5fa700f19..0 --- a/meta-oe/recipes-support/onig/files/configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: onig-5.9.3/configure.in -=== onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.0 + -+++ onig-5.9.3/configure.in2014-07-18 08:02:52.701574484 + -@@ -3,7 +3,7 @@ - - AC_CONFIG_MACRO_DIR([m4]) - --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADER(config.h) - - diff --git a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch b/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch deleted file mode 100644 index b93602a26..0 --- a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch +++ /dev/null @@ -1,44 +0,0 @@ -Author: Marcin Juszkiewicz - -When build on host with older eglibc (Ubuntu 12.04) build fails with: - -/tmp/OE/build/tmp-eglibc/sysroots/genericarmv8/usr/include/bits/predefs.h:23:3: error: #error "Never use directly; include instead." - -Signed-off-by: Marcin Juszkiewicz - -Upstream-Status: Inappropriate [embedded specific] - - Makefile.am|2 +- - sample/Makefile.am |2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - onig-5.9.3.orig/Makefile.am -+++ onig-5.9.3/Makefile.am -@@ -4,11 +4,11 @@ sampledir = $(top_srcdir)/sample - libname = libonig.la - - ACLOCAL_AMFLAGS = -I m4 - #AM_CFLAGS = -DNOT_RUBY - AM_CFLAGS = --INCLUDES = -I$(top_srcdir) -I$(includedir) -+INCLUDES = -I$(top_srcdir) - - SUBDIRS = . sample - - include_HEADERS = oniguruma.h oniggnu.h onigposix.h - lib_LTLIBRARIES = $(libname) onig-5.9.3.orig/sample/Makefile.am -+++ onig-5.9.3/sample/Makefile.am -@@ -1,10 +1,10 @@ - noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl - - libname = $(top_builddir)/libonig.la - LDADD = $(libname) --INCLUDES = -I$(top_srcdir) -I$(includedir) -+INCLUDES = -I$(top_srcdir) - - encode_SOURCES = encode.c - listcap_SOURCES = listcap.c - names_SOURCES = names.c - posix_SOURCES = posix.c diff --git a/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch new file mode 100644 index 0..891592650 --- /dev/null +++ b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch @@ -0,0 +1,42 @@ +From 78103ecd18efcd0966531d8718f6e94dcb7a5abf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Mon, 6 Jan 2020 16:56:31 + +Subject: [PATCH] build: don't link against (host) system libraries +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: André Draszik +--- + sample/Makefile.am | 1 - + test/Makefile.am | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/sample/Makefile.am b/sample/Makefile.am +index 22a4989..e935bf0 100644 +--- a/sample/Makefile.am b/sample/Makefile.am +@@ -3,7 +3,6 @@ + lib_onig = ../src/libonig.la + LDADD = $(lib_onig) + +-AM_LDFLAGS = -L$(prefix)/lib + AM_CPPFLAGS = -I$(top_srcdir)/src + + if ENABLE_POSIX_API +diff --git a/test/Makefile.am b/test/Makefile.am +index 4d62568..b7a2105 100644 +--- a/test/Makefile.am b/test/Makefile.am +@@ -1,7 +1,6 @@ + ## Makefile.am for Oniguruma + lib_onig = ../src/libonig.la + +-AM_LDFLAGS = -L$(prefix)/lib + AM_CFLAGS = -Wall -Wno-invalid-source-encoding + AM_CPPFLAGS = -I$(top_srcdir)/src + +-- +2.23.0.rc1 + diff --git a/meta-oe/recipes-support/onig/onig_5.9.6.
[oe] [meta-python][PATCH] python3-jsonrpcserver: allow to use as non-root
This version has some file system permission issues, all
the files are readable by the owner only (in the archive
from pypi.org). Given all files in the target file system
will ultimately be owned by root, this means that this
package can only be used by root.
Fix the permissions, and hopefully the next version will
have the archive fixed. The version has been hard-coded
on purpose here so as to remind us to double-check if
the _append() is still needed after a version upgrade.
Signed-off-by: André Draszik
---
.../recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb| 4
1 file changed, 4 insertions(+)
diff --git a/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
b/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
index 7d464b16c..ceae6abd8 100644
--- a/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
@@ -21,3 +21,7 @@ RDEPENDS_${PN} += "\
"
BBCLASSEXTEND = "native nativesdk"
+
+do_install_append() {
+chmod 0644
${D}${PYTHON_SITEPACKAGES_DIR}/jsonrpcserver-4.1.0-py3.7.egg-info/*
+}
--
2.23.0.rc1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-python][PATCH] python3-jsonrpcserver: update to 4.1.0
Already done here
http://lists.openembedded.org/pipermail/openembedded-devel/2020-January/203992.html
Cheers,
Andre'
On Mon, 2020-01-06 at 15:47 +, Nicola Lunghi wrote:
> Signed-off-by: Nicola Lunghi
> ---
> ...-jsonrpcserver_4.0.5.bb => python3-jsonrpcserver_4.1.0.bb} | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> rename meta-python/recipes-devtools/python/{python3-jsonrpcserver_4.0.5.bb
> => python3-jsonrpcserver_4.1.0.bb} (71%)
>
> diff --git
> a/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.0.5.bb
> b/meta-python/recipes-
> devtools/python/python3-jsonrpcserver_4.1.0.bb
> similarity index 71%
> rename from meta-python/recipes-devtools/python/python3-jsonrpcserver_4.0.5.bb
> rename to meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
> index bf9eb0a1c..c0b06b316 100644
> --- a/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.0.5.bb
> +++ b/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
> @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/bcb/jsonrpcserver;
> LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=c89120516900f96f4c60d35fdc4c3f15"
>
> -SRC_URI[md5sum] = "d41e9f6b310cb29b0d8f213ff9d57567"
> -SRC_URI[sha256sum] =
> "240c517f49b0fdd3bfa428c9a7cc581126a0c43eca60d29762da124017d9d9f4"
> +SRC_URI[md5sum] = "c1cc652bdeb04b8ce3ad962fbab34daf"
> +SRC_URI[sha256sum] =
> "3a35c0ef21174ca98f995f99688cebadda97053785833fbb31ec862d6b157f6d"
>
> inherit pypi setuptools3
>
> --
> 2.20.1
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH v2] python3-jsonrpcserver: update to v4.1.0
Signed-off-by: André Draszik
---
v2: fix missing newline in recipe at the same time
---
...sonrpcserver_4.0.5.bb => python3-jsonrpcserver_4.1.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-python/recipes-devtools/python/{python3-jsonrpcserver_4.0.5.bb =>
python3-jsonrpcserver_4.1.0.bb} (71%)
diff --git a/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.0.5.bb
b/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
similarity index 71%
rename from meta-python/recipes-devtools/python/python3-jsonrpcserver_4.0.5.bb
rename to meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
index bf9eb0a1c..7d464b16c 100644
--- a/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.0.5.bb
+++ b/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/bcb/jsonrpcserver;
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c89120516900f96f4c60d35fdc4c3f15"
-SRC_URI[md5sum] = "d41e9f6b310cb29b0d8f213ff9d57567"
-SRC_URI[sha256sum] =
"240c517f49b0fdd3bfa428c9a7cc581126a0c43eca60d29762da124017d9d9f4"
+SRC_URI[md5sum] = "c1cc652bdeb04b8ce3ad962fbab34daf"
+SRC_URI[sha256sum] =
"3a35c0ef21174ca98f995f99688cebadda97053785833fbb31ec862d6b157f6d"
inherit pypi setuptools3
@@ -20,4 +20,4 @@ RDEPENDS_${PN} += "\
python3-typing \
"
-BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file
+BBCLASSEXTEND = "native nativesdk"
--
2.23.0.rc1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH] python3-jsonrpcserver: update to v4.1.0
Signed-off-by: André Draszik
---
...-jsonrpcserver_4.0.5.bb => python3-jsonrpcserver_4.1.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-python/recipes-devtools/python/{python3-jsonrpcserver_4.0.5.bb =>
python3-jsonrpcserver_4.1.0.bb} (71%)
diff --git a/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.0.5.bb
b/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
similarity index 71%
rename from meta-python/recipes-devtools/python/python3-jsonrpcserver_4.0.5.bb
rename to meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
index bf9eb0a1c..c0b06b316 100644
--- a/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.0.5.bb
+++ b/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
@@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/bcb/jsonrpcserver;
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c89120516900f96f4c60d35fdc4c3f15"
-SRC_URI[md5sum] = "d41e9f6b310cb29b0d8f213ff9d57567"
-SRC_URI[sha256sum] =
"240c517f49b0fdd3bfa428c9a7cc581126a0c43eca60d29762da124017d9d9f4"
+SRC_URI[md5sum] = "c1cc652bdeb04b8ce3ad962fbab34daf"
+SRC_URI[sha256sum] =
"3a35c0ef21174ca98f995f99688cebadda97053785833fbb31ec862d6b157f6d"
inherit pypi setuptools3
--
2.23.0.rc1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH v2] openjdk-12: Add new recipe
Hi, On Fri, 2019-12-27 at 16:20 +0800, mohamad.noor.alim.hus...@intel.com wrote: > From: Mohamad Noor Alim Hussin > > Openjdk-12 is implementation of Java SE 12. > This recipe taken from branch jdk12u on release 12.0.2+10 [1]. > Openjdk-12 can compile with glibc on x86_64, x86 and aarch64. Compiling > against musl is not working. > > Some highlight features for openjdk-12 taken from [2-9] > 189: Shenandoah: A Low-Pause-Time Garbage Collector (Experimental) > 230: Microbenchmark Suite > 325: Switch Expressions (Preview) > 334: JVM Constants API > 340: One AArch64 Port, Not Two > 341: Default CDS Archives > 344: Abortable Mixed Collections for G1 > 346: Promptly Return Unused Committed Memory from G1 > > For more information see source code at [10]. > > References > [1] https://openjdk.java.net/projects/jdk/12/ > [2] https://openjdk.java.net/jeps/189 > [3] https://openjdk.java.net/jeps/230 > [4] https://openjdk.java.net/jeps/325 > [5] https://openjdk.java.net/jeps/334 > [6] https://openjdk.java.net/jeps/340 > [7] https://openjdk.java.net/jeps/341 > [8] https://openjdk.java.net/jeps/344 > [9] https://openjdk.java.net/jeps/346 > [10] https://hg.openjdk.java.net/jdk-updates/jdk12u/rev/7b6accc7c009 > > Signed-off-by: Mohamad Noor Alim Hussin > --- > lib/oeqa/files/hello.java | 5 + > lib/oeqa/runtime/cases/java.py| 16 ++ > lib/oeqa/runtime/cases/javac.py | 27 ++- > recipes-core/openjdk/openjdk-12-common.inc| 158 ++ > recipes-core/openjdk/openjdk-12-cross.inc | 145 > recipes-core/openjdk/openjdk-12-native.inc| 86 ++ > .../openjdk/openjdk-12-native_2+10.bb | 2 + > .../openjdk-12-release-2+10-aarch32.inc | 15 ++ > .../openjdk-12-release-2+10-aarch64.inc | 12 ++ > .../openjdk-12-release-2+10-common.inc| 35 > .../openjdk/openjdk-12-release-2+10.inc | 11 ++ > recipes-core/openjdk/openjdk-12_2+10.bb | 57 +++ > recipes-core/openjdk/openjre-12_2+10.bb | 54 ++ > .../0001-fix-stringop-truncate-gcc8.patch | 11 ++ > .../0002-fix-stringop-truncate-gcc8.patch | 38 + > .../filter-aclocal-copy-too.patch | 10 ++ > .../openjdk/patches-openjdk-12/jvm.cfg| 41 + > ...njdk12-find-compiler-fix-env-respect.patch | 11 ++ > ...move-shell-variables-from-autoheader.patch | 28 > .../images/openjdk-12-test-image.bb | 3 + > .../images/openjre-12-test-image.bb | 3 + > 21 files changed, 764 insertions(+), 4 deletions(-) > create mode 100644 lib/oeqa/files/hello.java > create mode 100644 recipes-core/openjdk/openjdk-12-common.inc > create mode 100644 recipes-core/openjdk/openjdk-12-cross.inc > create mode 100644 recipes-core/openjdk/openjdk-12-native.inc > create mode 100644 recipes-core/openjdk/openjdk-12-native_2+10.bb > create mode 100644 recipes-core/openjdk/openjdk-12-release-2+10-aarch32.inc > create mode 100644 recipes-core/openjdk/openjdk-12-release-2+10-aarch64.inc > create mode 100644 recipes-core/openjdk/openjdk-12-release-2+10-common.inc > create mode 100644 recipes-core/openjdk/openjdk-12-release-2+10.inc > create mode 100644 recipes-core/openjdk/openjdk-12_2+10.bb > create mode 100644 recipes-core/openjdk/openjre-12_2+10.bb > create mode 100644 > recipes-core/openjdk/patches-openjdk-12/0001-fix-stringop-truncate-gcc8.patch > create mode 100644 > recipes-core/openjdk/patches-openjdk-12/0002-fix-stringop-truncate-gcc8.patch > create mode 100644 > recipes-core/openjdk/patches-openjdk-12/filter-aclocal-copy-too.patch > create mode 100644 recipes-core/openjdk/patches-openjdk-12/jvm.cfg > create mode 100644 > recipes-core/openjdk/patches-openjdk-12/openjdk12-find-compiler-fix-env-respect.patch > create mode 100644 > recipes-core/openjdk/patches-openjdk-12/remove-shell-variables-from-autoheader.patch > create mode 100644 recipes-images/images/openjdk-12-test-image.bb > create mode 100644 recipes-images/images/openjre-12-test-image.bb This patch still uses 'True' options in the d.getVar() calls. This has been deprecated in 2016. Please remove them. Cheers, Andre' -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 2/2] upm: Link with libatomic on clang/x86
On Mon, 2019-11-18 at 17:16 -0800, Khem Raj wrote:
> This is needed for atomic which clang does not use intrinsic
> function for on 32bit x86
>
> Signed-off-by: Khem Raj
> ---
> .../upm/0001-nmea_gps-Link-with-latomic.patch | 27 +++
> meta-oe/recipes-extended/upm/upm_git.bb | 2 ++
> 2 files changed, 29 insertions(+)
> create mode 100644
> meta-oe/recipes-extended/upm/upm/0001-nmea_gps-Link-with-latomic.patch
>
> diff --git
> a/meta-oe/recipes-extended/upm/upm/0001-nmea_gps-Link-with-latomic.patch
> b/meta-oe/recipes-
> extended/upm/upm/0001-nmea_gps-Link-with-latomic.patch
> new file mode 100644
> index 00..c16b8dbc5a
> --- /dev/null
> +++ b/meta-oe/recipes-extended/upm/upm/0001-nmea_gps-Link-with-latomic.patch
> @@ -0,0 +1,27 @@
> +From 996d37fc0b7177ee57788399b9140032d5de2765 Mon Sep 17 00:00:00 2001
> +From: Khem Raj
> +Date: Mon, 18 Nov 2019 15:50:02 -0800
> +Subject: [PATCH] nmea_gps: Link with latomic
> +
> +clang/x86 ends up with missing symbols for atomics due to atomic
> +with libstdc++, it works ok with libc++
> +
> +Upstream-Status: Pending
> +Signed-off-by: Khem Raj
> +---
> + src/nmea_gps/CMakeLists.txt | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/nmea_gps/CMakeLists.txt b/src/nmea_gps/CMakeLists.txt
> +index b3fb6591..5280bfed 100644
> +--- a/src/nmea_gps/CMakeLists.txt
> b/src/nmea_gps/CMakeLists.txt
> +@@ -6,4 +6,4 @@ upm_mixed_module_init (NAME nmea_gps
> + CPP_SRC nmea_gps.cxx
> + FTI_SRC nmea_gps_fti.c
> + CPP_WRAPS_C
> +-REQUIRES mraa utilities-c ${CMAKE_THREAD_LIBS_INIT})
> ++REQUIRES mraa utilities-c atomic ${CMAKE_THREAD_LIBS_INIT})
> +--
> +2.24.0
> +
> diff --git a/meta-oe/recipes-extended/upm/upm_git.bb
> b/meta-oe/recipes-extended/upm/upm_git.bb
> index fb22e83359..dbe97370d5 100644
> --- a/meta-oe/recipes-extended/upm/upm_git.bb
> +++ b/meta-oe/recipes-extended/upm/upm_git.bb
> @@ -15,6 +15,8 @@ SRC_URI =
> "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \
> file://0001-Use-stdint-types.patch \
> "
>
> +SRC_URI_append_toolchain-clang_x86 = "
> file://0001-nmea_gps-Link-with-latomic.patch "
> +
> S = "${WORKDIR}/git"
>
> # Depends on mraa which only supports x86 and ARM for now
> --
> 2.24.0
>
If you're planning to upstream this, I normally use something like this in
CMake:
set(ATOMIC_TEST_C_SOURCE "
#include
#include
atomic_uint_fast64_t x;
atomic_uint_fast64_t y;
int main() {
return (int)(x + y);
}")
# libatomic check - some arches need to link against libatomic.so, some
don't
include(CheckCSourceCompiles)
include(CMakePushCheckState)
include(CheckLibraryExists)
cmake_push_check_state()
check_c_source_compiles("${ATOMIC_TEST_C_SOURCE}"
HAVE_ATOMICS_WITHOUT_LIBATOMIC)
if(NOT HAVE_ATOMICS_WITHOUT_LIBATOMIC)
check_library_exists(atomic __atomic_load_8 "" LIBATOMIC_EXISTS)
if(LIBATOMIC_EXISTS)
set(CMAKE_REQUIRED_LIBRARIES atomic)
check_c_source_compiles("${ATOMIC_TEST_C_SOURCE}"
HAVE_ATOMICS_WITH_LIBATOMIC)
endif()
if(HAVE_ATOMICS_WITH_LIBATOMIC)
list(APPEND EXTRA_LIBRARIES atomic)
else()
message(FATAL_ERROR "Could not determine support for atomic
operations.")
endif()
endif()
cmake_pop_check_state()
Cheers,
A.
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-python][PATCH] python-jsonschemea: add missing dependency
there's a typo in the subject line
jsonschemea -> jsonschema
A.
On Thu, 2019-11-21 at 10:34 +0800, Chen Qi wrote:
> Signed-off-by: Chen Qi
> ---
> meta-python/recipes-devtools/python/python-jsonschema.inc | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta-python/recipes-devtools/python/python-jsonschema.inc
> b/meta-python/recipes-devtools/python/python-
> jsonschema.inc
> index 1841b5893..5599cc6f4 100644
> --- a/meta-python/recipes-devtools/python/python-jsonschema.inc
> +++ b/meta-python/recipes-devtools/python/python-jsonschema.inc
> @@ -23,6 +23,7 @@ RDEPENDS_${PN} += " \
> ${PYTHON_PN}-strict-rfc3339 \
> ${PYTHON_PN}-unittest \
> ${PYTHON_PN}-setuptools-scm \
> +${PYTHON_PN}-zipp \
> "
>
> BBCLASSEXTEND = "native nativesdk"
> --
> 2.17.1
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] nodejs: ensure to use correct compiler & flags always
Khem,
This is a rev2, as v1 is still in master-next, only.
I forgot to set the subject line right...
Cheers,
Andre'
On Wed, 2019-11-13 at 09:58 +, André Draszik wrote:
> NodeJS comes with an embedded, patched, version of gyp.
>
> Normally, gyp supports compiling for the build machine, e.g.
> native tools that need to be compiled to run during the build,
> and for the host, using different variables, e.g. CC and
> CC.host, etc.
> Most of this has been patched out in the NodeJS version of gyp,
> and essentially it only supports compiling using one compiler -
> ${CC}. This modification excludes LDFLAGS for native tools, and
> those still evaluate LDFLAGS.host (only).
>
> While this modified behaviour is OK for the OE use-case of building
> native and target tools separately, it means that this recipe can
> not work as-is with standard gyp, and wrong LDFLAGS are being used
> for some of the tools compiled (torque) in either case.
>
> By setting the make variables that gyp-generated makefiles inspect,
> we support use of unpatched gyp, and we ensure that all tools
> are compiled with correct LDFLAGS in either case.
>
> This now also allows us to drop the patch that had been applied to
> work-around this problem.
>
> Signed-off-by: André Draszik
>
> ---
> v2: _append not needed for EXTRA_OEMAKE
> ---
> .../nodejs/0006-Use-target-ldflags.patch | 24 ---
> .../recipes-devtools/nodejs/nodejs_10.17.0.bb | 13 +-
> 2 files changed, 12 insertions(+), 25 deletions(-)
> delete mode 100644
> meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch
>
> diff --git
> a/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch
> b/meta-oe/recipes-
> devtools/nodejs/nodejs/0006-Use-target-ldflags.patch
> deleted file mode 100644
> index f6569cd57..0
> --- a/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -The target LDFLAGS have been ignored. Tools like torque
> -have been loaded from system libraries, even if a native
> -one was the target.
> -|$ ldd torque
> -|libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1
> -|libcrypto.so.1.1 => /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
> -|libssl.so.1.1 => /usr/lib/x86_64-linux-gnu/libssl.so.1.1
> -|libicui18n.so.63 => not found
> -|libicuuc.so.63 => not found
> -...
> -
> -Signed-off-by: Andrej Valek
> -
> -diff -Naur node-v10.15.1/deps/v8/gypfiles/toolchain.gypi
> node-v10.15.1/deps/v8/gypfiles/toolchain.gypi
> node-v10.15.1/deps/v8/gypfiles/toolchain.gypi2019-03-18
> 15:01:39.0 +0100
> -+++ node-v10.15.1/deps/v8/gypfiles/toolchain.gypi2019-03-18
> 15:04:08.628361308 +0100
> -@@ -1106,6 +1106,7 @@
> - 'cflags': [ '-fno-strict-aliasing' ],
> - }],
> - ], # conditions
> -+'ldflags+': [ '$(LDFLAGS)' ],
> - }],
> - ['OS=="solaris"', {
> - 'defines': [ '__C99FEATURES__=1' ], # isinf() etc.
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
> b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
> index 4013c6931..9af0d998c 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
> @@ -19,7 +19,6 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
> \
> file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
> file://0004-Make-compatibility-with-gcc-4.8.patch \
> file://0005-Link-atomic-library.patch \
> - file://0006-Use-target-ldflags.patch \
> "
> SRC_URI_append_class-target = " \
> file://0002-Using-native-torque.patch \
> @@ -58,6 +57,18 @@ PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
> PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
> PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
>
> +# We don't want to cross-compile during target compile,
> +# and we need to use the right flags during host compile,
> +# too.
> +EXTRA_OEMAKE = "\
> +CC.host='${CC}' \
> +CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \
> +CXX.host='${CXX}' \
> +CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \
> +LDFLAGS.host='${LDFLAGS}' \
> +AR.host='${AR}' \
> +"
> +
> # Node is way too cool to use proper autotools, so we install two wrappers
> to forcefully inject proper arch cflags to
> workaround gypi
> do_configure () {
> rm -rf ${S}/deps/openssl
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] nodejs: ensure to use correct compiler & flags always
NodeJS comes with an embedded, patched, version of gyp.
Normally, gyp supports compiling for the build machine, e.g.
native tools that need to be compiled to run during the build,
and for the host, using different variables, e.g. CC and
CC.host, etc.
Most of this has been patched out in the NodeJS version of gyp,
and essentially it only supports compiling using one compiler -
${CC}. This modification excludes LDFLAGS for native tools, and
those still evaluate LDFLAGS.host (only).
While this modified behaviour is OK for the OE use-case of building
native and target tools separately, it means that this recipe can
not work as-is with standard gyp, and wrong LDFLAGS are being used
for some of the tools compiled (torque) in either case.
By setting the make variables that gyp-generated makefiles inspect,
we support use of unpatched gyp, and we ensure that all tools
are compiled with correct LDFLAGS in either case.
This now also allows us to drop the patch that had been applied to
work-around this problem.
Signed-off-by: André Draszik
---
v2: _append not needed for EXTRA_OEMAKE
---
.../nodejs/0006-Use-target-ldflags.patch | 24 ---
.../recipes-devtools/nodejs/nodejs_10.17.0.bb | 13 +-
2 files changed, 12 insertions(+), 25 deletions(-)
delete mode 100644
meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch
diff --git
a/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch
b/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch
deleted file mode 100644
index f6569cd57..0
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-The target LDFLAGS have been ignored. Tools like torque
-have been loaded from system libraries, even if a native
-one was the target.
-|$ ldd torque
-|libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1
-|libcrypto.so.1.1 => /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
-|libssl.so.1.1 => /usr/lib/x86_64-linux-gnu/libssl.so.1.1
-|libicui18n.so.63 => not found
-|libicuuc.so.63 => not found
-...
-
-Signed-off-by: Andrej Valek
-
-diff -Naur node-v10.15.1/deps/v8/gypfiles/toolchain.gypi
node-v10.15.1/deps/v8/gypfiles/toolchain.gypi
node-v10.15.1/deps/v8/gypfiles/toolchain.gypi 2019-03-18
15:01:39.0 +0100
-+++ node-v10.15.1/deps/v8/gypfiles/toolchain.gypi 2019-03-18
15:04:08.628361308 +0100
-@@ -1106,6 +1106,7 @@
- 'cflags': [ '-fno-strict-aliasing' ],
- }],
- ], # conditions
-+'ldflags+': [ '$(LDFLAGS)' ],
- }],
- ['OS=="solaris"', {
- 'defines': [ '__C99FEATURES__=1' ], # isinf() etc.
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
index 4013c6931..9af0d998c 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
@@ -19,7 +19,6 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
file://0004-Make-compatibility-with-gcc-4.8.patch \
file://0005-Link-atomic-library.patch \
- file://0006-Use-target-ldflags.patch \
"
SRC_URI_append_class-target = " \
file://0002-Using-native-torque.patch \
@@ -58,6 +57,18 @@ PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
+# We don't want to cross-compile during target compile,
+# and we need to use the right flags during host compile,
+# too.
+EXTRA_OEMAKE = "\
+CC.host='${CC}' \
+CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \
+CXX.host='${CXX}' \
+CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \
+LDFLAGS.host='${LDFLAGS}' \
+AR.host='${AR}' \
+"
+
# Node is way too cool to use proper autotools, so we install two wrappers to
forcefully inject proper arch cflags to workaround gypi
do_configure () {
rm -rf ${S}/deps/openssl
--
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 4/5] nodejs: use OE-provided compiler flags (arm)
This overrides yocto-provided build flags with its own, e.g we get
arm-poky-linux-musleabi-g++ -mthumb -mfpu=neon -mfloat-abi=hard
-mcpu=cortex-a7 \
... \
-march=armv7-a -mfpu=neon -mfloat-abi=hard
-marm
Causing the latter to override the former, and compiler warnings:
cc1plus: warning: switch '-mcpu=cortex-a7' conflicts with '-march=armv7-a'
switch
Patch this out, so that yocto-provided flags take precedence.
Note that in reality the same should probably be done for all the other
supported architectures, too.
Note that this also switches to Thumb(2) mode (in my case). No obvious
problems have been noted during compilation or runtime.
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: André Draszik
---
.../0007-v8-don-t-override-ARM-CFLAGS.patch | 102 ++
.../recipes-devtools/nodejs/nodejs_10.17.0.bb | 1 +
2 files changed, 103 insertions(+)
create mode 100644
meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch
diff --git
a/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch
b/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch
new file mode 100644
index 0..eb2cbfb8b
--- /dev/null
+++
b/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch
@@ -0,0 +1,102 @@
+From 47ee5cc5501289205d3e8e9f27ea9daf18cebac1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?=
+Date: Sat, 9 Nov 2019 14:45:30 +
+Subject: [PATCH] v8: don't override ARM CFLAGS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This overrides yocto-provided build flags with its own, e.g we get
+arm-poky-linux-musleabi-g++ -mthumb -mfpu=neon -mfloat-abi=hard
-mcpu=cortex-a7 \
+ ... \
+ -march=armv7-a -mfpu=neon -mfloat-abi=hard
-marm
+
+Causing the latter to override the former, and compiler warnings:
+cc1plus: warning: switch '-mcpu=cortex-a7' conflicts with '-march=armv7-a'
switch
+
+Patch this out, so that yocto-provided flags take precedence.
+Note that in reality the same should probably be done for all the other
+supported architectures, too.
+
+Note that this also switches to Thumb(2) mode (in my case). No obvious
+problems have been noted during compilation or runtime.
+
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: André Draszik
+---
+ deps/v8/gypfiles/toolchain.gypi | 52 ++---
+ 1 file changed, 2 insertions(+), 50 deletions(-)
+
+diff --git a/deps/v8/gypfiles/toolchain.gypi b/deps/v8/gypfiles/toolchain.gypi
+index 910a212..1390b15 100644
+--- a/deps/v8/gypfiles/toolchain.gypi
b/deps/v8/gypfiles/toolchain.gypi
+@@ -199,31 +199,7 @@
+ 'target_conditions': [
+ ['_toolset=="host"', {
+ 'conditions': [
+- ['v8_target_arch==host_arch', {
+-# Host built with an Arm CXX compiler.
+-'conditions': [
+- [ 'arm_version==7', {
+-'cflags': ['-march=armv7-a',],
+- }],
+- [ 'arm_version==7 or arm_version=="default"', {
+-'conditions': [
+- [ 'arm_fpu!="default"', {
+-'cflags': ['-mfpu=<(arm_fpu)',],
+- }],
+-],
+- }],
+- [ 'arm_float_abi!="default"', {
+-'cflags': ['-mfloat-abi=<(arm_float_abi)',],
+- }],
+- [ 'arm_thumb==1', {
+-'cflags': ['-mthumb',],
+- }],
+- [ 'arm_thumb==0', {
+-'cflags': ['-marm',],
+- }],
+-],
+- }, {
+-# 'v8_target_arch!=host_arch'
++ ['v8_target_arch!=host_arch', {
+ # Host not built with an Arm CXX compiler (simulator build).
+ 'conditions': [
+ [ 'arm_float_abi=="hard"', {
+@@ -242,31 +218,7 @@
+ }], # _toolset=="host"
+ ['_toolset=="target"', {
+ 'conditions': [
+- ['v8_target_arch==target_arch', {
+-# Target built with an Arm CXX compiler.
+-'conditions': [
+- [ 'arm_version==7', {
+-'cflags': ['-march=armv7-a',],
+- }],
+- [ 'arm_version==7 or arm_version=="default"', {
+-'conditions': [
+- [ 'arm_fpu!="default"', {
+-'cflags': ['-mfpu=<(arm_fpu)',],
+- }],
+-],
+- }],
+-
[oe] [meta-oe][PATCH 5/5] nodejs: support long directory names for ${B} / ${S}
Part of the NodeJS build builds V8, which at some stage tries to call
ar with all objects with *absolute* paths (and printf the command line
first).
This will fail if the build path is too long:
make[1]: execvp: printf: Argument list too long
when trying to create Release/obj.target/deps/v8/gypfiles/libv8_base.a
via below gyp-generated out/Makefile rule:
cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
i.e. something like
printf rm -f Release/obj.target/deps/v8/gypfiles/libv8_base.a &&
arm-poky-linux-musleabi-gcc-ar crsT
Release/obj.target/deps/v8/gypfiles/libv8_base.a ...
The above failure happened on a build-directory S with 204 characters
on a Jenkins machine.
While one could probably increase the ulimit on that specific machine,
that would be a pretty specific build machine fix which would need to
be applied everywhere, or switch to non-verbose builds / compilation,
but fortunately we can change all object references to be relative to
the build directory itself by setting the builddir_name make variable
and thus avoid the other two possible work-arounds.
Signed-off-by: André Draszik
---
meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
index b189d2247..205e24889 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
@@ -69,6 +69,8 @@ EXTRA_OEMAKE_append = "\
CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \
LDFLAGS.host='${LDFLAGS}' \
AR.host='${AR}' \
+\
+builddir_name=./ \
"
python do_unpack() {
--
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 2/5] nodejs: delete all bundled deps in do_unpack() if needed
We can delete bundled deps where system-provided counterparts
should be used instead.
Amongst others, this ensures they are not used accidentally.
Signed-off-by: André Draszik
---
.../recipes-devtools/nodejs/nodejs_10.17.0.bb | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
index 9c514e6be..53149af5e 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
@@ -69,9 +69,24 @@ EXTRA_OEMAKE_append = "\
AR.host='${AR}' \
"
+python do_unpack() {
+import shutil
+
+bb.build.exec_func('base_do_unpack', d)
+
+shutil.rmtree(d.getVar('S') + '/deps/openssl', True)
+if 'ares' in d.getVar('PACKAGECONFIG'):
+shutil.rmtree(d.getVar('S') + '/deps/cares', True)
+if 'libuv' in d.getVar('PACKAGECONFIG'):
+shutil.rmtree(d.getVar('S') + '/deps/uv', True)
+if 'nghttp2' in d.getVar('PACKAGECONFIG'):
+shutil.rmtree(d.getVar('S') + '/deps/nghttp2', True)
+if 'zlib' in d.getVar('PACKAGECONFIG'):
+shutil.rmtree(d.getVar('S') + '/deps/zlib', True)
+}
+
# Node is way too cool to use proper autotools, so we install two wrappers to
forcefully inject proper arch cflags to workaround gypi
do_configure () {
-rm -rf ${S}/deps/openssl
export LD="${CXX}"
GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES
# $TARGET_ARCH settings don't match --dest-cpu settings
--
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 1/5] nodejs: ensure to use correct compiler & flags always
NodeJS comes with an embedded, patched, version of gyp.
Normally, gyp supports compiling for the build machine, e.g.
native tools that need to be compiled to run during the build,
and for the host, using different variables, e.g. CC and
CC.host, etc.
Most of this has been patched out in the NodeJS version of gyp,
and essentially it only supports compiling using one compiler -
${CC}. This modification excludes LDFLAGS for native tools, and
those still evaluate LDFLAGS.host (only).
While this modified behaviour is OK for the OE use-case of building
native and target tools separately, it means that this recipe can
not work as-is with standard gyp, and wrong LDFLAGS are being used
for some of the tools compiled (torque) in either case.
By setting the make variables that gyp-generated makefiles inspect,
we support use of unpatched gyp, and we ensure that all tools
are compiled with correct LDFLAGS in either case.
This now also allows us to drop the patch that had been applied to
work-around this problem.
Signed-off-by: André Draszik
---
.../nodejs/0006-Use-target-ldflags.patch | 24 ---
.../recipes-devtools/nodejs/nodejs_10.17.0.bb | 13 +-
2 files changed, 12 insertions(+), 25 deletions(-)
delete mode 100644
meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch
diff --git
a/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch
b/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch
deleted file mode 100644
index f6569cd57..0
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-The target LDFLAGS have been ignored. Tools like torque
-have been loaded from system libraries, even if a native
-one was the target.
-|$ ldd torque
-|libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1
-|libcrypto.so.1.1 => /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
-|libssl.so.1.1 => /usr/lib/x86_64-linux-gnu/libssl.so.1.1
-|libicui18n.so.63 => not found
-|libicuuc.so.63 => not found
-...
-
-Signed-off-by: Andrej Valek
-
-diff -Naur node-v10.15.1/deps/v8/gypfiles/toolchain.gypi
node-v10.15.1/deps/v8/gypfiles/toolchain.gypi
node-v10.15.1/deps/v8/gypfiles/toolchain.gypi 2019-03-18
15:01:39.0 +0100
-+++ node-v10.15.1/deps/v8/gypfiles/toolchain.gypi 2019-03-18
15:04:08.628361308 +0100
-@@ -1106,6 +1106,7 @@
- 'cflags': [ '-fno-strict-aliasing' ],
- }],
- ], # conditions
-+'ldflags+': [ '$(LDFLAGS)' ],
- }],
- ['OS=="solaris"', {
- 'defines': [ '__C99FEATURES__=1' ], # isinf() etc.
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
index 4013c6931..9c514e6be 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
@@ -19,7 +19,6 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
file://0004-Make-compatibility-with-gcc-4.8.patch \
file://0005-Link-atomic-library.patch \
- file://0006-Use-target-ldflags.patch \
"
SRC_URI_append_class-target = " \
file://0002-Using-native-torque.patch \
@@ -58,6 +57,18 @@ PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2"
PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
+# We don't want to cross-compile during target compile,
+# and we need to use the right flags during host compile,
+# too.
+EXTRA_OEMAKE_append = "\
+CC.host='${CC}' \
+CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \
+CXX.host='${CXX}' \
+CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \
+LDFLAGS.host='${LDFLAGS}' \
+AR.host='${AR}' \
+"
+
# Node is way too cool to use proper autotools, so we install two wrappers to
forcefully inject proper arch cflags to workaround gypi
do_configure () {
rm -rf ${S}/deps/openssl
--
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/5] nodejs: allow use of system gyp
Now that there is a gyp (python2) recipe in meta-python,
allow its use instead of the bundled one for when
meta-python is enabled.
At the same time, unconditionally inherit pythonnative
as in either case gyp actually uses python, and the
build machine's python and installed modules should
never be used.
Signed-off-by: André Draszik
---
meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
index 53149af5e..7c3728cc6 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=be980eb7ccafe287cb438076a65e888c"
DEPENDS = "openssl"
DEPENDS_append_class-target = " nodejs-native"
-inherit pkgconfig
+inherit pkgconfig pythonnative
COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*"
COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*"
@@ -52,6 +52,7 @@ 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"
@@ -77,6 +78,8 @@ 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-python][PATCH 1/2] gyp: update to fcd686f1880f
This brings a few python3 fixes:
fcd686f1 (origin/master, origin/HEAD, master) Add .tbd to the .xcodeproj
generator’s extension map
a8921fca fix encoding issues with inputs for better Python 3 support
12ef00df fix make output checks under C locale
aca1e2c3 Fix Python 3 incompatibilities
4f1618ab Add missing b'' qualifier from da63cb0f.
da63cb0f Misc python3 fixes in xcode_emulation.
5c270f76 Fix incorrect depfile path relativization
9f2a7bb1 Add flake8 checks to travis configuration.
Signed-off-by: André Draszik
---
meta-python/recipes-devtools/gyp/gyp_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-python/recipes-devtools/gyp/gyp_git.bb
b/meta-python/recipes-devtools/gyp/gyp_git.bb
index 2b3f3fb2b..61f3c8637 100644
--- a/meta-python/recipes-devtools/gyp/gyp_git.bb
+++ b/meta-python/recipes-devtools/gyp/gyp_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=ab828cb8ce4c62ee82945a11247b6bbd"
SECTION = "devel"
SRC_URI = "git://chromium.googlesource.com/external/gyp;protocol=https"
-SRCREV = "8bee09f4a57807136593ddc906b0b213c21f9014"
+SRCREV = "fcd686f1880fa52a1ee78d3e98af1b88cb334528"
S = "${WORKDIR}/git"
PV = "0.1+git${SRCPV}"
--
2.23.0.rc1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 2/2] gyp: provide a python2 version of gyp as gyp-py2
Doing so will allow us to change the NodeJS build
to use the system gyp, rather than its own copy.
NodeJS still uses python2, and imports parts of
gyp directly.
Also note that Debian only provides a python2 version.
Signed-off-by: André Draszik
---
meta-python/recipes-devtools/gyp/gyp-py2_git.bb | 2 ++
meta-python/recipes-devtools/gyp/gyp.inc| 13 +
meta-python/recipes-devtools/gyp/gyp_git.bb | 15 +--
3 files changed, 16 insertions(+), 14 deletions(-)
create mode 100644 meta-python/recipes-devtools/gyp/gyp-py2_git.bb
create mode 100644 meta-python/recipes-devtools/gyp/gyp.inc
diff --git a/meta-python/recipes-devtools/gyp/gyp-py2_git.bb
b/meta-python/recipes-devtools/gyp/gyp-py2_git.bb
new file mode 100644
index 0..d69b92ce6
--- /dev/null
+++ b/meta-python/recipes-devtools/gyp/gyp-py2_git.bb
@@ -0,0 +1,2 @@
+inherit setuptools
+require gyp.inc
diff --git a/meta-python/recipes-devtools/gyp/gyp.inc
b/meta-python/recipes-devtools/gyp/gyp.inc
new file mode 100644
index 0..98ed42cc9
--- /dev/null
+++ b/meta-python/recipes-devtools/gyp/gyp.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "GYP is a Meta-Build system: a build system that generates other
build systems."
+HOMEPAGE = "https://gyp.gsrc.io/;
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ab828cb8ce4c62ee82945a11247b6bbd"
+SECTION = "devel"
+
+SRC_URI = "git://chromium.googlesource.com/external/gyp;protocol=https"
+SRCREV = "fcd686f1880fa52a1ee78d3e98af1b88cb334528"
+
+S = "${WORKDIR}/git"
+PV = "0.1+git${SRCPV}"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/gyp/gyp_git.bb
b/meta-python/recipes-devtools/gyp/gyp_git.bb
index 61f3c8637..8e48a27fa 100644
--- a/meta-python/recipes-devtools/gyp/gyp_git.bb
+++ b/meta-python/recipes-devtools/gyp/gyp_git.bb
@@ -1,15 +1,2 @@
-DESCRIPTION = "GYP is a Meta-Build system: a build system that generates other
build systems."
-HOMEPAGE = "https://gyp.gsrc.io/;
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ab828cb8ce4c62ee82945a11247b6bbd"
-SECTION = "devel"
-
-SRC_URI = "git://chromium.googlesource.com/external/gyp;protocol=https"
-SRCREV = "fcd686f1880fa52a1ee78d3e98af1b88cb334528"
-
-S = "${WORKDIR}/git"
-PV = "0.1+git${SRCPV}"
-
inherit setuptools3
-
-BBCLASSEXTEND = "native nativesdk"
+require gyp.inc
--
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 v2] nodejs: allow use of system nghttp2
We can't enable this by default, though, as nghttp2 is in the meta-networking layer, which might not be enabled. At least this gives people a simple way to do so if they want. Signed-off-by: André Draszik --- Note that this commit depends on the nghttp2 updates being merged to meta-networking first. v2: keep PACKAGECONFIG[] in alphabetical order... --- meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb index 4afe341f9..4013c6931 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb @@ -55,6 +55,7 @@ PACKAGECONFIG ??= "ares icu libuv zlib" PACKAGECONFIG[ares] = "--shared-cares,,c-ares" PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" +PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi -- 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] nodejs: allow use of system nghttp2
We can't enable this by default, though, as nghttp2 is in the meta-networking layer, which might not be enabled. At least this gives people a simple way to do so if they want. Signed-off-by: André Draszik --- Note that this commit depends on the nghttp2 updates being merged to meta-networking first. --- meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb index 4afe341f9..be3cbf04f 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb @@ -54,6 +54,7 @@ ARCHFLAGS ?= "" PACKAGECONFIG ??= "ares icu libuv zlib" PACKAGECONFIG[ares] = "--shared-cares,,c-ares" PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" +PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" -- 2.23.0.rc1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 4/4] nghttp2: allow to build a -native package
This will e.g. enable us to use it from nodejs-native.
Signed-off-by: André Draszik
---
meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb
b/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb
index 7a475050f..c27afdb55 100644
--- a/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb
+++ b/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb
@@ -28,6 +28,7 @@ do_install_append() {
PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server"
RDEPENDS_${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server
(>= ${PV})"
+RDEPENDS_${PN}_class-native = ""
RDEPENDS_${PN}-proxy = "openssl python3-core python3-io python3-shell"
ALLOW_EMPTY_${PN} = "1"
@@ -36,3 +37,5 @@ FILES_lib${PN} = "${libdir}/*${SOLIBS}"
FILES_${PN}-client = "${bindir}/h2load ${bindir}/nghttp"
FILES_${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response"
FILES_${PN}-server = "${bindir}/nghttpd"
+
+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 2/3] cunit: allow to build a -native package
This will e.g. enable us to use it from nghttp2-native
Signed-off-by: André Draszik
---
meta-oe/recipes-test/cunit/cunit_2.1-3.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-test/cunit/cunit_2.1-3.bb
b/meta-oe/recipes-test/cunit/cunit_2.1-3.bb
index c9d87e36d..98f2cacf1 100644
--- a/meta-oe/recipes-test/cunit/cunit_2.1-3.bb
+++ b/meta-oe/recipes-test/cunit/cunit_2.1-3.bb
@@ -17,3 +17,5 @@ EXTRA_OECONF = "--enable-memtrace --enable-automated
--enable-basic --enable-con
FILES_${PN}-dev += "${datadir}/CUnit"
FILES_${PN}-doc += "${docdir}"
+
+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-networking][PATCH 2/4] nghttp2: update to 1.39.2
Signed-off-by: André Draszik
---
.../nghttp2/{nghttp2_1.39.1.bb => nghttp2_1.39.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-networking/recipes-support/nghttp2/{nghttp2_1.39.1.bb =>
nghttp2_1.39.2.bb} (75%)
diff --git a/meta-networking/recipes-support/nghttp2/nghttp2_1.39.1.bb
b/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb
similarity index 75%
rename from meta-networking/recipes-support/nghttp2/nghttp2_1.39.1.bb
rename to meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb
index 913065a04..c3f06a714 100644
--- a/meta-networking/recipes-support/nghttp2/nghttp2_1.39.1.bb
+++ b/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec"
UPSTREAM_CHECK_URI = "https://github.com/nghttp2/nghttp2/releases;
SRC_URI =
"https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz;
-SRC_URI[md5sum] = "02b015cb178c46f27dd87228e33db35f"
-SRC_URI[sha256sum] =
"679160766401f474731fd60c3aca095f88451e3cc4709b72306e4c34cf981448"
+SRC_URI[md5sum] = "de52cd6b587b76486346745514972995"
+SRC_URI[sha256sum] =
"a2d216450abd2beaf4e200c168957968e89d602ca4119338b9d7ab059fd4ce8b"
DEPENDS = "libxml2 openssl zlib jansson cunit c-ares"
--
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] libev: allow to build a -native package
This will e.g. enable us to use it from nghttp2-native
Signed-off-by: André Draszik
---
meta-oe/recipes-connectivity/libev/libev_4.27.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-connectivity/libev/libev_4.27.bb
b/meta-oe/recipes-connectivity/libev/libev_4.27.bb
index b72b7af4f..be4536b9c 100644
--- a/meta-oe/recipes-connectivity/libev/libev_4.27.bb
+++ b/meta-oe/recipes-connectivity/libev/libev_4.27.bb
@@ -17,3 +17,5 @@ do_install_append() {
# still basic so drop it for now.
rm ${D}${includedir}/event.h
}
+
+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 1/3] jansson: allow to build a -native package
This will e.g. enable us to use it from nghttp2-native Signed-off-by: André Draszik --- meta-oe/recipes-extended/jansson/jansson_2.12.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-extended/jansson/jansson_2.12.bb b/meta-oe/recipes-extended/jansson/jansson_2.12.bb index 3cc353ee7..f47fe5725 100644 --- a/meta-oe/recipes-extended/jansson/jansson_2.12.bb +++ b/meta-oe/recipes-extended/jansson/jansson_2.12.bb @@ -11,3 +11,4 @@ SRC_URI[sha256sum] = "5f8dec765048efac5d919aded51b26a32a05397ea207aa769ff6b53c70 inherit autotools pkgconfig +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-networking][PATCH 3/4] nghttp2: build more of this & fix packaging
nghttp2 also provides http client, server, and proxy.
Add the necessary DEPENDS and build flags to enable those.
They are all packaged into individual packages, with
'nghttp2' being a meta-package now and pulling in all
of the above three applications.
The shared library itself (the only part that this recipe
had been building so far), is also being split into its
own package, meaning existing users shouldn't be affected,
as nobody should have an RDEPENDS on 'nghttp2' at the
moment (due to bitbake's shlibs dependency tracking).
The deflatehd and inflatehd binaries have been completely
dropped, as they are (header) test applications for HTTP/2.
Debian doesn't ship them either.
The python script fetch-ocsp-response is (only) needed
by the proxy, and itself calls out to openssl. We can easily
make this python3 using a simple patch, though.
Minor additional fixes:
* sort DEPENDS alphabetically
* drop python-dir, this is implied by pythonnative
* inherit manpages so as to benefit from man-db processing
(note that manpages are not generated here, we just want
the automatic update of the package index caches)
We need to add a PACKAGECONFIG, as manpages.bbclass
requires it to be present, even though nghttp2
unconditionally installs them
Signed-off-by: André Draszik
---
...0001-fetch-ocsp-response-use-python3.patch | 27 +
.../recipes-support/nghttp2/nghttp2_1.39.2.bb | 29 +--
2 files changed, 53 insertions(+), 3 deletions(-)
create mode 100644
meta-networking/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch
diff --git
a/meta-networking/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch
b/meta-networking/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch
new file mode 100644
index 0..e4db09638
--- /dev/null
+++
b/meta-networking/recipes-support/nghttp2/nghttp2/0001-fetch-ocsp-response-use-python3.patch
@@ -0,0 +1,27 @@
+From 73ec79432fc557a8be4f1500982b1c0f5fdf12a9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?=
+Date: Thu, 7 Nov 2019 09:58:52 +
+Subject: [PATCH] fetch-ocsp-response: use python3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [oe specific]
+Signed-off-by: André Draszik
+---
+ script/fetch-ocsp-response | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/script/fetch-ocsp-response b/script/fetch-ocsp-response
+index 0ff7461..185116b 100755
+--- a/script/fetch-ocsp-response
b/script/fetch-ocsp-response
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- coding: utf-8 -*-
+
+ # nghttp2 - HTTP/2 C Library
+--
+2.23.0.rc1
+
diff --git a/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb
b/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb
index c3f06a714..7a475050f 100644
--- a/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb
+++ b/meta-networking/recipes-support/nghttp2/nghttp2_1.39.2.bb
@@ -3,13 +3,36 @@ HOMEPAGE = "https://nghttp2.org/;
SECTION = "libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec"
+DEPENDS = "c-ares cunit jansson libev libevent libxml2 openssl zlib"
UPSTREAM_CHECK_URI = "https://github.com/nghttp2/nghttp2/releases;
-SRC_URI =
"https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz;
+SRC_URI = "\
+
https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz
\
+file://0001-fetch-ocsp-response-use-python3.patch \
+"
SRC_URI[md5sum] = "de52cd6b587b76486346745514972995"
SRC_URI[sha256sum] =
"a2d216450abd2beaf4e200c168957968e89d602ca4119338b9d7ab059fd4ce8b"
-DEPENDS = "libxml2 openssl zlib jansson cunit c-ares"
+inherit cmake manpages pythonnative
+PACKAGECONFIG[manpages] = ""
-inherit cmake pythonnative python-dir
+# examples are never installed, and don't need to be built in the
+# first place
+EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=ON"
+
+do_install_append() {
+ rm ${D}${bindir}/deflatehd ${D}${bindir}/inflatehd
+}
+
+PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server"
+
+RDEPENDS_${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server
(>= ${PV})"
+RDEPENDS_${PN}-proxy = "openssl python3-core python3-io python3-shell"
+
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN} = ""
+FILES_lib${PN} = "${libdir}/*${SOLIBS}"
+FILES_${PN}-client = "${bindir}/h2load ${bindir}/nghttp"
+FILES_${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response"
+FILES_${PN}-server = "${bindir}/nghttpd"
--
2.23.0.rc1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 1/4] nghttp2: fix UPSTREAM_CHECK_URI
This was added incorrectly in the previous recipe update
and doesn't actually work.
Signed-off-by: André Draszik
---
meta-networking/recipes-support/nghttp2/nghttp2_1.39.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-networking/recipes-support/nghttp2/nghttp2_1.39.1.bb
b/meta-networking/recipes-support/nghttp2/nghttp2_1.39.1.bb
index 6077daf76..913065a04 100644
--- a/meta-networking/recipes-support/nghttp2/nghttp2_1.39.1.bb
+++ b/meta-networking/recipes-support/nghttp2/nghttp2_1.39.1.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec"
-+UPSTREAM_CHECK_URI = "https://github.com/nghttp2/nghttp2/releases;
+UPSTREAM_CHECK_URI = "https://github.com/nghttp2/nghttp2/releases;
SRC_URI =
"https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz;
SRC_URI[md5sum] = "02b015cb178c46f27dd87228e33db35f"
--
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 1/2] libuv: update to 1.33.1
Signed-off-by: André Draszik
---
.../libuv/{libuv_1.32.0.bb => libuv_1.33.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-connectivity/libuv/{libuv_1.32.0.bb => libuv_1.33.1.bb}
(90%)
diff --git a/meta-oe/recipes-connectivity/libuv/libuv_1.32.0.bb
b/meta-oe/recipes-connectivity/libuv/libuv_1.33.1.bb
similarity index 90%
rename from meta-oe/recipes-connectivity/libuv/libuv_1.32.0.bb
rename to meta-oe/recipes-connectivity/libuv/libuv_1.33.1.bb
index c7fa3c10f..604568e62 100644
--- a/meta-oe/recipes-connectivity/libuv/libuv_1.32.0.bb
+++ b/meta-oe/recipes-connectivity/libuv/libuv_1.33.1.bb
@@ -4,7 +4,7 @@ BUGTRACKER = "https://github.com/libuv/libuv/issues;
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47"
-SRCREV = "697bea87b3a0b0e9b4e5ff86b39d1dedb70ee46d"
+SRCREV = "07ad32138f4d2285ba2226b5e20462b27b091a59"
SRC_URI = "git://github.com/libuv/libuv;branch=v1.x"
S = "${WORKDIR}/git"
--
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 2/2] nodejs: allow use of system libuv (and make default)
Use system libuv via PACKAGECONFIG by default. So far,
nodejs had been built using its embedded copy of libuv,
which we generally try to avoid, for the known reasons
(independent updates, cve & license checks, etc).
Signed-off-by: André Draszik
---
meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb
b/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb
index 6dacc2824..e86804124 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb
@@ -49,9 +49,10 @@ ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES',
'callconvention-hard', '-
GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' "
ARCHFLAGS ?= ""
-PACKAGECONFIG ??= "ares icu zlib"
+PACKAGECONFIG ??= "ares icu libuv zlib"
PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
+PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
# Node is way too cool to use proper autotools, so we install two wrappers to
forcefully inject proper arch cflags to workaround gypi
--
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] nodejs: allow use of system c-ares (and make default)
Use system c-ares via PACKAGECONFIG by default. So far,
nodejs had been built using its embedded copy of c-ares,
which we generally try to avoid, for the known reasons
(independent updates, cve & license checks, etc).
Notes:
* otherwise nodejs uses its bundled version of c-ares
* the PACKAGECONFIG variable is 'ares' so as to be in
line with other uses of this (wget & curl recipes in
OE core)
Signed-off-by: André Draszik
---
meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb
b/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb
index 30724d41a..6dacc2824 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb
@@ -49,9 +49,10 @@ ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES',
'callconvention-hard', '-
GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' "
ARCHFLAGS ?= ""
-PACKAGECONFIG ??= "zlib icu"
-PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
+PACKAGECONFIG ??= "ares icu zlib"
+PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
+PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
# Node is way too cool to use proper autotools, so we install two wrappers to
forcefully inject proper arch cflags to workaround gypi
do_configure () {
--
2.23.0.rc1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] layer.conf: ignore wireless-regdb->crda dep for siggen purposes
From: André Draszik
In commit bae481e9331f ("wireless-regdb: make wireless-regdb architecture
independent")
wireless-regdb has been made allarch, but it depends
(via RSUGGESTS) on a TUNE_PKGARCH recipe (crda).
This causes needless rebuilds of wireless-regdb when crda
changes (due to changing sstate checksum).
Add this dependency to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS so
as to avoid that. Even though wireless-regdb has been
moved to OE-core since, we still add this dependeny here
(and not there), as crda is provided in this layer here.
Signed-off-by: André Draszik
---
meta-networking/conf/layer.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf
index 67f58bcc2..6f0046cf3 100644
--- a/meta-networking/conf/layer.conf
+++ b/meta-networking/conf/layer.conf
@@ -23,4 +23,5 @@ LICENSE_PATH += "${LAYERDIR}/licenses"
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
wireguard-tools->wireguard-module \
+ wireless-regdb->crda \
"
--
2.23.0.rc1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 0/2] RFC: Support building Java recipes with openjdk-8-native
Hi, First, I agree the current state isn't great at all. It does appear to me though that Java world seems to be a bit different, in that even today there are big Java projects out there that still only compile using Java 8, which others do compile fine using more recent versions. With your suggested approach it becomes impossible to properly support that, you still have to pick the lowest denominator globally. Other distributions, Debian based ones in particular are taking a different approach: Each Java compiler/runtime provides virtual properties, and recipes can depend on the required version easily, something like e.g. virtual/java8-sdk virtual/java9-sdk virtual/java10-sdk etc. I'had posted a patch series trying to mimic that before, but not really had time to work on that any more: http://lists.openembedded.org/pipermail/openembedded-devel/2018-July/195641.html http://lists.openembedded.org/pipermail/openembedded-devel/2018-July/195642.html http://lists.openembedded.org/pipermail/openembedded-devel/2018-July/195643.html http://lists.openembedded.org/pipermail/openembedded-devel/2018-July/195644.html http://lists.openembedded.org/pipermail/openembedded-devel/2018-July/195645.html http://lists.openembedded.org/pipermail/openembedded-devel/2018-July/195646.html http://lists.openembedded.org/pipermail/openembedded-devel/2018-July/195647.html What do you think? Cheers, Andre' On Tue, 2019-02-05 at 10:53 -0500, Kyle Russell wrote: > This series spun out of a request on the mailing list last October on > configuring meta-java for using openjdk-8-native to compile other Java > recipes that might require modern API features not provided by the > bootstrap VM classes. > > http://lists.openembedded.org/pipermail/openembedded-devel/2018-October/197186.html > [oe] meta-java configuration > > I've been running with this series on sumo, but I wanted to send it out > to get other thoughts on the approach. > > It seems like there's already precedent for this format with perlnative > and pythonnative. That was more or less how I expected java-native to > behave initially until I understood more about the bootstrap process. > > If I've missed a valid use case of java-native and this change would > cause breakage to someone else's layer, I'd be fine with introducing > javanative.bbclass as a new class that provides the same functionality > as the following patch to java-native.bbclass. (Its name would be more > closely aligned to perlnative and pythonnative without the dash.) > However, it appeared that java-native was essentially unused, and I > thought having both a java-native and javanative class would be > confusing. > > Kyle Russell (2): > Add support for building Java recipes using java-native > ant-native: only use classpath tools if no JDK > > README | 7 +++ > classes/java-native.bbclass | 17 ++--- > .../ant-contrib/ant-contrib-native_1.0b3.bb | 2 +- > recipes-core/ant/ant-native_1.8.1.bb| 4 ++-- > recipes-core/ant/files/ant | 9 + > recipes-core/openjdk/openjdk-8-native.inc | 2 ++ > 6 files changed, 31 insertions(+), 10 deletions(-) > > -- > 2.20.1 > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH] nginx: add default proxy_params
From: André Draszik
As per Debian packaging - to use it, see
https://wiki.debian.org/Nginx/DirectoryStructure#Extra_Parameters
This file is most commonly included when Nginx is acting
as a reverse proxy:
include /etc/nginx/proxy_params;
proxy_pass http://localhost:8000;
Signed-off-by: André Draszik
---
meta-webserver/recipes-httpd/nginx/files/proxy_params | 4
meta-webserver/recipes-httpd/nginx/nginx.inc | 3 +++
2 files changed, 7 insertions(+)
create mode 100644 meta-webserver/recipes-httpd/nginx/files/proxy_params
diff --git a/meta-webserver/recipes-httpd/nginx/files/proxy_params
b/meta-webserver/recipes-httpd/nginx/files/proxy_params
new file mode 100644
index 0..df75bc5d7
--- /dev/null
+++ b/meta-webserver/recipes-httpd/nginx/files/proxy_params
@@ -0,0 +1,4 @@
+proxy_set_header Host $http_host;
+proxy_set_header X-Real-IP $remote_addr;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto $scheme;
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc
b/meta-webserver/recipes-httpd/nginx/nginx.inc
index 522942504..29e7efc14 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx.inc
+++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
@@ -17,6 +17,7 @@ SRC_URI = " \
file://0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch \
file://nginx.conf \
file://default_server.site \
+file://proxy_params \
file://nginx.init \
file://nginx-volatile.conf \
file://nginx.service \
@@ -111,6 +112,8 @@ do_install () {
install -d ${D}${sysconfdir}/nginx/sites-enabled
ln -s ../sites-available/default_server
${D}${sysconfdir}/nginx/sites-enabled/
+install -m 0644 ${WORKDIR}/proxy_params
${D}${sysconfdir}/nginx/proxy_params
+
install -d ${D}${sysconfdir}/default/volatiles
install -m 0644 ${WORKDIR}/nginx-volatile.conf
${D}${sysconfdir}/default/volatiles/99_nginx
sed -i 's,/var/,${localstatedir}/,g'
${D}${sysconfdir}/default/volatiles/99_nginx
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH 1/2] nginx: update systemd unit using nginx recommendation
From: André Draszik
Our systemd unit doesn't follow the official
recommendation, see
https://www.nginx.com/resources/wiki/start/topics/examples/systemd/
Most importantly:
* it should start after some additional specific
targets/units
* using PrivateTmp is a useful security feature, in
particular to avoid cross domain scripting via the
temp folder
* using systemd's $MAINPID, we can distinguish between
multiple running nginx instances correctly
Signed-off-by: André Draszik
---
meta-webserver/recipes-httpd/nginx/files/nginx.service | 10 +++---
meta-webserver/recipes-httpd/nginx/nginx.inc | 1 +
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx.service
b/meta-webserver/recipes-httpd/nginx/files/nginx.service
index ce9906171..c6fc0495f 100644
--- a/meta-webserver/recipes-httpd/nginx/files/nginx.service
+++ b/meta-webserver/recipes-httpd/nginx/files/nginx.service
@@ -1,11 +1,15 @@
[Unit]
-Description=Nginx Server
-After=network.target
+Description=The NGINX HTTP and reverse proxy server
+After=syslog.target network.target remote-fs.target nss-lookup.target
+
[Service]
Type=forking
PIDFile=/run/nginx/nginx.pid
+ExecStartPre=@SBINDIR@/nginx -t
ExecStart=@SBINDIR@/nginx
-ExecStop=@SBINDIR@/nginx -s stop
ExecReload=@SBINDIR@/nginx -s reload
+ExecStop=@BINDIR@/kill -s QUIT $MAINPID
+PrivateTmp=true
+
[Install]
WantedBy=multi-user.target
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc
b/meta-webserver/recipes-httpd/nginx/nginx.inc
index 24c2cedf5..ea1c1f782 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx.inc
+++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
@@ -117,6 +117,7 @@ do_install () {
sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
-e 's,@LOCALSTATEDIR@,${localstatedir},g' \
-e 's,@SBINDIR@,${sbindir},g' \
+-e 's,@BINDIR@,${bindir},g' \
${D}${systemd_unitdir}/system/nginx.service
fi
}
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH 2/2] nginx: configuration update
From: André Draszik
Restructure the main configuration file to simplify custom configuration:
* support inclusion of configuration fragments from subdirectories:
- /etc/nginx/modules-enabled/*.conf
- /etc/nginx/conf.d/*.conf
- /etc/nginx/sites-enabled/*
* default site (port 80):
- move into /etc/nginx/sites-available/default_server
and enable via symlink in /etc/nginx/sites-enabled/
- listen on IPv6
- drop unneeded example fragments
* configure and enable gzip
* update TLS settings to drop SSLv3 and enable TLSv1.3 for some safer
defaults
* update remaining bits to follow Debian standard configuration
https://salsa.debian.org/nginx-team/nginx/blob/62a54a8ba66ee6cc1b4f8a33dab9a6f27a3fdac4/debian/conf/nginx.conf
* drop unneeded example configuration bits from /etc/nginx/*.default
These changes, in particular the configuration fragment
support allow to easily customise nginx based on individual
requirements.
In addition, it is now possible for other recipes / packages
to drop fragments into the respective directories in /etc/nginx
without having to meddle with /etc/nginx/nginx.conf
Signed-off-by: André Draszik
---
.../nginx/files/default_server.site | 14 ++
.../recipes-httpd/nginx/files/nginx.conf | 139 +-
meta-webserver/recipes-httpd/nginx/nginx.inc | 14 ++
3 files changed, 62 insertions(+), 105 deletions(-)
create mode 100644 meta-webserver/recipes-httpd/nginx/files/default_server.site
diff --git a/meta-webserver/recipes-httpd/nginx/files/default_server.site
b/meta-webserver/recipes-httpd/nginx/files/default_server.site
new file mode 100644
index 0..7a8a215cf
--- /dev/null
+++ b/meta-webserver/recipes-httpd/nginx/files/default_server.site
@@ -0,0 +1,14 @@
+# Default server configuration
+server {
+listen 80 default_server;
+listen [::]:80 default_server;
+
+root /var/www/localhost/html;
+
+index index.html index.htm;
+
+server_name _;
+
+# redirect server error pages to the static page /50x.html
+error_page 500 502 503 504 /50x.html;
+}
diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx.conf
b/meta-webserver/recipes-httpd/nginx/files/nginx.conf
index 69d3a2adc..6d219422b 100644
--- a/meta-webserver/recipes-httpd/nginx/files/nginx.conf
+++ b/meta-webserver/recipes-httpd/nginx/files/nginx.conf
@@ -1,118 +1,47 @@
-
user www;
-worker_processes 1;
-
-error_log /var/log/nginx/error.log;
-#error_log logs/error.log notice;
-#error_log logs/error.log info;
-
-pid/run/nginx/nginx.pid;
-
+worker_processes 1;
+pid /run/nginx/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
events {
-worker_connections 1024;
+worker_connections 768;
+# multi_accept on;
}
-
http {
-include mime.types;
+# Basic Settings
+sendfile on;
+tcp_nopush on;
+tcp_nodelay on;
+keepalive_timeout 65;
+types_hash_max_size 2048;
+# server_tokens off;
+
+# server_names_hash_bucket_size 64;
+# server_name_in_redirect off;
+
+include /etc/nginx/mime.types;
default_type application/octet-stream;
-log_format main '$remote_addr - $remote_user [$time_local] "$request" '
- '$status $body_bytes_sent "$http_referer" '
- '"$http_user_agent" "$http_x_forwarded_for"';
-
-access_log /var/log/nginx/access.log main;
-
-sendfileon;
-#tcp_nopush on;
-
-#keepalive_timeout 0;
-keepalive_timeout 65;
-
-#gzip on;
-
-server {
-listen 80;
-server_name localhost;
-
-#charset koi8-r;
-
-#access_log logs/host.access.log main;
-
-location / {
-root /var/www/localhost/html;
-index index.html index.htm;
-}
-
-#error_page 404 /404.html;
-
-# redirect server error pages to the static page /50x.html
-#
-error_page 500 502 503 504 /50x.html;
-location = /50x.html {
-root /var/www/localhost/html;
-}
-
-# proxy the PHP scripts to Apache listening on 127.0.0.1:80
-#
-#location ~ \.php$ {
-#proxy_pass http://127.0.0.1;
-#}
-
-# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-#
-#location ~ \.php$ {
-#root html;
-#fastcgi_pass 127.0.0.1:9000;
-#fastcgi_index index.php;
-#fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
-#includefastcgi_params;
-#}
-
-# deny access to .htaccess files, if Apache's document root
-# concurs with nginx's one
-#
-#location ~ /\.ht {
-#deny all;
-#}
-}
-
-
-# another virtual host using mix of IP-, name-, and port-based
configuration
-#
-#server {
-#listen 8000;
-#listen
[oe] [meta-java][PATCH] remove True option to getVar calls
From: André Draszik
getVar() has been defaulting to expanding by default for
a long time (2016), thus remove the True option from
getVar() calls with a regex search and replace.
Search & replace made using the following command:
sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
Signed-off-by: André Draszik
---
classes/java-library.bbclass | 4 ++--
classes/openjdk-build-helper.bbclass | 10 +-
recipes-core/openjdk/openjdk-7-common.inc | 2 +-
recipes-core/openjdk/openjdk-8-common.inc | 4 ++--
recipes-core/openjdk/openjdk-8-cross.inc | 10 +-
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index e0159ba..d801930 100644
--- a/classes/java-library.bbclass
+++ b/classes/java-library.bbclass
@@ -27,8 +27,8 @@ def java_package_name(d):
pre=""
post=""
- bpn = d.getVar('BPN', True)
- ml = d.getVar('MLPREFIX', True)
+ bpn = d.getVar('BPN')
+ ml = d.getVar('MLPREFIX')
if not bpn.startswith("lib"):
pre='lib'
diff --git a/classes/openjdk-build-helper.bbclass
b/classes/openjdk-build-helper.bbclass
index 01ed591..8d83e02 100644
--- a/classes/openjdk-build-helper.bbclass
+++ b/classes/openjdk-build-helper.bbclass
@@ -9,7 +9,7 @@ EXTRA_OEMAKE_remove_task-install = "${PARALLEL_MAKEINST}"
# In OE we have PARALLEL_MAKE which is the actual option passed to make,
# e.g. "-j 4".
def openjdk_build_helper_get_parallel_make(d):
-pm = d.getVar('PARALLEL_MAKE', True);
+pm = d.getVar('PARALLEL_MAKE');
if not pm or '-j' not in pm:
return 1
@@ -55,7 +55,7 @@ def openjdk_build_helper_get_target_cflags(d):
def openjdk_build_helper_get_jdk_arch(d):
import bb
-jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
+jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH')
if jdk_arch == "x86-64":
jdk_arch = "amd64"
elif jdk_arch == "powerpc":
@@ -73,7 +73,7 @@ def openjdk_build_helper_get_jdk_arch(d):
def openjdk_build_helper_get_llvm_configure_arch(d):
import bb;
-arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
+arch = d.getVar('TRANSLATED_TARGET_ARCH')
if arch in ['i386', 'i486', 'i586', 'i686', 'x86-64']:
arch = "x86"
elif arch in ['mipsel', 'mips']:
@@ -84,7 +84,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d):
arch = "arm"
else:
if 'shark' in d.getVar('PACKAGECONFIG').split():
-bb.warn("%s does not support %s in Shark builds yet" %
(d.getVar('PN', True), arch) );
+bb.warn("%s does not support %s in Shark builds yet" %
(d.getVar('PN'), arch) );
return arch
@@ -93,7 +93,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d):
def openjdk_build_helper_get_icedtea_arch(d):
import bb;
-arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
+arch = d.getVar('TRANSLATED_TARGET_ARCH')
if arch == "x86-64":
arch = "amd64"
elif arch in ['i386', 'i486', 'i586', 'i686']:
diff --git a/recipes-core/openjdk/openjdk-7-common.inc
b/recipes-core/openjdk/openjdk-7-common.inc
index 794bf58..d59a57a 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -93,7 +93,7 @@ export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}"
export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2"
export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}"
export CACAO_CONFIGURE_ARGS = " \
-${@['','--enable-softfloat'][d.getVar('TARGET_FPU', True) == 'soft']}"
+${@['','--enable-softfloat'][d.getVar('TARGET_FPU') == 'soft']}"
JAVA_HOME[unexport] = "1"
diff --git a/recipes-core/openjdk/openjdk-8-common.inc
b/recipes-core/openjdk/openjdk-8-common.inc
index 4d8f935..1fbe7fe 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -163,8 +163,8 @@ export DEBUG_BINARIES = "true"
ALTERNATIVE_PRIORITY = "50"
-OPENJDK_UPDATE_VERSION = "${@d.getVar('PV', True).split('b')[0]}"
-OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV', True).split('b')[1]}"
+OPENJDK_UPDATE_VERSION = "${@d.getVar('PV').split('b')[0]}"
+OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV').split('b')[1]}"
EXTRA_OECONF_append = "\
--with-build-number=${OPENJDK_BUILD_NUMBER} \
--with-update-version=${OPENJDK_UPDATE_VERSION} \
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc
b/recipes-core/openjdk/openjdk-8-cross.inc
index d04b0d3..7d6c1a5 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -108,14 +108,14 @@ EXTRA_OEMAKE_append = '\
[oe] [meta-oe][PATCH] meta-oe: remove True option to getVar calls (again)
From: André Draszik
A couple have still been missed in the past despite multiple
attempts at doing so (or simply have re-appeared?).
Search & replace made using the following command:
sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
Signed-off-by: André Draszik
---
meta-oe/classes/scancode.bbclass | 10 +-
meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb | 2 +-
meta-oe/recipes-devtools/php/php.inc | 2 +-
meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb | 2 +-
meta-oe/recipes-kernel/bpftool/bpftool.bb | 2 +-
meta-oe/recipes-kernel/cpupower/cpupower.bb | 2 +-
meta-oe/recipes-support/opencv/opencv_3.4.3.bb| 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/meta-oe/classes/scancode.bbclass b/meta-oe/classes/scancode.bbclass
index 701660f57..e0f0dbca4 100644
--- a/meta-oe/classes/scancode.bbclass
+++ b/meta-oe/classes/scancode.bbclass
@@ -3,18 +3,18 @@
# For more informaiton https://github.com/nexB/scancode-toolkit
SCANCODE_FORMAT ?= "html-app"
-EXT = "${@'html' if d.getVar('SCANCODE_FORMAT', True) == 'html-app' else
'json'}"
+EXT = "${@'html' if d.getVar('SCANCODE_FORMAT') == 'html-app' else 'json'}"
SCANCODE_TOOLKIT = "${@get_scancode_toolkit(d)}"
SCANCODE_TAG = "v2.2.1"
SCANCODE_GIT_LOCATION ?= "https://github.com/nexB/scancode-toolkit.git;
SCANCODE_SRC_LOCATION ?= "${DL_DIR}/scancode"
def get_scancode_toolkit(d):
-lf = bb.utils.lockfile(d.getVar('SCANCODE_SRC_LOCATION', True) + ".lock")
-if (not os.path.exists(d.getVar('SCANCODE_SRC_LOCATION', True))):
-os.system("git clone %s %s -b %s" % (d.getVar('SCANCODE_GIT_LOCATION',
True), d.getVar('SCANCODE_SRC_LOCATION', True), d.getVar('SCANCODE_TAG', True)))
+lf = bb.utils.lockfile(d.getVar('SCANCODE_SRC_LOCATION') + ".lock")
+if (not os.path.exists(d.getVar('SCANCODE_SRC_LOCATION'))):
+os.system("git clone %s %s -b %s" %
(d.getVar('SCANCODE_GIT_LOCATION'), d.getVar('SCANCODE_SRC_LOCATION'),
d.getVar('SCANCODE_TAG')))
bb.utils.unlockfile(lf)
-return (d.getVar('SCANCODE_SRC_LOCATION', True))
+return (d.getVar('SCANCODE_SRC_LOCATION'))
do_scancode() {
mkdir -p ${DEPLOY_DIR_IMAGE}/scancode
diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
b/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
index f3a0f70ee..c2d2180ba 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
@@ -22,7 +22,7 @@ BBCLASSEXTEND = "native"
# you need to install the multilib development package (e.g.
# libc6-dev-i386 on Debian/Ubuntu) and build a 32 bit host part
# (HOST_CC="gcc -m32").
-BUILD_CC_ARCH_append = " ${@['-m32',''][d.getVar('SITEINFO_BITS', True) !=
'32']}"
+BUILD_CC_ARCH_append = " ${@['-m32',''][d.getVar('SITEINFO_BITS') != '32']}"
# The lua makefiles expect the TARGET_SYS to be from uname -s
# Values: Windows, Linux, Darwin, iOS, SunOS, PS3, GNU/kFreeBSD
diff --git a/meta-oe/recipes-devtools/php/php.inc
b/meta-oe/recipes-devtools/php/php.inc
index bfd0ddfb8..ca7bd91b2 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -8,7 +8,7 @@ BBCLASSEXTEND = "native"
DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native"
DEPENDS_class-native = "zlib-native libxml2-native"
-PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}"
+PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}"
SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \
diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb
b/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb
index ca38e6aa2..30c850365 100644
--- a/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb
+++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb
@@ -21,7 +21,7 @@ LDFLAGS_append_libc-musl = " -largp"
def set_target_arch(d):
import re
-arch = d.getVar('TARGET_ARCH', True)
+arch = d.getVar('TARGET_ARCH')
if re.match(r'i.86', arch, re.I):
return 'i386'
else:
diff --git a/meta-oe/recipes-kernel/bpftool/bpftool.bb
b/meta-oe/recipes-kernel/bpftool/bpftool.bb
index dd7eaa2aa..f75ac6f81 100644
--- a/meta-oe/recipes-kernel/bpftool/bpftool.bb
+++ b/meta-oe/recipes-kernel/bpftool/bpftool.bb
@@ -27,7 +27,7 @@ do_install() {
PACKAGE_ARCH = "${MACHINE_ARCH}"
python do_package_prepend() {
-d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0])
+d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0])
}
B = "${
[oe] [meta-networking][PATCH] meta-networking: remove True option to getVar calls (again)
From: André Draszik
A couple have still been missed in the past despite multiple
attempts at doing so (or simply have re-appeared?).
Search & replace made using the following command:
sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
Signed-off-by: André Draszik
---
.../recipes-connectivity/mosquitto/mosquitto_1.5.4.bb | 2 +-
meta-networking/recipes-connectivity/samba/samba_4.8.4.bb | 6 +++---
meta-networking/recipes-support/nis/nis.inc | 2 +-
.../recipes-support/strongswan/strongswan_5.7.1.bb | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
index 01562aad1..8f406ff9c 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
@@ -39,7 +39,7 @@ EXTRA_OEMAKE = " \
WITH_BUNDLED_DEPS=no \
"
-export LIB_SUFFIX = "${@d.getVar('baselib', True).replace('lib', '')}"
+export LIB_SUFFIX = "${@d.getVar('baselib').replace('lib', '')}"
do_install() {
oe_runmake 'DESTDIR=${D}' install
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.8.4.bb
b/meta-networking/recipes-connectivity/samba/samba_4.8.4.bb
index f1aaeb83d..e86ed96a5 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.8.4.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.8.4.bb
@@ -193,15 +193,15 @@ PACKAGES =+ "${PN}-python ${PN}-pidl \
python samba_populate_packages() {
def module_hook(file, pkg, pattern, format, basename):
-pn = d.getVar('PN', True)
+pn = d.getVar('PN')
d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg)
-mlprefix = d.getVar('MLPREFIX', True) or ''
+mlprefix = d.getVar('MLPREFIX') or ''
pam_libdir = d.expand('${base_libdir}/security')
pam_pkgname = mlprefix + 'pam-plugin%s'
do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM
plugin for %s', extra_depends='', prepend=True)
-libdir = d.getVar('libdir', True)
+libdir = d.getVar('libdir')
do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s
library', extra_depends='${PN}-common', prepend=True, allow_links=True)
pkglibdir = '%s/samba' % libdir
do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s
library', extra_depends='${PN}-common', prepend=True)
diff --git a/meta-networking/recipes-support/nis/nis.inc
b/meta-networking/recipes-support/nis/nis.inc
index 200eaf74d..a968af174 100644
--- a/meta-networking/recipes-support/nis/nis.inc
+++ b/meta-networking/recipes-support/nis/nis.inc
@@ -25,7 +25,7 @@ do_install() {
# so force the package to be skipped here (this will cause a
# 'nothing provides' error)
python () {
-os = d.getVar("TARGET_OS", True)
+os = d.getVar("TARGET_OS")
if os == "linux-uclibc":
raise bb.parse.SkipRecipe("NIS functionality requires rpcsvc/yp.h,
uClibC does not provide this")
}
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb
b/meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb
index c8bb17c5b..5a4e2d36f 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb
@@ -66,8 +66,8 @@ python split_strongswan_plugins () {
dbglibdir = os.path.join(libdir, '.debug')
def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename):
-dvar = d.getVar('PKGD', True)
-oldfiles = d.getVar('CONFFILES_' + pkg, True)
+dvar = d.getVar('PKGD')
+oldfiles = d.getVar('CONFFILES_' + pkg)
newfile = '/' + os.path.relpath(f, dvar)
if not oldfiles:
@@ -83,7 +83,7 @@ python split_strongswan_plugins () {
split_staticdev_packages = do_split_packages(d, libdir,
'libstrongswan-(.*)\.a', '${PN}-plugin-%s-staticdev', 'strongSwan %s plugin -
Development files (Static Libraries)', prepend=True,
extra_depends='${PN}-staticdev')
if split_packages:
-pn = d.getVar('PN', True)
+pn = d.getVar('PN')
d.setVar('RRECOMMENDS_' + pn + '-plugins', ' '.join(split_packages))
d.appendVar('RRECOMMENDS_' + pn + '-dbg', ' ' + '
'.join(split_dbg_packages))
d.appendVar('RRECOMMENDS_' + pn + '-dev', ' ' + '
'.join(split_dev_packages))
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-initramfs][PATCH] meta-initramfs: remove True option to getVar calls (again)
From: André Draszik
A couple have still been missed in the past despite multiple
attempts at doing so (or simply have re-appeared?).
Search & replace made using the following command:
sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
Signed-off-by: André Draszik
---
meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
index b285b2e8b..ab2afb7f8 100644
--- a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
+++ b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
@@ -25,8 +25,8 @@ do_install() {
# magic by removing all the crazy escaping.
sed -i -e "2i \$TARGETSYSROOT = '${STAGING_DIR_TARGET}';" \
-e "2i \$NATIVESYSROOT = '${STAGING_DIR_NATIVE}';" \
- -e 's#${@d.getVar("STAGING_DIR_NATIVE", True).replace("/",
"/").replace("-", "-").replace(".", ".")}#${NATIVESYSROOT}#g;' \
- -e 's#${@d.getVar("STAGING_DIR_TARGET", True).replace("/",
"/").replace("-", "-").replace(".", ".")}#${TARGETSYSROOT}#g' \
+ -e 's#${@d.getVar("STAGING_DIR_NATIVE").replace("/",
"/").replace("-", "-").replace(".", ".")}#${NATIVESYSROOT}#g;' \
+ -e 's#${@d.getVar("STAGING_DIR_TARGET").replace("/",
"/").replace("-", "-").replace(".", ".")}#${TARGETSYSROOT}#g' \
${D}${bindir_crossscripts}/${TARGET_PREFIX}klcc
}
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-common: Define JAVA_HOME by default
On Thu, 2018-11-29 at 18:48 +0800, Fang Jia wrote: > Use postinst script to set the JAVA_HOME by default. > > Signed-off-by: Fang Jia > --- > recipes-core/openjdk/openjdk-common.inc | 14 ++ > 1 file changed, 14 insertions(+) > > diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes- > core/openjdk/openjdk-common.inc > index 01a0a2a..aaf81f6 100644 > --- a/recipes-core/openjdk/openjdk-common.inc > +++ b/recipes-core/openjdk/openjdk-common.inc What about all the other Java providers that could be installed in the system instead? The original did take care of that, whereas this only does the right thing now if OpenJDK-8 is installed... Cheers, Andre' -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java] OpenJDK 181b13 update in patchwork (was: Re: [meta-java][PATCH 2/2] openjdk-8: better interface invocations)
Hi, I don't seem to have this patch in my mailbox for whatever reason... but from a quick glance https://patchwork.openembedded.org/patch/156314/ just bumps the version of the the aarch32 and aarch64 ports to 181b13 without actually updating them - if I'm not mistaken. It should be updated to not do that before merging, or ideally even update the two aarch ports as well. Not sure if there are other issues... Cheers, Andre' On Mon, 2018-12-17 at 15:47 +0100, Richard Leitner wrote: > Hi, > > On 17.12.18 15:07, Attie Grande wrote: > > Hi Richard, > > > > It looks like gmail has helpfully wrapped some of the lines... > > Also, my patch was intended to go on top of the sumo branch - apologies. > > No problem, please just put [sumo] in the subject then. > > > It looks like you've bumped to 172b11 on master-next already. > > I'll try this and report back - possibly in the new year... > > Ok. Just fyi: We will likely update to 8u181b13 soon > (see https://patchwork.openembedded.org/patch/156314/) > > > Some crashes are available here: > > - https://pastebin.com/raw/f1PB4uJm > > - https://pastebin.com/raw/iXTz8v9z > > Thanks, i will take a look at them. > > > Attie > > regards;Richard.L -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/2] openjdk-common: Define JAVA_HOME by default
On Thu, 2018-11-29 at 18:48 +0800, Fang Jia wrote:
> Use postinst script to set the JAVA_HOME by default.
>
> Signed-off-by: Fang Jia
> ---
> recipes-core/openjdk/openjdk-common.inc | 14 ++
> 1 file changed, 14 insertions(+)
>
> diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-
> core/openjdk/openjdk-common.inc
> index 01a0a2a..aaf81f6 100644
> --- a/recipes-core/openjdk/openjdk-common.inc
> +++ b/recipes-core/openjdk/openjdk-common.inc
> @@ -5,3 +5,17 @@ JDK_ARCH = "${@openjdk_build_helper_get_jdk_arch(d)}"
>
> # Provides the target architecture to the configure script.
> export LLVM_CONFIGURE_ARCH="${@openjdk_build_helper_get_llvm_configure_ar
> ch(d)}"
> +
> +pkg_postinst_${PN}() {
> + cat >> $D${sysconfdir}/profile << EOT
> +JAVA_HOME=""
> +for dir in ${libdir}/jvm/*; do
> +if [ -x "\${dir}/bin/java" ]; then
> +[ -z "\${JAVA_HOME}" ] && JAVA_HOME="\${dir}"
> +fi
> +done
> +if [ -n "\${JAVA_HOME}" ]; then
> +export JAVA_HOME=\${JAVA_HOME}
> +fi
> +EOT
> +}
I'd say this should be done via adding a file to ${sysconfdir}/profile.d/
instead. Have a look at e.g. the DistCC recipe
poky.git/meta/recipes-devtools/devel-config/distcc-config.bb
Cheers,
Andre'
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] mosquitto: fully switch over to using PACKAGECONFIG_CONFARGS
From: André Draszik
Convert all other instances of explicit PACKAGECONFIG uses
to the PACKAGECONFIG_CONFARGS infrastructure.
Signed-off-by: André Draszik
---
.../mosquitto/mosquitto_1.5.4.bb | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
index e32f30d6e..01562aad1 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
@@ -23,20 +23,16 @@ PACKAGECONFIG ??= "ssl uuid \
${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \
"
-PACKAGECONFIG[dns-srv] = ",,c-ares"
-PACKAGECONFIG[ssl] = ",,openssl"
-PACKAGECONFIG[uuid] = ",,util-linux"
+PACKAGECONFIG[dns-srv] = "WITH_SRV=yes,WITH_SRV=no,c-ares"
+PACKAGECONFIG[ssl] = "WITH_TLS=yes WITH_TLS_PSK=yes,WITH_TLS=no
WITH_TLS_PSK=no,openssl"
+PACKAGECONFIG[uuid] = "WITH_UUID=yes,WITH_UUID=no,util-linux"
PACKAGECONFIG[systemd] = "WITH_SYSTEMD=yes,WITH_SYSTEMD=no,systemd"
-PACKAGECONFIG[websockets] = ",,libwebsockets"
+PACKAGECONFIG[websockets] =
"WITH_WEBSOCKETS=yes,WITH_WEBSOCKETS=no,libwebsockets"
EXTRA_OEMAKE = " \
prefix=${prefix} \
mandir=${mandir} \
localedir=${localedir} \
-${@bb.utils.contains('PACKAGECONFIG', 'dns-srv', 'WITH_SRV=yes',
'WITH_SRV=no', d)} \
-${@bb.utils.contains('PACKAGECONFIG', 'ssl', 'WITH_TLS=yes
WITH_TLS_PSK=yes', 'WITH_TLS=no WITH_TLS_PSK=no', d)} \
-${@bb.utils.contains('PACKAGECONFIG', 'uuid', 'WITH_UUID=yes',
'WITH_UUID=no', d)} \
-${@bb.utils.contains('PACKAGECONFIG', 'websockets', 'WITH_WEBSOCKETS=yes',
'WITH_WEBSOCKETS=no', d)} \
${PACKAGECONFIG_CONFARGS} \
STRIP=/bin/true \
WITH_DOCS=no \
--
2.20.0.rc2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] mosquitto: fix build in systemd environments
From: André Draszik
The mosquitto systemd service file instructs systemd to wait
for mosquitto to notify systemd that mosquitto has started
correctly. This isn't working as mosquitto is not *compiled*
with systemd support enabled. As such, systemd restarts
mosquitto every few seconds.
For reference, this was introduced in commit a483d344d9fb
("mosquitto: Make enabling systemd also enable build dep on systemd")
Because we build mosquitto using the provided Makefile
infrastructure, the solution is to add PACKAGECONFIG_CONFARGS
to EXTRA_OEMAKE, so that the required make flags are added
to the make command line.
Signed-off-by: André Draszik
---
.../recipes-connectivity/mosquitto/mosquitto_1.5.4.bb| 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
index ee4cab728..e32f30d6e 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
@@ -37,6 +37,7 @@ EXTRA_OEMAKE = " \
${@bb.utils.contains('PACKAGECONFIG', 'ssl', 'WITH_TLS=yes
WITH_TLS_PSK=yes', 'WITH_TLS=no WITH_TLS_PSK=no', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'uuid', 'WITH_UUID=yes',
'WITH_UUID=no', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'websockets', 'WITH_WEBSOCKETS=yes',
'WITH_WEBSOCKETS=no', d)} \
+${PACKAGECONFIG_CONFARGS} \
STRIP=/bin/true \
WITH_DOCS=no \
WITH_BUNDLED_DEPS=no \
--
2.20.0.rc2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH] java-library: make packages overriding PACKAGE_ARCH work again
From: André Draszik
Recent changes is OE have caused the traditional approach of inheriting
allarch and setting PACKAGE_ARCH not work anymore. Once allarch is
inherited, PACKAGE_ARCH can not be overridden afterwards.
See commit a23c482cab4f ("allarch: only enable allarch when multilib
is not used") d9ba0219b2f6 in poky.
http://git.openembedded.org/openembedded-core/commit/?id=a23c482cab4f874f4a6a6889716123569eb5ece9
The error manifests itself with configure trying to
--host=allarch-poky-linux --target=allarch-poky-linux
which fails.
To work around this we can make java-library's allarch inherit
conditional, as is done e.g. in OE-core for packagegroup.bbclass
http://git.openembedded.org/openembedded-core/commit/?id=9c826962ec8fa45c2b035427442b90a41517144e
http://git.openembedded.org/openembedded-core/commit/?id=2c9b1d304daade7b0907320aeb9c522e7ab9dcab
So this commit does exactly that, and fixes the two users of this to
follow the new approach.
Signed-off-by: André Draszik
---
classes/java-library.bbclass | 8 ++--
recipes-core/libmatthew/libmatthew.inc | 2 +-
recipes-extended/rxtx/rxtx_2.2.0.bb| 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index ce1cd28..e0159ba 100644
--- a/classes/java-library.bbclass
+++ b/classes/java-library.bbclass
@@ -10,9 +10,13 @@
#
# package archs are set to all, if the recipe builds also packages which
# can not be used for all archs, then set the PACKAGE_ARCH of that package
-# manually, see rxtx_xx.bb for an example.
+# manually *before* inheriting the class, see rxtx_xx.bb for an example.
-inherit java allarch
+inherit java
+PACKAGE_ARCH ?= "all"
+# Fully expanded - so it applies the overrides as well
+PACKAGE_ARCH_EXPANDED := "${PACKAGE_ARCH}"
+inherit ${@oe.utils.ifelse(d.getVar('PACKAGE_ARCH_EXPANDED') == 'all',
'allarch', '')}
# use java_stage for native packages
JAVA_NATIVE_STAGE_INSTALL = "1"
diff --git a/recipes-core/libmatthew/libmatthew.inc
b/recipes-core/libmatthew/libmatthew.inc
index 7db979b..2119c0b 100644
--- a/recipes-core/libmatthew/libmatthew.inc
+++ b/recipes-core/libmatthew/libmatthew.inc
@@ -7,8 +7,8 @@ DEPENDS = "virtual/java-native classpath-native classpath"
S = "${WORKDIR}/libmatthew-java-${PV}"
-inherit java-library
PACKAGE_ARCH = "${TUNE_PKGARCH}"
+inherit java-library
# Some internal version numbers which change from time to time.
# Allowing to override them makes this include file more
diff --git a/recipes-extended/rxtx/rxtx_2.2.0.bb
b/recipes-extended/rxtx/rxtx_2.2.0.bb
index e54dad7..d4fbb9d 100644
--- a/recipes-extended/rxtx/rxtx_2.2.0.bb
+++ b/recipes-extended/rxtx/rxtx_2.2.0.bb
@@ -28,8 +28,8 @@ S = "${WORKDIR}/rxtx-2.2pre2"
INSANE_SKIP_${JPN} += "dev-so"
-inherit autotools-brokensep java-library remove-libtool
PACKAGE_ARCH = "${TUNE_PKGARCH}"
+inherit autotools-brokensep java-library remove-libtool
JARFILENAME = "RXTXcomm.jar"
EXTRA_OEMAKE += "RXTX_PATH=${D}${libdir_jni} \
--
2.19.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] meta-java configuration
On Wed, 2018-10-24 at 17:15 -0400, Kyle Russell wrote: > It looks like the only javac that meta-java exposes through its bbclasses > comes from libecj-bootstrap-native 3.6.2. A few years ago, it looked like > there was an attempt to allow openjdk-8-native to provide > virtual/javac-native, but it has since been reverted. > > I think I understand libecj is needed as part of the bootstrap process to > build openjdk, but if other layers want to build newer java code using > javac from openjdk 8 once available after bootstrap, does meta-java > provide > support for using javac from openjdk-8-native, or is the expectation that > other layers would depend directly on openjdk-8-native and setup > EXTRANATIVEPATH as needed to reach its tools? > > Maybe this is planned future work, but I wanted to make sure I was > configuring the layer correctly and using it as intended. > > Thanks! > > Kyle I've tried something here http://lists.openembedded.org/pipermail/openembedded-devel/2018-July/119590.html http://lists.openembedded.org/pipermail/openembedded-devel/2018-July/119591.html http://lists.openembedded.org/pipermail/openembedded-devel/2018-July/119592.html http://lists.openembedded.org/pipermail/openembedded-devel/2018-July/119593.html http://lists.openembedded.org/pipermail/openembedded-devel/2018-July/119594.html http://lists.openembedded.org/pipermail/openembedded-devel/2018-July/119595.html http://lists.openembedded.org/pipermail/openembedded-devel/2018-July/119596.html [oe] [meta-java][RFC][PATCH 1/7] openjdk-8-native: add meaningful (R)PROVIDES [oe] [meta-java][RFC][PATCH 2/7] layer.conf: allow multiple Java SDKs & runtimes to co-exist [oe] [meta-java][RFC][PATCH 3/7] openjdk-8: add meaningful (R)PROVIDES [oe] [meta-java][RFC][PATCH 4/7] openjre-8: add meaningful (R)PROVIDES [oe] [meta-java][RFC][PATCH 5/7] layer.conf: set defaults for Java JRE (R)PROVIDERS [oe] [meta-java][RFC][PATCH 6/7] openjdk-7: (R)PROVIDE virtual Java [567] packages [oe] [meta-java][RFC][PATCH 7/7] ca-certificates-java: switch to more generic / more correct JAVA (R)DEPENDS the idea is to add virtual (R)PROVIDES that other recipes can depends on, similar to e.g. Debian. I'm using this locally, but I think there are some corner cases that aren't handled. Cheers, Andre' -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] [PATCH 1/2] systemd: upgrade to 239
On Thu, 2018-10-18 at 12:55 +0200, Martin Jansa wrote: > Using u-a for the systemd symlinks to systemctl seems like best solution > to > me, I've already suggested it in: > http://lists.openembedded.org/pipermail/openembedded-core/2018-October/156597.html Yes, I'd support that. Cheers, Andre' -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH] openjdk-8-native: hotspot: handle format-overflow error for gcc >= 7
Hi (Richard), On Tue, 2018-09-25 at 10:55 +0200, Andreas Obergschwandtner wrote: > fixed the format-overflow warnings by patch affected files in > openjdk-8-hotspot > > Signed-off-by: Andreas Obergschwandtner < > andreas.obergschwandt...@skidata.com> > --- > .../hotspot-handle-gcc7-format-overflow.patch | 25 +++ > 1 file changed, 25 insertions(+) > create mode 100644 recipes-core/openjdk/patches-openjdk-8/hotspot-handle- > gcc7-format-overflow.patch This patch seems to have been staged to master-next, but the patch is not actually being used / referenced by the recipe. Cheers, Andre' -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 1/3] ca-certificates-java: Fix sysconfdir for -native recipe
On Wed, 2018-09-19 at 12:48 +0300, Yevgeny Popovych wrote:
>
> On 09/17/2018 05:39 PM, André Draszik wrote:
> > On Fri, 2018-09-07 at 21:10 +0300, Yevgeny Popovych wrote:
> > > When ca-certificates-java-native is built, sysconfdir variable will
> > > be set to value that includes WORKDIR.
> >
> > What is your use-case for a -native version of this?
>
> I'm glad you asked as this should answer some questions..
>
> I am building a package that contains prebuilt ca-certificates
> (including what ca-certificates itself build and JKS),
> for this package I need -native version of ca-certificates-java.
> We have an immutable (readonly) rootfs, so running scripts at runtime is
> not an option.
> With patches I have recently sent it works pretty well.
>
> The bottom line is that there is a use-case for -native version.
> Even if you don't have an immutable (readonly) rootfs - you might want to
> use it
> that way because running scripts is quite error prone.
>
> >
> > > Avoid patching source with this value - use sysconfdir_native.
> > >
> > > Change-Id: I8ac79c3cd5016a8139d9d8c8d58bc2976d0b6fa3
> > > Signed-off-by: Yevgeny Popovych
> > > ---
> > > .../ca-certificates-java/ca-certificates-java_20180516.bb| 9
> > > +++--
> > > 1 file changed, 7 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/recipes-core/ca-certificates-java/ca-certificates-
> > > java_20180516.bb b/recipes-core/ca-certificates-java/ca-certificates-
> > > java_20180516.bb
> > > index 2db1915..7db5110 100644
> > > --- a/recipes-core/ca-certificates-java/ca-certificates-
> > > java_20180516.bb
> > > +++ b/recipes-core/ca-certificates-java/ca-certificates-
> > > java_20180516.bb
> > > @@ -41,9 +41,14 @@ do_patch_append () {
> > > bb.build.exec_func('do_fix_sysconfdir', d)
> > > }
> > >
> > > +# sysconfdir will include absolute native sysroot path in -native
> > > builds,
> > > avoid this
> > > +# (see 36.24 of
> > > https://www.yoctoproject.org/docs/2.5/mega-manual/mega-manual.html#faq
> > > )
> > > +SYSCONFDIR_VALUE_class-target = "${sysconfdir}"
> > > +SYSCONFDIR_VALUE_class-native = "${sysconfdir_native}"
> > > +
> > > do_fix_sysconfdir () {
> > > - sed -e 's|/etc/ssl/certs/java|${sysconfdir}/ssl/certs/java|g' \
> > > - -i
> > > ${S}/src/main/java/org/debian/security/UpdateCertificates.java
> > > +sed -e
> > > 's|/etc/ssl/certs/java|${SYSCONFDIR_VALUE}/ssl/certs/java|g' \
> > > +-i
> > > ${S}/src/main/java/org/debian/security/UpdateCertificates.java
> > > }
> > >
> >
> > No.
> >
> > It's probably best to remove the BBCLASSEXTEND statement in this recipe
> > instead, as it was never tested, and is unlikely to be needed.
>
> We have a use-case for -native and this series fixes it.
>
> >
> > The whole idea is to make this independent of the build machine paths.
> > If
> > you want a -native version of this, you still need to make sure to point
> > this into the yocto sysroot. Otherwise this will try to write to the
> > *build
> > machine's* /etc/ directory!
> >
> > If you really want a -native version, you need to point this into the
> > sysroot, and update this dynamically because of sstate usage, too.
>
> Ok, I suppose that ${sysconfdir_native} has mislead you -
> it does _not_ resolve to an absolute path into native sysroot.
> The value of ${sysconfdir_native} is always "/etc", it does not mangle in
> any way (that's why I have used it).
Exactly, so the code in UpdateCertificates.java will try to access
${SYSCONFDIR_VALUE}/ssl/certs/java, i.e. /etc/ssl/certs/java, which is what
your linux distro might or might not provide. It's not what yocto provides.
Cheers,
Andre'
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH] openjdk-8: support rm_work disabled
From: André Draszik
Now that generation of the Java keystore actually works (again?),
OE-core commit 09bb7718d74 ("ca-certificates: use relative symlinks from
$ETCCERTSDIR"),
do_compile() will fail when invoked multiple times.
The reason is that during do_compile(), the Java keytool is
used to create a Java keystore with the certificates provided
by ca-certificates. Before above OE-core commit, no
certificates were actually being added, but as certificates
are being added now, multiple do_compile() runs will end up
adding the same certificate twice when rm_work is disabled,
causing a keytool exception, as that is not allowed.
So let's remove any previously generated keystore before trying
to add certificates to it.
Signed-off-by: André Draszik
---
This applies on top of commit ec5aae3d ("conf: distro: add mejate{,-musl}
distributions")
---
recipes-core/openjdk/openjdk-8-native.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-core/openjdk/openjdk-8-native.inc
b/recipes-core/openjdk/openjdk-8-native.inc
index 6a01046..bae5d09 100644
--- a/recipes-core/openjdk/openjdk-8-native.inc
+++ b/recipes-core/openjdk/openjdk-8-native.inc
@@ -55,6 +55,7 @@ do_configure_prepend() {
do_compile_prepend() {
export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}"
+rm -f "${B}/images/j2sdk-image/jre/lib/security/cacerts"
}
do_compile_append() {
--
2.19.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v2] openjdk: remove incorrect PROVIDES (java2-vm java2-runtime)
From: André Draszik
There are two issues here:
* PROVIDES is not package specific
* it doesn't look like the intention is to be able to
DEPENDS on java2-vm or java2-runtime anyway
Regarding java2-vm:
---
java2-vm was originally used in the OpenJDK 6 & 7 recipes to be able to
select shark, zero, cacao, or jamvm VMs. OpenJDK-6 is not available any
more, and OpenJDK-7 has removed support for most of this in commit
38f4c1365c11 ("openjdk7: remove broken/unsupported VM's")
It is not clear why it was added to the OpenJDK-8 recipe either.
Given OpenJDK-7 has no way of using the VM compiled as part of OpenJDK-8,
and given that no part of the OpenJDK-8 makes use of the java2-vm part, the
correct solution here is to actually *remove* the incorrect PROVIDES as
well as *R*PROVIDES statements for java2-vm completely.
Regarding java2-runtime:
Again, looking at the other uses of this:
java2-runtime is a virtual runtime package name, which is provided by
different *runtime* packages (created by the OpenJDK-7, OpenJDK-8, JamVM, or
Cacao recipes). Other recipes only ever RDEPEND on java2-runtime. It makes
no sense for the OpenJDK-8 recipe to PROVIDES java2-runtime given the above.
Remove the incorrect (R)PROVIDES statements.
Signed-off-by: André Draszik
---
This applies on top of commit ec5aae3d ("conf: distro: add mejate{,-musl}
distributions")
v2:
also remove incorrect RPROVIDES java2-vm statements as per description
---
recipes-core/openjdk/openjdk-8_172b11.bb | 3 ---
recipes-core/openjdk/openjre-8_172b11.bb | 3 ---
2 files changed, 6 deletions(-)
diff --git a/recipes-core/openjdk/openjdk-8_172b11.bb
b/recipes-core/openjdk/openjdk-8_172b11.bb
index c1c6e1e..72f208e 100644
--- a/recipes-core/openjdk/openjdk-8_172b11.bb
+++ b/recipes-core/openjdk/openjdk-8_172b11.bb
@@ -47,10 +47,7 @@ FILES_${PN}-doc_append = "\
FILES_${PN}-source = " ${JDK_HOME}/src.zip "
-RPROVIDES_${PN} = "java2-vm"
-PROVIDES_${PN} = "java2-vm"
RPROVIDES_${PN} = "java2-runtime"
-PROVIDES_${PN} = "java2-runtime"
inherit update-alternatives
diff --git a/recipes-core/openjdk/openjre-8_172b11.bb
b/recipes-core/openjdk/openjre-8_172b11.bb
index dd29691..e9b930b 100644
--- a/recipes-core/openjdk/openjre-8_172b11.bb
+++ b/recipes-core/openjdk/openjre-8_172b11.bb
@@ -35,10 +35,7 @@ FILES_${PN}-doc_append = "\
${JRE_HOME}/THIRD_PARTY_README \
"
-RPROVIDES_${PN} = "java2-vm"
-PROVIDES_${PN} = "java2-vm"
RPROVIDES_${PN} = "java2-runtime"
-PROVIDES_${PN} = "java2-runtime"
inherit update-alternatives
--
2.19.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH] openjdk: remove incorrect PROVIDES (java2-vm java2-runtime)
From: André Draszik
There are two issues here:
* PROVIDES is not package specific
* it doesn't look like the intention is to be able to
DEPENDS on java2-vm or java2-runtime anyway
Regarding java2-vm:
---
java2-vm was originally used in the OpenJDK 6 & 7 recipes to be able to
select shark, zero, cacao, or jamvm VMs. OpenJDK-6 is not available any
more, and OpenJDK-7 has removed support for most of this in commit
38f4c1365c11 ("openjdk7: remove broken/unsupported VM's")
It is not clear why it was added to the OpenJDK-8 recipe either.
Given OpenJDK-7 has no way of using the VM compiled as part of OpenJDK-8,
and given that no part of the OpenJDK-8 makes use of the java2-vm part, the
correct solution here is to actually *remove* the incorrect PROVIDES
statement for java2-vm completely.
Regarding java2-runtime:
Again, looking at the other uses of this:
java2-runtime is a virtual runtime package name, which is provided by
different *runtime* packages (created by the OpenJDK-7, OpenJDK-8, JamVM, or
Cacao recipes). Other recipes only ever RDEPEND on java2-runtime. It makes
no sense for the OpenJDK-8 recipe to PROVIDES java2-runtime given the above.
Remove the incorrect PROVIDES statements.
Signed-off-by: André Draszik
---
This applies on top of commit ec5aae3d ("conf: distro: add mejate{,-musl}
distributions")
---
recipes-core/openjdk/openjdk-8_172b11.bb | 2 --
recipes-core/openjdk/openjre-8_172b11.bb | 2 --
2 files changed, 4 deletions(-)
diff --git a/recipes-core/openjdk/openjdk-8_172b11.bb
b/recipes-core/openjdk/openjdk-8_172b11.bb
index c1c6e1e..08f3a32 100644
--- a/recipes-core/openjdk/openjdk-8_172b11.bb
+++ b/recipes-core/openjdk/openjdk-8_172b11.bb
@@ -48,9 +48,7 @@ FILES_${PN}-doc_append = "\
FILES_${PN}-source = " ${JDK_HOME}/src.zip "
RPROVIDES_${PN} = "java2-vm"
-PROVIDES_${PN} = "java2-vm"
RPROVIDES_${PN} = "java2-runtime"
-PROVIDES_${PN} = "java2-runtime"
inherit update-alternatives
diff --git a/recipes-core/openjdk/openjre-8_172b11.bb
b/recipes-core/openjdk/openjre-8_172b11.bb
index dd29691..d2e8f31 100644
--- a/recipes-core/openjdk/openjre-8_172b11.bb
+++ b/recipes-core/openjdk/openjre-8_172b11.bb
@@ -36,9 +36,7 @@ FILES_${PN}-doc_append = "\
"
RPROVIDES_${PN} = "java2-vm"
-PROVIDES_${PN} = "java2-vm"
RPROVIDES_${PN} = "java2-runtime"
-PROVIDES_${PN} = "java2-runtime"
inherit update-alternatives
--
2.19.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 0/3] ca-certificates-java: Fix usage as a native tool, do_rootfs failure
On Fri, 2018-09-07 at 21:10 +0300, Yevgeny Popovych wrote:
> This series fixes several issues with ca-certificates-java:
> * when used as a native tool
> * failure on do_rootfs
Can you share complete logs? I'd like to understand the do_rootfs issues you
are seeing (I don't see any).
> This doesn't fix all the issues and there is definitely a room for
> improvement.
What other issues?
> I presume that running it on the target doesn't work - at least
> ${sysconfdir} is
> not expanded in the hook.
True.
> I also think that will be best to drop create-ca-certificates-java usage
> in
> the postinst and let it be called as a hook of ca-certificates. This will
> allow
> us to remove some code and simplify both script and recipe.
You can't do that, because ca-certificates could be installed before ca-
certificates-java. In which case the hook will not be run.
>
> It would be great if others could test their use cases;
> and clarify them - is create-ca-certificates-java really needed?.
As per above.
Cheers,
Andre'
>
> Yevgeny Popovych (3):
> ca-certificates-java: Fix sysconfdir for -native recipe
> ca-certificates-java: Don't fail when called via hook on do_rootfs
> ca-certificates-java: Distinguish between SYSROOT and D
>
> .../ca-certificates-java.hook.in | 23 +++
> ---
> .../ca-certificates-java_20180516.bb | 11 ---
> 2 files changed, 19 insertions(+), 15 deletions(-)
>
> --
> 2.7.4
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 3/3] ca-certificates-java: Distinguish between SYSROOT and D
On Fri, 2018-09-07 at 21:10 +0300, Yevgeny Popovych wrote:
> This fixes ca-certificates-java-hook invocation via
> update-ca-certificates on build host and as a native tool.
> Provide SYSROOT variable in the postinst and consume it in the script,
> like ca-certificates recipe does.
>
> SYSROOT is set whenever the script is executed on the build host
> (do_rootfs, or as native dependency).
> D is only set during do_rootfs.
>
I think I'm missing something...
It looks like this patch switches the hook script to use $SYSROOT instead of
$D, and SYSROOT is set to $D in the postinst explicitly.
In both cases, the expansion of $SYSROOT or $D will yield the same. How is
that fixing anything? What am I missing?
Cheers,
Andre'
> Change-Id: Ifbf50ca705a98012e1357ebf5afa33c07ea6cd87
> Signed-off-by: Yevgeny Popovych
> ---
> .../ca-certificates-java/ca-certificates-java.hook.in | 17 --
> ---
> .../ca-certificates-java_20180516.bb| 2 +-
> 2 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/recipes-core/ca-certificates-java/ca-certificates-java/ca-
> certificates-java.hook.in b/recipes-core/ca-certificates-java/ca-
> certificates-java/ca-certificates-java.hook.in
> index 611a4ef..5e89dd9 100755
> --- a/recipes-core/ca-certificates-java/ca-certificates-java/ca-
> certificates-java.hook.in
> +++ b/recipes-core/ca-certificates-java/ca-certificates-java/ca-
> certificates-java.hook.in
> @@ -8,20 +8,21 @@
> # and package update in OE, so the distinction between cases 2)
> # and 3) isn't perfect.
>
> +# SYSROOT is set whenever the script is executed on the build host
> +# (do_rootfs, or as native dependency).
> +# D is only set during do_rootfs.
> +
> self=$(basename $0)
> -jvm_libdir="@@libdir_jvm@@"
> +jvm_libdir="${JVM_LIBDIR:-@@libdir_jvm@@}"
>
> -if [ -n "${D:-}" ] ; then
> -# called from postinst as part of image build on host
> +if [ -n "${SYSROOT:-}" ] ; then
> +# called on build host - from postinst (directly or as a hook) or as
> a native tool
> if [ -z "${JVM_LIBDIR:-}" ] ; then
> # if JVM_LIBDIR is not present - we were called as a hook
> echo "called as a hook of ca-certificates on do_rootfs, exiting"
> exit 0
> fi
> fi
> -if [ -n "${JVM_LIBDIR:-}" ] ; then
> -jvm_libdir="${JVM_LIBDIR}"
> -fi
>
> for JAVA in icedtea7-native/bin/java \
> openjdk-8-native/bin/java openjdk-8/bin/java openjre-
> 8/bin/java \
> @@ -58,6 +59,4 @@ else
> while read filename ; do
> echo "+${filename}"
> done
> -fi | SYSROOT="${D:-}" ${JAVA} -Xmx64m \
> - -jar ${D:-}@@datadir_java@@/@@JARFILENAME@@
> \
> - -storepass changeit
> +fi | ${JAVA} -Xmx64m -jar ${D:-}@@datadir_java@@/@@JARFILENAME@@
> -storepass changeit
> diff --git a/recipes-core/ca-certificates-java/ca-certificates-
> java_20180516.bb b/recipes-core/ca-certificates-java/ca-certificates-
> java_20180516.bb
> index 7db5110..2f2536d 100644
> --- a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
> +++ b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
> @@ -100,7 +100,7 @@ pkg_postinst_${PN} () {
> fi
> JVM_LIBDIR=$NATIVE_ROOT${libdir_jvm}
> fi
> - JVM_LIBDIR=$JVM_LIBDIR $D${sbindir}/create-ca-certificates-java
> + SYSROOT=$D JVM_LIBDIR=$JVM_LIBDIR $D${sbindir}/create-ca-
> certificates-java
> }
>
> RDEPENDS_${PN} = "ca-certificates"
> --
> 2.7.4
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 2/3] ca-certificates-java: Don't fail when called via hook on do_rootfs
On Fri, 2018-09-07 at 21:10 +0300, Yevgeny Popovych wrote:
> It is possible that ca-certificates-java hook will be called via
> update-ca-certificates hook during do_roofs (the case when D is set
> and JVM_LIBDIR is not).
> This is a valid case so don't fail.
>
> Change-Id: I908e2f0acec487c41499543014014e29919bd6ab
> Signed-off-by: Yevgeny Popovych
> ---
> .../ca-certificates-java/ca-certificates-java.hook.in | 6
> +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/recipes-core/ca-certificates-java/ca-certificates-java/ca-
> certificates-java.hook.in b/recipes-core/ca-certificates-java/ca-
> certificates-java/ca-certificates-java.hook.in
> index 89c764f..611a4ef 100755
> --- a/recipes-core/ca-certificates-java/ca-certificates-java/ca-
> certificates-java.hook.in
> +++ b/recipes-core/ca-certificates-java/ca-certificates-java/ca-
> certificates-java.hook.in
> @@ -14,9 +14,9 @@ jvm_libdir="@@libdir_jvm@@"
> if [ -n "${D:-}" ] ; then
> # called from postinst as part of image build on host
> if [ -z "${JVM_LIBDIR:-}" ] ; then
> -# should never happen, this is supposed to be passed in
> -echo "$0: no JVM_LIBDIR specified" >&2
> -false
> +# if JVM_LIBDIR is not present - we were called as a hook
> +echo "called as a hook of ca-certificates on do_rootfs, exiting"
> +exit 0
I don't understand how silently not creating / updating the Java certificate
store any more is good? True, there is an issue here, but I'd say that this
should actually do something useful, not just pretend to have done
something.
Cheers,
Andre'
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 1/3] ca-certificates-java: Fix sysconfdir for -native recipe
On Fri, 2018-09-07 at 21:10 +0300, Yevgeny Popovych wrote:
> When ca-certificates-java-native is built, sysconfdir variable will
> be set to value that includes WORKDIR.
What is your use-case for a -native version of this?
> Avoid patching source with this value - use sysconfdir_native.
>
> Change-Id: I8ac79c3cd5016a8139d9d8c8d58bc2976d0b6fa3
> Signed-off-by: Yevgeny Popovych
> ---
> .../ca-certificates-java/ca-certificates-java_20180516.bb| 9
> +++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-core/ca-certificates-java/ca-certificates-
> java_20180516.bb b/recipes-core/ca-certificates-java/ca-certificates-
> java_20180516.bb
> index 2db1915..7db5110 100644
> --- a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
> +++ b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
> @@ -41,9 +41,14 @@ do_patch_append () {
> bb.build.exec_func('do_fix_sysconfdir', d)
> }
>
> +# sysconfdir will include absolute native sysroot path in -native builds,
> avoid this
> +# (see 36.24 of
> https://www.yoctoproject.org/docs/2.5/mega-manual/mega-manual.html#faq)
> +SYSCONFDIR_VALUE_class-target = "${sysconfdir}"
> +SYSCONFDIR_VALUE_class-native = "${sysconfdir_native}"
> +
> do_fix_sysconfdir () {
> - sed -e 's|/etc/ssl/certs/java|${sysconfdir}/ssl/certs/java|g' \
> - -i
> ${S}/src/main/java/org/debian/security/UpdateCertificates.java
> +sed -e 's|/etc/ssl/certs/java|${SYSCONFDIR_VALUE}/ssl/certs/java|g' \
> +-i ${S}/src/main/java/org/debian/security/UpdateCertificates.java
> }
>
No.
It's probably best to remove the BBCLASSEXTEND statement in this recipe
instead, as it was never tested, and is unlikely to be needed.
The whole idea is to make this independent of the build machine paths. If
you want a -native version of this, you still need to make sure to point
this into the yocto sysroot. Otherwise this will try to write to the *build
machine's* /etc/ directory!
If you really want a -native version, you need to point this into the
sysroot, and update this dynamically because of sstate usage, too.
Cheers,
Andre'
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH] cacao: class-native: RPROVIDE virtual/java-native
On Fri, 2018-09-07 at 20:25 +0300, Yevgeny Popovych wrote:
> This will allow other native recipes RDEPEND on virtual/java-native.
I don't understand, can you please explain why a target package would ever
want to runtime depend on a native package?
How did you test this?
Also, the virtual/ namespace is usually used in PROVIDES, not in RPROVIDES.
Cheers,
Andre'
>
> Change-Id: I85fcd012d09441867fa5f359463cbe8fff702fbe
> Signed-off-by: Yevgeny Popovych
> ---
> recipes-core/cacao/cacao_1.6.1.bb | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/recipes-core/cacao/cacao_1.6.1.bb b/recipes-
> core/cacao/cacao_1.6.1.bb
> index 1074ff5..ead0e2f 100644
> --- a/recipes-core/cacao/cacao_1.6.1.bb
> +++ b/recipes-core/cacao/cacao_1.6.1.bb
> @@ -6,6 +6,7 @@ SECTION = "interpreters"
>
> DEPENDS_class-native = "zlib-native libtool-native ecj-initial-native
> fastjar-native classpath-initial-native classpath-native bdwgc-native
> virtual/java-initial-native"
> PROVIDES_class-native = "virtual/java-native"
> +RPROVIDES_${PN}_class-native = "virtual/java-native"
>
> DEPENDS = "zlib libtool classpath virtual/javac-native bdwgc"
> RPROVIDES_${PN} = "java2-runtime"
> --
> 2.7.4
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH] openjdk-8, openjre-8: Fix PROVIDES assignment
Hi Richard, On Wed, 2018-09-12 at 08:57 +0200, Richard Leitner wrote: > Hi, > this is a note to let you know that I've just added this patch to the > master-next branch of the meta-java repository at > git://git.yoctoproject.org/meta-java > > As soon as it has gone through some more testing it will likely be > merged to the master branch. > > If you have any questions, please let me know. I'd say please remove this patch from the queue. Thanks, Andre' > > regards;Richard.L > > On 9/7/18 12:44 PM, Yevgeny Popovych wrote: > > PROVIDES is a recipe-specific variable, not package-specific like > > RPROVIDES. > > This bug would prevent you from having recipes DEPEND on java2-runtime > > or java2-vm (assuming you have set PREFERRED_PROVIDER correctly). > > > > Signed-off-by: Yevgeny Popovych -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH] openjdk-8, openjre-8: Fix PROVIDES assignment
On Fri, 2018-09-07 at 13:44 +0300, Yevgeny Popovych wrote:
> PROVIDES is a recipe-specific variable, not package-specific like
> RPROVIDES.
> This bug would prevent you from having recipes DEPEND on java2-runtime
> or java2-vm (assuming you have set PREFERRED_PROVIDER correctly).
Looking at all uses of this, I don't think the intention is to be able to
DEPENDS on java2-vm or java2-runtime at all.
Regarding java2-vm:
java2-vm was originally used in the OpenJDK 6 & 7 recipes to be able to
select shark, zero, cacao, or jamvm VMs. OpenJDK-6 is not available any
more, and OpenJDK-7 has removed support for most of this in commit
38f4c1365c11 ("openjdk7: remove broken/unsupported VM's")
It is not clear why it was added to the OpenJDK-8 recipe either.
Given OpenJDK-7 has no way of using the VM compiled as part of OpenJDK-8,
and given that no part of the OpenJDK-8 makes use of the java2-vm part, the
correct solution here is to actually *remove* the incorrect PROVIDES
statement for java2-vm completely.
Regarding java2-runtime:
Again, looking at the other uses of this:
java2-runtime is a virtual runtime package name, which is provided by
different *runtime* packages (created by the OpenJDK-7, OpenJDK-8, JamVM, or
Cacao recipes). Other recipes only ever RDEPEND on java2-runtime. It makes
not sense for OpenJDK-8 to PROVIDES java2-runtime given the above.
So for this, PROVIDES_${PN} = "java2-runtime" should be indeed removed, but
without any replacement.
Cheers,
Andre'
>
> Change-Id: I602d98241d2a6f42a13a1fa1edad049d4e8792b0
> Signed-off-by: Yevgeny Popovych
> ---
> recipes-core/openjdk/openjdk-8_172b11.bb | 4 ++--
> recipes-core/openjdk/openjre-8_172b11.bb | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/recipes-core/openjdk/openjdk-8_172b11.bb b/recipes-
> core/openjdk/openjdk-8_172b11.bb
> index c1c6e1e..22d0113 100644
> --- a/recipes-core/openjdk/openjdk-8_172b11.bb
> +++ b/recipes-core/openjdk/openjdk-8_172b11.bb
> @@ -47,10 +47,10 @@ FILES_${PN}-doc_append = "\
>
> FILES_${PN}-source = " ${JDK_HOME}/src.zip "
>
> +PROVIDES = "java2-vm"
> +PROVIDES = "java2-runtime"
> RPROVIDES_${PN} = "java2-vm"
> -PROVIDES_${PN} = "java2-vm"
> RPROVIDES_${PN} = "java2-runtime"
> -PROVIDES_${PN} = "java2-runtime"
>
> inherit update-alternatives
>
> diff --git a/recipes-core/openjdk/openjre-8_172b11.bb b/recipes-
> core/openjdk/openjre-8_172b11.bb
> index dd29691..d8d4ba8 100644
> --- a/recipes-core/openjdk/openjre-8_172b11.bb
> +++ b/recipes-core/openjdk/openjre-8_172b11.bb
> @@ -35,10 +35,10 @@ FILES_${PN}-doc_append = "\
> ${JRE_HOME}/THIRD_PARTY_README \
> "
>
> +PROVIDES = "java2-vm"
> +PROVIDES = "java2-runtime"
> RPROVIDES_${PN} = "java2-vm"
> -PROVIDES_${PN} = "java2-vm"
> RPROVIDES_${PN} = "java2-runtime"
> -PROVIDES_${PN} = "java2-runtime"
>
> inherit update-alternatives
>
> --
> 2.7.4
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH v2 1/5] layer.conf: stop OpenJDK-8(native) build dependencies from being installed
On Wed, 2018-08-22 at 14:11 +0200, Richard Leitner wrote: > Hi André, > > On 8/22/18 2:04 PM, André Draszik wrote: > > Hi Richard, > > > > I've noticed that I had one more uncommitted but necessary patch lying > > around to make the aarch32 port work with musl. > > Thank you for noticing! > > We should definitely add qemu test-images with musl. So similar issues > pop up during my automated tests ;-) > > Do you have a qemu musl setup which could be integrated in our oeqa? Well, I have my hacked qemu cortex a7 machine that doesn't work with oeqa. For musl, I have my own distro, but not sure how the rest of the Yocto project does the automated musl testing - there might be something more standard... Because of the different hotspot versions, it would really need to test all three ports, default, aarch64, aarch32 and each with glibc and musl. BTW, I just today saw that meta-ivi has a qemu cortex a9 here http://git.yoctoproject.org/cgit/cgit.cgi/meta-ivi/tree/meta-ivi-bsp maybe that works better with oeqa? Cheers, Andre' -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH v2 1/5] layer.conf: stop OpenJDK-8(native) build dependencies from being installed
Hi Richard,
I've noticed that I had one more uncommitted but necessary patch lying
around to make the aarch32 port work with musl.
Hope it's not too late for v3, but I can send a follow-up instead if you
prefer.
Cheers,
Andre'
On Wed, 2018-08-22 at 11:26 +0200, Richard Leitner wrote:
> Hi,
> this is a note to let you know that I've just added this series to the
> master-next branch of the meta-java repository at
> git://git.yoctoproject.org/meta-java
>
> As soon as it has gone through some more testing it will likely be
> merged to the master branch.
>
> If you have any questions, please let me know.
>
> regards;Richard.L
>
> On 8/20/18 5:32 PM, André Draszik wrote:
> > From: André Draszik
> >
> > Avoid installation of all openjdk-8-native buildtime dependencies into
> > a depending recipe's sysroot.
> > To execute openjdk-8-native as part of a depending recipe's build, we
> > don't need the openjdk-8-native build time dependencies (like ant-
> > native,
> > or more importantly icedtea-7-native), just its runtime dependencies,
> > unless of course that depending recipe's builds needs those tools
> > itself.
> > In that case, it needs to specify them explicitly, though (of course!).
> >
> > Use SSTATE_EXCLUDEDEPS_SYSROOT to prevent openjdk-8-native build time
> > dependencies from being copied in the sysroot unless explicitly
> > requested.
> >
> > Signed-off-by: André Draszik
> > ---
> > conf/layer.conf | 4
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/conf/layer.conf b/conf/layer.conf
> > index 3b00f61..8e8a300 100644
> > --- a/conf/layer.conf
> > +++ b/conf/layer.conf
> > @@ -14,3 +14,7 @@ LICENSE_PATH += "${LAYERDIR}/licenses"
> > SIGGEN_EXCLUDERECIPES_ABISAFE += "\
> > ca-certificates-java \
> > "
> > +
> > +SSTATE_EXCLUDEDEPS_SYSROOT += "\
> > +openjdk-8-native->(ant-native|attr-native|coreutils-
> > native|icedtea7-native|libxslt-native|make-native|openssl-native|zip-
> > native|unzip-native) \
> > +"
> >
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH v3] openjdk-8: add aarch32 port 8u172b11
From: André Draszik
Similar to the aarch64 build, we import the specific aarch32 port when
building for ARMv7. We also add all the necessary patches to:
* compile using gcc v8
* compile against musl
This was tested on:
* QEMU with cortex A7 emulation (using glibc)
* real hardware (using musl)
Signed-off-by: André Draszik
---
v3: add one forgotten musl aarch32 patch
v2: add missing signed-off-by
---
.../openjdk-8-release-172b11-aarch32.inc | 58 +++
.../openjdk-8-release-172b11-aarch64.inc | 2 +
.../openjdk-8-release-172b11-common.inc | 36 ++--
.../openjdk/openjdk-8-release-172b11.inc | 7 ++-
recipes-core/openjdk/openjdk-8_172b11.bb | 2 +
recipes-core/openjdk/openjre-8_172b11.bb | 2 +
...ot-aarch32-fix-missing-return-values.patch | 53 +
...hotspot-remaining-musl-fixes-aarch32.patch | 35 +++
...-hotspot-disable-agent-build-common.patch} | 41 ++---
...spot-disable-agent-build-pt2-aarch32.patch | 51
...0005-hotspot-disable-agent-build-pt2.patch | 51
...ux-remove-glibc-dependencies-common.patch} | 19 +-
...-remove-glibc-dependencies-pt2-aarch.patch | 36
..._linux-remove-glibc-dependencies-pt2.patch | 34 +++
... => openjdk8-fix-shark-build-common.patch} | 38
...openjdk8-fix-shark-build-pt2-aarch32.patch | 11
.../openjdk8-fix-shark-build-pt2.patch| 38
17 files changed, 416 insertions(+), 98 deletions(-)
create mode 100644 recipes-core/openjdk/openjdk-8-release-172b11-aarch32.inc
create mode 100644
recipes-core/openjdk/patches-openjdk-8/0001-hotspot-aarch32-fix-missing-return-values.patch
create mode 100644
recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch32.patch
rename
recipes-core/openjdk/patches-openjdk-8/{musl-0005-hotspot-disable-agent-build.patch
=> musl-0005-hotspot-disable-agent-build-common.patch} (55%)
create mode 100644
recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch
create mode 100644
recipes-core/openjdk/patches-openjdk-8/musl-0005-hotspot-disable-agent-build-pt2.patch
rename
recipes-core/openjdk/patches-openjdk-8/{musl-0006-hotspot-os_linux-remove-glibc-dependencies.patch
=> musl-0006-hotspot-os_linux-remove-glibc-dependencies-common.patch} (79%)
create mode 100644
recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch
create mode 100644
recipes-core/openjdk/patches-openjdk-8/musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2.patch
rename recipes-core/openjdk/patches-openjdk-8/{openjdk8-fix-shark-build.patch
=> openjdk8-fix-shark-build-common.patch} (93%)
create mode 100644
recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2-aarch32.patch
create mode 100644
recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-aarch32.inc
b/recipes-core/openjdk/openjdk-8-release-172b11-aarch32.inc
new file mode 100644
index 000..9cc2083
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-8-release-172b11-aarch32.inc
@@ -0,0 +1,58 @@
+require openjdk-8-release-172b11-common.inc
+
+COMPATIBLE_HOST = "^$"
+COMPATIBLE_HOST_armv7a = "arm"
+COMPATIBLE_HOST_armv7ve = "arm"
+
+CORBA_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
+SRC_URI[corba.md5sum] = "557b94847d8fade14c048cb0a96ed035"
+SRC_URI[corba.sha256sum] =
"366fa9aaf11d75f74e8c6bdf9cab9214cf66b0eac1ca40f2789b3ba442929708"
+
+HOTSPOT_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
+SRC_URI[hotspot.md5sum] = "37d796794234f38fa71339ba78368b80"
+SRC_URI[hotspot.sha256sum] =
"5f89f8ba9a099a2d84b4ca6bd49553ce4efe1b29d55de9134809b7b59b6c9ce3"
+
+JAXP_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
+SRC_URI[jaxp.md5sum] = "2dc311a7c0d6483226cdc5e501b1f8d0"
+SRC_URI[jaxp.sha256sum] =
"f62db09a41213b5b5d1886c1aeabe43def09235de1d60af518213b9acea4fdca"
+
+JAXWS_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
+SRC_URI[jaxws.md5sum] = "fbd81e288d1ee5df631f213c130f21bb"
+SRC_URI[jaxws.sha256sum] =
"bac66e848ee48c6fef6130db4bb6879dbd64c550c1f42e4676ab6a2c3ee4fab8"
+
+JDK_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
+SRC_URI[jdk.md5sum] = "b8003e6f1714617461f3eb7ee8b1efee"
+SRC_URI[jdk.sha256sum] =
"0a7eef6fef2b457bef3bd1d24031234bbb9d74a5fca2f65e1603278cd9d393a0"
+
+LANGTOOLS_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
+SRC_URI[langtools.md5sum] = "e38f50b0113b3a956ac4917720655e93"
+SRC_URI[langtools.sha256sum] =
"9ca88fcfe5a07861de693ff3b38d03f063a7937576cd93116ea6b4a4bd7894d5"
+
+NASHORN_CHANGESET_arm = "jdk8u172-b11-aarch32-180511"
+SRC_URI[nashorn.md5sum] = "c191cc92996fcb271254fc
Re: [oe] [meta-java][PATCH v2 5/5] openjdk-8: add aarch32 port 8u172b11
On Tue, 2018-08-21 at 09:26 +0200, Richard Leitner wrote: > On 8/21/18 9:15 AM, André Draszik wrote: > > On Tue, 2018-08-21 at 08:54 +0200, Richard Leitner wrote: > > > Hi André, > > > thank you for your patches! > > > > > > Just one little question on your tests: did you run the oeqa test for > > > your > > > qemu cortex A7 target? Did you enable the compiled mode test? > > > > I ran the all java (not javac) tests from oeqa manually, as the qemu > > machine > > I hacked together has the issue that oeqa just times out waiting for the > > login prompt for a reason I didn't figure out quickly enough for my > > liking... It'd be good to have an 'official', working cortex a7 qemu > > machine > > somewhere in yocto, though. > > Ok. Thanks. > I was also trying to set up a working cortexa7 qemu machine some months > ago, > but apparently failed too ;-) > > Yeah, it would be great to have one in oe-core (or at least meta-java) to > fully automate our tests. > > > > > But yes, oeqa would also need updating to not skip the compile mode on > > armv7. > > I'll send a patch for that. Thanks :-) > Another question: have you checked if the aarch32 port works for ARMv6? > I'm just curious because openjdk.java.net/projects/aarch32-port/ says: > > The port will be fully compatible with ARMv7 and may support ARMv6 > depending on community interest. I didn't as I read it as: "If people contribute patches, it can be made to work. But nobody has done so so far". Also, Debian only enables this for ARMv7 (although they have no specific ARMv6 port), and I know for sure that it doesn't work on ARMv5. Cheers, Andre' -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH v2 5/5] openjdk-8: add aarch32 port 8u172b11
On Tue, 2018-08-21 at 08:54 +0200, Richard Leitner wrote: > Hi André, > thank you for your patches! > > Just one little question on your tests: did you run the oeqa test for your > qemu cortex A7 target? Did you enable the compiled mode test? I ran the all java (not javac) tests from oeqa manually, as the qemu machine I hacked together has the issue that oeqa just times out waiting for the login prompt for a reason I didn't figure out quickly enough for my liking... It'd be good to have an 'official', working cortex a7 qemu machine somewhere in yocto, though. But yes, oeqa would also need updating to not skip the compile mode on armv7. Cheers, Andre' > > On 8/20/18 5:32 PM, André Draszik wrote: > > From: André Draszik > > > > Similar to the aarch64 build, we import the specific aarch32 port when > > building for ARMv7. We also add all the necessary patches to: > > * compile using gcc v8 > > * compile against musl > > > > This was tested on: > > * QEMU with cortex A7 emulation (using glibc) > > * real hardware (using musl) > > > > Signed-off-by: André Draszik > > > > regards;Richard.L -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
