Re: [OE-core] [PATCH] resulttool/merge: Enable merge results to one file
Hi RP,
Yes, you are right, I missed the current feature to merge to flat file. Thanks
for your inputs and sharing.
After we tested the merge to flat file features, these are our findings.
1) Existing merge could not support use case where both base and target are
directory.
Traceback (most recent call last):
File "/home/poky/scripts/resulttool", line 93, in
sys.exit(main())
File "/home/poky/scripts/resulttool", line 87, in main
ret = args.func(args, logger)
File "/home/poky/scripts/lib/resulttool/merge.py", line 22, in merge
resultutils.append_resultsdata(results, args.base_results,
configmap=resultutils.store_map)
File "/home/poky/scripts/lib/resulttool/resultutils.py", line 47, in
append_resultsdata
with open(f, "r") as filedata:
IsADirectoryError: [Errno 21] Is a directory: ''
2) Existing merge will always create testseries configuration where this
configuration has important implication to report and regression.
For current QA process, we need the merge to be more flexible where it will
allow merge where both base and target are directory, furthermore we need
control over when we want to create the testseries configuration.
To fulfill both of these requirements, we tried the below:
Previously the append_resultsdata function only allow append the results data
to the map_results data (where map_results data wrapped the results data with
configuration map as the key).
Initially, we tried to implement an extra function where it will enable append
one map_results to another map_results data. But we abandoned this alternative
as this new append function will be pretty much a duplicated function to the
original append_resultsdata, and these will create two append functions which
they might be both hard to maintain and confusing. Thus, we tried to refactor
the append function to enable a single append function to be used for most of
the situation. Furthermore, since the map_results were
only needed by report and regression, we pulled the instructions used to turn
results data to map_results data to another function. Finally, we renamed the
functions and arguments to clearly seperated the functions using results data
from the one using map_results data.
The new patches are at below:
http://lists.openembedded.org/pipermail/openembedded-core/2019-March/280547.html
http://lists.openembedded.org/pipermail/openembedded-core/2019-March/280548.html
Please let us know if you have any more inputs or questions. Thank you very
much for your attention and help!
Best regards,
Yeoh Ee Peng
-Original Message-
From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org]
Sent: Tuesday, March 26, 2019 8:52 PM
To: Yeoh, Ee Peng ;
openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH] resulttool/merge: Enable merge results to one
file
On Tue, 2019-03-26 at 10:02 +0800, Yeoh Ee Peng wrote:
> QA team execute extra testing that create multiple test result files,
> where these test result files need to be merged into a single file
> under certain use case.
>
> Enable merge to allow merging results into a single test result file.
>
> Signed-off-by: Yeoh Ee Peng
> ---
> scripts/lib/resulttool/merge.py | 29 -
> scripts/lib/resulttool/resultutils.py | 76
> +--
> 2 files changed, 82 insertions(+), 23 deletions(-)
>
> diff --git a/scripts/lib/resulttool/merge.py
> b/scripts/lib/resulttool/merge.py index 3e4b7a3..90b3cb3 100644
> --- a/scripts/lib/resulttool/merge.py
> +++ b/scripts/lib/resulttool/merge.py
> @@ -17,6 +17,26 @@ import json
> import resulttool.resultutils as resultutils
>
> def merge(args, logger):
> +if args.merge_to_one:
> +if os.path.isdir(args.target_results):
> +target_results = resultutils.load_results(args.target_results)
> +else:
> +target_results = resultutils.append_results({},
> + args.target_results)
Looking at load_resultsdata:
def load_resultsdata(source, configmap=store_map):
results = {}
if os.path.isfile(source):
append_resultsdata(results, source, configmap)
return results
The code above can therefore be simplified to:
target_results = resultutils.load_results(args.target_results)
?
> +if os.path.isdir(args.base_results):
> +base_results = resultutils.load_results(args.base_results)
> +results = resultutils.append_results(target_results,
> base_results)
> +else:
> +results = resultutils.append_results(target_results,
> + args.base_results)
Again, I'm not sure you need to differentiate between a file and a directory
given the way the code works internally?
> +
> +target_file_dir = os.path.join(os.path.dirname(args.target_results),
> 'merged_results/testresults.json')
> +if os.path.isdir(args.target_results):
> +target_file_dir = os.path.join(args.target_results,
>
[OE-core] [PATCH v02] resulttool/merge: enhance merge and control testseries
v01: Enable merging results where both base and target are directory. v02: Follow suggestion from RP to reused the existing resultutils code base where it will merge results to flat file. Refactor resultutils code base to enable merging results where both base and target are directory. Add control for creation of testseries configuration. Yeoh Ee Peng (1): resulttool/merge: Merge files from folders and control add testseries meta/lib/oeqa/selftest/cases/resulttooltests.py | 16 ++-- scripts/lib/resulttool/merge.py | 29 -- scripts/lib/resulttool/regression.py| 10 +- scripts/lib/resulttool/report.py| 6 +- scripts/lib/resulttool/resultutils.py | 118 +++- scripts/lib/resulttool/store.py | 5 +- 6 files changed, 112 insertions(+), 72 deletions(-) -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] resulttool/merge: Merge files from folders and control add testseries
QA team execute extra testing that create multiple test result files,
where these test result files need to be merged under various use cases.
Furthermore, during results merging, user need control over the
testseries configuration creation as this configuration has important
implication to report and regression.
Current merge do not support merge results where both base and target
are directory.
Traceback (most recent call last):
File "/home/poky/scripts/resulttool", line 93, in
sys.exit(main())
File "/home/poky/scripts/resulttool", line 87, in main
ret = args.func(args, logger)
File "/home/poky/scripts/lib/resulttool/merge.py", line 22, in merge
resultutils.append_resultsdata(results, args.base_results,
configmap=resultutils.store_map)
File "/home/poky/scripts/lib/resulttool/resultutils.py", line 47, in
append_resultsdata
with open(f, "r") as filedata:
IsADirectoryError: [Errno 21] Is a directory: ''
This patches enable merge for both base and target as directory.
Also, enable control the creation of testseries configuration.
Previously the append_resultsdata function only allow append
the results data to the map_results data (where map_results data
wrapped the results data with configuration map as the key).
Initially, we tried to implement an extra function where it will
enable append one map_results to another map_results data. But
we abandoned this alternative as this new append function will be
pretty much a duplicated function to the original append_resultsdata,
and these will create two append functions which they might be both
hard to maintain and confusing. Thus, we tried to refactor the
append function to enable a single append function to be used
in all the situation. Futhermore, since the map_results were
only needed by report and regression, we pulled the instructions
used to turn results data to map_results data to another function.
Finally, we renamed the functions and arguments to clearly
seperated the functions using results data from the one using
map_results data.
Signed-off-by: Yeoh Ee Peng
---
meta/lib/oeqa/selftest/cases/resulttooltests.py | 16 ++--
scripts/lib/resulttool/merge.py | 29 --
scripts/lib/resulttool/regression.py| 10 +-
scripts/lib/resulttool/report.py| 6 +-
scripts/lib/resulttool/resultutils.py | 118 +++-
scripts/lib/resulttool/store.py | 5 +-
6 files changed, 112 insertions(+), 72 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/resulttooltests.py
b/meta/lib/oeqa/selftest/cases/resulttooltests.py
index 0a089c0..ea7d02e 100644
--- a/meta/lib/oeqa/selftest/cases/resulttooltests.py
+++ b/meta/lib/oeqa/selftest/cases/resulttooltests.py
@@ -60,10 +60,11 @@ class ResultToolTests(OESelftestTestCase):
def test_regression_can_get_regression_base_target_pair(self):
results = {}
-resultutils.append_resultsdata(results,
ResultToolTests.base_results_data)
-resultutils.append_resultsdata(results,
ResultToolTests.target_results_data)
-self.assertTrue('target_result1' in
results['runtime/mydistro/qemux86/image'], msg="Pair not correct:%s" % results)
-self.assertTrue('target_result3' in
results['runtime/mydistro/qemux86-64/image'], msg="Pair not correct:%s" %
results)
+resultutils.append_results(results, ResultToolTests.base_results_data)
+resultutils.append_results(results,
ResultToolTests.target_results_data)
+map_results = resultutils.get_map_results(results)
+self.assertTrue('target_result1' in
map_results['runtime/mydistro/qemux86/image'], msg="Pair not correct:%s" %
map_results)
+self.assertTrue('target_result3' in
map_results['runtime/mydistro/qemux86-64/image'], msg="Pair not correct:%s" %
map_results)
def test_regrresion_can_get_regression_result(self):
base_result_data = {'result': {'test1': {'status': 'PASSED'},
@@ -88,7 +89,8 @@ class ResultToolTests(OESelftestTestCase):
def test_merge_can_merged_results(self):
results = {}
-resultutils.append_resultsdata(results,
ResultToolTests.base_results_data, configmap=resultutils.flatten_map)
-resultutils.append_resultsdata(results,
ResultToolTests.target_results_data, configmap=resultutils.flatten_map)
-self.assertEqual(len(results[''].keys()), 5, msg="Flattened results
not correct %s" % str(results))
+resultutils.append_results(results, ResultToolTests.base_results_data)
+resultutils.append_results(results,
ResultToolTests.target_results_data)
+map_results = resultutils.get_map_results(results,
configmap=resultutils.flatten_map)
+self.assertEqual(len(map_results[''].keys()), 5, msg="Flattened
results not correct %s" % str(map_results))
diff --git a/scripts/lib/resulttool/merge.py b/scripts/lib/resulttool/merge.py
index 3e4b7a3..fd698f2 100644
--- a/scripts/lib/resulttool/merge.py
+++
Re: [OE-core] glibc broken when linked with gold Was: [oe] State of OE World, 2019-03-16
On Wed, Mar 27, 2019 at 3:32 PM Martin Jansa wrote: > > On Wed, Mar 27, 2019 at 09:39:07PM +0100, Martin Jansa wrote: > > On Wed, Mar 27, 2019 at 05:35:07PM +0100, Martin Jansa wrote: > > > On Wed, Mar 27, 2019 at 05:17:54PM +0100, Martin Jansa wrote: > > > > On Sun, Mar 17, 2019 at 08:26:37AM -0700, Khem Raj wrote: > > > > > http://www.openembedded.org/wiki/Bitbake_World_Status > > > > > > > > > > == Failed tasks 2019-03-16 == > > > > > > > > > > INFO: jenkins-job.sh-1.8.45 Complete log available at > > > > > http://logs.nslu2-linux.org/buildlogs/oe/world/warrior/log.report.20190317_082308.log > > > > > > > > > > * > > > > > sources/openembedded-core/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.3.bb:do_compile > > > > > > > > I was hit by this one as well on some arm targets. > > > > > > > > http://logs.nslu2-linux.org/buildlogs/oe/world/warrior/log.world.qemuarm.20190321_215508.log/bitbake.log > > > > > > > > shows that it's actually from qemu-arm segfault inside > > > > g-ir-scanner-qemuwrapper > > > > > > > > | qemu: uncaught target signal 11 (Segmentation fault) - core dumped > > > > | > > > > /home/jenkins/oe/world/yoe/build/tmpfs/work/armv7vet2hf-neon-yoe-linux-gnueabi/gobject-introspection/1.58.3-r0/build/g-ir-scanner-qemuwrapper: > > > > line 6: 1959 Segmentation fault (core dumped) PSEUDO_UNLOAD=1 > > > > qemu-arm -r 3.2.0 -L > > > > /home/jenkins/oe/world/yoe/build/tmpfs/work/armv7vet2hf-neon-yoe-linux-gnueabi/gobject-introspection/1.58.3-r0/recipe-sysroot > > > > -E > > > > LD_LIBRARY_PATH=$GIR_EXTRA_LIBS_PATH:.libs:/home/jenkins/oe/world/yoe/build/tmpfs/work/armv7vet2hf-neon-yoe-linux-gnueabi/gobject-introspection/1.58.3-r0/recipe-sysroot//usr/lib:/home/jenkins/oe/world/yoe/build/tmpfs/work/armv7vet2hf-neon-yoe-linux-gnueabi/gobject-introspection/1.58.3-r0/recipe-sysroot//lib > > > > "$@" > > > > > > > > The interesting part is that this happens only when glibc is built with > > > > gold enabled. > > > > > > > > I've put a bit more details in temporary work-around here: > > > > https://github.com/shr-distribution/meta-smartphone/commit/8f06eb355ead85464b1a1bbaa82584504df15743 > > > > > > > > I'm comparing qemuarm glibc build with bfd and gold to see if there is > > > > some > > > > significant difference which might cause this and I plan to flash some > > > > small > > > > image on my targets to see if libc is broken in runtime as well or only > > > > when > > > > running inside qemu-arm. > > > > > > > > Is anyone else seeing this as well? > > > > > > Checking older world status on the wiki shows that this issue was > > > introduced somewhere around christmas > > > > > > This is last world build before the issue: > > > http://logs.nslu2-linux.org/buildlogs/oe/world/warrior/log.report.20181219_112425.log > > > ... > > > == Tested changes (not included in master yet) - openembedded-core == > > > latest upstream commit: > > > 14c291e1fb gcc-runtime: Add missing libc dependency > > > not included in master yet: > > > 7e2ab991fa python/python3: use cc_basename to replace CC for checking > > > compiler > > > ced915026d python-native: fix one do_populate_sysroot warning > > > aee47f3e82 netbase: add entry to /etc/hosts according to /etc/hostname > > > a09e2db43a sstate: add support for caching shared workdir tasks > > > c104a34166 grub2: Fix passing null to printf formats > > > 6f364ff8c4 gnupg: Upgrade to 2.2.12 release > > > 0224fec86b glibc: Upgrade towards 2.29 release > > > 2486349782 gcc-9.0: Add recipes for upcoming gcc 9.0 release in mid-2019 > > > b3ab29bdbb gcc-runtime: Drop building libmpx > > > > > > and this is the first which reported qemu-arm segfault: > > > == Tested changes (not included in master yet) - openembedded-core == > > > latest upstream commit: > > > 95659bed3f populate_sdk_ext.bbclass: Include site.conf in parsing for > > > contents for local.conf > > > not included in master yet: > > > 0c9db0ae7d python/python3: use cc_basename to replace CC for checking > > > compiler > > > bb3eb6bc41 python-native: fix one do_populate_sysroot warning > > > 08a205f872 netbase: add entry to /etc/hosts according to /etc/hostname > > > b81c8650d0 sstate: add support for caching shared workdir tasks > > > 702be42dc9 glibc: Remove site_config and glibc-initial > > > fc230822d8 gcc: Drop gcc-cross-initial and use gcc-cross instead > > > 8652df3a0d gcc: Drop the -initial versions of the compiler > > > 0c2f6dfa2f recipes: Drop virtual/libc-for-gcc > > > c64531600d newlib: Move away from gcc-initial dependency > > > 0d5fb4428f libssp: Remove dependency on gcc-initial > > > 7dd8829d3e musl: Move away from gcc-initial dependency > > > 9abdb4d6ca tcmode-default: Drop pinnings for gcc-initial based recipes > > > e02724e8f8 base.bbclass, classextend.py: Drop catering to gcc-initial > > > 7756cb7d17 oeqa/concurrencytest: fix for locating meta-selftest > > > f4c68c39e7 crosssdk/cross-canadian: Set LIBCOVERRIDE correctly > > > 6fc9bb5698 glibc: Enable
[OE-core] [PATCH] gdk-pixbuf:upgrade 2.38.0 -> 2.38.1
-Upgrade from gdk-pixbuf_2.38.0.bb to gdk-pixbuf_2.38.1.bb.
-Delete
gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
beacuse this patch has been fixed.
-Delete gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch
beacuse this patch has been fixed.
Signed-off-by: Zang Ruochen
---
...f-decisions-around-cross-compilation.patch | 46 -
...-depend-on-loaders-being-fully-build.patch | 51 ---
...-pixbuf_2.38.0.bb => gdk-pixbuf_2.38.1.bb} | 6 +--
3 files changed, 2 insertions(+), 101 deletions(-)
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.38.0.bb =>
gdk-pixbuf_2.38.1.bb} (94%)
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
deleted file mode 100644
index e638fd3b6f..00
---
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bf71999b6e64d1f1919b0351b27c1c417e2b8856 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Thu, 14 Feb 2019 18:06:25 +0100
-Subject: [PATCH] Generate loaders.cache using a native tool when
- cross-compiling
-
-Otherwise meson would attempt to run a target binary.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin
-
- gdk-pixbuf/meson.build | 13 +
- 1 file changed, 13 insertions(+)
-
-diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
-index 1995ffd..d692cb7 100644
a/gdk-pixbuf/meson.build
-+++ b/gdk-pixbuf/meson.build
-@@ -291,6 +291,7 @@ foreach bin: gdkpixbuf_bin
- set_variable(bin_name.underscorify(), bin)
- endforeach
-
-+if not meson.is_cross_build()
- # The 'loaders.cache' used for testing, so we don't accidentally
- # load the installed cache; we always build it by default
- loaders_cache = custom_target('loaders.cache',
-@@ -302,6 +303,18 @@ loaders_cache = custom_target('loaders.cache',
- ],
- build_by_default: true)
- loaders_dep = declare_dependency(sources: [ loaders_cache ])
-+else
-+loaders_cache = custom_target('loaders.cache',
-+ output: 'loaders.cache',
-+ capture: true,
-+ depends: [ dynamic_loaders_dep ],
-+ command: [
-+'gdk-pixbuf-query-loaders',
-+dynamic_loaders,
-+ ],
-+ build_by_default: true)
-+loaders_dep = declare_dependency(sources: [ loaders_cache ])
-+endif
-
- pkgconfig = import('pkgconfig')
- pkgconfig.generate(
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch
deleted file mode 100644
index 2a7751511b..00
---
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 116bc8f7a6034ce43053876a72a132fcd4e1e472 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Wed, 20 Feb 2019 19:53:07 +0100
-Subject: [PATCH] loaders.cache: depend on loaders being fully build
-
-Otherwise, races have been observed:
-https://autobuilder.yoctoproject.org/typhoon/#/builders/61/builds/310/steps/7/logs/step1b
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin
-
- gdk-pixbuf/meson.build | 4
- 1 file changed, 4 insertions(+)
-
-diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
-index fc3eb33..4e7ed20 100644
a/gdk-pixbuf/meson.build
-+++ b/gdk-pixbuf/meson.build
-@@ -171,6 +171,7 @@ gdkpixbuf_dep = declare_dependency(link_with: gdkpixbuf,
- # Now check if we are building loaders as installed shared modules
- # We do this here because shared modules depend on libgdk-pixbuf
- dynamic_loaders = []
-+dynamic_loaders_dep = []
-
- foreach l: loaders
- name = l[0]
-@@ -189,6 +190,7 @@ foreach l: loaders
-
- # We need the path to build loaders.cache for tests
- dynamic_loaders += mod.full_path()
-+dynamic_loaders_dep += mod
- endif
- endforeach
-
-@@ -206,6 +208,7 @@ if enable_native_windows_loaders
- install: true,
- install_dir: gdk_pixbuf_loaderdir)
- dynamic_loaders += mod.full_path()
-+ dynamic_loaders_dep += mod
- endforeach
- endif
- endif
-@@ -236,6 +239,7 @@ if not meson.is_cross_build()
- loaders_cache = custom_target('loaders.cache',
-
Re: [OE-core] [PATCH 1/2] gdk-pixbuf: update to 2.38.0
Hi, Alexander
I met a problem after gdk-pixbuf upgrade to 2.38.0. Seems you have do
some work about this package,
could you help to take a look if you have any idea about this problem ?
Thanks in advance.
bitbake core-image-minimal with below local.conf
MACHINE ?= "qemux86"
VIRTUAL-RUNTIME_init_manager = "systemd"
DISTRO_FEATURES_append = " systemd"
DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
KERNEL_FEATURES_append = " cfg/systemd.scc"
DISTRO_FEATURES_append = " polkit"
IMAGE_INSTALL_append = " packagegroup-xfce-base"
Error:
ERROR: core-image-minimal-1.0-r0 do_rootfs: [log_check]
core-image-minimal: found 1 error message in the logfile:
[log_check] ** (process:162531): CRITICAL **: 02:10:12.174: Failed to
get connection to xfconfd: Cannot autolaunch D-Bus without X11 $DISPLAY
ERROR: core-image-minimal-1.0-r0 do_rootfs:
ERROR: core-image-minimal-1.0-r0 do_rootfs: Function failed: do_rootfs
ERROR: Logfile of failure stored in:
/buildarea3/cli10/yocto/builds/systemd/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.15350
Some other info:
1. problem only reproduce after add "IMAGE_INSTALL_append = "
packagegroup-xfce-base""
2. error was reproduces during run update-pixbuf-cache during
do_rootrfs, but cannot reproduce if manually run in devshell enviroment
3. version 2.36.11 don't have this problem. from 2.36.12, this
problem appeared.
4. 2.36.11 default open x11 packageconfig, but 2.38.0 disable it, I
tried with add x11 into packageconfig, but not resolve this problem.
On 2/22/19 10:16 PM, Alexander Kanavin wrote:
Drop 0001-Disable-tests-in-native-builds.patch as upstream has fixed the issue.
Rework 0001-Fix-a-couple-of-decisions-around-cross-compilation.patch to
enable generation of loaders.cache in target builds (using a native tool),
because otherwise building tests becomes impossible.
Rework 0002-Work-around-thumbnailer-cross-compile-failure.patch into
0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch
(which deals with substituting native tools in cross builds) and
0004-Do-not-run-tests-when-building.patch (which avoids running
test binaries during cross builds).
Rebase fatal-loader.patch.
License checksum updates as COPYING file had 2.0 version of LGPL and
has been replaced with 2.1 version.
Take meson's x11 and installed_tests options into use.
Install gdk-pixbuf-query-loaders also into $bindir, as we need the native
version during cross compile.
Signed-off-by: Alexander Kanavin
---
.../0001-Disable-tests-in-native-builds.patch | 31 -
...f-decisions-around-cross-compilation.patch | 38 +++--
...nd-thumbnailer-cross-compile-failure.patch | 131 --
...-around-thumbnailer-cross-compile-fa.patch | 96 +
.../0004-Do-not-run-tests-when-building.patch | 39 ++
.../gdk-pixbuf/gdk-pixbuf/fatal-loader.patch | 37 +++--
...pixbuf_2.36.11.bb => gdk-pixbuf_2.38.0.bb} | 44 +++---
7 files changed, 197 insertions(+), 219 deletions(-)
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0002-Work-around-thumbnailer-cross-compile-failure.patch
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0004-Do-not-run-tests-when-building.patch
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.36.11.bb =>
gdk-pixbuf_2.38.0.bb} (76%)
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
deleted file mode 100644
index 1e45b716b93..000
---
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Disable-tests-in-native-builds.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b287cb313dbfac3257f1ab451b19ba59580f78e1 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Mon, 18 Feb 2019 16:00:12 +0100
-Subject: [PATCH] Disable tests in native builds.
-
-They have found to be problematic at least on Centos 7:
-https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/296/steps/7/logs/step1b
-
-With autotools this was not a problem because it had a configuration
-switch for disabling test, which was used. Meson has no such facility :(
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin
-
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 92c4049..0871c84 100644
a/meson.build
-+++ b/meson.build
-@@ -397,7 +397,7 @@ endif
- # i18n
- subdir('po')
-
--subdir('tests')
-+#subdir('tests')
- subdir('thumbnailer')
-
- # Documentation
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
[OE-core] [PATCH] freetype:upgrade 2.9.1 -> 2.10.0
Upgrade from freetype_2.9.1.bb to freetype_2.10.0.bb
Signed-off-by: Zang Ruochen
---
.../freetype/{freetype_2.9.1.bb => freetype_2.10.0.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/freetype/{freetype_2.9.1.bb =>
freetype_2.10.0.bb} (93%)
diff --git a/meta/recipes-graphics/freetype/freetype_2.9.1.bb
b/meta/recipes-graphics/freetype/freetype_2.10.0.bb
similarity index 93%
rename from meta/recipes-graphics/freetype/freetype_2.9.1.bb
rename to meta/recipes-graphics/freetype/freetype_2.10.0.bb
index 1e6f66ee9f..200f43c21b 100644
--- a/meta/recipes-graphics/freetype/freetype_2.9.1.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.10.0.bb
@@ -19,8 +19,8 @@ SRC_URI =
"${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
UPSTREAM_CHECK_URI =
"http://sourceforge.net/projects/freetype/files/freetype2/;
UPSTREAM_CHECK_REGEX = "freetype-(?P\d+(\.\d+)+)"
-SRC_URI[md5sum] = "60ef7d8160cd4bf8cb118ee9d65367ca"
-SRC_URI[sha256sum] =
"db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"
+SRC_URI[md5sum] = "a717e6925b61b9dda946322ecd278a42"
+SRC_URI[sha256sum] =
"fccc62928c65192fff6c98847233b28eb7ce05f12d2fea3f6cc90e8b4e5fbe06"
inherit autotools pkgconfig multilib_header
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ethtool:upgrade 4.19 -> 5.0
Upgrade from ethtool_4.19.bb to ethtool_5.0.bb
Signed-off-by: Zang Ruochen
---
.../ethtool/{ethtool_4.19.bb => ethtool_5.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/ethtool/{ethtool_4.19.bb => ethtool_5.0.bb} (88%)
diff --git a/meta/recipes-extended/ethtool/ethtool_4.19.bb
b/meta/recipes-extended/ethtool/ethtool_5.0.bb
similarity index 88%
rename from meta/recipes-extended/ethtool/ethtool_4.19.bb
rename to meta/recipes-extended/ethtool/ethtool_5.0.bb
index 74e255c24b..76cdf9c4e7 100644
--- a/meta/recipes-extended/ethtool/ethtool_4.19.bb
+++ b/meta/recipes-extended/ethtool/ethtool_5.0.bb
@@ -11,8 +11,8 @@ SRC_URI =
"${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
file://avoid_parallel_tests.patch \
"
-SRC_URI[md5sum] = "a533db1d202724822c4ef297643fac12"
-SRC_URI[sha256sum] =
"e8e88f5a79c78e542cd84fee60b67dbf29cee63e4760e8d61544fea74c761ad1"
+SRC_URI[md5sum] = "8998c9eb7e491b0aec420a807ce52ba6"
+SRC_URI[sha256sum] =
"cc53a6d4d5643f8993ef20d6b638f88d9035529a9e777e222073c3a5b9237178"
inherit autotools ptest
RDEPENDS_${PN}-ptest += "make"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cups:upgrade 2.2.10 -> 2.2.11
Upgrade from cups_2.2.10.bb to cups_2.2.11.bb Signed-off-by: Zang Ruochen --- meta/recipes-extended/cups/cups_2.2.10.bb | 6 -- meta/recipes-extended/cups/cups_2.2.11.bb | 6 ++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta/recipes-extended/cups/cups_2.2.10.bb create mode 100644 meta/recipes-extended/cups/cups_2.2.11.bb diff --git a/meta/recipes-extended/cups/cups_2.2.10.bb b/meta/recipes-extended/cups/cups_2.2.10.bb deleted file mode 100644 index 490c84e2f4..00 --- a/meta/recipes-extended/cups/cups_2.2.10.bb +++ /dev/null @@ -1,6 +0,0 @@ -require cups.inc - -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460" - -SRC_URI[md5sum] = "3d22d747403ec5dcd0b66d1332564816" -SRC_URI[sha256sum] = "77c8b2b3bb7fe8b5fbfffc307f2c817b2d7ec67b657f261a1dd1c61ab81205bb" diff --git a/meta/recipes-extended/cups/cups_2.2.11.bb b/meta/recipes-extended/cups/cups_2.2.11.bb new file mode 100644 index 00..aeb2e14e3b --- /dev/null +++ b/meta/recipes-extended/cups/cups_2.2.11.bb @@ -0,0 +1,6 @@ +require cups.inc + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460" + +SRC_URI[md5sum] = "7afbbcd2497e7d742583c492f6de40cd" +SRC_URI[sha256sum] = "f58010813fd6903f690cdb0c0b91e4d1bc9e5b9570c28734229ba3ed2908b76c" -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] coreutils:upgrade 8.30 -> 8.31
Upgrade from coreutils_8.30.bb to coreutils_8.31.bb
Change the md5 of file://src/ls.c beacuse of the date change in the file
Signed-off-by: Zang Ruochen
---
.../coreutils/{coreutils_8.30.bb => coreutils_8.31.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-core/coreutils/{coreutils_8.30.bb => coreutils_8.31.bb}
(95%)
diff --git a/meta/recipes-core/coreutils/coreutils_8.30.bb
b/meta/recipes-core/coreutils/coreutils_8.31.bb
similarity index 95%
rename from meta/recipes-core/coreutils/coreutils_8.30.bb
rename to meta/recipes-core/coreutils/coreutils_8.31.bb
index 8f4ee55712..d171ec93a9 100644
--- a/meta/recipes-core/coreutils/coreutils_8.30.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.31.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/coreutils/;
BUGTRACKER = "http://debbugs.gnu.org/coreutils;
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
-
file://src/ls.c;beginline=1;endline=15;md5=dbe356a88b09c29232b083d1ff8ac82a"
+
file://src/ls.c;beginline=1;endline=15;md5=c456f9896277a0543e3866777ccc0255"
DEPENDS = "gmp libcap"
DEPENDS_class-native = ""
@@ -20,8 +20,8 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
file://0001-local.mk-fix-cross-compiling-problem.patch \
"
-SRC_URI[md5sum] = "ab06d68949758971fe744db66b572816"
-SRC_URI[sha256sum] =
"e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057"
+SRC_URI[md5sum] = "0009a224d8e288e8ec406ef0161f9293"
+SRC_URI[sha256sum] =
"ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd"
EXTRA_OECONF_class-native = "--without-gmp"
EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname
--libexecdir=${libdir}"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] llvm: don't inherit perlnative
This doesn't appear to be required at all.
Signed-off-by: Ross Burton
---
meta/recipes-devtools/llvm/llvm_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb
b/meta/recipes-devtools/llvm/llvm_git.bb
index 31abadcace5..2a8cd4a3e4e 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -12,7 +12,7 @@ DEPENDS = "libffi libxml2 zlib ninja-native llvm-native"
RDEPENDS_${PN}_append_class-target = " ncurses-terminfo"
-inherit perlnative cmake pkgconfig
+inherit cmake pkgconfig
PROVIDES += "llvm${PV}"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] llvm: doesn't actually need pythonnative
LLVM doesn't actually need pythonnative, the host Python2 is sufficient but
cmake's executable searching currently isn't reliable in cross-compilations.
Convince cmake by setting PYTHON_EXECUTABLE to point at python2 in the HOSTTOOLS
directory. Note that currently LLVM *needs* python2 currently:
https://github.com/llvm-mirror/llvm/blob/master/CMakeLists.txt#L670
Signed-off-by: Ross Burton
---
meta/recipes-devtools/llvm/llvm_git.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb
b/meta/recipes-devtools/llvm/llvm_git.bb
index d2ea927651d..31abadcace5 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -12,7 +12,7 @@ DEPENDS = "libffi libxml2 zlib ninja-native llvm-native"
RDEPENDS_${PN}_append_class-target = " ncurses-terminfo"
-inherit perlnative pythonnative cmake pkgconfig
+inherit perlnative cmake pkgconfig
PROVIDES += "llvm${PV}"
@@ -74,6 +74,7 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \
-DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi)
\
-DLLVM_OPTIMIZED_TABLEGEN=ON \
-DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS}' \
+ -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python2 \
-G Ninja"
EXTRA_OECMAKE_append_class-target = "\
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] glibc broken when linked with gold Was: [oe] State of OE World, 2019-03-16
On Wed, Mar 27, 2019 at 09:39:07PM +0100, Martin Jansa wrote: > On Wed, Mar 27, 2019 at 05:35:07PM +0100, Martin Jansa wrote: > > On Wed, Mar 27, 2019 at 05:17:54PM +0100, Martin Jansa wrote: > > > On Sun, Mar 17, 2019 at 08:26:37AM -0700, Khem Raj wrote: > > > > http://www.openembedded.org/wiki/Bitbake_World_Status > > > > > > > > == Failed tasks 2019-03-16 == > > > > > > > > INFO: jenkins-job.sh-1.8.45 Complete log available at > > > > http://logs.nslu2-linux.org/buildlogs/oe/world/warrior/log.report.20190317_082308.log > > > > > > > > * > > > > sources/openembedded-core/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.3.bb:do_compile > > > > > > I was hit by this one as well on some arm targets. > > > > > > http://logs.nslu2-linux.org/buildlogs/oe/world/warrior/log.world.qemuarm.20190321_215508.log/bitbake.log > > > > > > shows that it's actually from qemu-arm segfault inside > > > g-ir-scanner-qemuwrapper > > > > > > | qemu: uncaught target signal 11 (Segmentation fault) - core dumped > > > | > > > /home/jenkins/oe/world/yoe/build/tmpfs/work/armv7vet2hf-neon-yoe-linux-gnueabi/gobject-introspection/1.58.3-r0/build/g-ir-scanner-qemuwrapper: > > > line 6: 1959 Segmentation fault (core dumped) PSEUDO_UNLOAD=1 > > > qemu-arm -r 3.2.0 -L > > > /home/jenkins/oe/world/yoe/build/tmpfs/work/armv7vet2hf-neon-yoe-linux-gnueabi/gobject-introspection/1.58.3-r0/recipe-sysroot > > > -E > > > LD_LIBRARY_PATH=$GIR_EXTRA_LIBS_PATH:.libs:/home/jenkins/oe/world/yoe/build/tmpfs/work/armv7vet2hf-neon-yoe-linux-gnueabi/gobject-introspection/1.58.3-r0/recipe-sysroot//usr/lib:/home/jenkins/oe/world/yoe/build/tmpfs/work/armv7vet2hf-neon-yoe-linux-gnueabi/gobject-introspection/1.58.3-r0/recipe-sysroot//lib > > > "$@" > > > > > > The interesting part is that this happens only when glibc is built with > > > gold enabled. > > > > > > I've put a bit more details in temporary work-around here: > > > https://github.com/shr-distribution/meta-smartphone/commit/8f06eb355ead85464b1a1bbaa82584504df15743 > > > > > > I'm comparing qemuarm glibc build with bfd and gold to see if there is > > > some > > > significant difference which might cause this and I plan to flash some > > > small > > > image on my targets to see if libc is broken in runtime as well or only > > > when > > > running inside qemu-arm. > > > > > > Is anyone else seeing this as well? > > > > Checking older world status on the wiki shows that this issue was > > introduced somewhere around christmas > > > > This is last world build before the issue: > > http://logs.nslu2-linux.org/buildlogs/oe/world/warrior/log.report.20181219_112425.log > > ... > > == Tested changes (not included in master yet) - openembedded-core == > > latest upstream commit: > > 14c291e1fb gcc-runtime: Add missing libc dependency > > not included in master yet: > > 7e2ab991fa python/python3: use cc_basename to replace CC for checking > > compiler > > ced915026d python-native: fix one do_populate_sysroot warning > > aee47f3e82 netbase: add entry to /etc/hosts according to /etc/hostname > > a09e2db43a sstate: add support for caching shared workdir tasks > > c104a34166 grub2: Fix passing null to printf formats > > 6f364ff8c4 gnupg: Upgrade to 2.2.12 release > > 0224fec86b glibc: Upgrade towards 2.29 release > > 2486349782 gcc-9.0: Add recipes for upcoming gcc 9.0 release in mid-2019 > > b3ab29bdbb gcc-runtime: Drop building libmpx > > > > and this is the first which reported qemu-arm segfault: > > == Tested changes (not included in master yet) - openembedded-core == > > latest upstream commit: > > 95659bed3f populate_sdk_ext.bbclass: Include site.conf in parsing for > > contents for local.conf > > not included in master yet: > > 0c9db0ae7d python/python3: use cc_basename to replace CC for checking > > compiler > > bb3eb6bc41 python-native: fix one do_populate_sysroot warning > > 08a205f872 netbase: add entry to /etc/hosts according to /etc/hostname > > b81c8650d0 sstate: add support for caching shared workdir tasks > > 702be42dc9 glibc: Remove site_config and glibc-initial > > fc230822d8 gcc: Drop gcc-cross-initial and use gcc-cross instead > > 8652df3a0d gcc: Drop the -initial versions of the compiler > > 0c2f6dfa2f recipes: Drop virtual/libc-for-gcc > > c64531600d newlib: Move away from gcc-initial dependency > > 0d5fb4428f libssp: Remove dependency on gcc-initial > > 7dd8829d3e musl: Move away from gcc-initial dependency > > 9abdb4d6ca tcmode-default: Drop pinnings for gcc-initial based recipes > > e02724e8f8 base.bbclass, classextend.py: Drop catering to gcc-initial > > 7756cb7d17 oeqa/concurrencytest: fix for locating meta-selftest > > f4c68c39e7 crosssdk/cross-canadian: Set LIBCOVERRIDE correctly > > 6fc9bb5698 glibc: Enable --with-default-link > > d4cb282bc6 gcc-9.0: Add recipes for upcoming gcc 9.0 release in mid-2019 > > 6efe313b46 glibc: Upgrade towards 2.29 release > > dac5dc5067 grub2: Fix passing null to printf formats > > bb36d9dc8c
[OE-core] [PATCH] mesa: update 19.0.0 -> 19.0.1
x.0.0 releases are actually considered 'development' by the upstream,
and true releases are x.0.1:
https://www.mesa3d.org/relnotes/19.0.0.html
Signed-off-by: Alexander Kanavin
---
.../mesa/{mesa-gl_19.0.0.bb => mesa-gl_19.0.1.bb} | 0
meta/recipes-graphics/mesa/{mesa_19.0.0.bb => mesa_19.0.1.bb} | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-gl_19.0.0.bb => mesa-gl_19.0.1.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_19.0.0.bb => mesa_19.0.1.bb} (85%)
diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.0.0.bb
b/meta/recipes-graphics/mesa/mesa-gl_19.0.1.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_19.0.0.bb
rename to meta/recipes-graphics/mesa/mesa-gl_19.0.1.bb
diff --git a/meta/recipes-graphics/mesa/mesa_19.0.0.bb
b/meta/recipes-graphics/mesa/mesa_19.0.1.bb
similarity index 85%
rename from meta/recipes-graphics/mesa/mesa_19.0.0.bb
rename to meta/recipes-graphics/mesa/mesa_19.0.1.bb
index 024acdad0b1..d90be8a0745 100644
--- a/meta/recipes-graphics/mesa/mesa_19.0.0.bb
+++ b/meta/recipes-graphics/mesa/mesa_19.0.1.bb
@@ -7,8 +7,8 @@ SRC_URI =
"https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
file://0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \
"
-SRC_URI[md5sum] = "d0d76cd8b00bc1308e37985d4a45d3c5"
-SRC_URI[sha256sum] =
"5a549dfb40ec31e5c36c47aadac04554cb2e2a8d144a046a378fc16da57e38f8"
+SRC_URI[md5sum] = "19636bb3da35c21f43040d31e575d5ce"
+SRC_URI[sha256sum] =
"6884163c0ea9e4c98378ab8fecd72fe7b5f437713a14471beda378df247999d4"
#because we cannot rely on the fact that all apps will use pkgconfig,
#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/8] qemu: remove support for building against host sdl
This hasn't been the default for a long time (as some distros don't
support it), and with gtk+ being the new default shouldn't
be needed at all.
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/qemu/qemu.inc | 8
1 file changed, 8 deletions(-)
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index e503aa866d3..dccbd83548a 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -87,14 +87,6 @@ export LIBTOOL="${HOST_SYS}-libtool"
B = "${WORKDIR}/build"
-do_configure_prepend_class-native() {
- # Append build host pkg-config paths for native target since the host
may provide sdl
- BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path
pkg-config || echo "")
- if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
- export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
- fi
-}
-
do_configure() {
${S}/configure ${EXTRA_OECONF}
}
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/8] qemu: remove sdl option from PACKAGECONFIG default
This removes confusion over where qemu frontends are enabled for
native/nativesdk builds: currently they are also set in local.conf.sample
from poky distro, and with this change that becomes the only place.
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/qemu/qemu_3.1.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/qemu/qemu_3.1.0.bb
b/meta/recipes-devtools/qemu/qemu_3.1.0.bb
index 669638a6592..16eaa54a16c 100644
--- a/meta/recipes-devtools/qemu/qemu_3.1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_3.1.0.bb
@@ -18,7 +18,7 @@ PACKAGECONFIG ??= " \
${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', ''
,d)} \
"
-PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm \
+PACKAGECONFIG_class-nativesdk ??= "fdt kvm \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', ''
,d)} \
"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/8] local.conf.sample: enable gtk+ frontend in addition to sdl
As SDL was found to be buggy for virgl-based GL passthrough, gtk+ is enabled to allow that use case. Signed-off-by: Alexander Kanavin --- meta-poky/conf/local.conf.sample | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta-poky/conf/local.conf.sample b/meta-poky/conf/local.conf.sample index 9068e567dcd..2775e15d748 100644 --- a/meta-poky/conf/local.conf.sample +++ b/meta-poky/conf/local.conf.sample @@ -238,11 +238,12 @@ BB_DISKMON_DIRS ??= "\ # Qemu configuration # # By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. By default libsdl2-native will -# be built, if you want to use your host's libSDL instead of the minimal libsdl built -# by libsdl2-native then uncomment the ASSUME_PROVIDED line below. -PACKAGECONFIG_append_pn-qemu-system-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +# seen. The two lines below enable the SDL and Gtk UI frontends as well. +# +# By default libsdl2-native will be built, if you want to use your host's libSDL instead +# of the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. +PACKAGECONFIG_append_pn-qemu-system-native = " sdl gtk+" +PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl gtk+" #ASSUME_PROVIDED += "libsdl2-native" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/8] local.conf.sample: remove support for building against host libsdl
Signed-off-by: Alexander Kanavin --- meta-poky/conf/local.conf.sample | 4 1 file changed, 4 deletions(-) diff --git a/meta-poky/conf/local.conf.sample b/meta-poky/conf/local.conf.sample index 2775e15d748..00795ae6a3f 100644 --- a/meta-poky/conf/local.conf.sample +++ b/meta-poky/conf/local.conf.sample @@ -239,12 +239,8 @@ BB_DISKMON_DIRS ??= "\ # # By default qemu will build with a builtin VNC server where graphical output can be # seen. The two lines below enable the SDL and Gtk UI frontends as well. -# -# By default libsdl2-native will be built, if you want to use your host's libSDL instead -# of the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. PACKAGECONFIG_append_pn-qemu-system-native = " sdl gtk+" PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl gtk+" -#ASSUME_PROVIDED += "libsdl2-native" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/8] qemu: enable virglrenderer and glx options subject to 'opengl' DISTRO_FEATURE
Note that to actually use accelerated GL passthrough, there are two options
1) a suitable frontend need to be also enabled - gtk+ seems to work well,
sdl was found to be buggy.
2) it is also possible to render off-screen with -display egl-headless option,
and see the output with a VNC viewer (for which, qemu needs to be started
with a VNC server):
$ runqemu kvm egl-headless publicvnc
Signed-off-by: Alexander Kanavin
---
meta/lib/oeqa/selftest/cases/runtime_test.py | 15 ++-
.../qemu/qemu-system-native_3.1.0.bb | 4 +++-
meta/recipes-devtools/qemu/qemu_3.1.0.bb | 5 -
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py
b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 6c25bb901d1..fca803ffbc5 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -185,13 +185,12 @@ class TestImage(OESelftestTestCase):
self.skipTest('virgl isn\'t working with Debian 8')
qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
+qemu_distrofeatures = get_bb_var('DISTRO_FEATURES',
'qemu-system-native')
features = 'INHERIT += "testimage"\n'
if 'gtk+' not in qemu_packageconfig:
features += 'PACKAGECONFIG_append_pn-qemu-system-native = "
gtk+"\n'
-if 'virglrenderer' not in qemu_packageconfig:
-features += 'PACKAGECONFIG_append_pn-qemu-system-native = "
virglrenderer"\n'
-if 'glx' not in qemu_packageconfig:
-features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
+if 'opengl' not in qemu_distrofeatures:
+features += 'DISTRO_FEATURES_append = " opengl"\n'
features += 'TEST_SUITES = "ping ssh virgl"\n'
features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
features += 'IMAGE_INSTALL_append = " kmscube"\n'
@@ -220,12 +219,10 @@ class TestImage(OESelftestTestCase):
dripath = subprocess.check_output("pkg-config
--variable=dridriverdir dri", shell=True)
except subprocess.CalledProcessError as e:
self.skipTest("Could not determine the path to dri drivers on the
host via pkg-config.\nPlease install Mesa development files (particularly,
dri.pc) on the host machine.")
-qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
+qemu_distrofeatures = get_bb_var('DISTRO_FEATURES',
'qemu-system-native')
features = 'INHERIT += "testimage"\n'
-if 'virglrenderer' not in qemu_packageconfig:
-features += 'PACKAGECONFIG_append_pn-qemu-system-native = "
virglrenderer"\n'
-if 'glx' not in qemu_packageconfig:
-features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
+if 'opengl' not in qemu_distrofeatures:
+features += 'DISTRO_FEATURES_append = " opengl"\n'
features += 'TEST_SUITES = "ping ssh virgl"\n'
features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
features += 'IMAGE_INSTALL_append = " kmscube"\n'
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_3.1.0.bb
b/meta/recipes-devtools/qemu/qemu-system-native_3.1.0.bb
index 5bf528bec12..6928592a94c 100644
--- a/meta/recipes-devtools/qemu/qemu-system-native_3.1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-system-native_3.1.0.bb
@@ -9,7 +9,9 @@ DEPENDS = "glib-2.0-native zlib-native pixman-native
qemu-native"
EXTRA_OECONF_append = " --target-list=${@get_qemu_system_target_list(d)}"
-PACKAGECONFIG ??= "fdt alsa kvm"
+PACKAGECONFIG ??= "fdt alsa kvm \
+${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', ''
,d)} \
+"
# Handle distros such as CentOS 5 32-bit that do not have kvm support
PACKAGECONFIG_remove = "${@'kvm' if not
os.path.exists('/usr/include/linux/kvm.h') else ''}"
diff --git a/meta/recipes-devtools/qemu/qemu_3.1.0.bb
b/meta/recipes-devtools/qemu/qemu_3.1.0.bb
index 04d8bee99f2..8113fc24e8b 100644
--- a/meta/recipes-devtools/qemu/qemu_3.1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_3.1.0.bb
@@ -16,7 +16,10 @@ do_install_append_class-nativesdk() {
PACKAGECONFIG ??= " \
fdt sdl kvm \
${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
+${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', ''
,d)} \
+"
+PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm \
+${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', ''
,d)} \
"
-PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/8] qemu: add a gtk+ frontend to target builds
sdl frontend remains enabled and available.
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/qemu/qemu_3.1.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/qemu/qemu_3.1.0.bb
b/meta/recipes-devtools/qemu/qemu_3.1.0.bb
index 8113fc24e8b..669638a6592 100644
--- a/meta/recipes-devtools/qemu/qemu_3.1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_3.1.0.bb
@@ -14,7 +14,7 @@ do_install_append_class-nativesdk() {
}
PACKAGECONFIG ??= " \
-fdt sdl kvm \
+fdt sdl gtk+ kvm \
${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virglrenderer glx', ''
,d)} \
"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/8] xorg-lib: drop native overrides for REQUIRED_DISTRO_FEATURES
x11 is actually always present in native DISTRO_FEATURES, and so it's fine to require it in all cases. Signed-off-by: Alexander Kanavin --- meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb| 1 - meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 1 - 2 files changed, 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb index 84303e6246f..518249ee922 100644 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb @@ -30,7 +30,6 @@ inherit autotools pkgconfig distro_features_check # The libxau and others requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" -REQUIRED_DISTRO_FEATURES_class-native = "" export PYTHON = "python3" diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index 6f4e44454f2..09df0109cb8 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc @@ -24,4 +24,3 @@ UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0ret " REQUIRED_DISTRO_FEATURES ?= "x11" -REQUIRED_DISTRO_FEATURES_class-native = "" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/8] bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
This will allow better control over native virgl/qemu configurations.
Adjust gtk+3/cairo native configurations to actually ignore opengl
when building for -native: we do not need it, and it would cause build
failures as only a limited subset of mesa-native is currently built.
Drop native/nativesdk overrides from virglrenderer/libepoxy recipes
as opengl feature is now correctly set for those variants.
Signed-off-by: Alexander Kanavin
---
meta/conf/bitbake.conf | 4 ++--
meta/recipes-gnome/gtk+/gtk+3.inc | 2 ++
meta/recipes-graphics/cairo/cairo_1.16.0.bb| 2 ++
meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb | 2 --
meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb | 2 --
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7f8b043cc45..b64252eac94 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -833,8 +833,8 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
# Normally target distro features will not be applied to native builds:
# Native distro features on this list will use the target feature value
-DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation"
-DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"
+DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation opengl"
+DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation opengl"
DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5
gobject-introspection-data ldconfig"
MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc
b/meta/recipes-gnome/gtk+/gtk+3.inc
index 77b6c31536b..2f9e05b1cd4 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -47,6 +47,8 @@ do_compile_prepend() {
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11',
d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11',
'glx', '', d)}"
+PACKAGECONFIG_class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11',
d)}"
PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk
fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender
libxcomposite libxfixes"
# this is provided by oe-core patch that removes epoxy/gl dependency from a
X11 build
diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
index c2628ae0ca0..e875180f6e6 100644
--- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
@@ -41,6 +41,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb',
'', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl',
'opengl', '', d)}"
+PACKAGECONFIG_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'x11',
'x11 xcb', '', d)}"
+PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES',
'x11', 'x11 xcb', '', d)}"
PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no
--disable-xlib,${X11DEPENDS}"
PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
b/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
index dd706a96063..66e8b476dcc 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb
@@ -14,8 +14,6 @@ UPSTREAM_CHECK_URI =
"https://github.com/anholt/libepoxy/releases;
inherit meson pkgconfig distro_features_check
REQUIRED_DISTRO_FEATURES = "opengl"
-REQUIRED_DISTRO_FEATURES_class-native = ""
-REQUIRED_DISTRO_FEATURES_class-nativesdk = ""
PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl"
PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no, virtual/libx11 virtual/libgl"
diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb
b/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb
index 225a0b8b0c9..b1dfb85c49e 100644
--- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb
+++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb
@@ -18,5 +18,3 @@ inherit autotools pkgconfig distro_features_check
BBCLASSEXTEND = "native nativesdk"
REQUIRED_DISTRO_FEATURES = "opengl"
-REQUIRED_DISTRO_FEATURES_class-native = ""
-REQUIRED_DISTRO_FEATURES_class-nativesdk = ""
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] virglrenderer: requires distro feature opengl
On Tue, 12 Mar 2019 at 23:35, Richard Purdie wrote: > > On Tue, 12 Mar 2019 at 01:23, wrote: > > > +REQUIRED_DISTRO_FEATURES = "opengl" > > > +REQUIRED_DISTRO_FEATURES_class-native = "" > > > +REQUIRED_DISTRO_FEATURES_class-nativesdk = "" > > > > I suspect you can drop the native/nativesdk overrides here, as > > DISTRO_FEATURES is overridden in those builds. > > I suspect it is needed since we clear DISTRO_FEATURES to a small subset > for native/nativesdk and hence opengl won't be present. If its not > present, virglrenderer-native will then not build. > > We may need to rethink how we're using the native distro features. > Maybe when you add virglrender-native, you need to add opengl to the > native distro features? We could change qemu config based upon that? > > It would be good to confirm my above guess is correct... I have reworked the patchset that enables virgl in qemu to make that conditional to opengl in DISTRO_FEATURES, which also allowed the suggested cleanups. Will post that in a moment. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] Systemd: Add pattern matching support to PACKAGECONFIG
Hi Pierre-Jean,
Thanks for your review, I'll rework commit log in V3 tomorrow,
Regards,
Vincent
Le mer. 27 mars 2019 à 16:57, TEXIER Pierre-Jean a
écrit :
> Hi Vincent,
>
> Le mer. 27 mars 2019 à 16:45, Vincent Prince
> a écrit :
>
>> libpcre2 is needed to enable grep option to journalctl.
>>
>> Changes in v2:
>> - Fix false case option
>>
>> Signed-off-by: Vincent Prince
>> ---
>> meta/recipes-core/systemd/systemd_241.bb | 1 +
>> 1 file changed, 1 insertion(+)
>>
>
> The changelog should be added below the "---" line in the patch,
> this allows to not get included into the actual commit log.
>
> Pierre-Jean
>
>
>> diff --git a/meta/recipes-core/systemd/systemd_241.bb
>> b/meta/recipes-core/systemd/systemd_241.bb
>> index a12b9ab..bfbfc81 100644
>> --- a/meta/recipes-core/systemd/systemd_241.bb
>> +++ b/meta/recipes-core/systemd/systemd_241.bb
>> @@ -151,6 +151,7 @@ PACKAGECONFIG[nss-mymachines] =
>> "-Dnss-mymachines=true,-Dnss-mymachines=false"
>> PACKAGECONFIG[nss-resolve] = "-Dnss-resolve=true,-Dnss-resolve=false"
>> PACKAGECONFIG[openssl] = "-Dopenssl=true,-Dopenssl=false,openssl"
>> PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam,${PAM_PLUGINS}"
>> +PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=false,libpcre2"
>> PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false"
>> PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false"
>> PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode"
>> --
>> 2.7.4
>>
>> --
>> ___
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] target-sdk-provides-dummy: add more perl modules to avoid populate_sdk failure
Hi Alexander, I added those to fix issue raised by lcov recipe, I'll check again tomorrow. Regards, Vincent Le mer. 27 mars 2019 à 14:05, Alexander Kanavin a écrit : > Can you specify in detail what the failure is please? It is not > happening on the AB. > > Alex > > On Wed, 27 Mar 2019 at 13:59, Vincent Prince > wrote: > > > > Signed-off-by: Vincent Prince > > --- > > meta/recipes-core/meta/target-sdk-provides-dummy.bb | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/meta/recipes-core/meta/target-sdk-provides-dummy.bb > b/meta/recipes-core/meta/target-sdk-provides-dummy.bb > > index 60499f7..85472a8 100644 > > --- a/meta/recipes-core/meta/target-sdk-provides-dummy.bb > > +++ b/meta/recipes-core/meta/target-sdk-provides-dummy.bb > > @@ -20,6 +20,7 @@ DUMMYPROVIDES = "\ > > libxml-parser-perl \ > > perl-module-bytes \ > > perl-module-carp \ > > +perl-module-config \ > > perl-module-constant \ > > perl-module-data-dumper \ > > perl-module-errno \ > > @@ -35,10 +36,12 @@ DUMMYPROVIDES = "\ > > perl-module-getopt-long \ > > perl-module-io-file \ > > perl-module-overload \ > > +perl-module-overloading \ > > perl-module-posix \ > > perl-module-thread-queue \ > > perl-module-threads \ > > perl-module-warnings \ > > +perl-module-warnings-register \ > > /bin/sh \ > > /bin/bash \ > > /usr/bin/env \ > > -- > > 2.7.4 > > > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] Systemd: Add pattern matching support to PACKAGECONFIG
Hi Vincent,
Le mer. 27 mars 2019 à 16:45, Vincent Prince
a écrit :
> libpcre2 is needed to enable grep option to journalctl.
>
> Changes in v2:
> - Fix false case option
>
> Signed-off-by: Vincent Prince
> ---
> meta/recipes-core/systemd/systemd_241.bb | 1 +
> 1 file changed, 1 insertion(+)
>
The changelog should be added below the "---" line in the patch,
this allows to not get included into the actual commit log.
Pierre-Jean
> diff --git a/meta/recipes-core/systemd/systemd_241.bb
> b/meta/recipes-core/systemd/systemd_241.bb
> index a12b9ab..bfbfc81 100644
> --- a/meta/recipes-core/systemd/systemd_241.bb
> +++ b/meta/recipes-core/systemd/systemd_241.bb
> @@ -151,6 +151,7 @@ PACKAGECONFIG[nss-mymachines] =
> "-Dnss-mymachines=true,-Dnss-mymachines=false"
> PACKAGECONFIG[nss-resolve] = "-Dnss-resolve=true,-Dnss-resolve=false"
> PACKAGECONFIG[openssl] = "-Dopenssl=true,-Dopenssl=false,openssl"
> PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam,${PAM_PLUGINS}"
> +PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=false,libpcre2"
> PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false"
> PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false"
> PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode"
> --
> 2.7.4
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] Systemd: Add pattern matching support to PACKAGECONFIG
libpcre2 is needed to enable grep option to journalctl.
Changes in v2:
- Fix false case option
Signed-off-by: Vincent Prince
---
meta/recipes-core/systemd/systemd_241.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/systemd/systemd_241.bb
b/meta/recipes-core/systemd/systemd_241.bb
index a12b9ab..bfbfc81 100644
--- a/meta/recipes-core/systemd/systemd_241.bb
+++ b/meta/recipes-core/systemd/systemd_241.bb
@@ -151,6 +151,7 @@ PACKAGECONFIG[nss-mymachines] =
"-Dnss-mymachines=true,-Dnss-mymachines=false"
PACKAGECONFIG[nss-resolve] = "-Dnss-resolve=true,-Dnss-resolve=false"
PACKAGECONFIG[openssl] = "-Dopenssl=true,-Dopenssl=false,openssl"
PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam,${PAM_PLUGINS}"
+PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=false,libpcre2"
PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false"
PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false"
PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Systemd: Add pattern matching support to PACKAGECONFIG
Ouch :/
Thanks Alex, sending V2.
Le mer. 27 mars 2019 à 16:26, Alex Kiernan a
écrit :
> On Wed, Mar 27, 2019 at 12:47 PM Vincent Prince
> wrote:
> >
> > libpcre2 is needed to enable grep option to journalctl.
> >
> > Signed-off-by: Vincent Prince
> > ---
> > meta/recipes-core/systemd/systemd_241.bb | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/meta/recipes-core/systemd/systemd_241.bb
> b/meta/recipes-core/systemd/systemd_241.bb
> > index a12b9ab..9e05944 100644
> > --- a/meta/recipes-core/systemd/systemd_241.bb
> > +++ b/meta/recipes-core/systemd/systemd_241.bb
> > @@ -151,6 +151,7 @@ PACKAGECONFIG[nss-mymachines] =
> "-Dnss-mymachines=true,-Dnss-mymachines=false"
> > PACKAGECONFIG[nss-resolve] = "-Dnss-resolve=true,-Dnss-resolve=false"
> > PACKAGECONFIG[openssl] = "-Dopenssl=true,-Dopenssl=false,openssl"
> > PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam,${PAM_PLUGINS}"
> > +PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=true,libpcre2"
>
> You've got "pcre2=true" in both arms of the PACKAGECONFIG.
>
> > PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false"
> > PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false"
> > PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode"
> > --
> > 2.7.4
> >
> > --
> > ___
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>
> --
> Alex Kiernan
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Systemd: Add pattern matching support to PACKAGECONFIG
On Wed, Mar 27, 2019 at 12:47 PM Vincent Prince
wrote:
>
> libpcre2 is needed to enable grep option to journalctl.
>
> Signed-off-by: Vincent Prince
> ---
> meta/recipes-core/systemd/systemd_241.bb | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta/recipes-core/systemd/systemd_241.bb
> b/meta/recipes-core/systemd/systemd_241.bb
> index a12b9ab..9e05944 100644
> --- a/meta/recipes-core/systemd/systemd_241.bb
> +++ b/meta/recipes-core/systemd/systemd_241.bb
> @@ -151,6 +151,7 @@ PACKAGECONFIG[nss-mymachines] =
> "-Dnss-mymachines=true,-Dnss-mymachines=false"
> PACKAGECONFIG[nss-resolve] = "-Dnss-resolve=true,-Dnss-resolve=false"
> PACKAGECONFIG[openssl] = "-Dopenssl=true,-Dopenssl=false,openssl"
> PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam,${PAM_PLUGINS}"
> +PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=true,libpcre2"
You've got "pcre2=true" in both arms of the PACKAGECONFIG.
> PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false"
> PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false"
> PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode"
> --
> 2.7.4
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Alex Kiernan
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/8] blktool: update to 4-7.1
Right, I have sent a followup removing the duplicate. Alex On Wed, 27 Mar 2019 at 15:51, Adrian Bunk wrote: > > On Wed, Mar 27, 2019 at 03:09:17PM +0100, Alexander Kanavin wrote: > > This update adds a patch from Debian to match the latest version there. > >... > > + file://0004-fix-ftbfs-glibc-2.28.patch \ > > file://blktool-gnulib-makedev.patch \ > >... > > That's 2 patches adding the same #include. > > cu > Adrian > > -- > >"Is there not promise of rain?" Ling Tan asked suddenly out > of the darkness. There had been need of rain for many days. >"Only a promise," Lao Er said. >Pearl S. Buck - Dragon Seed > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] blktool: remove a duplicate patch
blktool-gnulib-makedev.patch is actually doing the same
thing as 0004-fix-ftbfs-glibc-2.28.patch, so we end up
including the same file twice.
Signed-off-by: Alexander Kanavin
---
.../blktool/blktool-gnulib-makedev.patch | 23 ---
.../recipes-extended/blktool/blktool_4-7.1.bb | 1 -
2 files changed, 24 deletions(-)
delete mode 100644
meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch
diff --git a/meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch
b/meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch
deleted file mode 100644
index 6eea608b291..000
--- a/meta/recipes-extended/blktool/blktool/blktool-gnulib-makedev.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-include for major/minor defintions
-
-Fixes
-
-| ../blktool-4.orig/blktool.c: In function 'detect_dev_class':
-| ../blktool-4.orig/blktool.c:295:10: warning: implicit declaration of
function 'major' [-Wimplicit-function-declaration]
-| switch (major(st_rdev)) {
-| ^
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj
-Index: blktool-4.orig/blktool.c
-===
blktool-4.orig.orig/blktool.c
-+++ blktool-4.orig/blktool.c
-@@ -27,6 +27,7 @@
- #include
- #include
- #include
-+#include
-
- #include "blktool.h"
-
diff --git a/meta/recipes-extended/blktool/blktool_4-7.1.bb
b/meta/recipes-extended/blktool/blktool_4-7.1.bb
index cc24d3cdb24..ff2eaa5352b 100644
--- a/meta/recipes-extended/blktool/blktool_4-7.1.bb
+++ b/meta/recipes-extended/blktool/blktool_4-7.1.bb
@@ -14,7 +14,6 @@ SRC_URI =
"http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/
file://0002-fix-string-error.patch \
file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \
file://0004-fix-ftbfs-glibc-2.28.patch \
- file://blktool-gnulib-makedev.patch \
"
SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 7/8] llvm: update from 8.0.0rc2 to 8.0.0 final release
On Wed, 27 Mar 2019 at 15:43, Martin Jansa wrote:
> Are you intentionally using d2298e74235598f15594fe2c99bbac870a507c59
> instead of the SRCREV of the annotated tag llvmorg-8.0.0?
>
> llvm-project $ git show-ref -d llvmorg-8.0.0
> 8474bc915331b2b7851fcad74f510803f0989b8b refs/tags/llvmorg-8.0.0
> d2298e74235598f15594fe2c99bbac870a507c59 refs/tags/llvmorg-8.0.0^{}
>
> I know that many projects don't use annotated tags, but if there is one
> it would be nice to use that (so that it's easier to verify that the
> SRCREV really matches with the tag).
I took the SRCREV from the github web interface:
https://github.com/llvm/llvm-project/releases
I'm not able to find the annotated tag ids there anywhere, so I simply
had no idea they exist.
Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/8] blktool: update to 4-7.1
On Wed, Mar 27, 2019 at 03:09:17PM +0100, Alexander Kanavin wrote: > This update adds a patch from Debian to match the latest version there. >... > + file://0004-fix-ftbfs-glibc-2.28.patch \ > file://blktool-gnulib-makedev.patch \ >... That's 2 patches adding the same #include. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 7/8] llvm: update from 8.0.0rc2 to 8.0.0 final release
On Wed, Mar 27, 2019 at 03:09:21PM +0100, Alexander Kanavin wrote:
> Also, update PV to match the version scheme used by upstream
> to tag releases (e.g. major.minor.patch).
>
> Signed-off-by: Alexander Kanavin
> ---
> meta/recipes-devtools/llvm/llvm_git.bb | 8 ++--
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-devtools/llvm/llvm_git.bb
> b/meta/recipes-devtools/llvm/llvm_git.bb
> index d2ea927651d..d1832e03f71 100644
> --- a/meta/recipes-devtools/llvm/llvm_git.bb
> +++ b/meta/recipes-devtools/llvm/llvm_git.bb
> @@ -19,18 +19,14 @@ PROVIDES += "llvm${PV}"
> LLVM_RELEASE = "${PV}"
> LLVM_DIR = "llvm${LLVM_RELEASE}"
>
> -# SRCREV is set to the revision of 8.0.0-rc2 tag, while latest release
> -# tag is 7.0.1 as of Feb 18 2019, hence the need for UPSTREAM_CHECK_UNKNOWN
> -# Remove the UPSTREAM_VERSION_UNKNOWN line once 8.0.0 final is tagged
> -UPSTREAM_VERSION_UNKNOWN = "1"
> -SRCREV = "98ebe7460199b9cd79eb562b5e8705ad28f5513f"
> +SRCREV = "d2298e74235598f15594fe2c99bbac870a507c59"
Are you intentionally using d2298e74235598f15594fe2c99bbac870a507c59
instead of the SRCREV of the annotated tag llvmorg-8.0.0?
llvm-project $ git show-ref -d llvmorg-8.0.0
8474bc915331b2b7851fcad74f510803f0989b8b refs/tags/llvmorg-8.0.0
d2298e74235598f15594fe2c99bbac870a507c59 refs/tags/llvmorg-8.0.0^{}
I know that many projects don't use annotated tags, but if there is one
it would be nice to use that (so that it's easier to verify that the
SRCREV really matches with the tag).
> BRANCH = "release/${MAJOR_VERSION}.x"
> MAJOR_VERSION = "8"
> MINOR_VERSION = "0"
> PATCH_VERSION = "0"
> SOLIBVER = "1"
> -PV = "${MAJOR_VERSION}.${MINOR_VERSION}"
> +PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}"
> SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \
>
> file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
> file://0002-llvm-allow-env-override-of-exe-path.patch \
> --
> 2.17.1
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libcomps: put PV in filename
On Wed, Mar 27, 2019 at 04:03:27PM +0200, Adrian Bunk wrote: > On Wed, Mar 27, 2019 at 02:33:14PM +0100, Martin Jansa wrote: > > On Tue, Mar 26, 2019 at 12:42:12PM +0200, Adrian Bunk wrote: > >... > > > Not having the release there also loses the ability to use either > > > gcc_%.bbappend or gcc_8.3.0.bbappend, which are suitable for > > > different situations. > > > > There is usually just one version per recipe and even with _git.bb > > suffix you can easily do gcc_7+git.bb and gcc_8+git.bb if you need to. > > Thud contains 8.2 today, but might have 8.3 tomorrow. > > A layer might want to append only to one of them, > or have different appends for different versions. > > That's trivial with gcc_8.2.bb and gcc_8.3.bb, > and harder with gcc_8+svn.bb. If your layer has gcc_8.2.bbappend and the recipe in oe-core gets renamed from gcc_8.2.bb to gcc_8.3.bb in newer thud revision, then your bbappend will not apply and bitbake will complain that there is no recipe for your gcc_8.2.bbappend. Layer which doesn't even parse correctly with different revisions of the same thud branch isn't really something we should encourage. gcc_8%.bbappend with some logic inside (e.g. adding some .patch file only when PV starts with 8.2) will be compatible with both newer and older revision of thud. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] asciidoc: use Python 3 port
There's a sort-of-official port of asciidoc to Python 3. Whilst the official
replacement is asciidoctor which is rewritten in Ruby, this is a fairly trivial
swap and removes Python 2 from core-image-sato builds entirely.
Moving forward we should evaluate asciidoctor, but that can wait.
Change the RDEPENDS so that python3 is only a dependency for target and
nativesdk builds, for native this can use the host python3.
Remove redundant DESTDIR export that isn't needed.
Signed-off-by: Ross Burton
---
meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 21 -
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
index 38164d55735..d0d15171ac4 100644
--- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
+++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
@@ -8,17 +8,20 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069"
-SRC_URI =
"http://downloads.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz;
-SRC_URI[md5sum] = "c59018f105be8d022714b826b0be130a"
-SRC_URI[sha256sum] =
"78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0"
+SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https"
+SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
+PV .= "+py3-git${SRCPV}"
-UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/asciidoc/files/;
+DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native"
+S = "${WORKDIR}/git"
+
+# Not using automake
inherit autotools-brokensep
+CLEANBROKEN = "1"
-export DESTDIR = "${D}"
-DEPENDS_class-native = "docbook-xml-dtd4-native"
-RDEPENDS_${PN} += "python"
-BBCLASSEXTEND = "native"
+# target and nativesdk needs python3, but for native we can use the host.
+RDEPENDS_${PN} += "python3"
+RDEPENDS_remove_class-native = "python3"
-CLEANBROKEN = "1"
+BBCLASSEXTEND = "native nativesdk"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/8] sysklogd: switch SRC_URI to the new, maintained location
The previous SRC_URI seems to be gone, and sysklogd hasn't received
any updates there for a long time.
The new location says:
Origin & References
This is the continuation of the original sysklogd by Martin Schulze.
Now maintained by Joachim Nilsson. Please file bug reports, or send
pull requests for bug fixes and proposed extensions at GitHub.
and generally seems credible: http://troglobit.com/
Signed-off-by: Alexander Kanavin
---
meta/recipes-extended/sysklogd/sysklogd.inc | 3 ++-
meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc
b/meta/recipes-extended/sysklogd/sysklogd.inc
index f151dd87f78..749026f8533 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
inherit update-rc.d update-alternatives systemd
-SRC_URI =
"http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \
+SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \
file://no-strip-install.patch \
file://0001-Fix-build-with-musl.patch \
file://0001-fix-problems-that-causes-a-segmentation-fault-under-.patch \
@@ -24,6 +24,7 @@ SRC_URI =
"http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar
file://klogd.service \
file://tmpfiles.sysklogd.conf \
"
+S = "${WORKDIR}/git"
SRC_URI_append_e500v2 = " file://no-vectorization.patch"
diff --git a/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
b/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
index 975ecc2b633..88bcfd9e4a0 100644
--- a/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
+++ b/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
@@ -1,4 +1,3 @@
require sysklogd.inc
-SRC_URI[md5sum] = "c70599ab0d037fde724f7210c2c8d7f8"
-SRC_URI[sha256sum] =
"5166c185ae23c92e8b9feee66a6e3d0bc944bf673112f53e3ecf62e08ce7c201"
+SRCREV = "930a2b1c0d15b14309a49f14e3f30e905456af4d"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/8] llvm: update from 8.0.0rc2 to 8.0.0 final release
Also, update PV to match the version scheme used by upstream
to tag releases (e.g. major.minor.patch).
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/llvm/llvm_git.bb | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb
b/meta/recipes-devtools/llvm/llvm_git.bb
index d2ea927651d..d1832e03f71 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -19,18 +19,14 @@ PROVIDES += "llvm${PV}"
LLVM_RELEASE = "${PV}"
LLVM_DIR = "llvm${LLVM_RELEASE}"
-# SRCREV is set to the revision of 8.0.0-rc2 tag, while latest release
-# tag is 7.0.1 as of Feb 18 2019, hence the need for UPSTREAM_CHECK_UNKNOWN
-# Remove the UPSTREAM_VERSION_UNKNOWN line once 8.0.0 final is tagged
-UPSTREAM_VERSION_UNKNOWN = "1"
-SRCREV = "98ebe7460199b9cd79eb562b5e8705ad28f5513f"
+SRCREV = "d2298e74235598f15594fe2c99bbac870a507c59"
BRANCH = "release/${MAJOR_VERSION}.x"
MAJOR_VERSION = "8"
MINOR_VERSION = "0"
PATCH_VERSION = "0"
SOLIBVER = "1"
-PV = "${MAJOR_VERSION}.${MINOR_VERSION}"
+PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}"
SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \
file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
file://0002-llvm-allow-env-override-of-exe-path.patch \
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/8] bmap-tools: fix upstream version check
Signed-off-by: Alexander Kanavin
---
meta/recipes-support/bmap-tools/bmap-tools_3.5.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-support/bmap-tools/bmap-tools_3.5.bb
b/meta/recipes-support/bmap-tools/bmap-tools_3.5.bb
index a3f77d374f7..7c4db85b32c 100644
--- a/meta/recipes-support/bmap-tools/bmap-tools_3.5.bb
+++ b/meta/recipes-support/bmap-tools/bmap-tools_3.5.bb
@@ -15,7 +15,7 @@ SRCREV = "db7087b883bf52cbff063ad17a41cc1cbb85104d"
S = "${WORKDIR}/git"
PV .= "+git${SRCPV}"
-UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)"
RDEPENDS_${PN} = "python3-core python3-compression python3-mmap
python3-setuptools python3-fcntl python3-six"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/8] binutils: fix upstream version check
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/binutils/binutils-2.32.inc | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-devtools/binutils/binutils-2.32.inc
b/meta/recipes-devtools/binutils/binutils-2.32.inc
index 74239868151..15406441241 100644
--- a/meta/recipes-devtools/binutils/binutils-2.32.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.32.inc
@@ -14,6 +14,11 @@ def binutils_branch_version(d):
pvsplit = d.getVar('PV').split('.')
return pvsplit[0] + "_" + pvsplit[1]
+# Actual upstream version is 2.32 (without the .0), so we have to set
+# UPSTREAM_VERSION_UNKNOWN to avoid the version check failure. The line can
+# be removed when a new version of binutils is released (if the PV is then
+# correctly set to match the upstream version tag).
+UPSTREAM_VERSION_UNKNOWN = "1"
PV = "2.32.0"
BINUPV = "${@binutils_branch_version(d)}"
#BRANCH = "binutils-${BINUPV}-branch"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/8] sysprof: drop obsolete no-update reason
Signed-off-by: Alexander Kanavin
---
meta/recipes-kernel/sysprof/sysprof_3.30.2.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-kernel/sysprof/sysprof_3.30.2.bb
b/meta/recipes-kernel/sysprof/sysprof_3.30.2.bb
index 27f37f808e8..24e49cb0d58 100644
--- a/meta/recipes-kernel/sysprof/sysprof_3.30.2.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_3.30.2.bb
@@ -15,7 +15,6 @@ SRC_URI += " \
file://define-NT_GNU_BUILD_ID.patch \
file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \
"
-RECIPE_NO_UPDATE_REASON = "Waiting for resolution of
https://bugzilla.gnome.org/show_bug.cgi?id=794625;
PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES',
'${GTK3DISTROFEATURES}', 'gtk', '', d)}"
PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/8] blktool: update to 4-7.1
This update adds a patch from Debian to match the latest version there.
Signed-off-by: Alexander Kanavin
---
.../blktool/0004-fix-ftbfs-glibc-2.28.patch | 19 +++
.../{blktool_4-7.bb => blktool_4-7.1.bb} | 1 +
2 files changed, 20 insertions(+)
create mode 100644
meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch
rename meta/recipes-extended/blktool/{blktool_4-7.bb => blktool_4-7.1.bb} (96%)
diff --git
a/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch
b/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch
new file mode 100644
index 000..65bca651000
--- /dev/null
+++ b/meta/recipes-extended/blktool/blktool/0004-fix-ftbfs-glibc-2.28.patch
@@ -0,0 +1,19 @@
+Description: Fix FTBFS with glibc 2.28
+Author: Adrian Bunk
+Bug-Debian: https://bugs.debian.org/917055
+
+This patch is taken from
+http://ftp.debian.org/debian/pool/main/b/blktool/blktool_4-7.1.debian.tar.xz
+
+Upstream-Status: Inappropriate [upstream is dead]
+Signed-off-by: Alexander Kanavin
+--- blktool-4.orig/blktool.c
blktool-4/blktool.c
+@@ -18,6 +18,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/meta/recipes-extended/blktool/blktool_4-7.bb
b/meta/recipes-extended/blktool/blktool_4-7.1.bb
similarity index 96%
rename from meta/recipes-extended/blktool/blktool_4-7.bb
rename to meta/recipes-extended/blktool/blktool_4-7.1.bb
index 0e6f7ee6df1..cc24d3cdb24 100644
--- a/meta/recipes-extended/blktool/blktool_4-7.bb
+++ b/meta/recipes-extended/blktool/blktool_4-7.1.bb
@@ -13,6 +13,7 @@ SRC_URI =
"http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/
file://0001-fix-typos-in-manpage.patch \
file://0002-fix-string-error.patch \
file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \
+ file://0004-fix-ftbfs-glibc-2.28.patch \
file://blktool-gnulib-makedev.patch \
"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/8] db: fix upstream version check
The new regex excludes the 5.3.28+dfsg1 which is a Debian
repackaging of the original tarball:
* Repack the .orig tarball to eliminate prebuilt binaries that need a
Visual Studio plugin to build from source. (Closes: #898215)
https://metadata.ftp-master.debian.org/changelogs/main/d/db5.3/unstable_changelog
Signed-off-by: Alexander Kanavin
---
meta/recipes-support/db/db_5.3.28.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-support/db/db_5.3.28.bb
b/meta/recipes-support/db/db_5.3.28.bb
index 46536efe86f..8975647daf4 100644
--- a/meta/recipes-support/db/db_5.3.28.bb
+++ b/meta/recipes-support/db/db_5.3.28.bb
@@ -30,7 +30,7 @@ SRC_URI += "file://fix-parallel-build.patch \
# We are not interested in official latest 6.x versions;
# let's track what debian is using.
UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/db5.3/"
-UPSTREAM_CHECK_REGEX = "db5\.3_(?P.+)\.orig"
+UPSTREAM_CHECK_REGEX = "db5\.3_(?P\d+(\.\d+)+).+\.orig"
SRC_URI[md5sum] = "b99454564d5b4479750567031d66fe24"
SRC_URI[sha256sum] =
"e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/8] syslinux: fix upstream version check
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb
b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb
index a7fc21e2fc1..67e5d57d48e 100644
--- a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb
@@ -26,6 +26,10 @@ SRC_URI =
"https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz
SRC_URI[md5sum] = "2b31c78f087f99179feb357da312d7ec"
SRC_URI[sha256sum] =
"4441a5d593f85bb6e8d578cf6653fb4ec30f9e8f4a2315a3d8f2d0a8b3fadf94"
+UPSTREAM_CHECK_URI = "https://www.zytor.com/pub/syslinux/;
+UPSTREAM_CHECK_REGEX = "syslinux-(?P.+)\.tar"
+UPSTREAM_VERSION_UNKNOWN = "1"
+
COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
# Don't let the sanity checker trip on the 32 bit real mode BIOS binaries
INSANE_SKIP_${PN}-misc = "arch"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libcomps: put PV in filename
On Wed, Mar 27, 2019 at 02:33:14PM +0100, Martin Jansa wrote: > On Tue, Mar 26, 2019 at 12:42:12PM +0200, Adrian Bunk wrote: >... > > Not having the release there also loses the ability to use either > > gcc_%.bbappend or gcc_8.3.0.bbappend, which are suitable for > > different situations. > > There is usually just one version per recipe and even with _git.bb > suffix you can easily do gcc_7+git.bb and gcc_8+git.bb if you need to. Thud contains 8.2 today, but might have 8.3 tomorrow. A layer might want to append only to one of them, or have different appends for different versions. That's trivial with gcc_8.2.bb and gcc_8.3.bb, and harder with gcc_8+svn.bb. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libexif: fix CVE-2016-6328 and CVE-2018-20030
Signed-off-by: Ross Burton
---
.../libexif/libexif/CVE-2016-6328.patch| 64
.../libexif/libexif/CVE-2018-20030.patch | 115 +
meta/recipes-support/libexif/libexif_0.6.21.bb | 4 +-
3 files changed, 182 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-support/libexif/libexif/CVE-2016-6328.patch
create mode 100644 meta/recipes-support/libexif/libexif/CVE-2018-20030.patch
diff --git a/meta/recipes-support/libexif/libexif/CVE-2016-6328.patch
b/meta/recipes-support/libexif/libexif/CVE-2016-6328.patch
new file mode 100644
index 000..a6f307439bf
--- /dev/null
+++ b/meta/recipes-support/libexif/libexif/CVE-2016-6328.patch
@@ -0,0 +1,64 @@
+CVE: CVE-2016-6328
+Upstream-Status: Backport
+Signed-off-by: Ross Burton
+
+From 41bd04234b104312f54d25822f68738ba8d7133d Mon Sep 17 00:00:00 2001
+From: Marcus Meissner
+Date: Tue, 25 Jul 2017 23:44:44 +0200
+Subject: [PATCH] fixes some (not all) buffer overreads during decoding pentax
+ makernote entries.
+
+This should fix:
+https://sourceforge.net/p/libexif/bugs/125/ CVE-2016-6328
+---
+ libexif/pentax/mnote-pentax-entry.c | 16 +---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/libexif/pentax/mnote-pentax-entry.c
b/libexif/pentax/mnote-pentax-entry.c
+index d03d159..ea0429a 100644
+--- a/libexif/pentax/mnote-pentax-entry.c
b/libexif/pentax/mnote-pentax-entry.c
+@@ -425,24 +425,34 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
+ case EXIF_FORMAT_SHORT:
+ {
+ const unsigned char *data = entry->data;
+- size_t k, len = strlen(val);
++ size_t k, len = strlen(val), sizeleft;
++
++ sizeleft = entry->size;
+ for(k=0; kcomponents; k++) {
++ if (sizeleft < 2)
++ break;
+ vs = exif_get_short (data, entry->order);
+ snprintf (val+len, maxlen-len, "%i ", vs);
+ len = strlen(val);
+ data += 2;
++ sizeleft -= 2;
+ }
+ }
+ break;
+ case EXIF_FORMAT_LONG:
+ {
+ const unsigned char *data = entry->data;
+- size_t k, len = strlen(val);
++ size_t k, len = strlen(val), sizeleft;
++
++ sizeleft = entry->size;
+ for(k=0; kcomponents; k++) {
++ if (sizeleft < 4)
++ break;
+ vl = exif_get_long (data, entry->order);
+ snprintf (val+len, maxlen-len, "%li", (long
int) vl);
+ len = strlen(val);
+ data += 4;
++ sizeleft -= 4;
+ }
+ }
+ break;
+@@ -455,5 +465,5 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
+ break;
+ }
+
+- return (val);
++ return val;
+ }
diff --git a/meta/recipes-support/libexif/libexif/CVE-2018-20030.patch
b/meta/recipes-support/libexif/libexif/CVE-2018-20030.patch
new file mode 100644
index 000..76233e6dc9b
--- /dev/null
+++ b/meta/recipes-support/libexif/libexif/CVE-2018-20030.patch
@@ -0,0 +1,115 @@
+CVE: CVE-2018-20030
+Upstream-Status: Backport
+Signed-off-by: Ross Burton
+
+From 6aa11df549114ebda520dde4cdaea2f9357b2c89 Mon Sep 17 00:00:00 2001
+From: Dan Fandrich
+Date: Fri, 12 Oct 2018 16:01:45 +0200
+Subject: [PATCH] Improve deep recursion detection in
+ exif_data_load_data_content.
+
+The existing detection was still vulnerable to pathological cases
+causing DoS by wasting CPU. The new algorithm takes the number of tags
+into account to make it harder to abuse by cases using shallow recursion
+but with a very large number of tags. This improves on commit 5d28011c
+which wasn't sufficient to counter this kind of case.
+
+The limitation in the previous fix was discovered by Laurent Delosieres,
+Secunia Research at Flexera (Secunia Advisory SA84652) and is assigned
+the identifier CVE-2018-20030.
+
+diff --git a/libexif/exif-data.c b/libexif/exif-data.c
+index 67df4db..8d9897e 100644
+--- a/libexif/exif-data.c
b/libexif/exif-data.c
+@@ -35,6 +35,7 @@
+ #include
+ #include
+
++#include
+ #include
+ #include
+ #include
+@@ -344,6 +345,20 @@ if (data->ifd[(i)]->count) {
\
+ break; \
+ }
+
++/*! Calculate the recursion cost added by one level of IFD loading.
++ *
++ * The work performed is related to the cost in the exponential relation
++ * work=1.1**cost
++ */
++static unsigned int
Re: [OE-core] [PATCH] libcomps: put PV in filename
On Tue, Mar 26, 2019 at 12:42:12PM +0200, Adrian Bunk wrote:
> On Tue, Mar 26, 2019 at 11:20:17AM +0100, Martin Jansa wrote:
> > On Tue, Mar 26, 2019 at 10:00:52AM +, Burton, Ross wrote:
> > > On Tue, 26 Mar 2019 at 01:39, Khem Raj wrote:
> > > > > This isn't a git snapshot recipe but a release that is fetched over
> > > > > it. For
> > > > > clarity, put the PV in the filename.
> > > >
> > > > I think its better to keep it as it is. since its easy to trace git log
> > > > history.
> > >
> > > So should I be renaming gcc-8.3.bb to gcc_http.bb? If the argument is
> > > that the filename should contain the transport protocol and PV is
> > > embedded in the recipe so that git log is easier, we should be
> > > applying that rule consistently.
> >
> > FWIW: I agree with Khem.
> >
> > http fetcher won't (usually) fetch different version just by changing 1
> > variable inside the recipe and vice versa, renaming the recipe won't
> > fetch different SRCREV with git.
>
> Why should the name of the recipe depend on whatever fetcher is
> currently used?
>
> If the same gcc release would be fetched from the upstream SVN,
> would you argue that the recipe has to be renamed to gcc_svn.bb?
It's quite common use case to override SRCREV outside the recipe (at
least during the development) to newer SRCREV or even AUTOREV.
Using _git or _svn in recipe filename was good indicator that this might
be happening.
With e.g. http fetcher the PV is usually used in SRC_URI, so it's less
likely to be inconsistent between what version the recipe (and enduser
visible packages) say and what is actually downloaded and built.
> > If someone wants to update SRCREV in libcoms to be 10 commits behind
> > 0.1.10, is he expected to rename the recipe back to libcomps_git.bb and
> > re-add the PV variable (with new +git${SRCPV} suffix)?
> >
> > I got used to "+git${SRCPV}" being dropped when the SRCREV matches
> > exactly the git tag, but renaming the recipe and removing the PV seems
> > too much, what is the benefit of doing that?
>
> Is it actually a benefit to make it easy to switch from a release to
> some random git snapshot?
>
> This is not something that should happen frequently.
It's not about easy switching, it's about making sure that SRCREV is
updated at the same time as PV. Which is easier to notice when the 2
variables are set next to each other, than when PV is taken from the
recipe filename and SRCREV (which is the only one which matters when
downloading the source) is set inside the renamed recipe file.
> > It's not for clarity or
> > easier maintenance (at least for me), because PV next to SRCREV makes
> > much more sense to me (and helps people not to forget updating both at
> > the same time).
>
> There are not only developers, but also users.
>
> It is valuable to see from the filename whether it is a release
> (and which release it is) or some VCS snapshot.
That's why bitbake shows not only the filename (which isn't really
important for users) but also the PV set in the recipe (either through
the recipe filename or through PV variable set inside the recipe).
> Not having the release there also loses the ability to use either
> gcc_%.bbappend or gcc_8.3.0.bbappend, which are suitable for
> different situations.
There is usually just one version per recipe and even with _git.bb
suffix you can easily do gcc_7+git.bb and gcc_8+git.bb if you need to.
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] target-sdk-provides-dummy: add more perl modules to avoid populate_sdk failure
Can you specify in detail what the failure is please? It is not happening on the AB. Alex On Wed, 27 Mar 2019 at 13:59, Vincent Prince wrote: > > Signed-off-by: Vincent Prince > --- > meta/recipes-core/meta/target-sdk-provides-dummy.bb | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/meta/recipes-core/meta/target-sdk-provides-dummy.bb > b/meta/recipes-core/meta/target-sdk-provides-dummy.bb > index 60499f7..85472a8 100644 > --- a/meta/recipes-core/meta/target-sdk-provides-dummy.bb > +++ b/meta/recipes-core/meta/target-sdk-provides-dummy.bb > @@ -20,6 +20,7 @@ DUMMYPROVIDES = "\ > libxml-parser-perl \ > perl-module-bytes \ > perl-module-carp \ > +perl-module-config \ > perl-module-constant \ > perl-module-data-dumper \ > perl-module-errno \ > @@ -35,10 +36,12 @@ DUMMYPROVIDES = "\ > perl-module-getopt-long \ > perl-module-io-file \ > perl-module-overload \ > +perl-module-overloading \ > perl-module-posix \ > perl-module-thread-queue \ > perl-module-threads \ > perl-module-warnings \ > +perl-module-warnings-register \ > /bin/sh \ > /bin/bash \ > /usr/bin/env \ > -- > 2.7.4 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] target-sdk-provides-dummy: add more perl modules to avoid populate_sdk failure
Signed-off-by: Vincent Prince --- meta/recipes-core/meta/target-sdk-provides-dummy.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/meta/target-sdk-provides-dummy.bb b/meta/recipes-core/meta/target-sdk-provides-dummy.bb index 60499f7..85472a8 100644 --- a/meta/recipes-core/meta/target-sdk-provides-dummy.bb +++ b/meta/recipes-core/meta/target-sdk-provides-dummy.bb @@ -20,6 +20,7 @@ DUMMYPROVIDES = "\ libxml-parser-perl \ perl-module-bytes \ perl-module-carp \ +perl-module-config \ perl-module-constant \ perl-module-data-dumper \ perl-module-errno \ @@ -35,10 +36,12 @@ DUMMYPROVIDES = "\ perl-module-getopt-long \ perl-module-io-file \ perl-module-overload \ +perl-module-overloading \ perl-module-posix \ perl-module-thread-queue \ perl-module-threads \ perl-module-warnings \ +perl-module-warnings-register \ /bin/sh \ /bin/bash \ /usr/bin/env \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Systemd: Add pattern matching support to PACKAGECONFIG
libpcre2 is needed to enable grep option to journalctl.
Signed-off-by: Vincent Prince
---
meta/recipes-core/systemd/systemd_241.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/systemd/systemd_241.bb
b/meta/recipes-core/systemd/systemd_241.bb
index a12b9ab..9e05944 100644
--- a/meta/recipes-core/systemd/systemd_241.bb
+++ b/meta/recipes-core/systemd/systemd_241.bb
@@ -151,6 +151,7 @@ PACKAGECONFIG[nss-mymachines] =
"-Dnss-mymachines=true,-Dnss-mymachines=false"
PACKAGECONFIG[nss-resolve] = "-Dnss-resolve=true,-Dnss-resolve=false"
PACKAGECONFIG[openssl] = "-Dopenssl=true,-Dopenssl=false,openssl"
PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam,${PAM_PLUGINS}"
+PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=true,libpcre2"
PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false"
PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false"
PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] init-install-efi.sh: don't assume the fixed location of efi loader
Currently, it is true that efi loader is in the same device as the
rootfs image. But the script doesn't work when efi loader and rootfs
image are in different live devices. This change makes the script work
in this situation.
Signed-off-by: Yongxin Liu
---
.../initrdscripts/files/init-install-efi.sh| 29 --
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index b6855b5..922f97b 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -241,13 +241,28 @@ echo "Preparing boot partition..."
EFIDIR="/boot/EFI/BOOT"
mkdir -p $EFIDIR
-# Copy the efi loader
-cp /run/media/$1/EFI/BOOT/*.efi $EFIDIR
-if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
+src_boot=""
+
+for i in `ls /dev/${live_dev_name}*`; do
+i=${i#\/dev/}
+if [ -f /run/media/$i/EFI/BOOT/*.efi ]; then
+# Copy the efi loader
+cp /run/media/$i/EFI/BOOT/*.efi $EFIDIR
+src_boot=$i
+break
+fi
+done
+
+if [ -z "$src_boot" ]; then
+echo "No EFI bootloader found. Installation aborted."
+exit 1
+fi
+
+if [ -f /run/media/$src_boot/EFI/BOOT/grub.cfg ]; then
root_part_uuid=$(blkid -o value -s PARTUUID ${rootfs})
GRUBCFG="$EFIDIR/grub.cfg"
-cp /run/media/$1/EFI/BOOT/grub.cfg $GRUBCFG
+cp /run/media/$src_boot/EFI/BOOT/grub.cfg $GRUBCFG
# Update grub config for the installed image
# Delete the install entry
sed -i "/menuentry 'install'/,/^}/d" $GRUBCFG
@@ -260,11 +275,11 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
sed -i "s/ root=[^ ]*/ root=PARTUUID=$root_part_uuid rw $rootwait quiet
/g" $GRUBCFG
fi
-if [ -d /run/media/$1/loader ]; then
+if [ -d /run/media/$src_boot/loader ]; then
rootuuid=$(blkid -o value -s PARTUUID ${rootfs})
SYSTEMDBOOT_CFGS="/boot/loader/entries/*.conf"
# copy config files for systemd-boot
-cp -dr /run/media/$1/loader /boot
+cp -dr /run/media/$src_boot/loader /boot
# delete the install entry
rm -f /boot/loader/entries/install.conf
# delete the initrd lines
@@ -282,7 +297,7 @@ umount /tgt_root
# Copy kernel artifacts. To add more artifacts just add to types
# For now just support kernel types already being used by something in OE-core
for types in bzImage zImage vmlinux vmlinuz fitImage; do
-for kernel in `find /run/media/$1/ -name $types*`; do
+for kernel in `find /run/media/$src_boot/ -name $types*`; do
cp $kernel /boot
done
done
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] wic/bootimg-efi.py: add new source parameter "initrd_rename"
When using initrd in bootloader configuration file, we may want
the name of initrd to be fixed. However, the actual name of initrd
may change and depend on distro/machine's name. "initrd_rename"
gives user a chance to rename initrd in final wic image.
Signed-off-by: Yongxin Liu
---
scripts/lib/wic/plugins/source/bootimg-efi.py | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py
b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 83a7e18..852ed88 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -69,7 +69,11 @@ class BootimgEFIPlugin(SourcePlugin):
if not bootimg_dir:
raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting")
-cp_cmd = "cp %s/%s %s" % (bootimg_dir, initrd, hdddir)
+initrd_rename = source_params.get('initrd_rename')
+if initrd_rename:
+cp_cmd = "cp %s/%s %s/%s" % (bootimg_dir, initrd, hdddir,
initrd_rename)
+else:
+cp_cmd = "cp %s/%s %s" % (bootimg_dir, initrd, hdddir)
exec_cmd(cp_cmd, True)
else:
logger.debug("Ignoring missing initrd")
@@ -126,7 +130,11 @@ class BootimgEFIPlugin(SourcePlugin):
if not bootimg_dir:
raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting")
-cp_cmd = "cp %s/%s %s" % (bootimg_dir, initrd, hdddir)
+initrd_rename = source_params.get('initrd_rename')
+if initrd_rename:
+cp_cmd = "cp %s/%s %s/%s" % (bootimg_dir, initrd, hdddir,
initrd_rename)
+else:
+cp_cmd = "cp %s/%s %s" % (bootimg_dir, initrd, hdddir)
exec_cmd(cp_cmd, True)
else:
logger.debug("Ignoring missing initrd")
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cmake: 3.13.4 -> 3.14.0
The copyright date changed in the license file, thus the hash change.
CMake 3.14 fixes some issues with implicit include path that lead to
errors with gcc not finding "stdlib.h" etc in include_next.
Signed-off-by: Pascal Bach
---
...ake-native_3.13.4.bb => cmake-native_3.14.0.bb} | 0
meta/recipes-devtools/cmake/cmake.inc | 6 ++--
...ineSystem-use-oe-environment-vars-to-load.patch | 2 +-
.../0002-cmake-Prevent-the-detection-of-Qt5.patch | 39 +++---
...upport-OpenEmbedded-Qt4-tool-binary-names.patch | 4 +--
...ently-if-system-Qt-installation-is-broken.patch | 2 +-
.../cmake/{cmake_3.13.4.bb => cmake_3.14.0.bb} | 0
7 files changed, 27 insertions(+), 26 deletions(-)
rename meta/recipes-devtools/cmake/{cmake-native_3.13.4.bb =>
cmake-native_3.14.0.bb} (100%)
rename meta/recipes-devtools/cmake/{cmake_3.13.4.bb => cmake_3.14.0.bb} (100%)
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.13.4.bb
b/meta/recipes-devtools/cmake/cmake-native_3.14.0.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.13.4.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.14.0.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc
b/meta/recipes-devtools/cmake/cmake.inc
index 68a71e9139..f787851e2d 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.cmake.org/;
BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php;
SECTION = "console/utils"
LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://Copyright.txt;md5=f61f5f859bc5ddba2b050eb10335e013 \
+LIC_FILES_CHKSUM = "file://Copyright.txt;md5=622747147b46f22e1953876a7cba3323 \
file://Source/cmake.h;md5=4494dee184212fc89c469c3acd555a14;beginline=1;endline=3
\
"
@@ -18,7 +18,7 @@ SRC_URI =
"https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch
\
"
-SRC_URI[md5sum] = "b5a544ffc73f6922a6cf371fcb6bae22"
-SRC_URI[sha256sum] =
"fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b"
+SRC_URI[md5sum] = "7504e4f3e05b59e083f2127e07059d5d"
+SRC_URI[sha256sum] =
"aa76ba67b3c2af1946701f847073f4652af5cbd9f141f221c97af99127e75502"
UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar"
diff --git
a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
index f690720870..cdeea647fe 100644
---
a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
+++
b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
@@ -28,7 +28,7 @@ diff --git a/Modules/CMakeDetermineSystem.cmake
b/Modules/CMakeDetermineSystem.c
index 600d5580e..32d7f1945 100644
--- a/Modules/CMakeDetermineSystem.cmake
+++ b/Modules/CMakeDetermineSystem.cmake
-@@ -82,6 +82,13 @@ else()
+@@ -81,6 +81,13 @@ else()
endif()
endif()
diff --git
a/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch
b/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch
index 3bea6935b7..8d2dc10ce5 100644
---
a/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch
+++
b/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch
@@ -1,4 +1,4 @@
-From 7a1f4e724f9c68498f401244c2938e784a2e6fbd Mon Sep 17 00:00:00 2001
+From b4b6e9b1be33213ede3f612e87840c0045824d9e Mon Sep 17 00:00:00 2001
From: Otavio Salvador
Date: Wed, 17 Jan 2018 10:02:14 -0200
Subject: [PATCH 2/5] cmake: Prevent the detection of Qt5
@@ -16,14 +16,14 @@ Signed-off-by: Otavio Salvador
Source/QtDialog/CMakeLists.txt | 2 +-
Tests/CMakeLists.txt | 2 +-
Tests/Qt4And5Automoc/CMakeLists.txt| 4 ++--
- Tests/QtAutogen/AutogenTest.cmake | 2 +-
+ Tests/QtAutogen/AutogenGuiTest.cmake | 3 +--
Tests/QtAutogen/MacOsFW/CMakeLists.txt | 2 +-
Tests/RunCMake/CMakeLists.txt | 2 +-
Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | 2 +-
- 7 files changed, 8 insertions(+), 8 deletions(-)
+ 7 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
-index 330b74729..e7709dee6 100644
+index 9ce0323844..06c86d63eb 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -6,7 +6,7 @@ if(POLICY CMP0020)
@@ -36,10 +36,10 @@ index 330b74729..e7709dee6 100644
include_directories(${Qt5Widgets_INCLUDE_DIRS})
add_definitions(${Qt5Widgets_DEFINITONS})
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
-index b8b724ed8..63f6bb6d2 100644
+index ed98d974b0..7adfbc301b 100644
--- a/Tests/CMakeLists.txt
[OE-core] [PATCH 0/1] openssl: follow OE's rule for specifying CVE ID
*** BLURB HERE *** The following changes since commit 35742c10f531ba451c06a4e360fecfb55f358b35: ref-manual: Removed DISK_DESCRIPTION variable from glossary (2019-03-26 15:38:56 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/openssl-fixup http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/openssl-fixup Chen Qi (1): openssl: follow OE's rule for specifying CVE ID meta/recipes-connectivity/openssl/openssl/CVE-2019-1543.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] openssl: follow OE's rule for specifying CVE ID
Signed-off-by: Chen Qi --- meta/recipes-connectivity/openssl/openssl/CVE-2019-1543.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2019-1543.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2019-1543.patch index 59a92f0..900ef97 100644 --- a/meta/recipes-connectivity/openssl/openssl/CVE-2019-1543.patch +++ b/meta/recipes-connectivity/openssl/openssl/CVE-2019-1543.patch @@ -32,7 +32,7 @@ because no such use sets such a long nonce value. However user applications that use this cipher directly and set a non-default nonce length to be longer than 12 bytes may be vulnerable. -CVE-2019-1543 +CVE: CVE-2019-1543 Fixes #8345 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] libarchive: fix up CVE IDs in patches
Signed-off-by: Chen Qi --- meta/recipes-extended/libarchive/libarchive/CVE-2019-119.patch | 2 +- meta/recipes-extended/libarchive/libarchive/CVE-2019-120.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/libarchive/libarchive/CVE-2019-119.patch b/meta/recipes-extended/libarchive/libarchive/CVE-2019-119.patch index f6f1add..7f39893 100644 --- a/meta/recipes-extended/libarchive/libarchive/CVE-2019-119.patch +++ b/meta/recipes-extended/libarchive/libarchive/CVE-2019-119.patch @@ -1,4 +1,4 @@ -CVE: CVE-2018-119 +CVE: CVE-2019-119 Upstream-Status: Backport Signed-off-by: Ross Burton diff --git a/meta/recipes-extended/libarchive/libarchive/CVE-2019-120.patch b/meta/recipes-extended/libarchive/libarchive/CVE-2019-120.patch index 3e63921..25a76fd 100644 --- a/meta/recipes-extended/libarchive/libarchive/CVE-2019-120.patch +++ b/meta/recipes-extended/libarchive/libarchive/CVE-2019-120.patch @@ -1,4 +1,4 @@ -CVE: CVE-2018-120 +CVE: CVE-2019-120 Upstream-Status: Backport Signed-off-by: Ross Burton -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] libarchive: fix up CVE IDs in patches
*** BLURB HERE *** The following changes since commit 35742c10f531ba451c06a4e360fecfb55f358b35: ref-manual: Removed DISK_DESCRIPTION variable from glossary (2019-03-26 15:38:56 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/libarchive-fixup http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/libarchive-fixup Chen Qi (1): libarchive: fix up CVE IDs in patches meta/recipes-extended/libarchive/libarchive/CVE-2019-119.patch | 2 +- meta/recipes-extended/libarchive/libarchive/CVE-2019-120.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] at-spi2-core:upgrade 2.30.0 -> 2.32.0
upgrade from at-spi2-core_2.30.0.bb to at-spi2-core_2.32.0.bb
Signed-off-by: Zang Ruochen
---
.../atk/{at-spi2-core_2.30.0.bb => at-spi2-core_2.32.0.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/atk/{at-spi2-core_2.30.0.bb =>
at-spi2-core_2.32.0.bb} (92%)
diff --git a/meta/recipes-support/atk/at-spi2-core_2.30.0.bb
b/meta/recipes-support/atk/at-spi2-core_2.32.0.bb
similarity index 92%
rename from meta/recipes-support/atk/at-spi2-core_2.30.0.bb
rename to meta/recipes-support/atk/at-spi2-core_2.32.0.bb
index d0b567a5e5..0eaa7b55c5 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.30.0.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.32.0.bb
@@ -8,8 +8,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
"
-SRC_URI[md5sum] = "d4f22c66b3210ffe6b10d01c04e008b5"
-SRC_URI[sha256sum] =
"0175f5393d19da51f4c11462cba4ba6ef3fa042abf1611a70bdfed586b7bfb2b"
+SRC_URI[md5sum] = "57269004541646c4c5cf0bcb7c99bb5b"
+SRC_URI[sha256sum] =
"43a435d213f8d4b55e8ac83a46ae976948dc511bb4a515b69637cb36cf0e7220"
X11DEPENDS = "virtual/libx11 libxi libxtst"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] at-spi2-atk:upgrade 2.30.0 -> 2.32.0
upgrade from at-spi2-atk_2.30.0.bb to at-spi2-atk_2.32.0.bb
Signed-off-by: Zang Ruochen
---
.../atk/{at-spi2-atk_2.30.0.bb => at-spi2-atk_2.32.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/atk/{at-spi2-atk_2.30.0.bb =>
at-spi2-atk_2.32.0.bb} (80%)
diff --git a/meta/recipes-support/atk/at-spi2-atk_2.30.0.bb
b/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb
similarity index 80%
rename from meta/recipes-support/atk/at-spi2-atk_2.30.0.bb
rename to meta/recipes-support/atk/at-spi2-atk_2.32.0.bb
index 2244797071..8812d33d9a 100644
--- a/meta/recipes-support/atk/at-spi2-atk_2.30.0.bb
+++ b/meta/recipes-support/atk/at-spi2-atk_2.32.0.bb
@@ -3,8 +3,8 @@ HOMEPAGE =
"https://wiki.linuxfoundation.org/accessibility/d-bus;
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
-SRC_URI[archive.md5sum] = "1ad754b90bcb14244b73ca4d0c14d274"
-SRC_URI[archive.sha256sum] =
"e2e1571004ea7b105c969473ce455a95be4038fb2541471714aeb33a26da8a9a"
+SRC_URI[archive.md5sum] = "6a4b27bace3b9352721ed462b95f6291"
+SRC_URI[archive.sha256sum] =
"0b51e6d339fa2bcca3a3e3159ccea574c67b107f1ac8b00047fa60e34ce7a45c"
DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] atk:upgrade 2.30.0 -> 2.32.0
upgrade from atk_2.30.0.bb to atk_2.32.0.bb
delete atk/0001-Switch-from-filename-to-basename.patch beacuse of this
patch has been fixed
Signed-off-by: Zang Ruochen
---
...001-Switch-from-filename-to-basename.patch | 38 ---
.../atk/{atk_2.30.0.bb => atk_2.32.0.bb} | 5 +--
2 files changed, 2 insertions(+), 41 deletions(-)
delete mode 100644
meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch
rename meta/recipes-support/atk/{atk_2.30.0.bb => atk_2.32.0.bb} (86%)
diff --git
a/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch
b/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch
deleted file mode 100644
index 047e81fb61..00
--- a/meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Upstream-Status: Submitted
-
-From 0330251715fee908f2f162565d4fa1df5030d0c0 Mon Sep 17 00:00:00 2001
-From: Jeremy Puhlman
-Date: Thu, 14 Jun 2018 17:21:49 +
-Subject: [PATCH] Switch from filename to basename
-
-When atk-enum-types.h is installed in to a system, the user likely has
-no access to the location where the headers were built, especially if
-the software was built in a sysroot environment. If the headers were
-built for a mulitlib environment, the build pathing may be different.
-Subsequently, if two mulitlib variants of atk are installed together the
-headers conflict for no other reason then they were built in two
-different locations. Switching from filename to basename, still should
-provide sufficient information on the providence of the enums, while not
-conflicting for really no good reason.
-
-Signed-off-by: Jeremy Puhlman
- atk/atk-enum-types.h.template | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template
-index 7b4cec4..8321c24 100644
a/atk/atk-enum-types.h.template
-+++ b/atk/atk-enum-types.h.template
-@@ -14,7 +14,7 @@ G_BEGIN_DECLS
-
- /*** BEGIN file-production ***/
-
--/* enumerations from "@filename@" */
-+/* enumerations from "@basename@" */
- /*** END file-production ***/
-
- /*** BEGIN value-header ***/
---
-2.14.1.459.g238e487
-
diff --git a/meta/recipes-support/atk/atk_2.30.0.bb
b/meta/recipes-support/atk/atk_2.32.0.bb
similarity index 86%
rename from meta/recipes-support/atk/atk_2.30.0.bb
rename to meta/recipes-support/atk/atk_2.32.0.bb
index 4e2dacbc4d..5425c8e57e 100644
--- a/meta/recipes-support/atk/atk_2.30.0.bb
+++ b/meta/recipes-support/atk/atk_2.32.0.bb
@@ -30,10 +30,9 @@ EXTRA_OEMESON_append_class-target = "
${@bb.utils.contains('GTKDOC_ENABLED', 'Tr
SRC_URI_append = " \
file://0001-meson.build-enable-introspection-for-cross-compile.patch \
- file://0001-Switch-from-filename-to-basename.patch \
"
-SRC_URI[archive.md5sum] = "769c85005d392ad17ffbc063f2d26454"
-SRC_URI[archive.sha256sum] =
"dd4d90d4217f2a0c1fee708a96c2c19d26fef0952e1ead1938ab632c027b"
+SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d"
+SRC_URI[archive.sha256sum] =
"cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc"
BBCLASSEXTEND = "native nativesdk"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] at-spi2-atk related upgrade
upgrade at-spi2-atk and it's dependence.
The dependencies are as follows:
at-spi2-atk depends on atk
at-spi2-atk depends on at-spi2-core
Zang Ruochen (3):
[OE-core] [PATCH] atk:upgrade 2.30.0 -> 2.32.0
[OE-core] [PATCH] at-spi2-core:upgrade 2.30.0 -> 2.32.0
[OE-core] [PATCH] at-spi2-atk:upgrade 2.30.0 -> 2.32.0
...i2-atk_2.30.0.bb => at-spi2-atk_2.32.0.bb} | 4 +-
...-core_2.30.0.bb => at-spi2-core_2.32.0.bb} | 4 +-
...001-Switch-from-filename-to-basename.patch | 38 ---
.../atk/{atk_2.30.0.bb => atk_2.32.0.bb} | 5 +--
4 files changed, 6 insertions(+), 45 deletions(-)
rename meta/recipes-support/atk/{at-spi2-atk_2.30.0.bb =>
at-spi2-atk_2.32.0.bb} (80%)
rename meta/recipes-support/atk/{at-spi2-core_2.30.0.bb =>
at-spi2-core_2.32.0.bb} (92%)
delete mode 100644
meta/recipes-support/atk/atk/0001-Switch-from-filename-to-basename.patch
rename meta/recipes-support/atk/{atk_2.30.0.bb => atk_2.32.0.bb} (86%)
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
