Re: [OE-core] [PATCH 2/2] wic: plugins source bootimage/isoimage rename to allow be imported
Hi, Thanks for reporting, I will adapt the tests. Regards, Anibal On Mon, Mar 25, 2024, 04:18 Alexandre Belloni wrote: > This breaks some selftests and meta-virtualization: > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/6573/steps/14/logs/stdio > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/128/builds/3005/steps/12/logs/stdio > > > On 23/03/2024 13:53:04-0600, Anibal Limon wrote: > > Python not support importing modules with - so change to _. > > > > Signed-off-by: Anibal Limon > > --- > > .../source/{bootimg-biosplusefi.py => bootimg_biosplusefi.py} | 0 > > scripts/lib/wic/plugins/source/{bootimg-efi.py => bootimg_efi.py} | 0 > > .../plugins/source/{bootimg-partition.py => bootimg_partition.py} | 0 > > .../wic/plugins/source/{bootimg-pcbios.py => bootimg_pcbios.py} | 0 > > .../source/{isoimage-isohybrid.py => isoimage_isohybrid.py} | 0 > > 5 files changed, 0 insertions(+), 0 deletions(-) > > rename scripts/lib/wic/plugins/source/{bootimg-biosplusefi.py => > bootimg_biosplusefi.py} (100%) > > rename scripts/lib/wic/plugins/source/{bootimg-efi.py => > bootimg_efi.py} (100%) > > rename scripts/lib/wic/plugins/source/{bootimg-partition.py => > bootimg_partition.py} (100%) > > rename scripts/lib/wic/plugins/source/{bootimg-pcbios.py => > bootimg_pcbios.py} (100%) > > rename scripts/lib/wic/plugins/source/{isoimage-isohybrid.py => > isoimage_isohybrid.py} (100%) > > > > diff --git a/scripts/lib/wic/plugins/source/bootimg-biosplusefi.py > b/scripts/lib/wic/plugins/source/bootimg_biosplusefi.py > > similarity index 100% > > rename from scripts/lib/wic/plugins/source/bootimg-biosplusefi.py > > rename to scripts/lib/wic/plugins/source/bootimg_biosplusefi.py > > diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py > b/scripts/lib/wic/plugins/source/bootimg_efi.py > > similarity index 100% > > rename from scripts/lib/wic/plugins/source/bootimg-efi.py > > rename to scripts/lib/wic/plugins/source/bootimg_efi.py > > diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py > b/scripts/lib/wic/plugins/source/bootimg_partition.py > > similarity index 100% > > rename from scripts/lib/wic/plugins/source/bootimg-partition.py > > rename to scripts/lib/wic/plugins/source/bootimg_partition.py > > diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py > b/scripts/lib/wic/plugins/source/bootimg_pcbios.py > > similarity index 100% > > rename from scripts/lib/wic/plugins/source/bootimg-pcbios.py > > rename to scripts/lib/wic/plugins/source/bootimg_pcbios.py > > diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py > b/scripts/lib/wic/plugins/source/isoimage_isohybrid.py > > similarity index 100% > > rename from scripts/lib/wic/plugins/source/isoimage-isohybrid.py > > rename to scripts/lib/wic/plugins/source/isoimage_isohybrid.py > > -- > > 2.43.0 > > > > > > > > > > > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#197487): https://lists.openembedded.org/g/openembedded-core/message/197487 Mute This Topic: https://lists.openembedded.org/mt/105108998/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/2] wic: bootimg-partition allow to set var to get boot files
This is a generic functionality that takes a set of files and create a boot parition based on IMAGE_BOOT_FILES var, allow to sepcify the variable name so a BSP plugin can extend this and re-use the functionality. Signed-off-by: Anibal Limon --- scripts/lib/wic/plugins/source/bootimg-partition.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py index 58f6da72c3..1071d1af3f 100644 --- a/scripts/lib/wic/plugins/source/bootimg-partition.py +++ b/scripts/lib/wic/plugins/source/bootimg-partition.py @@ -32,6 +32,7 @@ class BootimgPartitionPlugin(SourcePlugin): """ name = 'bootimg-partition' +image_boot_files_var_name = 'IMAGE_BOOT_FILES' @classmethod def do_configure_partition(cls, part, source_params, cr, cr_workdir, @@ -56,12 +57,12 @@ class BootimgPartitionPlugin(SourcePlugin): else: var = "" -boot_files = get_bitbake_var("IMAGE_BOOT_FILES" + var) +boot_files = get_bitbake_var(cls.image_boot_files_var_name + var) if boot_files is not None: break if boot_files is None: -raise WicError('No boot files defined, IMAGE_BOOT_FILES unset for entry #%d' % part.lineno) +raise WicError('No boot files defined, %s unset for entry #%d' % (cls.image_boot_files_var_name, part.lineno)) logger.debug('Boot files: %s', boot_files) -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#197470): https://lists.openembedded.org/g/openembedded-core/message/197470 Mute This Topic: https://lists.openembedded.org/mt/105108997/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/2] wic: plugins source bootimage/isoimage rename to allow be imported
Python not support importing modules with - so change to _. Signed-off-by: Anibal Limon --- .../source/{bootimg-biosplusefi.py => bootimg_biosplusefi.py} | 0 scripts/lib/wic/plugins/source/{bootimg-efi.py => bootimg_efi.py} | 0 .../plugins/source/{bootimg-partition.py => bootimg_partition.py} | 0 .../wic/plugins/source/{bootimg-pcbios.py => bootimg_pcbios.py} | 0 .../source/{isoimage-isohybrid.py => isoimage_isohybrid.py} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename scripts/lib/wic/plugins/source/{bootimg-biosplusefi.py => bootimg_biosplusefi.py} (100%) rename scripts/lib/wic/plugins/source/{bootimg-efi.py => bootimg_efi.py} (100%) rename scripts/lib/wic/plugins/source/{bootimg-partition.py => bootimg_partition.py} (100%) rename scripts/lib/wic/plugins/source/{bootimg-pcbios.py => bootimg_pcbios.py} (100%) rename scripts/lib/wic/plugins/source/{isoimage-isohybrid.py => isoimage_isohybrid.py} (100%) diff --git a/scripts/lib/wic/plugins/source/bootimg-biosplusefi.py b/scripts/lib/wic/plugins/source/bootimg_biosplusefi.py similarity index 100% rename from scripts/lib/wic/plugins/source/bootimg-biosplusefi.py rename to scripts/lib/wic/plugins/source/bootimg_biosplusefi.py diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg_efi.py similarity index 100% rename from scripts/lib/wic/plugins/source/bootimg-efi.py rename to scripts/lib/wic/plugins/source/bootimg_efi.py diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg_partition.py similarity index 100% rename from scripts/lib/wic/plugins/source/bootimg-partition.py rename to scripts/lib/wic/plugins/source/bootimg_partition.py diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg_pcbios.py similarity index 100% rename from scripts/lib/wic/plugins/source/bootimg-pcbios.py rename to scripts/lib/wic/plugins/source/bootimg_pcbios.py diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage_isohybrid.py similarity index 100% rename from scripts/lib/wic/plugins/source/isoimage-isohybrid.py rename to scripts/lib/wic/plugins/source/isoimage_isohybrid.py -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#197471): https://lists.openembedded.org/g/openembedded-core/message/197471 Mute This Topic: https://lists.openembedded.org/mt/105108998/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH][dunfell] lttng-modules: do not search in non-existing folder during install
Hi, Any update on push this to dunfell?, I'm facing the issue, https://ci.linaro.org/job/lt-qcom-openembedded-meta-qcom-premerge-dunfell/46/MACHINE=dragonboard-410c,TCLIBC=glibc,label=docker-buster-amd64/console Thanks in advance!, Anibal On Wed, 8 Dec 2021 at 14:21, Anibal Limon via lists.openembedded.org wrote: > From: Andrey Zhizhikin > > When CONFIG_TRACEPOINTS is not enabled in kernel config - module > compilation is skipped, which causes the ${D}/${nonarch_base_libdir} not > to be created. > > This fails later in do_install:append() due to the fact that find > command in executed for non-existing folder. > > Check for folder existence before find command in executed. > > Signed-off-by: Andrey Zhizhikin > Signed-off-by: Richard Purdie > (cherry picked from commit de0aa1700ed4e6f04b0a233eb1f6d2ac598e7ed8) > Signed-off-by: Aníbal Limón > --- > meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb > b/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb > index 3fdc8094e9..3145f0298c 100644 > --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb > +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb > @@ -39,7 +39,9 @@ EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'" > > do_install_append() { > # Delete empty directories to avoid QA failures if no modules were > built > - find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir > {} \; > + if [ -d ${D}/${nonarch_base_libdir} ]; then > + find ${D}/${nonarch_base_libdir} -depth -type d -empty > -exec rmdir {} \; > + fi > } > > python do_package_prepend() { > -- > 2.34.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159706): https://lists.openembedded.org/g/openembedded-core/message/159706 Mute This Topic: https://lists.openembedded.org/mt/87597519/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH][dunfell] lttng-modules: do not search in non-existing folder during install
From: Andrey Zhizhikin When CONFIG_TRACEPOINTS is not enabled in kernel config - module compilation is skipped, which causes the ${D}/${nonarch_base_libdir} not to be created. This fails later in do_install:append() due to the fact that find command in executed for non-existing folder. Check for folder existence before find command in executed. Signed-off-by: Andrey Zhizhikin Signed-off-by: Richard Purdie (cherry picked from commit de0aa1700ed4e6f04b0a233eb1f6d2ac598e7ed8) Signed-off-by: Aníbal Limón --- meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb index 3fdc8094e9..3145f0298c 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb @@ -39,7 +39,9 @@ EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'" do_install_append() { # Delete empty directories to avoid QA failures if no modules were built - find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \; + if [ -d ${D}/${nonarch_base_libdir} ]; then + find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \; + fi } python do_package_prepend() { -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#159365): https://lists.openembedded.org/g/openembedded-core/message/159365 Mute This Topic: https://lists.openembedded.org/mt/87597519/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCHv3] waffle: add explicit dependency to cmake-native
On Tue, 23 Nov 2021 at 16:40, Richard Purdie < richard.pur...@linuxfoundation.org> wrote: > On Tue, 2021-11-23 at 12:00 -0600, Anibal Limon wrote: > > Hi, > > > > Is this patch good enough? or need another change. > > There was feedback about the commit message needing work. Someone else > also sent > a similar patch with a commit message with the right explanation in it so > that > was merged in preference but the issue should be fixed. > > > http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=50e0aed0684526c74072ceaf8fa52964c9cc0d19 Great!, Regards, Anibal > > > Cheers, > > Richard > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158779): https://lists.openembedded.org/g/openembedded-core/message/158779 Mute This Topic: https://lists.openembedded.org/mt/87073490/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCHv3] waffle: add explicit dependency to cmake-native
Hi, Is this patch good enough? or need another change. Regards!, Anibal On Mon, 15 Nov 2021 at 10:36, Anibal Limon via lists.openembedded.org wrote: > cmake-native can get pulled into the sysroot via dependencies, but it > is always needed: > > | Program cmake found: NO > | ERROR: meson failed > > Fixes, > > ... > File > "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/site-packages/mesonbuild/modules/cmake.py", > line 241, in detect_cmake > p, stdout, stderr = mesonlib.Popen_safe(cmakebin.get_command() + > ['--system-information', '-G', 'Ninja'])[0:3] > File > "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/site-packages/mesonbuild/mesonlib/universal.py", > line 1397, in Popen_safe > p = subprocess.Popen(args, universal_newlines=True, close_fds=False, > File > "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/subprocess.py", > line 966, in __init__ > self._execute_child(args, executable, preexec_fn, close_fds, > File > "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/subprocess.py", > line 1717, in _execute_child > and os.path.dirname(executable) > File > "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/posixpath.py", > line 152, in dirname > p = os.fspath(p) > ... > > Not inherit cmake class because expects meson-log.txt, > > ... > > File: 'exec_func_python() autogenerated', lineno: 2, function: >0001: >*** 0002:meson_do_qa_configure(d) >0003: > File: > '/home/builds/oe-rpb-master/build-410c/conf/../../layers/openembedded-core/meta/classes/meson.bbclass', > lineno: 130, function: meson_do_qa_configure >0126: >0127:python meson_do_qa_configure() { >0128:import re >0129:warn_re = re.compile(r"^WARNING: Cross property (.+) is > using default value (.+)$", re.MULTILINE) >*** 0130:with open(d.expand("${B}/meson-logs/meson-log.txt")) as > logfile: >0131:log = logfile.read() >0132:for (prop, value) in warn_re.findall(log): >0133:bb.warn("Meson cross property %s used without explicit > assignment, defaulting to %s" % (prop, value)) >0134:} > Exception: FileNotFoundError: [Errno 2] No such file or directory: > '/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/build/meson-logs/meson-log.txt' > ... > > Signed-off-by: Aníbal Limón > --- > meta/recipes-graphics/waffle/waffle_1.7.0.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-graphics/waffle/waffle_1.7.0.bb > b/meta/recipes-graphics/waffle/waffle_1.7.0.bb > index 6284af3076..ea11309940 100644 > --- a/meta/recipes-graphics/waffle/waffle_1.7.0.bb > +++ b/meta/recipes-graphics/waffle/waffle_1.7.0.bb > @@ -17,7 +17,7 @@ S = "${WORKDIR}/git" > > inherit meson features_check lib_package bash-completion pkgconfig > > -DEPENDS:append = " python3" > +DEPENDS:append = " python3 cmake-native" > > # This should be overridden per-machine to reflect the capabilities of > the GL > # stack. > -- > 2.33.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158615): https://lists.openembedded.org/g/openembedded-core/message/158615 Mute This Topic: https://lists.openembedded.org/mt/87073490/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv3] waffle: add explicit dependency to cmake-native
cmake-native can get pulled into the sysroot via dependencies, but it is always needed: | Program cmake found: NO | ERROR: meson failed Fixes, ... File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/site-packages/mesonbuild/modules/cmake.py", line 241, in detect_cmake p, stdout, stderr = mesonlib.Popen_safe(cmakebin.get_command() + ['--system-information', '-G', 'Ninja'])[0:3] File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/site-packages/mesonbuild/mesonlib/universal.py", line 1397, in Popen_safe p = subprocess.Popen(args, universal_newlines=True, close_fds=False, File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/subprocess.py", line 966, in __init__ self._execute_child(args, executable, preexec_fn, close_fds, File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/subprocess.py", line 1717, in _execute_child and os.path.dirname(executable) File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/posixpath.py", line 152, in dirname p = os.fspath(p) ... Not inherit cmake class because expects meson-log.txt, ... File: 'exec_func_python() autogenerated', lineno: 2, function: 0001: *** 0002:meson_do_qa_configure(d) 0003: File: '/home/builds/oe-rpb-master/build-410c/conf/../../layers/openembedded-core/meta/classes/meson.bbclass', lineno: 130, function: meson_do_qa_configure 0126: 0127:python meson_do_qa_configure() { 0128:import re 0129:warn_re = re.compile(r"^WARNING: Cross property (.+) is using default value (.+)$", re.MULTILINE) *** 0130:with open(d.expand("${B}/meson-logs/meson-log.txt")) as logfile: 0131:log = logfile.read() 0132:for (prop, value) in warn_re.findall(log): 0133:bb.warn("Meson cross property %s used without explicit assignment, defaulting to %s" % (prop, value)) 0134:} Exception: FileNotFoundError: [Errno 2] No such file or directory: '/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/build/meson-logs/meson-log.txt' ... Signed-off-by: Aníbal Limón --- meta/recipes-graphics/waffle/waffle_1.7.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/waffle/waffle_1.7.0.bb b/meta/recipes-graphics/waffle/waffle_1.7.0.bb index 6284af3076..ea11309940 100644 --- a/meta/recipes-graphics/waffle/waffle_1.7.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.7.0.bb @@ -17,7 +17,7 @@ S = "${WORKDIR}/git" inherit meson features_check lib_package bash-completion pkgconfig -DEPENDS:append = " python3" +DEPENDS:append = " python3 cmake-native" # This should be overridden per-machine to reflect the capabilities of the GL # stack. -- 2.33.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158305): https://lists.openembedded.org/g/openembedded-core/message/158305 Mute This Topic: https://lists.openembedded.org/mt/87073490/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv2] recipe-graphics/waffle: Add depends on cmake-native
Fixes, ... File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/site-packages/mesonbuild/modules/cmake.py", line 241, in detect_cmake p, stdout, stderr = mesonlib.Popen_safe(cmakebin.get_command() + ['--system-information', '-G', 'Ninja'])[0:3] File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/site-packages/mesonbuild/mesonlib/universal.py", line 1397, in Popen_safe p = subprocess.Popen(args, universal_newlines=True, close_fds=False, File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/subprocess.py", line 966, in __init__ self._execute_child(args, executable, preexec_fn, close_fds, File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/subprocess.py", line 1717, in _execute_child and os.path.dirname(executable) File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/posixpath.py", line 152, in dirname p = os.fspath(p) ... Not inherit cmake class because expects meson-log.txt, ... File: 'exec_func_python() autogenerated', lineno: 2, function: 0001: *** 0002:meson_do_qa_configure(d) 0003: File: '/home/builds/oe-rpb-master/build-410c/conf/../../layers/openembedded-core/meta/classes/meson.bbclass', lineno: 130, function: meson_do_qa_configure 0126: 0127:python meson_do_qa_configure() { 0128:import re 0129:warn_re = re.compile(r"^WARNING: Cross property (.+) is using default value (.+)$", re.MULTILINE) *** 0130:with open(d.expand("${B}/meson-logs/meson-log.txt")) as logfile: 0131:log = logfile.read() 0132:for (prop, value) in warn_re.findall(log): 0133:bb.warn("Meson cross property %s used without explicit assignment, defaulting to %s" % (prop, value)) 0134:} Exception: FileNotFoundError: [Errno 2] No such file or directory: '/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/build/meson-logs/meson-log.txt' ... Signed-off-by: Aníbal Limón --- meta/recipes-graphics/waffle/waffle_1.7.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/waffle/waffle_1.7.0.bb b/meta/recipes-graphics/waffle/waffle_1.7.0.bb index 6284af3076..ea11309940 100644 --- a/meta/recipes-graphics/waffle/waffle_1.7.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.7.0.bb @@ -17,7 +17,7 @@ S = "${WORKDIR}/git" inherit meson features_check lib_package bash-completion pkgconfig -DEPENDS:append = " python3" +DEPENDS:append = " python3 cmake-native" # This should be overridden per-machine to reflect the capabilities of the GL # stack. -- 2.33.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158193): https://lists.openembedded.org/g/openembedded-core/message/158193 Mute This Topic: https://lists.openembedded.org/mt/86987139/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] recipe-graphics: Add depends on cmake-native
Fixes, ... File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/site-packages/mesonbuild/modules/cmake.py", line 241, in detect_cmake p, stdout, stderr = mesonlib.Popen_safe(cmakebin.get_command() + ['--system-information', '-G', 'Ninja'])[0:3] File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/site-packages/mesonbuild/mesonlib/universal.py", line 1397, in Popen_safe p = subprocess.Popen(args, universal_newlines=True, close_fds=False, File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/subprocess.py", line 966, in __init__ self._execute_child(args, executable, preexec_fn, close_fds, File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/subprocess.py", line 1717, in _execute_child and os.path.dirname(executable) File "/home/builds/oe-rpb-master/build-410c/tmp-rpb-glibc/work/cortexa53-linaro-linux/waffle/1.7.0-r0/recipe-sysroot-native/usr/lib/python3.10/posixpath.py", line 152, in dirname p = os.fspath(p) ... Signed-off-by: Aníbal Limón --- meta/recipes-graphics/waffle/waffle_1.7.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/waffle/waffle_1.7.0.bb b/meta/recipes-graphics/waffle/waffle_1.7.0.bb index 6284af3076..ea11309940 100644 --- a/meta/recipes-graphics/waffle/waffle_1.7.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.7.0.bb @@ -17,7 +17,7 @@ S = "${WORKDIR}/git" inherit meson features_check lib_package bash-completion pkgconfig -DEPENDS:append = " python3" +DEPENDS:append = " python3 cmake-native" # This should be overridden per-machine to reflect the capabilities of the GL # stack. -- 2.33.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158122): https://lists.openembedded.org/g/openembedded-core/message/158122 Mute This Topic: https://lists.openembedded.org/mt/86971860/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] recipes-support/ptest-runner: Bump to v2.4.2
Changes, bcb8280 utils.c: add system data collection when a test gets stuck. c29240c utils.c: handle test timeouts directly with poll() d6f509f tests/utils.c: fix a memory corruption in find_word c10e747 main: Do not return number of failed tests when calling ptest-runner 4958988 utils.c: fix memory leak in run_ptests() fcfa6a1 clang: clean-ups to avoid -Weverything warnings. 215e52d Makefile: allow using CC env var to pick compiler fdd233d mem: Simplify memory management e5e218a mem: Fix memleak for ptest_opts 0dc42eb git: Extend the gitignore Signed-off-by: Aníbal Limón --- .../{ptest-runner_2.4.1.bb => ptest-runner_2.4.2.bb}| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/ptest-runner/{ptest-runner_2.4.1.bb => ptest-runner_2.4.2.bb} (93%) diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.4.1.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb similarity index 93% rename from meta/recipes-support/ptest-runner/ptest-runner_2.4.1.bb rename to meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb index c6a1ab1781..1d3c24a177 100644 --- a/meta/recipes-support/ptest-runner/ptest-runner_2.4.1.bb +++ b/meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/; LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "cce0edb4282ee081d043030bfdf29f3e4052f86c" +SRCREV = "bcb82804daa8f725b6add259dcef2067e61a75aa" PV .= "+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/ptest-runner2 \ -- 2.33.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#156397): https://lists.openembedded.org/g/openembedded-core/message/156397 Mute This Topic: https://lists.openembedded.org/mt/85908558/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [dunfell][PATCH] build-appliance-image: Update to master head revision
From: Richard Purdie Signed-off-by: Richard Purdie --- meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 925235db60..1aeb952db2 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -24,7 +24,7 @@ IMAGE_FSTYPES = "wic.vmdk wic.vhd wic.vhdx" inherit core-image setuptools3 -SRCREV ?= "c6483187f96c6d21b7129ad78de3ff976fbe5970" +SRCREV ?= "42514ade8bdb9502f49a56752561f6c2e9f23348" SRC_URI = "git://git.yoctoproject.org/poky \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ -- 2.31.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150270): https://lists.openembedded.org/g/openembedded-core/message/150270 Mute This Topic: https://lists.openembedded.org/mt/81916773/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] meta/recipes-support: ptest-runner bump to 2.4.1
Changes, cce0edb utils.c: wait_child reimplement timeout using alarm acbba90 utils.c: Use a thread to read from child cb2840a utils.c: Fix exit status of a child 77bc79e utils.c: get_available_ptests allow to specify relative directories d27e242 README.md: Small fix mtrace call c5d5831 tests/utils.c: Add braces in START_TEST/END_TEST now required in check 0.15.x Signed-off-by: Aníbal Limón --- .../{ptest-runner_2.4.0.bb => ptest-runner_2.4.1.bb}| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/ptest-runner/{ptest-runner_2.4.0.bb => ptest-runner_2.4.1.bb} (93%) diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.4.0.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.4.1.bb similarity index 93% rename from meta/recipes-support/ptest-runner/ptest-runner_2.4.0.bb rename to meta/recipes-support/ptest-runner/ptest-runner_2.4.1.bb index 8b9938f572..ba0eb03799 100644 --- a/meta/recipes-support/ptest-runner/ptest-runner_2.4.0.bb +++ b/meta/recipes-support/ptest-runner/ptest-runner_2.4.1.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/; LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "834670317bd3f6e427e1ac461c07ada6b8936dfd" +SRCREV = "cce0edb4282ee081d043030bfdf29f3e4052f86c" PV .= "+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/ptest-runner2 \ -- 2.31.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150067): https://lists.openembedded.org/g/openembedded-core/message/150067 Mute This Topic: https://lists.openembedded.org/mt/81711469/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [dunfell][PATCH] pseudo: Bump to rev 60e25a3
I'm still getting this error, I don't know if this patch will be applied. Regards, Anibal On Tue, 23 Feb 2021 at 01:04, Ilias Apalodimas wrote: > On Mon, Feb 22, 2021 at 03:45:08PM -0600, Aníbal Limón wrote: > > Changes, > > > > 60e25a3 (HEAD -> oe-core, origin/oe-core) makewrappers: Fix glibc 2.33 > fstatat usage issues > > 77d2898 ports/linux: Add wrapper for fstatat/fstatat64 in glibc 2.33 > > d03de55 ports/rename/renameat: Avoid race when renaming files > > c838d8c ports/unix: Add faccessat and faccessat2 > > 7720723 ports/access.c: Use EACCES, not EPERM > > f332f56 linux/portdefs.h: Fix pseudo to work with glibc 2.33 > > > > Fixes, > > > > ... > > Exception: subprocess.CalledProcessError: Command 'tar -cf - -C > /home/builds/oe-rpb-dunfell/build-410c/tmp-rpb-glibc/work/all-linaro-linux/os-release/1.0-r0/image > -p -S . | tar -xf - -C > /home/builds/oe-rpb-dunfell/build-410c/tmp-rpb-glibc/work/all-linaro-linux/os-release/1.0-r0/package' > returned non-zero exit status 134. > > > > Subprocess output: > > abort()ing pseudo client by server request. See > https://wiki.yoctoproject.org/wiki/Pseudo_Abort for more details on this. > > Check logfile: > /home/builds/oe-rpb-dunfell/build-410c/tmp-rpb-glibc/work/all-linaro-linux/os-release/1.0-r0/pseudo//pseudo.log > > Aborted > > ... > > > > Signed-off-by: Aníbal Limón > > --- > > meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb > b/meta/recipes-devtools/pseudo/pseudo_git.bb > > index 0ba7b50355..17bd02c27c 100644 > > --- a/meta/recipes-devtools/pseudo/pseudo_git.bb > > +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb > > @@ -6,7 +6,7 @@ SRC_URI = "git:// > git.yoctoproject.org/pseudo;branch=oe-core \ > > file://fallback-group \ > > " > > > > -SRCREV = "8317c0ab172db47dabcef909bae02cd77b1f1010" > > +SRCREV = "60e25a36558f1f07dcce1a044fe976b475bec42b" > > S = "${WORKDIR}/git" > > PV = "1.9.0+git${SRCPV}" > > > > -- > > 2.30.1 > > > > FWIW > Tested-by: Ilias Apalodimas > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148910): https://lists.openembedded.org/g/openembedded-core/message/148910 Mute This Topic: https://lists.openembedded.org/mt/80837051/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] glib-2.0: replace THISDIR instead of COREBASE in find_meson_cross_files --cross-file paths
On Tue, 2 Mar 2021 at 11:32, Martin Jansa wrote: > what's the value of COREBASE in that build? Wasn't full path already in > your sstate signatures - in that case this change didn't break your builds, > just highlighted an issue in your builds which was already there. > > Our COREBASE is, COREBASE="/home/builds/oe-rpb-master/layers/openembedded-core" Expands as follows, ... # $COREBASE [3 operations] # set /home/builds/oe-rpb-master/build-845c/conf/../../layers/openembedded-core/meta/conf/layer.conf:20 # "${@os.path.normpath("${LAYERDIR}/../")}" # set data_smart.py:931 [expandVarref] # "${@os.path.normpath("/home/builds/oe-rpb-master/build-845c/conf/../../layers/openembedded-core/meta/../")}" # set /home/builds/oe-rpb-master/build-845c/conf/../../layers/openembedded-core/meta/conf/documentation.conf:124 # [doc] "Specifies the parent directory of the OpenEmbedded Core Metadata layer (i.e. meta)." # pre-expansion value: # "${@os.path.normpath("/home/builds/oe-rpb-master/build-845c/conf/../../layers/openembedded-core/meta/../")}" COREBASE="/home/builds/oe-rpb-master/layers/openembedded-core" ... > We can fix that by calling os.path.normpath on THISDIR, but I would like > to know the reason why THISDIR is set this way for you (also to reproduce > it locally to verify the fix). > I tried it and fixes the issue, -thisdir = d.getVar("THISDIR") +thisdir = os.path.normpath(d.getVar("THISDIR")) We use the next config files for bblayers and local.conf, https://github.com/96boards/oe-rpb-manifest/tree/qcom/master/conf Regards, Anibal > > > > On Tue, Mar 2, 2021 at 6:14 PM Anibal Limon > wrote: > >> This breaks our builds, >> >> ... >> ERROR: Cannot add >> '/home/builds/oe-rpb-master/layers/openembedded-core/meta/recipes-core/glib-2.0/files/meson.cross.d/common' >> to --cross-file, because it's not relative to THISDIR >> '/home/builds/oe-rpb-master/build-410c-2/conf/../../layers/openembedded-core/meta/recipes-core/glib-2.0' >> and sstate signature would contain this full path >> ... >> >> In, >> >> >> https://ci.linaro.org/job/lt-qcom-openembedded-rpb-master/DISTRO=rpb,MACHINE=dragonboard-410c,label=docker-buster-amd64/470/console >> >> Regards, >> Anibal >> >> On Thu, 25 Feb 2021 at 11:45, Martin Jansa >> wrote: >> >>> * COREBASE works correctly only as long as this recipe is inside of >>> COREBASE directory and leaves the full absolute paths if you copy >>> this recipe into your own layer (e.g. to backport newer version) >>> >>> * use THISDIR as all FILESPATH should be relative to that, unless >>> there is a .bbappend not only extending FILESPATH, but also adding >>> meson.cross.d files there (at which point it also didn't work with >>> COREBASE replacements as well already) - show an ERROR in such case, >>> I don't think it's common scenario to spend more time to support that. >>> >>> Signed-off-by: Martin Jansa >>> --- >>> meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb | 8 ++-- >>> 1 file changed, 6 insertions(+), 2 deletions(-) >>> >>> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb >>> b/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb >>> index 15e9dbaf6f..882a89da7a 100644 >>> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb >>> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb >>> @@ -31,7 +31,7 @@ def find_meson_cross_files(d): >>> if bb.data.inherits_class('native', d): >>> return "" >>> >>> -corebase = d.getVar("COREBASE") >>> +thisdir = d.getVar("THISDIR") >>> import collections >>> sitedata = siteinfo_data(d) >>> # filename -> found >>> @@ -39,7 +39,11 @@ def find_meson_cross_files(d): >>> for path in d.getVar("FILESPATH").split(":"): >>> for element in sitedata: >>> filename = os.path.normpath(os.path.join(path, >>> "meson.cross.d", element)) >>> -files[filename.replace(corebase, "${COREBASE}")] = >>> os.path.exists(filename) >>> +sanitized_path = filename.replace(thisdir, "${THISDIR}") >>> +if sanitized_path == filename: >>> +bb.error("Cannot add '%s' to --cross-file, because it's >>> not relative to THISDIR '%s' and sstate signature would contain this full >>> path" % (filename, thisdir)) >>> +continue >>> +files[filename.replace(thisdir, "${THISDIR}")] = >>> os.path.exists(filename) >>> >>> items = ["--cross-file=" + k for k,v in files.items() if v] >>> d.appendVar("EXTRA_OEMESON", " " + " ".join(items)) >>> -- >>> 2.27.0 >>> >>> >>> >>> >>> -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148868): https://lists.openembedded.org/g/openembedded-core/message/148868 Mute This Topic: https://lists.openembedded.org/mt/80907807/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] glib-2.0: replace THISDIR instead of COREBASE in find_meson_cross_files --cross-file paths
This breaks our builds, ... ERROR: Cannot add '/home/builds/oe-rpb-master/layers/openembedded-core/meta/recipes-core/glib-2.0/files/meson.cross.d/common' to --cross-file, because it's not relative to THISDIR '/home/builds/oe-rpb-master/build-410c-2/conf/../../layers/openembedded-core/meta/recipes-core/glib-2.0' and sstate signature would contain this full path ... In, https://ci.linaro.org/job/lt-qcom-openembedded-rpb-master/DISTRO=rpb,MACHINE=dragonboard-410c,label=docker-buster-amd64/470/console Regards, Anibal On Thu, 25 Feb 2021 at 11:45, Martin Jansa wrote: > * COREBASE works correctly only as long as this recipe is inside of > COREBASE directory and leaves the full absolute paths if you copy > this recipe into your own layer (e.g. to backport newer version) > > * use THISDIR as all FILESPATH should be relative to that, unless > there is a .bbappend not only extending FILESPATH, but also adding > meson.cross.d files there (at which point it also didn't work with > COREBASE replacements as well already) - show an ERROR in such case, > I don't think it's common scenario to spend more time to support that. > > Signed-off-by: Martin Jansa > --- > meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb | 8 ++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb > b/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb > index 15e9dbaf6f..882a89da7a 100644 > --- a/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb > +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.66.7.bb > @@ -31,7 +31,7 @@ def find_meson_cross_files(d): > if bb.data.inherits_class('native', d): > return "" > > -corebase = d.getVar("COREBASE") > +thisdir = d.getVar("THISDIR") > import collections > sitedata = siteinfo_data(d) > # filename -> found > @@ -39,7 +39,11 @@ def find_meson_cross_files(d): > for path in d.getVar("FILESPATH").split(":"): > for element in sitedata: > filename = os.path.normpath(os.path.join(path, > "meson.cross.d", element)) > -files[filename.replace(corebase, "${COREBASE}")] = > os.path.exists(filename) > +sanitized_path = filename.replace(thisdir, "${THISDIR}") > +if sanitized_path == filename: > +bb.error("Cannot add '%s' to --cross-file, because it's > not relative to THISDIR '%s' and sstate signature would contain this full > path" % (filename, thisdir)) > +continue > +files[filename.replace(thisdir, "${THISDIR}")] = > os.path.exists(filename) > > items = ["--cross-file=" + k for k,v in files.items() if v] > d.appendVar("EXTRA_OEMESON", " " + " ".join(items)) > -- > 2.27.0 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148858): https://lists.openembedded.org/g/openembedded-core/message/148858 Mute This Topic: https://lists.openembedded.org/mt/80907807/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [dunfell][PATCH] pseudo: Bump to rev 60e25a3
Changes, 60e25a3 (HEAD -> oe-core, origin/oe-core) makewrappers: Fix glibc 2.33 fstatat usage issues 77d2898 ports/linux: Add wrapper for fstatat/fstatat64 in glibc 2.33 d03de55 ports/rename/renameat: Avoid race when renaming files c838d8c ports/unix: Add faccessat and faccessat2 7720723 ports/access.c: Use EACCES, not EPERM f332f56 linux/portdefs.h: Fix pseudo to work with glibc 2.33 Fixes, ... Exception: subprocess.CalledProcessError: Command 'tar -cf - -C /home/builds/oe-rpb-dunfell/build-410c/tmp-rpb-glibc/work/all-linaro-linux/os-release/1.0-r0/image -p -S . | tar -xf - -C /home/builds/oe-rpb-dunfell/build-410c/tmp-rpb-glibc/work/all-linaro-linux/os-release/1.0-r0/package' returned non-zero exit status 134. Subprocess output: abort()ing pseudo client by server request. See https://wiki.yoctoproject.org/wiki/Pseudo_Abort for more details on this. Check logfile: /home/builds/oe-rpb-dunfell/build-410c/tmp-rpb-glibc/work/all-linaro-linux/os-release/1.0-r0/pseudo//pseudo.log Aborted ... Signed-off-by: Aníbal Limón --- meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 0ba7b50355..17bd02c27c 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -6,7 +6,7 @@ SRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \ file://fallback-group \ " -SRCREV = "8317c0ab172db47dabcef909bae02cd77b1f1010" +SRCREV = "60e25a36558f1f07dcce1a044fe976b475bec42b" S = "${WORKDIR}/git" PV = "1.9.0+git${SRCPV}" -- 2.30.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148498): https://lists.openembedded.org/g/openembedded-core/message/148498 Mute This Topic: https://lists.openembedded.org/mt/80837051/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 6/7] native: Stop clearing PACKAGES
On Sun, 31 Jan 2021 at 07:10, Martin Jansa wrote: > On Sun, Jan 31, 2021 at 10:34:48AM +, Richard Purdie wrote: > > On Sun, 2021-01-31 at 10:55 +0100, Martin Jansa wrote: > > > On Sun, Jan 31, 2021 at 09:07:50AM +, Richard Purdie wrote: > > > > On Sat, 2021-01-30 at 17:15 +0100, Martin Jansa wrote: > > > > > I'm asking because meta-python2 has the same issue in: > > > > > > https://git.openembedded.org/meta-python2/tree/recipes-devtools/python/python-setuptools.inc#n49 > > > > > > > > > > and my fix I was planing to send was to replace it with: > > > > > RDEPENDS_${PN}_append_class-target = " ${PYTHON_PN}-pkg-resources" > > > > > and drop the RPROVIDES, because it unfortunately causes bitbake to > > > > > get stuck after reporting parsing error as: > > > > > > > > > > ERROR: meta-python2/recipes-devtools/python/python- > > > > > setuptools_42.0.2.bb: QA Issue: meta-python2/recipes- > > > > > devtools/python/python-setuptools_42.0.2.bb: Variable RPROVIDES is > > > > > set as not being package specific, please fix this. [pkgvarcheck] > > > > > ERROR: meta-python2/recipes-devtools/python/python- > > > > > setuptools_42.0.2.bb: Fatal QA errors found, failing task. > > > > > ERROR: Failed to parse recipe: meta-python2/recipes- > > > > > devtools/python/python-setuptools_42.0.2.bb > > > > > > > > Are you saying that it does that with the RPROVIDES removed? That > seems > > > > odd :/ > > > > > > No, this was before removing RPROVIDES in meta-python2, I was just > > > surprised that bitbake got stuck after reporting parsing failure, I'm > > > seeing bitbake getting stuck in dunfell builds quite often, but don't > > > remember seeing it with gatesgarth and newer (and was believing that > you > > > have already fixed most if not all cases there). But it's also true > that > > > our jenkins runs 1000x more builds based on dunfell, so it's much more > > > likely to happen there. > > > > Its the first time I've heard a report of that and it sounds a little > > worrying. What you say stuck, bitbake hangs? Is it using cpu? A process > > tree of what it looks like when stuck would be interesting if it is > > hanging and maybe the last things in any running or just finished task > > logs. It could be some issue with the way a failing task is handled? > > > > We've seen a lot of weird issues on the autobuilder but not that. Could > > you have something enabled in your setup for logging/reporting whch > > wouldn't be in ours and could be causing it? > > It doesn't seem to happen very often and I guess autobuilder doesn't > include meta-python2 (which is currently the only reproducer in my list > of layers). > Hi, We have similar failure in the Linaro CI using meta-python2, https://ci.linaro.org/job/lt-qcom-openembedded-rpb-master/437/DISTRO=rpb,MACHINE=dragonboard-820c,label=docker-buster-amd64/console Regards, Anibal > > I've tried to reproduce it with just 3 layers included: > BBLAYERS = " \ > /OE/build/oe-core/meta-python2 \ > /OE/build/oe-core/meta-openembedded/meta-oe \ > /OE/build/oe-core/openembedded-core/meta \ > " > > and it happened on 3rd try (cache, tmpdir, sstate-cache were removed > only before 1st try) > > martin@jama:/OE/build/oe-core$ bitbake -k python-native > Loading cache: 100% | > > > | ETA: --:--:-- > Loaded 0 entries from dependency cache. > ERROR: /OE/build/oe-core/meta-python2/recipes-devtools/python/ > python-setuptools_42.0.2.bb: QA Issue: > /OE/build/oe-core/meta-python2/recipes-devtools/python/ > python-setuptools_42.0.2.bb: Variable RPROVIDES is set as not being > package specific, please fix this. [pkgvarcheck] > ERROR: /OE/build/oe-core/meta-python2/recipes-devtools/python/ > python-setuptools_42.0.2.bb: Fatal QA errors found, failing task. > ERROR: Failed to parse recipe: > /OE/build/oe-core/meta-python2/recipes-devtools/python/ > python-setuptools_42.0.2.bb > > | ETA: 0:00:14 > > Summary: There were 3 ERROR messages shown, returning a non-zero exit code. > martin@jama:/OE/build/oe-core$ bitbake -k python-native > NOTE: Reconnecting to bitbake server... > Loading cache: 100% > |###| > Time: 0:00:00 > Loaded 845 entries from dependency cache. > ERROR: /OE/build/oe-core/meta-python2/recipes-devtools/python/ > python-native_2.7.18.bb: Error executing a python function in : > > | ETA: 0:01:10 > > The stack trace of python calls that resulted in this exception/failure > was: > File: '', lineno: 14, function: > > > 0010:__anon_35__OE_build_oe_core_openembedded_core_meta_classes_devshell_bbclass(d) > > > 0011:__anon_151__OE_build_oe_core_openembedded_core_meta_classes_sstate_bbclass(d) > > > 0012:__anon_20__OE_build_oe_core_openembedded_core_meta_classes_blacklist_bbclass(d) >
Re: [OE-core] [meta-oe][PATCH v3] net-tools: split into binary packages
This patch causes problems in multilib configurations, http://errors.yoctoproject.org/Errors/Details/539019/ Regards, Anibal On Mon, 30 Nov 2020 at 21:35, Sinan Kaya wrote: > Support per binary package to not bloat the system with unneeded > tools. > > Signed-off-by: Sinan Kaya > --- > .../net-tools/net-tools_1.60-20181103.bb | 29 ++- > 1 file changed, 28 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb > b/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb > index e97731073e8..63a3ccbe516 100644 > --- a/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb > +++ b/meta/recipes-extended/net-tools/net-tools_1.60-20181103.bb > @@ -93,7 +93,7 @@ base_bindir_progs = "ifconfig netstat route \ > ${@bb.utils.contains('PACKAGECONFIG', 'hostname', 'dnsdomainname > domainname hostname nisdomainname ypdomainname', '', d)} \ > " > > -ALTERNATIVE_${PN} = "${base_sbindir_progs} ${base_bindir_progs}" > +ALTERNATIVE_${PN} = "" > ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', > 'hostname', 'hostname.1 dnsdomainname.1', '', d)}" > ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" > ALTERNATIVE_LINK_NAME[dnsdomainname.1] = "${mandir}/man1/dnsdomainname.1" > @@ -107,4 +107,31 @@ python __anonymous() { > } > ALTERNATIVE_PRIORITY = "100" > > +python __anonymous () { > +packages = [] > +for prog in d.getVar('base_sbindir_progs').split(): > +pkg = "net-tools-%s" % prog.replace("_", "-") > +packages.append(pkg) > +d.setVar("ALTERNATIVE_%s" % pkg, prog.replace("_", "-")) > +if not d.getVar("FILES_%s" % pkg): > +d.setVar("FILES_%s" % pkg, "${base_sbindir}/%s*" % prog) > +for prog in d.getVar('base_bindir_progs').split(): > +pkg = "net-tools-%s" % prog.replace("_", "-") > +packages.append(pkg) > +d.setVar("ALTERNATIVE_%s" % pkg, prog.replace("_", "-")) > +if not d.getVar("FILES_%s" % pkg): > +d.setVar("FILES_%s" % pkg, "${base_bindir}/%s*" % prog) > +pkg = "net-tools-man" > +packages.append(pkg) > +if not d.getVar("FILES_%s" % pkg): > +d.setVar("FILES_%s" % pkg, "${mandir}/*") > +d.setVar("NETTOOLS_PACKAGES", " ".join(packages)) > +} > +# "net-tools" is a metapackage which pulls in all net-tools binaries > +PACKAGES += "${NETTOOLS_PACKAGES}" > +PROVIDES += "${NETTOOLS_PACKAGES}" > +FILES_${PN} = "" > +ALLOW_EMPTY_${PN} = "1" > +RRECOMMENDS_${PN} += "${NETTOOLS_PACKAGES}" > + > BBCLASSEXTEND = "native nativesdk" > -- > 2.17.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#145239): https://lists.openembedded.org/g/openembedded-core/message/145239 Mute This Topic: https://lists.openembedded.org/mt/78625904/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] mesa: update 20.1.6 -> 20.1.8
Signed-off-by: Aníbal Limón --- .../mesa/{mesa-gl_20.1.6.bb => mesa-gl_20.1.8.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/{mesa_20.1.6.bb => mesa_20.1.8.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/mesa/{mesa-gl_20.1.6.bb => mesa-gl_20.1.8.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_20.1.6.bb => mesa_20.1.8.bb} (100%) diff --git a/meta/recipes-graphics/mesa/mesa-gl_20.1.6.bb b/meta/recipes-graphics/mesa/mesa-gl_20.1.8.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_20.1.6.bb rename to meta/recipes-graphics/mesa/mesa-gl_20.1.8.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index af2a5c0f9b..dd4619a06b 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -23,7 +23,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ " -SRC_URI[sha256sum] = "23bed40114b03ad640c95bfe72cc879ed2f941d0d481b77b5204a1fc567fa93c" +SRC_URI[sha256sum] = "df21351494f7caaec5a3ccc16f14f15512e98d2ecde178bba1d134edc899b961" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_20.1.6.bb b/meta/recipes-graphics/mesa/mesa_20.1.8.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa_20.1.6.bb rename to meta/recipes-graphics/mesa/mesa_20.1.8.bb -- 2.28.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#142692): https://lists.openembedded.org/g/openembedded-core/message/142692 Mute This Topic: https://lists.openembedded.org/mt/76993790/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv2] recipes-graphics/xorg-xserver: Add patch to fix segfault when probe
Fix segfault on probing a non-PCI platform device on a system with PCI. ... at ../../xorg-server-1.20.9/os/log.c:1017 at ../../xorg-server-1.20.9/os/osinit.c:156 at ../../xorg-server-1.20.9/os/osinit.c:110 at ../../../../xorg-server-1.20.9/hw/xfree86/common/xf86platformBus.c:292 argv=argv@entry=0xca43c7c8) at ../../../../xorg-server-1.20.9/hw/xfree86/common/xf86Init.c:388 at ../../xorg-server-1.20.9/dix/main.c:193 init=, fini=, rtld_fini=, stack_end=) at ../csu/libc-start.c:314 ... Backported from upstream rev e50c85f4e. Signed-off-by: Aníbal Limón --- ...probing-a-non-PCI-platform-device-on.patch | 34 +++ .../xorg-xserver/xserver-xorg_1.20.9.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch new file mode 100644 index 00..7b9e3b4cad --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch @@ -0,0 +1,34 @@ +From e50c85f4ebf559a3bac4817b41074c43d4691779 Mon Sep 17 00:00:00 2001 +From: Eric Anholt +Date: Fri, 26 Oct 2018 17:47:30 -0700 +Subject: [PATCH] Fix segfault on probing a non-PCI platform device on a system + with PCI. + +Some Broadcom set-top-box boards have PCI busses, but the GPU is still +probed through DT. We would dereference a null busid here in that +case. + +Signed-off-by: Eric Anholt + +Upstream-status: Backport [https://github.com/freedesktop/xorg-xserver/commit/e50c85f4e] +Signed-off-by: Aníbal Limón +--- + hw/xfree86/common/xf86platformBus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c +index cef47da03..dadbac6c8 100644 +--- a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c +@@ -289,7 +289,7 @@ xf86platformProbe(void) + for (i = 0; i < xf86_num_platform_devices; i++) { + char *busid = xf86_platform_odev_attributes(i)->busid; + +-if (pci && (strncmp(busid, "pci:", 4) == 0)) { ++if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) { + platform_find_pci_info(_platform_devices[i], busid); + } + +-- +2.28.0 + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb index 86d432a7c4..c83e43ed99 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb @@ -6,6 +6,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://sdksyms-no-build-path.patch \ file://0001-drmmode_display.c-add-missing-mi.h-include.patch \ file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ + file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \ " SRC_URI[sha256sum] = "e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571" -- 2.28.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#142272): https://lists.openembedded.org/g/openembedded-core/message/142272 Mute This Topic: https://lists.openembedded.org/mt/76714288/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] recipes-graphics/xorg-xserver: Add patch to fix segfault when probe
Fix segfault on probing a non-PCI platform device on a system with PCI. ... at ../../xorg-server-1.20.9/os/log.c:1017 at ../../xorg-server-1.20.9/os/osinit.c:156 at ../../xorg-server-1.20.9/os/osinit.c:110 at ../../../../xorg-server-1.20.9/hw/xfree86/common/xf86platformBus.c:292 argv=argv@entry=0xca43c7c8) at ../../../../xorg-server-1.20.9/hw/xfree86/common/xf86Init.c:388 at ../../xorg-server-1.20.9/dix/main.c:193 init=, fini=, rtld_fini=, stack_end=) at ../csu/libc-start.c:314 ... >From upstream rev e50c85f4e. Signed-off-by: Aníbal Limón --- ...probing-a-non-PCI-platform-device-on.patch | 31 +++ .../xorg-xserver/xserver-xorg_1.20.9.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch new file mode 100644 index 00..d66059d116 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch @@ -0,0 +1,31 @@ +From e50c85f4ebf559a3bac4817b41074c43d4691779 Mon Sep 17 00:00:00 2001 +From: Eric Anholt +Date: Fri, 26 Oct 2018 17:47:30 -0700 +Subject: [PATCH] Fix segfault on probing a non-PCI platform device on a system + with PCI. + +Some Broadcom set-top-box boards have PCI busses, but the GPU is still +probed through DT. We would dereference a null busid here in that +case. + +Signed-off-by: Eric Anholt +--- + hw/xfree86/common/xf86platformBus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c +index cef47da03..dadbac6c8 100644 +--- a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c +@@ -289,7 +289,7 @@ xf86platformProbe(void) + for (i = 0; i < xf86_num_platform_devices; i++) { + char *busid = xf86_platform_odev_attributes(i)->busid; + +-if (pci && (strncmp(busid, "pci:", 4) == 0)) { ++if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) { + platform_find_pci_info(_platform_devices[i], busid); + } + +-- +2.28.0 + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb index 86d432a7c4..c83e43ed99 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb @@ -6,6 +6,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://sdksyms-no-build-path.patch \ file://0001-drmmode_display.c-add-missing-mi.h-include.patch \ file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ + file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \ " SRC_URI[sha256sum] = "e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571" -- 2.28.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#142269): https://lists.openembedded.org/g/openembedded-core/message/142269 Mute This Topic: https://lists.openembedded.org/mt/76712485/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [dunfell][PATCH] recipes-kernel: linux-firmware add qcom-venus-{5.2,5.4} packages
From: Anibal Limon Signed-off-by: Aníbal Limón Signed-off-by: Richard Purdie (cherry picked from commit e20c1e07a807f66f028104d8491d974a36734192) Signed-off-by: Aníbal Limón --- .../linux-firmware/linux-firmware_20200817.bb | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb index 22e71059d8..ffeb8e6926 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb @@ -291,7 +291,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-netronome-license ${PN}-netronome \ ${PN}-qat ${PN}-qat-license \ ${PN}-qcom-license \ - ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 \ + ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 ${PN}-qcom-venus-5.2 ${PN}-qcom-venus-5.4 \ ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 ${PN}-qcom-adreno-a630 \ ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ ${PN}-whence-license \ @@ -860,6 +860,8 @@ LICENSE_${PN}-qcom-license = "Firmware-qcom" FILES_${PN}-qcom-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom ${nonarch_base_libdir}/firmware/qcom/NOTICE.txt" FILES_${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" FILES_${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" +FILES_${PN}-qcom-venus-5.2 = "${nonarch_base_libdir}/firmware/qcom/venus-5.2/*" +FILES_${PN}-qcom-venus-5.4 = "${nonarch_base_libdir}/firmware/qcom/venus-5.4/*" FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" FILES_${PN}-qcom-adreno-a630 = "${nonarch_base_libdir}/firmware/qcom/a630*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/a630*.*" @@ -868,6 +870,8 @@ FILES_${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/c FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-venus-5.2 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-venus-5.4 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a530 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a630 = "${PN}-qcom-license" -- 2.28.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#142129): https://lists.openembedded.org/g/openembedded-core/message/142129 Mute This Topic: https://lists.openembedded.org/mt/76591790/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] recipes-kernel: linux-firmware add qcom-venus-{5.2,5.4} packages
Signed-off-by: Aníbal Limón --- .../linux-firmware/linux-firmware_20200817.bb | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb index 22e71059d8..ffeb8e6926 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb @@ -291,7 +291,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-netronome-license ${PN}-netronome \ ${PN}-qat ${PN}-qat-license \ ${PN}-qcom-license \ - ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 \ + ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 ${PN}-qcom-venus-5.2 ${PN}-qcom-venus-5.4 \ ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 ${PN}-qcom-adreno-a630 \ ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ ${PN}-whence-license \ @@ -860,6 +860,8 @@ LICENSE_${PN}-qcom-license = "Firmware-qcom" FILES_${PN}-qcom-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom ${nonarch_base_libdir}/firmware/qcom/NOTICE.txt" FILES_${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" FILES_${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" +FILES_${PN}-qcom-venus-5.2 = "${nonarch_base_libdir}/firmware/qcom/venus-5.2/*" +FILES_${PN}-qcom-venus-5.4 = "${nonarch_base_libdir}/firmware/qcom/venus-5.4/*" FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" FILES_${PN}-qcom-adreno-a630 = "${nonarch_base_libdir}/firmware/qcom/a630*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/a630*.*" @@ -868,6 +870,8 @@ FILES_${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/c FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-venus-5.2 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-venus-5.4 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a530 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a630 = "${PN}-qcom-license" -- 2.28.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#142029): https://lists.openembedded.org/g/openembedded-core/message/142029 Mute This Topic: https://lists.openembedded.org/mt/76540530/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH][dunfell 1/3] recipes-kernel/linux-firmware: Add wlanmdsp.mbn to qcom-modem package
On Wed, 20 May 2020 at 11:51, Nicolas Dechesne wrote: > > On Wed, May 20, 2020 at 4:59 PM Aníbal Limón > wrote: > >> Signed-off-by: Aníbal Limón >> > > all you 3 patches are backports/cherry-picked, please show that in your > new patches, e.g. git cherry-pick -x -s . it's much easier to > review stable patches. > right, sending v2 ones... > > >> --- >> meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta/recipes-kernel/linux-firmware/ >> linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/ >> linux-firmware_20200122.bb >> index 7173409e05..139307cda3 100644 >> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb >> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb >> @@ -851,7 +851,7 @@ FILES_${PN}-qcom-adreno-a3xx = >> "${nonarch_base_libdir}/firmware/qcom/a300_*.fw $ >> FILES_${PN}-qcom-adreno-a530 = >> "${nonarch_base_libdir}/firmware/qcom/a530*.*" >> FILES_${PN}-qcom-sdm845-audio = >> "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*" >> FILES_${PN}-qcom-sdm845-compute = >> "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*" >> -FILES_${PN}-qcom-sdm845-modem = >> "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn >> ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.*" >> +FILES_${PN}-qcom-sdm845-modem = >> "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn >> ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* >> ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" >> RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" >> RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" >> RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" >> -- >> 2.26.2 >> >> -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138516): https://lists.openembedded.org/g/openembedded-core/message/138516 Mute This Topic: https://lists.openembedded.org/mt/74351825/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv2][dunfell 2/3] recipes-kernel/linux-firmware: Add adreno-a630 firmware package
Signed-off-by: Aníbal Limón Signed-off-by: Richard Purdie (cherry picked from commit dd5f6de4995fbfad881567137fdefc1a8a3903b4) Signed-off-by: Aníbal Limón --- meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 139307cda3..ac7d6ec431 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -288,7 +288,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-qat ${PN}-qat-license \ ${PN}-qcom-license \ ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 \ - ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 \ + ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 ${PN}-qcom-adreno-a630 \ ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ ${PN}-whence-license \ ${PN}-license \ @@ -849,6 +849,7 @@ FILES_${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" FILES_${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" +FILES_${PN}-qcom-adreno-a630 = "${nonarch_base_libdir}/firmware/qcom/a630*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/a630*.*" FILES_${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*" FILES_${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*" FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" @@ -856,6 +857,7 @@ RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a530 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-adreno-a630 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-sdm845-audio = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-sdm845-compute = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-sdm845-modem = "${PN}-qcom-license" -- 2.26.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138518): https://lists.openembedded.org/g/openembedded-core/message/138518 Mute This Topic: https://lists.openembedded.org/mt/74356903/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv2][dunfell 3/3] linux-firmware: Update to 20200122 -> 20200421
Signed-off-by: Aníbal Limón Signed-off-by: Richard Purdie (cherry picked from commit ed9da2d9dc42c437650d539c4d14b8b786f82059) Signed-off-by: Aníbal Limón --- ...inux-firmware_20200122.bb => linux-firmware_20200421.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20200122.bb => linux-firmware_20200421.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200421.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20200421.bb index ac7d6ec431..fa0507a88c 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200421.bb @@ -125,7 +125,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ -file://WHENCE;md5=c27d0c06cd5d376d8ab55860e65ba4e4 \ +file://WHENCE;md5=cb9a66eff0464b55335d3a7374fbc51c \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -196,8 +196,8 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "ac291b21f366ae2a37193ec8f14c39d2" -SRC_URI[sha256sum] = "a30e811b3736a72b874ac27e10662f5e5409b1cadf8aab7ba88e8f8bc8083986" +SRC_URI[md5sum] = "229a93395f4033da68429f165a62b952" +SRC_URI[sha256sum] = "6dd7cba25d694c031f65529b9027cc8faaffaddfae70a4e3b58c2e4a0af3bfa8" inherit allarch -- 2.26.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138519): https://lists.openembedded.org/g/openembedded-core/message/138519 Mute This Topic: https://lists.openembedded.org/mt/74356906/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv2][dunfell 1/3] recipes-kernel/linux-firmware: Add wlanmdsp.mbn to qcom-modem package
Signed-off-by: Aníbal Limón Signed-off-by: Richard Purdie (cherry picked from commit 55fb6324d627f55c197af068038f3886b95c3cb2) Signed-off-by: Aníbal Limón --- meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 7173409e05..139307cda3 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -851,7 +851,7 @@ FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw $ FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" FILES_${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*" FILES_${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*" -FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.*" +FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" -- 2.26.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138517): https://lists.openembedded.org/g/openembedded-core/message/138517 Mute This Topic: https://lists.openembedded.org/mt/74356902/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH][dunfell 2/3] recipes-kernel/linux-firmware: Add adreno-a630 firmware package
Signed-off-by: Aníbal Limón --- meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 139307cda3..ac7d6ec431 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -288,7 +288,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-qat ${PN}-qat-license \ ${PN}-qcom-license \ ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 \ - ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 \ + ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 ${PN}-qcom-adreno-a630 \ ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ ${PN}-whence-license \ ${PN}-license \ @@ -849,6 +849,7 @@ FILES_${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" FILES_${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" +FILES_${PN}-qcom-adreno-a630 = "${nonarch_base_libdir}/firmware/qcom/a630*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/a630*.*" FILES_${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*" FILES_${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*" FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" @@ -856,6 +857,7 @@ RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a530 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-adreno-a630 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-sdm845-audio = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-sdm845-compute = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-sdm845-modem = "${PN}-qcom-license" -- 2.26.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138510): https://lists.openembedded.org/g/openembedded-core/message/138510 Mute This Topic: https://lists.openembedded.org/mt/74351829/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH][dunfell 3/3] linux-firmware: Update to 20200122 -> 20200421
Signed-off-by: Aníbal Limón --- ...inux-firmware_20200122.bb => linux-firmware_20200421.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20200122.bb => linux-firmware_20200421.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200421.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20200421.bb index ac7d6ec431..fa0507a88c 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200421.bb @@ -125,7 +125,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ -file://WHENCE;md5=c27d0c06cd5d376d8ab55860e65ba4e4 \ +file://WHENCE;md5=cb9a66eff0464b55335d3a7374fbc51c \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -196,8 +196,8 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "ac291b21f366ae2a37193ec8f14c39d2" -SRC_URI[sha256sum] = "a30e811b3736a72b874ac27e10662f5e5409b1cadf8aab7ba88e8f8bc8083986" +SRC_URI[md5sum] = "229a93395f4033da68429f165a62b952" +SRC_URI[sha256sum] = "6dd7cba25d694c031f65529b9027cc8faaffaddfae70a4e3b58c2e4a0af3bfa8" inherit allarch -- 2.26.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138509): https://lists.openembedded.org/g/openembedded-core/message/138509 Mute This Topic: https://lists.openembedded.org/mt/74351828/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH][dunfell 1/3] recipes-kernel/linux-firmware: Add wlanmdsp.mbn to qcom-modem package
Signed-off-by: Aníbal Limón --- meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 7173409e05..139307cda3 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -851,7 +851,7 @@ FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw $ FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" FILES_${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*" FILES_${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*" -FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.*" +FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" -- 2.26.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138508): https://lists.openembedded.org/g/openembedded-core/message/138508 Mute This Topic: https://lists.openembedded.org/mt/74351825/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 3/3] linux-firmware: Update to 20200122 -> 20200421
Signed-off-by: Aníbal Limón --- ...inux-firmware_20200122.bb => linux-firmware_20200421.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20200122.bb => linux-firmware_20200421.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200421.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20200421.bb index ac7d6ec431..fa0507a88c 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200421.bb @@ -125,7 +125,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ -file://WHENCE;md5=c27d0c06cd5d376d8ab55860e65ba4e4 \ +file://WHENCE;md5=cb9a66eff0464b55335d3a7374fbc51c \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -196,8 +196,8 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "ac291b21f366ae2a37193ec8f14c39d2" -SRC_URI[sha256sum] = "a30e811b3736a72b874ac27e10662f5e5409b1cadf8aab7ba88e8f8bc8083986" +SRC_URI[md5sum] = "229a93395f4033da68429f165a62b952" +SRC_URI[sha256sum] = "6dd7cba25d694c031f65529b9027cc8faaffaddfae70a4e3b58c2e4a0af3bfa8" inherit allarch -- 2.26.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138446): https://lists.openembedded.org/g/openembedded-core/message/138446 Mute This Topic: https://lists.openembedded.org/mt/74318612/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/3] recipes-kernel/linux-firmware: Add adreno-a630 firmware package
Signed-off-by: Aníbal Limón --- meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 139307cda3..ac7d6ec431 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -288,7 +288,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-qat ${PN}-qat-license \ ${PN}-qcom-license \ ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 \ - ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 \ + ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 ${PN}-qcom-adreno-a630 \ ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ ${PN}-whence-license \ ${PN}-license \ @@ -849,6 +849,7 @@ FILES_${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" FILES_${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" +FILES_${PN}-qcom-adreno-a630 = "${nonarch_base_libdir}/firmware/qcom/a630*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/a630*.*" FILES_${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*" FILES_${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*" FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" @@ -856,6 +857,7 @@ RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a530 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-adreno-a630 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-sdm845-audio = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-sdm845-compute = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-sdm845-modem = "${PN}-qcom-license" -- 2.26.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138445): https://lists.openembedded.org/g/openembedded-core/message/138445 Mute This Topic: https://lists.openembedded.org/mt/74318611/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/3] recipes-kernel/linux-firmware: Add wlanmdsp.mbn to qcom-modem package
Signed-off-by: Aníbal Limón --- meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 7173409e05..139307cda3 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -851,7 +851,7 @@ FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw $ FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" FILES_${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*" FILES_${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*" -FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.*" +FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" -- 2.26.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138444): https://lists.openembedded.org/g/openembedded-core/message/138444 Mute This Topic: https://lists.openembedded.org/mt/74318610/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/2] ptest-runner: Bump to 2.4.0
Add support for un ptests in multiple directories, useful in multilib builds. Changes, 1e9a845 Add support to specify multiple folder for ptest-runner 287ba30 Makefile: Fix TEST_LDFLAGS gcc cmdline position [YOCTO #12604] Signed-off-by: Aníbal Limón --- .../{ptest-runner_2.3.2.bb => ptest-runner_2.4.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/ptest-runner/{ptest-runner_2.3.2.bb => ptest-runner_2.4.0.bb} (90%) diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.3.2.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.4.0.bb similarity index 90% rename from meta/recipes-support/ptest-runner/ptest-runner_2.3.2.bb rename to meta/recipes-support/ptest-runner/ptest-runner_2.4.0.bb index 187f22df04..09fabdeebc 100644 --- a/meta/recipes-support/ptest-runner/ptest-runner_2.3.2.bb +++ b/meta/recipes-support/ptest-runner/ptest-runner_2.4.0.bb @@ -7,8 +7,8 @@ HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/ptest-runner2/about/; LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "7015e9199ce748c0717addeebe7a8c47448bab03" -PV = "2.3.2+git${SRCPV}" +SRCREV = "1e9a84585909b970cc8850d3ea02a7215dcfa5a3" +PV = "2.4.0+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/ptest-runner2 \ " -- 2.26.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#137583): https://lists.openembedded.org/g/openembedded-core/message/137583 Mute This Topic: https://lists.openembedded.org/mt/73336814/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/2] oeqa/runtime: Use libdir to run ptest-runner
In multilib build configs libs can be installed in /usr/lib{32,64,x32} so use libdir to specify the correct ptest directory along with default /usr/lib. [YOCTO #12604] Signed-off-by: Aníbal Limón --- meta/lib/oeqa/runtime/cases/ptest.py | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/runtime/cases/ptest.py b/meta/lib/oeqa/runtime/cases/ptest.py index 99a44f0767..1b1474adcf 100644 --- a/meta/lib/oeqa/runtime/cases/ptest.py +++ b/meta/lib/oeqa/runtime/cases/ptest.py @@ -49,7 +49,11 @@ class PtestRunnerTest(OERuntimeTestCase): ptest_log_dir = '%s.%s' % (ptest_log_dir_link, timestamp) ptest_runner_log = os.path.join(ptest_log_dir, 'ptest-runner.log') -status, output = self.target.run('ptest-runner', 0) +libdir = self.td.get('libdir', '') +ptest_dirs = [ '/usr/lib' ] +if not libdir in ptest_dirs: +ptest_dirs.append(libdir) +status, output = self.target.run('ptest-runner -d \"{}\"'.format(' '.join(ptest_dirs)), 0) os.makedirs(ptest_log_dir) with open(ptest_runner_log, 'w') as f: f.write(output) -- 2.26.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#137584): https://lists.openembedded.org/g/openembedded-core/message/137584 Mute This Topic: https://lists.openembedded.org/mt/73336816/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv2] recipes-kernel/linux-firmware: Add qcom-sdm845-{audio,compute,modem} firmware packages
Contains the firmware for the audio, compute and modem/wireless in SDM845 platforms. Signed-off-by: Aníbal Limón --- .../linux-firmware/linux-firmware_20200122.bb| 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index a7406e48de..7173409e05 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -289,6 +289,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-qcom-license \ ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 \ ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 \ + ${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \ ${PN}-whence-license \ ${PN}-license \ " @@ -841,17 +842,23 @@ FILES_${PN}-qat-license = "${nonarch_base_libdir}/firmware/LICENCE.qat_firmwar FILES_${PN}-qat = "${nonarch_base_libdir}/firmware/qat*.bin" RDEPENDS_${PN}-qat= "${PN}-qat-license" -# For QCOM VPU/GPU +# For QCOM VPU/GPU and SDM845 LICENSE_${PN}-qcom-license = "Firmware-qcom" FILES_${PN}-qcom-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom ${nonarch_base_libdir}/firmware/qcom/NOTICE.txt" FILES_${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" FILES_${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" +FILES_${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*" +FILES_${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*" +FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.*" RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a530 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-sdm845-audio = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-sdm845-compute = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-sdm845-modem = "${PN}-qcom-license" FILES_${PN}-liquidio = "${nonarch_base_libdir}/firmware/liquidio" -- 2.26.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#136902): https://lists.openembedded.org/g/openembedded-core/message/136902 Mute This Topic: https://lists.openembedded.org/mt/72686025/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] recipes-kernel/linux-firmware: Add qcom-sdm845 firmware package
On Tue, 31 Mar 2020 at 07:31, Nicolas Dechesne wrote: > > > On Tue, Mar 31, 2020 at 4:01 AM Aníbal Limón > wrote: > >> Contains the firmware for the modem and wireless in SDM845 platforms. >> > > it is more than that, since that folder contains also the audio and > compute DSP firmware, so we should either say that , or not include them. > > >> Signed-off-by: Aníbal Limón >> --- >> meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/meta/recipes-kernel/linux-firmware/ >> linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/ >> linux-firmware_20200122.bb >> index a7406e48de..3e03aafb6b 100644 >> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb >> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb >> @@ -289,6 +289,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ >> ${PN}-qcom-license \ >> ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 \ >> ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 \ >> + ${PN}-qcom-sdm845 \ >> ${PN}-whence-license \ >> ${PN}-license \ >> " >> @@ -848,10 +849,12 @@ FILES_${PN}-qcom-venus-1.8 = >> "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" >> FILES_${PN}-qcom-venus-4.2 = >> "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" >> FILES_${PN}-qcom-adreno-a3xx = >> "${nonarch_base_libdir}/firmware/qcom/a300_*.fw >> ${nonarch_base_libdir}/firmware/a300_*.fw" >> FILES_${PN}-qcom-adreno-a530 = >> "${nonarch_base_libdir}/firmware/qcom/a530*.*" >> +FILES_${PN}-qcom-sdm845 = "${nonarch_base_libdir}/firmware/qcom/sdm845/*" >> > > I think we should be specific for the files we include, using the wildcard > means we don't control/know what we are packaging. We could do several > packages for qcom-sdm845-modem, qcom-sdm845-audio, qcom-sdm845-compute, ... > which would be ideal.. but i am not sure how appropriate this is for > oe-core. but for the other qcom firmware, we package them by 'feature' (see > above). > Right, better to have a split of firmware by feature, I will send a v2. Anibal > > RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" >> RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" >> RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" >> RDEPENDS_${PN}-qcom-adreno-a530 = "${PN}-qcom-license" >> +RDEPENDS_${PN}-qcom-sdm845 = "${PN}-qcom-license" >> >> FILES_${PN}-liquidio = "${nonarch_base_libdir}/firmware/liquidio" >> >> -- >> 2.26.0 >> >> -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#136893): https://lists.openembedded.org/g/openembedded-core/message/136893 Mute This Topic: https://lists.openembedded.org/mt/72669191/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] recipes-kernel/linux-firmware: Add qcom-sdm845 firmware package
Contains the firmware for the modem and wireless in SDM845 platforms. Signed-off-by: Aníbal Limón --- meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index a7406e48de..3e03aafb6b 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -289,6 +289,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-qcom-license \ ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 \ ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 \ + ${PN}-qcom-sdm845 \ ${PN}-whence-license \ ${PN}-license \ " @@ -848,10 +849,12 @@ FILES_${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" FILES_${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" +FILES_${PN}-qcom-sdm845 = "${nonarch_base_libdir}/firmware/qcom/sdm845/*" RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" RDEPENDS_${PN}-qcom-adreno-a530 = "${PN}-qcom-license" +RDEPENDS_${PN}-qcom-sdm845 = "${PN}-qcom-license" FILES_${PN}-liquidio = "${nonarch_base_libdir}/firmware/liquidio" -- 2.26.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#136874): https://lists.openembedded.org/g/openembedded-core/message/136874 Mute This Topic: https://lists.openembedded.org/mt/72669191/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCHv2] meta/recipes-graphics/waffle: Add python3 dependency
Hi, Any update on this?, Regards, Anibal On Mon, 20 Jan 2020 at 18:41, Anibal Limon wrote: > I found the answer, poky adds wayland support via DISTRO_FEATURES that > ends on python3 dependency in the waffle recipe-sysroot. > > You can test removing wayland from DISTRO_FEATURES to see the failure, we > use OE and has two distro variants X/Wayland so the builds > fails only in X [1][2]. > > Regards, > Anibal > > [1] > https://ci.linaro.org/job/lt-qcom-openembedded-rpb-zeus/61/DISTRO=rpb,MACHINE=dragonboard-410c,label=docker-stretch-amd64/console > [2] > https://ci.linaro.org/job/lt-qcom-openembedded-rpb-zeus/61/DISTRO=rpb-wayland,MACHINE=dragonboard-410c,label=docker-stretch-amd64/console > > > On Tue, 14 Jan 2020 at 10:24, Alexander Kanavin > wrote: > >> This failure is not seen on the autobuilder. Is it something that happens >> only under specific condition, and so should the dependency be conditional >> to that? >> >> Alex >> >> On Tue, 14 Jan 2020 at 17:20, Aníbal Limón >> wrote: >> >>> The python3native.bbclass set PYTHON_{LIBRARY, INCLUDE_DIR} pointing to >>> python target build, a patch was add to use target _sysconfigdata too [1] >>> but is not available without python3 dependency. >>> >>> Fixes waffle build when trying to find _sysconfigdata module, >>> >>> ... >>> | Program python3 found: YES >>> (/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3) >>> | >>> | meson.build:36:0: ERROR: >>> ['/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3']> >>> is not a valid python or it is missing setuptools >>> | >>> | A full log can be found at >>> /home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/build/meson-logs/meson-log.txt >>> | WARNING: exit code 1 from a shell command. >>> ... >>> >>> [1] >>> http://git.openembedded.org/openembedded-core/commit/?id=02714c105426b0d687620913c1a7401b386428b6 >>> >>> Signed-off-by: Aníbal Limón >>> --- >>> meta/recipes-graphics/waffle/waffle_1.6.0.bb | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/meta/recipes-graphics/waffle/waffle_1.6.0.bb >>> b/meta/recipes-graphics/waffle/waffle_1.6.0.bb >>> index 52cb1df899..a620295978 100644 >>> --- a/meta/recipes-graphics/waffle/waffle_1.6.0.bb >>> +++ b/meta/recipes-graphics/waffle/waffle_1.6.0.bb >>> @@ -11,6 +11,8 @@ UPSTREAM_CHECK_URI = " >>> http://www.waffle-gl.org/releases.html; >>> >>> inherit meson features_check lib_package bash-completion >>> >>> +DEPENDS_append = " python3" >>> + >>> # This should be overridden per-machine to reflect the capabilities of >>> the GL >>> # stack. >>> PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx >>> x11-egl', '', d)} \ >>> -- >>> 2.24.1 >>> >>> -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2] meta/recipes-graphics/waffle: Add python3 dependency
I found the answer, poky adds wayland support via DISTRO_FEATURES that ends on python3 dependency in the waffle recipe-sysroot. You can test removing wayland from DISTRO_FEATURES to see the failure, we use OE and has two distro variants X/Wayland so the builds fails only in X [1][2]. Regards, Anibal [1] https://ci.linaro.org/job/lt-qcom-openembedded-rpb-zeus/61/DISTRO=rpb,MACHINE=dragonboard-410c,label=docker-stretch-amd64/console [2] https://ci.linaro.org/job/lt-qcom-openembedded-rpb-zeus/61/DISTRO=rpb-wayland,MACHINE=dragonboard-410c,label=docker-stretch-amd64/console On Tue, 14 Jan 2020 at 10:24, Alexander Kanavin wrote: > This failure is not seen on the autobuilder. Is it something that happens > only under specific condition, and so should the dependency be conditional > to that? > > Alex > > On Tue, 14 Jan 2020 at 17:20, Aníbal Limón > wrote: > >> The python3native.bbclass set PYTHON_{LIBRARY, INCLUDE_DIR} pointing to >> python target build, a patch was add to use target _sysconfigdata too [1] >> but is not available without python3 dependency. >> >> Fixes waffle build when trying to find _sysconfigdata module, >> >> ... >> | Program python3 found: YES >> (/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3) >> | >> | meson.build:36:0: ERROR: >> ['/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3']> >> is not a valid python or it is missing setuptools >> | >> | A full log can be found at >> /home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/build/meson-logs/meson-log.txt >> | WARNING: exit code 1 from a shell command. >> ... >> >> [1] >> http://git.openembedded.org/openembedded-core/commit/?id=02714c105426b0d687620913c1a7401b386428b6 >> >> Signed-off-by: Aníbal Limón >> --- >> meta/recipes-graphics/waffle/waffle_1.6.0.bb | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/meta/recipes-graphics/waffle/waffle_1.6.0.bb >> b/meta/recipes-graphics/waffle/waffle_1.6.0.bb >> index 52cb1df899..a620295978 100644 >> --- a/meta/recipes-graphics/waffle/waffle_1.6.0.bb >> +++ b/meta/recipes-graphics/waffle/waffle_1.6.0.bb >> @@ -11,6 +11,8 @@ UPSTREAM_CHECK_URI = " >> http://www.waffle-gl.org/releases.html; >> >> inherit meson features_check lib_package bash-completion >> >> +DEPENDS_append = " python3" >> + >> # This should be overridden per-machine to reflect the capabilities of >> the GL >> # stack. >> PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx >> x11-egl', '', d)} \ >> -- >> 2.24.1 >> >> -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] meta/conf/bitbake.conf: Add BB_SIGNATURE_LOCAL_DIRS_EXCLUDE with VCS
Forget this patch, I was confused about which version merged on bitbake. Anibal On Thu, 9 Jan 2020 at 14:03, Aníbal Limón wrote: > The new BB_SIGNATURE_LOCAL_DIRS_EXCLUDE allows you to specify a list > of directories to exclude when making taskhash [1], set default as common > VCS directories. > > [1] > http://git.openembedded.org/bitbake/commit/?id=923aff060d8aba8456979c35b16d300ba7c13ff9 > > Signed-off-by: Aníbal Limón > --- > meta/conf/bitbake.conf | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > index 62b5466b71..b3688edd9a 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -885,6 +885,7 @@ BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \ > sstate-lockfile-shared prefuncs postfuncs export_func deptask > rdeptask \ > recrdeptask nodeprrecs stamp-extra-info sstate-outputdirs filename > lineno \ > progress mcdepends number_threads" > +BB_SIGNATURE_LOCAL_DIRS_EXCLUDE ?= "CVS .bzr .git .hg .osc .p4 .repo .svn" > > MLPREFIX ??= "" > MULTILIB_VARIANTS ??= "" > -- > 2.24.1 > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] meta/classes/menson.bbclass: Add python3 dependency
On Thu, 9 Jan 2020 at 05:23, Alexander Kanavin wrote: > On Thu, 9 Jan 2020 at 02:43, Aníbal Limón wrote: > >> -DEPENDS_append = " meson-native ninja-native" >> +DEPENDS_append = " meson-native ninja-native python3" >> > > Apologies, but I cannot accept this. Not all meson-based components even > ask for python, and this adds a non-trivial (built time wise) target > dependency to them all. There is also the potential to create circular > dependencies some time in the future if something required by target python > switches over to meson. > > I suggest you rather patch meson itself, so that the python probe > implemented there does not import a target module. > This issue comes from python3native.bbclass when use python target library and include dirs and set _sysconfigdata too. ... export PYTHON_LIBRARY="${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so" export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata" ... Menson python module uses it to get python interpreter information to build [1], I agree that not all recipes uses menson + python but it is a single point to patch. I understand the implications of build time being increase so the other option is to add the dependency only on waffle. Comments? Regards, Anibal [1] https://github.com/mesonbuild/meson/blob/master/mesonbuild/modules/python.py#L262 > > Alex > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] meta/classes/meson.bbclass: Add inherit setuptools3
On Wed, 18 Dec 2019 at 14:31, Ross Burton wrote: > On 03/12/2019 22:06, Aníbal Limón wrote: > > Fixes, > > > > ... > > | Program python3 found: YES > (/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3) > > | > > | meson.build:36:0: ERROR: > ['/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3']> > is not a valid python or it is missing setuptools > > | > > | A full log can be found at > /home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/build/meson-logs/meson-log.txt > > | WARNING: exit code 1 from a shell command. > > Going back to this... > > Without this patch I get a different result: > > Program python3 found: YES > > (/data/poky-tmp/master/work/corei7-64-poky-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3) > Run-time dependency threads found: YES > [ continues fine ] > > So what is the meson-log.txt saying? > Hi, I'm debugging this issue again and found the root cause that is missing _sysconfigdata module, in python3-native.bbclass is set (_PYTHON_SYSCONFIGDATA_NAME) and fails if no python3 isn't available so it relais on python3 target being added. Reviewing python3 recipe _sysconfig_data thera are two possible fixes, - Copy _sysconfig_data from /usr/lib/python-sysconfig to /usr/lib/pythonVER (I will go for this one) ... + +do_install_append_class-native() { + cp ${D}${libdir}/python-sysconfigdata/_sysconfigdata.py ${D}/${libdir}/python${PYTHON_MAJMIN} +} + ... - Find right _sysconfig_data in python3native.bbclass because the library name is based on os-machine. Regards, Anibal > > Ross > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2] meta/recipes-graphics/waffle: Add inherit setuptools
On Wed, 4 Dec 2019 at 13:15, Alexander Kanavin wrote: > On Wed, 4 Dec 2019 at 20:04, Aníbal Limón wrote: > >> -inherit meson features_check lib_package bash-completion >> +inherit meson setuptools3 features_check lib_package bash-completion >> > > I don't think you actually need setuptools3 here, just target python3 > dependency is enough. > Actually doesn't need python3 it needs python3-native with setuptools, not need to depend of python3 for the target. Anibal > > Alex > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] meta/classes/meson.bbclass: Add inherit setuptools3
On Wed, 4 Dec 2019 at 04:20, Alexander Kanavin wrote: > I tend to agree with Khem; this change will pull in target python as build > and runtime dependency to all meson-using recipes, even those that have > nothing to do with python. > Ok, it depends on python3-setuptools-native I will add this inherit on waffle recipe. Regards, Anibal > > I'd suggest you fix the broken recipes individually by adding python3 to > DEPENDS. Yes, the "not a valid python" message is not helpful; suggestions > how to improve this are welcome. > > Alex > > On Wed, 4 Dec 2019 at 03:35, Anibal Limon wrote: > >> >> >> On Tue, 3 Dec 2019 at 17:37, Khem Raj wrote: >> >>> >>> >>> On Tue, Dec 3, 2019 at 2:06 PM Aníbal Limón >>> wrote: >>> >>>> Fixes, >>>> >>>> ... >>>> | Program python3 found: YES >>>> (/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3) >>>> | >>>> | meson.build:36:0: ERROR: >>>> ['/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3']> >>>> is not a valid python or it is missing setuptools >>>> | >>>> | A full log can be found at >>>> /home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/build/meson-logs/meson-log.txt >>>> | WARNING: exit code 1 from a shell command. >>>> ... >>>> >>> >>> I wonder if it’s better to add this inherit to waffle recipe alone I >>> doubt that all meson using recipes are building python modules >>> >> >> This issue is triggered from waffle [1] but the actual meson code looks >> for setuptools [2]. >> >> Anibal >> >> [1] >> https://gitlab.freedesktop.org/mesa/waffle/blob/master/meson.build#L36 >> [2] >> https://github.com/mesonbuild/meson/blob/master/mesonbuild/modules/python.py#L578 >> >> >>> >>> >>>> Signed-off-by: Aníbal Limón >>>> --- >>>> meta/classes/meson.bbclass | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass >>>> index efa6234078..90868963b7 100644 >>>> --- a/meta/classes/meson.bbclass >>>> +++ b/meta/classes/meson.bbclass >>>> @@ -1,4 +1,4 @@ >>>> -inherit siteinfo python3native >>>> +inherit siteinfo python3native setuptools3 >>>> >>>> DEPENDS_append = " meson-native ninja-native" >>>> >>>> -- >>>> 2.24.0 >>>> >>>> -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] meta/classes/meson.bbclass: Add inherit setuptools3
On Tue, 3 Dec 2019 at 17:37, Khem Raj wrote: > > > On Tue, Dec 3, 2019 at 2:06 PM Aníbal Limón > wrote: > >> Fixes, >> >> ... >> | Program python3 found: YES >> (/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3) >> | >> | meson.build:36:0: ERROR: >> ['/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3']> >> is not a valid python or it is missing setuptools >> | >> | A full log can be found at >> /home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/build/meson-logs/meson-log.txt >> | WARNING: exit code 1 from a shell command. >> ... >> > > I wonder if it’s better to add this inherit to waffle recipe alone I doubt > that all meson using recipes are building python modules > This issue is triggered from waffle [1] but the actual meson code looks for setuptools [2]. Anibal [1] https://gitlab.freedesktop.org/mesa/waffle/blob/master/meson.build#L36 [2] https://github.com/mesonbuild/meson/blob/master/mesonbuild/modules/python.py#L578 > > >> Signed-off-by: Aníbal Limón >> --- >> meta/classes/meson.bbclass | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass >> index efa6234078..90868963b7 100644 >> --- a/meta/classes/meson.bbclass >> +++ b/meta/classes/meson.bbclass >> @@ -1,4 +1,4 @@ >> -inherit siteinfo python3native >> +inherit siteinfo python3native setuptools3 >> >> DEPENDS_append = " meson-native ninja-native" >> >> -- >> 2.24.0 >> >> -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv4 2/3] runqemu: Add support for multiple tap devices
On Wed, 3 Jul 2019 at 12:01, Aníbal Limón wrote: > Add the ability to set more than one tap devices into the > same qemu instance, > > The code was modified to detect multiple @TAP@ and @MAC@ in the > QA_TAP_OPT and QA_NETWORK_DEVICE respectively, it handles the > attach/creation of multiple tap devices and stores into a list > for lock/unlock. > > Configure the first interface because Kernel IP Configuration > only takes care of the first device. > > This patch was tested using qemux86, kvm-vhost and NFS rootfs. > > Example of the configuration: > > QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no \ > -netdev tap,id=net1,ifname=@TAP@,script=no,downscript=no" > QB_NETWORK_DEVICE = "-device virtio-net-pci,netdev=net0,mac=@MAC@ \ > -device virtio-net-pci,netdev=net1,mac=@MAC@" > > Signed-off-by: Aníbal Limón > --- > scripts/runqemu | 141 > 1 file changed, 83 insertions(+), 58 deletions(-) > > diff --git a/scripts/runqemu b/scripts/runqemu > index 38dd1c30d9..0134f86b4c 100755 > --- a/scripts/runqemu > +++ b/scripts/runqemu > @@ -1006,64 +1006,88 @@ class BaseConfig(object): > except FileExistsError: > pass > > -cmd = (ip, 'link') > -logger.debug('Running %s...' % str(cmd)) > -ip_link = subprocess.check_output(cmd).decode('utf-8') > -# Matches line like: 6: tap0: > -possibles = re.findall('^[0-9]+: +(tap[0-9]+): <.*', ip_link, > re.M) > -tap = "" > -for p in possibles: > -lockfile = os.path.join(lockdir, p) > -if os.path.exists('%s.skip' % lockfile): > -logger.info('Found %s.skip, skipping %s' % (lockfile, p)) > -continue > -lock = lockfile + '.lock' > -if self.acquire_lock(lock, error=False): > -tap = p > -logger.info("Using preconfigured tap device %s" % tap) > -logger.info("If this is not intended, touch %s.skip to > make runqemu skip %s." %(lockfile, tap)) > -break > - > -if not tap: > -if os.path.exists(nosudo_flag): > -logger.error("Error: There are no available tap devices > to use for networking,") > -logger.error("and I see %s exists, so I am not going to > try creating" % nosudo_flag) > -raise RunQemuError("a new one with sudo.") > - > -gid = os.getgid() > -uid = os.getuid() > -logger.info("Setting up tap interface under sudo") > -cmd = ('sudo', self.qemuifup, str(uid), str(gid), > self.bindir_native) > -tap = subprocess.check_output(cmd).decode('utf-8').strip() > -lockfile = os.path.join(lockdir, tap) > -lock = lockfile + '.lock' > -self.acquire_lock(lock) > -self.cleantap = True > -logger.debug('Created tap: %s' % tap) > - > -if not tap: > -logger.error("Failed to setup tap device. Run > runqemu-gen-tapdevs to manually create.") > -return 1 > -self.tap = tap > -tapnum = int(tap[3:]) > -gateway = tapnum * 2 + 1 > -client = gateway + 1 > -if self.fstype == 'nfs': > -self.setup_nfs() > -netconf = "192.168.7.%s::192.168.7.%s:255.255.255.0" % (client, > gateway) > -logger.info("Network configuration: %s", netconf) > -self.kernel_cmdline_script += " ip=%s" % netconf > -mac = "%s%02x" % (self.mac_tap, client) > -qb_tap_opt = self.get('QB_TAP_OPT') > -if qb_tap_opt: > -qemu_tap_opt = qb_tap_opt.replace('@TAP@', tap) > -else: > -qemu_tap_opt = "-netdev > tap,id=net0,ifname=%s,script=no,downscript=no" % (self.tap) > +self.taps = [] > +qemu_tap_opt = self.get('QB_TAP_OPT') > +if not qemu_tap_opt: > +qemu_tap_opt = '-netdev tap,id=net0,ifname=@TAP@ > ,script=no,downscript=no' > > if self.vhost_enabled: > -qemu_tap_opt += ',vhost=on' > +opts = [] > +for tap_opt in qemu_tap_opt.split(): > +if 'tap' in tap_opt: > +tap_opt += ',vhost=on' > +opts.append(tap_opt) > +else: > +opts.append(tap_opt) > +qemu_tap_opt = ' '.join(opts) > + > +tap_no = qemu_tap_opt.count('@TAP@') > +for tap_idx in range(tap_no): > +cmd = (ip, 'link') > +logger.debug('Running %s...' % str(cmd)) > +ip_link = subprocess.check_output(cmd).decode('utf-8') > +# Matches line like: 6: tap0: > +possibles = re.findall('^[0-9]+: +(tap[0-9]+): <.*', ip_link, > re.M) > +tap = "" > +for p in possibles: > +if p in self.taps: > +continue > + > +
Re: [OE-core] [PATCHv3 1/3] runqemu: Allow to store more than one lock for network interfaces
Hi Chen, Thanks for report, may be related to the name of the NIC inside qemu. I will investigate. Regards!, Anibal On Tue, 2 Jul 2019 at 21:08, ChenQi wrote: > Could you please help check if the following failures are related to > this patch series? > > https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/785/steps/7/logs/step1c > > https://autobuilder.yoctoproject.org/typhoon/#/builders/63/builds/766/steps/7/logs/step1c > > Regards, > Chen Qi > > On 07/02/2019 05:23 AM, Aníbal Limón wrote: > > In order to support multiple tap devices in the same qemu virtual > > machine. > > > > Signed-off-by: Aníbal Limón > > --- > > scripts/runqemu | 50 + > > 1 file changed, 26 insertions(+), 24 deletions(-) > > > > diff --git a/scripts/runqemu b/scripts/runqemu > > index 4079f2b17d..38dd1c30d9 100755 > > --- a/scripts/runqemu > > +++ b/scripts/runqemu > > @@ -181,8 +181,7 @@ class BaseConfig(object): > > self.audio_enabled = False > > self.tcpserial_portnum = '' > > self.custombiosdir = '' > > -self.lock = '' > > -self.lock_descriptor = None > > +self.lock_descriptors = {} > > self.bitbake_e = '' > > self.snapshot = False > > self.wictypes = ('wic', 'wic.vmdk', 'wic.qcow2', 'wic.vdi') > > @@ -204,30 +203,32 @@ class BaseConfig(object): > > # avoid cleanup twice > > self.cleaned = False > > > > -def acquire_lock(self, error=True): > > -logger.debug("Acquiring lockfile %s..." % self.lock) > > +def acquire_lock(self, lock, error=True): > > +logger.debug("Acquiring lockfile %s..." % lock) > > +descriptor = None > > try: > > -self.lock_descriptor = open(self.lock, 'w') > > -fcntl.flock(self.lock_descriptor, > fcntl.LOCK_EX|fcntl.LOCK_NB) > > +descriptor = open(lock, 'w') > > +fcntl.flock(descriptor, fcntl.LOCK_EX|fcntl.LOCK_NB) > > except Exception as e: > > -msg = "Acquiring lockfile %s failed: %s" % (self.lock, e) > > +msg = "Acquiring lockfile %s failed: %s" % (lock, e) > > if error: > > logger.error(msg) > > else: > > logger.info(msg) > > -if self.lock_descriptor: > > -self.lock_descriptor.close() > > -self.lock_descriptor = None > > +if descriptor: > > +descriptor.close() > > +descriptor = None > > return False > > +self.lock_descriptors[lock] = descriptor > > return True > > > > -def release_lock(self): > > -if self.lock_descriptor: > > -logger.debug("Releasing lockfile for tap device '%s'" % > self.tap) > > -fcntl.flock(self.lock_descriptor, fcntl.LOCK_UN) > > -self.lock_descriptor.close() > > -os.remove(self.lock) > > -self.lock_descriptor = None > > +def release_lock(self, lock): > > +if self.lock_descriptors[lock]: > > +logger.debug("Releasing lockfile for tap device '%s'" % > lock) > > +fcntl.flock(self.lock_descriptors[lock], fcntl.LOCK_UN) > > +self.lock_descriptors[lock].close() > > +os.remove(lock) > > +self.lock_descriptors[lock] = None > > > > def get(self, key): > > if key in self.d: > > @@ -1016,8 +1017,8 @@ class BaseConfig(object): > > if os.path.exists('%s.skip' % lockfile): > > logger.info('Found %s.skip, skipping %s' % (lockfile, > p)) > > continue > > -self.lock = lockfile + '.lock' > > -if self.acquire_lock(error=False): > > +lock = lockfile + '.lock' > > +if self.acquire_lock(lock, error=False): > > tap = p > > logger.info("Using preconfigured tap device %s" % tap) > > logger.info("If this is not intended, touch %s.skip > to make runqemu skip %s." %(lockfile, tap)) > > @@ -1035,8 +1036,8 @@ class BaseConfig(object): > > cmd = ('sudo', self.qemuifup, str(uid), str(gid), > self.bindir_native) > > tap = subprocess.check_output(cmd).decode('utf-8').strip() > > lockfile = os.path.join(lockdir, tap) > > -self.lock = lockfile + '.lock' > > -self.acquire_lock() > > +lock = lockfile + '.lock' > > +self.acquire_lock(lock) > > self.cleantap = True > > logger.debug('Created tap: %s' % tap) > > > > @@ -1268,8 +1269,8 @@ class BaseConfig(object): > > cmds = shlex.split(cmd) > > logger.info('Running %s\n' % cmd) > > pass_fds = [] > > -if self.lock_descriptor: > > -pass_fds = [self.lock_descriptor.fileno()] > > +if self.lock_descriptors.keys(): > > +
Re: [OE-core] [PATCHv3 1/3] runqemu: Allow to store more than one lock for network interfaces
I squashed the fix in the wrong patch that's because the v3 that are no functional changes between v2 and v3. Fixed acquired_lock method to only add the lock when acquire succeed. Regards, Anibal On Mon, 1 Jul 2019 at 16:23, Aníbal Limón wrote: > In order to support multiple tap devices in the same qemu virtual > machine. > > Signed-off-by: Aníbal Limón > --- > scripts/runqemu | 50 + > 1 file changed, 26 insertions(+), 24 deletions(-) > > diff --git a/scripts/runqemu b/scripts/runqemu > index 4079f2b17d..38dd1c30d9 100755 > --- a/scripts/runqemu > +++ b/scripts/runqemu > @@ -181,8 +181,7 @@ class BaseConfig(object): > self.audio_enabled = False > self.tcpserial_portnum = '' > self.custombiosdir = '' > -self.lock = '' > -self.lock_descriptor = None > +self.lock_descriptors = {} > self.bitbake_e = '' > self.snapshot = False > self.wictypes = ('wic', 'wic.vmdk', 'wic.qcow2', 'wic.vdi') > @@ -204,30 +203,32 @@ class BaseConfig(object): > # avoid cleanup twice > self.cleaned = False > > -def acquire_lock(self, error=True): > -logger.debug("Acquiring lockfile %s..." % self.lock) > +def acquire_lock(self, lock, error=True): > +logger.debug("Acquiring lockfile %s..." % lock) > +descriptor = None > try: > -self.lock_descriptor = open(self.lock, 'w') > -fcntl.flock(self.lock_descriptor, fcntl.LOCK_EX|fcntl.LOCK_NB) > +descriptor = open(lock, 'w') > +fcntl.flock(descriptor, fcntl.LOCK_EX|fcntl.LOCK_NB) > except Exception as e: > -msg = "Acquiring lockfile %s failed: %s" % (self.lock, e) > +msg = "Acquiring lockfile %s failed: %s" % (lock, e) > if error: > logger.error(msg) > else: > logger.info(msg) > -if self.lock_descriptor: > -self.lock_descriptor.close() > -self.lock_descriptor = None > +if descriptor: > +descriptor.close() > +descriptor = None > return False > +self.lock_descriptors[lock] = descriptor > return True > > -def release_lock(self): > -if self.lock_descriptor: > -logger.debug("Releasing lockfile for tap device '%s'" % > self.tap) > -fcntl.flock(self.lock_descriptor, fcntl.LOCK_UN) > -self.lock_descriptor.close() > -os.remove(self.lock) > -self.lock_descriptor = None > +def release_lock(self, lock): > +if self.lock_descriptors[lock]: > +logger.debug("Releasing lockfile for tap device '%s'" % lock) > +fcntl.flock(self.lock_descriptors[lock], fcntl.LOCK_UN) > +self.lock_descriptors[lock].close() > +os.remove(lock) > +self.lock_descriptors[lock] = None > > def get(self, key): > if key in self.d: > @@ -1016,8 +1017,8 @@ class BaseConfig(object): > if os.path.exists('%s.skip' % lockfile): > logger.info('Found %s.skip, skipping %s' % (lockfile, p)) > continue > -self.lock = lockfile + '.lock' > -if self.acquire_lock(error=False): > +lock = lockfile + '.lock' > +if self.acquire_lock(lock, error=False): > tap = p > logger.info("Using preconfigured tap device %s" % tap) > logger.info("If this is not intended, touch %s.skip to > make runqemu skip %s." %(lockfile, tap)) > @@ -1035,8 +1036,8 @@ class BaseConfig(object): > cmd = ('sudo', self.qemuifup, str(uid), str(gid), > self.bindir_native) > tap = subprocess.check_output(cmd).decode('utf-8').strip() > lockfile = os.path.join(lockdir, tap) > -self.lock = lockfile + '.lock' > -self.acquire_lock() > +lock = lockfile + '.lock' > +self.acquire_lock(lock) > self.cleantap = True > logger.debug('Created tap: %s' % tap) > > @@ -1268,8 +1269,8 @@ class BaseConfig(object): > cmds = shlex.split(cmd) > logger.info('Running %s\n' % cmd) > pass_fds = [] > -if self.lock_descriptor: > -pass_fds = [self.lock_descriptor.fileno()] > +if self.lock_descriptors.keys(): > +pass_fds = [self.lock_descriptors[lock].fileno() for lock in > self.lock_descriptors.keys()] > process = subprocess.Popen(cmds, stderr=subprocess.PIPE, > pass_fds=pass_fds) > self.qemupid = process.pid > retcode = process.wait() > @@ -1291,7 +1292,8 @@ class BaseConfig(object): > cmd = ('sudo', self.qemuifdown, self.tap, self.bindir_native) > logger.debug('Running %s' % str(cmd)) > subprocess.check_call(cmd) > -
Re: [OE-core] [PATCH 1/3] runqemu: Allow to store more than one lock for network interfaces
On Sun, 30 Jun 2019 at 06:41, wrote: > On Thu, 2019-06-27 at 22:38 -0500, Aníbal Limón wrote: > > In order to support multiple tap devices in the same qemu virtual > > machine. > > > > Signed-off-by: Aníbal Limón > > --- > > With this change included tests failed on the autobuilder. I think it > breaks usage of tap devices after the first one. E.g.: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/59/builds/756 > > (but testimage failed all over) > Ok, I will review the issue and send a v2. Thanks, Anibal > > Cheers, > > Richard > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] meta/classes/testimage.bbclass: Only validate IMAGE_FSTYPES when is QEMU
On Thu, 15 Nov 2018 at 07:08, Burton, Ross wrote: > On Tue, 23 Oct 2018 at 01:38, Anibal Limon > wrote: > >> > -fstypes = [fs for fs in d.getVar('IMAGE_FSTYPES').split(' ') > > >> > +fstypes = d.getVar('IMAGE_FSTYPES') > >> > +fstypes = [fs for fs in fstypes if fs in supported_fstypes] > > That's the problem, the old code takes IMAGE_FSTYPES and splits it on > whitespace, the new code iterates over each *character* > I sent an old version, sorry for that, sending v3... Anibal > > Ross > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] meta/classes/testimage.bbclass: Only validate IMAGE_FSTYPES when is QEMU
On Sat, 20 Oct 2018 at 02:11, wrote: > On Tue, 2018-10-16 at 18:21 -0500, Aníbal Limón wrote: > > When use simpleremote target the flash/boot process is executed > > manually, the IMAGE_FSTYPES validation is only needed when execute > > testimage against qemu. > > > > The supported_fstypes comes from oeqa.core.target.qemu module. > > > > Signed-off-by: Aníbal Limón > > --- > > meta/classes/testimage.bbclass | 13 +++-- > > 1 file changed, 7 insertions(+), 6 deletions(-) > > > > diff --git a/meta/classes/testimage.bbclass > b/meta/classes/testimage.bbclass > > index 2642a722e7..734cb7caae 100644 > > --- a/meta/classes/testimage.bbclass > > +++ b/meta/classes/testimage.bbclass > > @@ -194,12 +194,13 @@ def testimage_main(d): > > machine = d.getVar("MACHINE") > > > > # Get rootfs > > -fstypes = [fs for fs in d.getVar('IMAGE_FSTYPES').split(' ') > > - if fs in supported_fstypes] > > -if not fstypes: > > -bb.fatal('Unsupported image type built. Add a comptible image > to ' > > - 'IMAGE_FSTYPES. Supported types: %s' % > > - ', '.join(supported_fstypes)) > > +fstypes = d.getVar('IMAGE_FSTYPES') > > +if d.getVar("TEST_TARGET") == "qemu": > > +fstypes = [fs for fs in fstypes if fs in supported_fstypes] > > +if not fstypes: > > +bb.fatal('Unsupported image type built. Add a comptible > image to ' > > + 'IMAGE_FSTYPES. Supported types: %s' % > > + ', '.join(supported_fstypes)) > > rootfs = '%s.%s' % (image_name, fstypes[0]) > > > > # Get tmpdir (not really used, just for compatibility) > > This causes the autobuilder to break and there is a bug in the logic > above: > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/32/builds/128/steps/7/logs/step1c I'm not seeing this error, I executed testimage in qemuarm and qemux86, I'm looking at the configuration but should not fail because I added only a conditional to filter only when the target is qemu. Regards, Anibal > > > (one of many failures as everything broke) > > Cheers, > > Richard > > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] meta/classes/testexport: Use manfiest filenames for package and testdata
Hi Richard, I need to update the selftest testcase, i will send v2. I send other patch, can you take a look? http://lists.openembedded.org/pipermail/openembedded-core/2018-October/156762.html Regards, Anibal On Thu, 18 Oct 2018 at 10:43, wrote: > On Wed, 2018-10-17 at 18:00 -0500, Aníbal Limón wrote: > > Is clear to know for what image and machine the testexport package > > manifest and testdata was build. > > > > Signed-off-by: Aníbal Limón > > --- > > meta/classes/testexport.bbclass | 4 ++-- > > meta/lib/oeqa/runtime/context.py | 9 +++-- > > 2 files changed, 9 insertions(+), 4 deletions(-) > > I think this breaks oe-selftest: > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/28/builds/132/steps/7/logs/step2d > > Cheers, > > Richard > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] scripts/yocto-check-layer: Don't abort when layer fails to get signatures
Targeting sumo too. Anibal On Tue, 2 Oct 2018 at 16:43, Aníbal Limón wrote: > When execute in multiple layers like meta-openembedded the execution is > aborted when some sublayer fails to get world signatures, so mark it as > an error and continue the execution in the remaining sublayers. > > Signed-off-by: Aníbal Limón > --- > scripts/yocto-check-layer | 9 - > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/scripts/yocto-check-layer b/scripts/yocto-check-layer > index 5a4fd752ca..9b7e53679b 100755 > --- a/scripts/yocto-check-layer > +++ b/scripts/yocto-check-layer > @@ -169,7 +169,14 @@ def main(): > td['bbvars'] = get_bb_vars() > logger.info('Getting initial signatures ...') > td['builddir'] = builddir > -td['sigs'], td['tunetasks'] = get_signatures(td['builddir']) > +try: > +td['sigs'], td['tunetasks'] = get_signatures(td['builddir']) > +except RuntimeError as e: > +logger.info(str(e)) > +results[layer['name']] = None > +results_status[layer['name']] = 'FAIL (Generating world > signatures)' > +layers_tested = layers_tested + 1 > +continue > td['machines'] = args.machines > > if not add_layer(bblayersconf, layer, dep_layers, logger): > -- > 2.19.0 > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][RFC] glibc: Avoid multilibbing on wordsize.h
On Wed, 18 Jul 2018 at 20:27, Daniel Díaz wrote: > Once another header #includes , there is a > potential recursion going on because the > multilib_header_wrapper.h #includes again! > > This should not happen because an __arm__ (32-bits) or an > __aarch64__ (64-bits) environment guarantees that we will > be getting the correct definition, but when building against > a different target (like BPF), recursion is what happens. > > This can be seen, for instance, when building eBPF programs > from the kernel with `clang -target bpf', such as the ones > located in linux/tools/testing/selftests/bpf/. > > Signed-off-by: Daniel Díaz > Signed-off-by: Aníbal Limón > --- > meta/recipes-core/glibc/glibc-package.inc | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/meta/recipes-core/glibc/glibc-package.inc > b/meta/recipes-core/glibc/glibc-package.inc > index ae3f2f6..a4f61f8 100644 > --- a/meta/recipes-core/glibc/glibc-package.inc > +++ b/meta/recipes-core/glibc/glibc-package.inc > @@ -136,8 +136,7 @@ do_install_append_armeb () { > } > > do_install_armmultilib () { > - > - oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h > bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h bits/wordsize.h > + oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h > bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h > oe_multilib_header bits/local_lim.h bits/mman.h bits/msq.h > bits/pthreadtypes.h bits/pthreadtypes-arch.h bits/sem.h bits/semaphore.h > bits/setjmp.h > oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h > bits/statfs.h bits/typesizes.h > > -- > 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] deb_packaging: Added support for multilib
The Package Manager implementation for deb didn't take a look about multilib enabled variants. Changes are made for generate apt.conf, sources.list and debian repo index Release and Packages files. [YOCTO #1502] Signed-off-by: Anibal Limon anibal.ezau.limon.belma...@linux.intel.com --- meta/lib/oe/package_manager.py | 35 ++- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index b3b3b2d..27fdf26 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -167,6 +167,9 @@ class DpkgIndexer(Indexer): if a not in pkg_archs: arch_list.append(a) +all_mlb_pkg_arch_list = (self.d.getVar('ALL_MULTILIB_PACKAGE_ARCHS', True) or ).replace('-', '_').split() +arch_list.extend(arch for arch in all_mlb_pkg_arch_list if arch not in arch_list) + apt_ftparchive = bb.utils.which(os.getenv('PATH'), apt-ftparchive) gzip = bb.utils.which(os.getenv('PATH'), gzip) @@ -1474,6 +1477,10 @@ class DpkgPM(PackageManager): self.apt_args = d.getVar(APT_ARGS, True) +self.all_arch_list = self.d.getVar('PACKAGE_ARCHS', True).split() +all_mlb_pkg_arch_list = (self.d.getVar('ALL_MULTILIB_PACKAGE_ARCHS', True) or ).replace('-', '_').split() +self.all_arch_list.extend(arch for arch in all_mlb_pkg_arch_list if arch not in self.all_arch_list) + self._create_configs(archs, base_archs) self.indexer = DpkgIndexer(self.d, self.deploy_dir) @@ -1631,8 +1638,8 @@ class DpkgPM(PackageManager): sources_conf = os.path.join(%s/etc/apt/sources.list % self.target_rootfs) arch_list = [] -archs = self.d.getVar('PACKAGE_ARCHS', True) -for arch in archs.split(): + +for arch in self.all_arch_list: if not os.path.exists(os.path.join(self.deploy_dir, arch)): continue arch_list.append(arch) @@ -1655,7 +1662,7 @@ class DpkgPM(PackageManager): bb.utils.mkdirhier(self.apt_conf_dir + /apt.conf.d/) arch_list = [] -for arch in archs.split(): +for arch in self.all_arch_list: if not os.path.exists(os.path.join(self.deploy_dir, arch)): continue arch_list.append(arch) @@ -1684,15 +1691,25 @@ class DpkgPM(PackageManager): sources_file.write(deb file:%s/ ./\n % os.path.join(self.deploy_dir, arch)) +base_arch_list = base_archs.split() +multilib_variants = self.d.getVar(MULTILIB_VARIANTS, True); +for variant in multilib_variants.split(): +if variant == lib32: +base_arch_list.append(i386) +elif variant == lib64: +base_arch_list.append(amd64) + with open(self.apt_conf_file, w+) as apt_conf: with open(self.d.expand(${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample)) as apt_conf_sample: for line in apt_conf_sample.read().split(\n): -line = re.sub(Architecture \.*\;, - Architecture \%s\; % base_archs, line) -line = re.sub(#ROOTFS#, self.target_rootfs, line) -line = re.sub(#APTCONF#, self.apt_conf_dir, line) - -apt_conf.write(line + \n) +match_arch = re.match( Architecture \.*\;$, line) +if match_arch: +for base_arch in base_arch_list: +apt_conf.write( Architecture \%s\;\n % base_arch) +else: +line = re.sub(#ROOTFS#, self.target_rootfs, line) +line = re.sub(#APTCONF#, self.apt_conf_dir, line) +apt_conf.write(line + \n) target_dpkg_dir = %s/var/lib/dpkg % self.target_rootfs bb.utils.mkdirhier(os.path.join(target_dpkg_dir, info)) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core