[OE-core] [PATCH] python/python3: add virtual/crypt to DEPENDS

2018-08-20 Thread Hongxu Jia
Since `6146b8c glibc: Disable crypt support in glibc' in oe-core, python2/3 could not find symbol crypt which caused import crypt failed. [snip] >>> import crypt Traceback (most recent call last): File "", line 1, in File "/usr/lib64/python3.5/crypt.py", line 3, in import _crypt

Re: [OE-core] [PATCH] nativesdk-packagegroup-sdk-host: Add wayland-scanner to

2018-08-20 Thread Seokha Ko
currently nativesdk-wayland-dev package bin directory which includes wayland-scanner only. And, IMHO, if there are other tools for dev package, we need them for nativesdk target also. Thank you. - Original Message - From: Khem Raj To:

Re: [OE-core] [PATCH V2] nasm: fix CVE-2018-8883 & CVE-2018-8882 & CVE-2018-10016 & CVE-2018-10316

2018-08-20 Thread ChenQi
Caused ovmf do_compile failure. https://autobuilder.yocto.io/builders/nightly-musl/builds/1254/steps/BuildImages/logs/stdio Best Regards, Chen Qi On 08/20/2018 09:23 AM, Hongxu Jia wrote: Signed-off-by: Hongxu Jia --- ...t-we-are-not-reading-past-end-of-a-buffer.patch | 65

[OE-core] : feedback on externalsrc patch

2018-08-20 Thread Vignesh Rajendran (RBEI/ECF3)
Hello Khem, Paul, I am waiting for any feedback for the patch changes. https://patchwork.openembedded.org/patch/150819/ The approach suggested to use "DEBUG_PREFIX_MAP relative to S instead of WORKDIR" seems not possible due to the package.bbclass approach.

Re: [OE-core] [PATCH] nativesdk-packagegroup-sdk-host: Add wayland-scanner to the SDK native toolchain

2018-08-20 Thread Seokha Ko
currently nativesdk-wayland-dev package bin directory which includes wayland-scanner only. And, IMHO, if there are other tools for dev package, we need them for nativesdk target also. Thank you. - Original  Message - From: Khem Raj To:

Re: [OE-core] [PATCH 1/1] assimp.py: fix AttributeError in tearDownClass

2018-08-20 Thread ChenQi
On 08/21/2018 12:53 AM, Richard Purdie wrote: On Fri, 2018-08-17 at 17:17 +0800, Chen Qi wrote: When running this test case, we will see the following error. AttributeError: type object 'BuildAssimp' has no attribute 'project' assimp.py test case does not make use of SDKBuildProject, so

[OE-core] [PATCH V4] sstate: Avoid indirect autoconf-archive-native dependencies

2018-08-20 Thread changqing.li
From: Changqing Li remove the indirect dependcy of autoconf-archive-native via SSTATE_EXCLUDEDEPS_SYSROOT to avoid not needed .m4 installed into sysroot, which may cause compile problem. Signed-off-by: Changqing Li --- meta/conf/layer.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git

Re: [OE-core] [PATCH] nativesdk-packagegroup-sdk-host: Add wayland-scanner to the SDK native toolchain

2018-08-20 Thread Khem Raj
On Mon, Aug 20, 2018 at 4:26 PM Seokha Ko wrote: > > The wayland-scanner was missing from the native toolchain for SDK build > because it's copied from wayland dev package. > > Signed-off-by: Seokha Ko > --- > .../packagegroups/nativesdk-packagegroup-sdk-host.bb| 2 +- > 1 file

[OE-core] [PATCH] openssl: fix hardcoded paths in native for openssl 1.1

2018-08-20 Thread Andre McCurdy
Relying on hardcoded built-in paths causes openssl-native to not be relocateable from sstate. Solution for openssl 1.1, based on the existing solution from openssl 1.0: http://git.openembedded.org/openembedded-core/commit/?id=771d3123331fbfab1eb9ce47e3013eabcb2248f5 Signed-off-by: Andre

[OE-core] [PATCH] nativesdk-packagegroup-sdk-host: Add wayland-scanner to the SDK native toolchain

2018-08-20 Thread Seokha Ko
The wayland-scanner was missing from the native toolchain for SDK build because it's copied from wayland dev package. Signed-off-by: Seokha Ko --- .../packagegroups/nativesdk-packagegroup-sdk-host.bb| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [OE-core] [PATCH] busybox: Add a dependency on virtual/crypt

2018-08-20 Thread Andre McCurdy
On Mon, Aug 20, 2018 at 2:03 PM, Peter Kjellerstedt wrote: >> -Original Message- >> From: Andre McCurdy >> Sent: den 20 augusti 2018 22:23 >> To: Khem Raj >> Cc: Richard Purdie ; Peter >> Kjellerstedt ; Patches and discussions >> about the oe-core layer >> Subject: Re: [OE-core]

Re: [OE-core] [PATCH] busybox: Add a dependency on virtual/crypt

2018-08-20 Thread Peter Kjellerstedt
> -Original Message- > From: Andre McCurdy > Sent: den 20 augusti 2018 22:23 > To: Khem Raj > Cc: Richard Purdie ; Peter > Kjellerstedt ; Patches and discussions > about the oe-core layer > Subject: Re: [OE-core] [PATCH] busybox: Add a dependency on > virtual/crypt > > On Mon, Aug 20,

Re: [OE-core] [PATCH 1/1] assimp.py: fix AttributeError in tearDownClass

2018-08-20 Thread Richard Purdie
On Mon, 2018-08-20 at 17:53 +0100, Richard Purdie wrote: > On Fri, 2018-08-17 at 17:17 +0800, Chen Qi wrote: > > When running this test case, we will see the following error. > > > > AttributeError: type object 'BuildAssimp' has no attribute > > 'project' > > > > assimp.py test case does not

Re: [OE-core] [V2][PATCH] gnutls: Update to 3.6.3

2018-08-20 Thread Andre McCurdy
On Fri, Aug 17, 2018 at 3:39 PM, akuster808 wrote: > On 08/17/2018 02:31 PM, Andre McCurdy wrote: >> On Fri, Aug 17, 2018 at 7:14 AM, Armin Kuster wrote: >>> [v2] >>> Fix new config options form with to disable. >>> >>> [v1] >>> release notes: >>>

Re: [OE-core] [PATCH V3] sstate: Avoid indirect autoconf-archive-native dependencies

2018-08-20 Thread Peter Kjellerstedt
> -Original Message- > From: openembedded-core-boun...@lists.openembedded.org core-boun...@lists.openembedded.org> On Behalf Of > changqing...@windriver.com > Sent: den 20 augusti 2018 04:31 > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [PATCH V3] sstate: Avoid

Re: [OE-core] [PATCH] busybox: Add a dependency on virtual/crypt

2018-08-20 Thread Andre McCurdy
On Mon, Aug 20, 2018 at 12:45 PM, Khem Raj wrote: > On Mon, Aug 20, 2018 at 2:45 AM Richard Purdie > wrote: >> >> On Mon, 2018-08-20 at 04:46 +0200, Peter Kjellerstedt wrote: >> > busybox needs crypt() if CONFIG_USE_BB_CRYPT is not defined. >> > >> > Signed-off-by: Peter Kjellerstedt >> > ---

Re: [OE-core] x86_64: ldd does not work (not a dynamic executable)

2018-08-20 Thread richard . purdie
On Mon, 2018-08-20 at 12:06 +0200, Ricardo Ribalda Delgado wrote: > Hi > > I think that I found a bug with ldd on sumo. Whenever I try to use it > on the target with an dynamic binary, it returns: > > root@qt5122:~# ldd ./qtec_webcam > not a dynamic executable > > > The reason seems to be that

Re: [OE-core] x86_64: ldd does not work (not a dynamic executable)

2018-08-20 Thread Khem Raj
This seems a bug, but we need to ensure it works with multilib On Mon, Aug 20, 2018 at 3:06 AM Ricardo Ribalda Delgado wrote: > > Hi > > I think that I found a bug with ldd on sumo. Whenever I try to use it > on the target with an dynamic binary, it returns: > > root@qt5122:~# ldd ./qtec_webcam >

Re: [OE-core] [PATCH] busybox: Add a dependency on virtual/crypt

2018-08-20 Thread Khem Raj
On Mon, Aug 20, 2018 at 2:45 AM Richard Purdie wrote: > > On Mon, 2018-08-20 at 04:46 +0200, Peter Kjellerstedt wrote: > > busybox needs crypt() if CONFIG_USE_BB_CRYPT is not defined. > > > > Signed-off-by: Peter Kjellerstedt > > --- > > meta/recipes-core/busybox/busybox.inc | 3 ++- > > 1 file

[OE-core] [PATCH 5/5] llvm: Use HOST_ARCH in LLVM_TARGETS_TO_BUILD for builds

2018-08-20 Thread Khem Raj
LLVM_TARGETS_TO_BUILD is needed to represent HOST_ARCH for builds and target specific additions should use class-target override Signed-off-by: Khem Raj --- meta/recipes-devtools/llvm/llvm_git.bb | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git

[OE-core] [PATCH 3/5] gdb: Alias rpl_stat to stat() on musl

2018-08-20 Thread Khem Raj
Use CPPFLAGS instead of CFLAGS since there is C++ compiler being used for somefiles Fixes gdb/gdbserver/../../../gdb-8.1.1/gdb/gdbserver/../common/common-utils.c:419: undefined reference to `rpl_stat' | collect2: error: ld returned 1 exit status | make[4]: *** [Makefile:414: libinproctrace.so]

[OE-core] [PATCH 4/5] dos2unix.bbclass: Move to oe-core

2018-08-20 Thread Khem Raj
- Import from meta-oe layer - This is useful for many packages where CR-LF needs to be adjusted, many recipes depend on it e.g. meta-multimedia libebml and so on. - Add myself as maintainer for now Signed-off-by: Khem Raj --- meta/conf/distro/include/maintainers.inc | 1 +

[OE-core] [PATCH 2/5] gdb: Upgrade to 8.1.1

2018-08-20 Thread Khem Raj
Signed-off-by: Khem Raj --- meta/recipes-devtools/gdb/{gdb-8.1.inc => gdb-8.1.1.inc} | 4 ++-- ...{gdb-cross-canadian_8.1.bb => gdb-cross-canadian_8.1.1.bb} | 0 .../gdb/{gdb-cross_8.1.bb => gdb-cross_8.1.1.bb} | 0 meta/recipes-devtools/gdb/{gdb_8.1.bb => gdb_8.1.1.bb}

[OE-core] [PATCH 1/5] mesa: Enable gallium-llvm on x86 and x86_64

2018-08-20 Thread Khem Raj
Signed-off-by: Khem Raj --- meta/recipes-graphics/cairo/cairo.inc | 3 ++- meta/recipes-graphics/mesa/mesa.inc | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 20e0d2c92a..7347f223ff

[OE-core] [PATCH V3 0/5] Use llvmpile for mesa on x86/x86-64

2018-08-20 Thread Khem Raj
This series fixes llvm build to support multilib configurations Adds dos2unix bbclass to core from meta-oe Fixes ppc security flags world builds v2: Upgrade binutils and gdb Fix libidb2 cross build issue when build host == target host v3: Fix sstate differences between different builds for

Re: [OE-core] [PATCH 1/9] mesa: Enable gallium-llvm on x86 and x86_64

2018-08-20 Thread Khem Raj
On Mon, Aug 20, 2018 at 10:14 AM Khem Raj wrote: > > On Mon, Aug 20, 2018 at 2:40 AM Richard Purdie > wrote: > > > > On Sun, 2018-08-19 at 10:23 -0700, Khem Raj wrote: > > > Signed-off-by: Khem Raj > > > --- > > > meta/recipes-graphics/cairo/cairo.inc | 3 ++- > > >

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

2018-08-20 Thread Jolley, Stephen K
All, The triage team meets weekly and does its best to handle the bugs reported into the bugzilla. The number of people attending that meeting has fallen, as have the number of people available to help fix bugs. One of the things we hear users report is they don't know how to help. We (the

Re: [OE-core] [PATCH 4/9] dos2unix.bbclass: Move to oe-core

2018-08-20 Thread Khem Raj
I updated this in pull branch to include recipe as well. On Mon, Aug 20, 2018 at 10:02 AM Khem Raj wrote: > > On Mon, Aug 20, 2018 at 2:43 AM Richard Purdie > wrote: > > > > On Mon, 2018-08-20 at 11:23 +0200, Martin Hundebøll wrote: > > > Hi Khem, > > > > > > On 19/08/2018 19.23, Khem Raj wrote:

Re: [OE-core] [PATCH 1/9] mesa: Enable gallium-llvm on x86 and x86_64

2018-08-20 Thread Khem Raj
On Mon, Aug 20, 2018 at 2:40 AM Richard Purdie wrote: > > On Sun, 2018-08-19 at 10:23 -0700, Khem Raj wrote: > > Signed-off-by: Khem Raj > > --- > > meta/recipes-graphics/cairo/cairo.inc | 3 ++- > > meta/recipes-graphics/mesa/mesa.inc | 3 +++ > > 2 files changed, 5 insertions(+), 1

Re: [OE-core] Submission of 'emit-buildvars' class?

2018-08-20 Thread Enrico Scholz via Openembedded-core
Alexander Kanavin writes: >> I do not know, how this can be done with plain OE. As said, SDKs are too >> heavy weighted, 'devshell' too slow and can not be scripted, 'externalsrc' >> is broken, slow and can not be scripted. > > For better or worse, Yocto Project has standardized on devtool (not

Re: [OE-core] [PATCH 4/9] dos2unix.bbclass: Move to oe-core

2018-08-20 Thread Khem Raj
On Mon, Aug 20, 2018 at 2:43 AM Richard Purdie wrote: > > On Mon, 2018-08-20 at 11:23 +0200, Martin Hundebøll wrote: > > Hi Khem, > > > > On 19/08/2018 19.23, Khem Raj wrote: > > > - Import from meta-oe layer > > > > > > - This is useful for many packages where CR-LF > > >needs to be

Re: [OE-core] [PATCH 8/9] gdb: Upgrade to 8.1.1

2018-08-20 Thread Khem Raj
On Mon, Aug 20, 2018 at 3:59 AM Richard Purdie wrote: > > On Sun, 2018-08-19 at 19:41 -0700, Khem Raj wrote: > > On Sun, Aug 19, 2018 at 7:19 PM ChenQi wrote: > > > > > > There's a build failure on autobuilder. > > > > > > https://autobuilder.yocto.io/builders/nightly-musl-x86-64/builds/70 > > >

Re: [OE-core] [PATCH v2] classes/package: Clean up getstatusoutput

2018-08-20 Thread richard . purdie
On Mon, 2018-08-20 at 10:54 -0500, Joshua Watt wrote: > Replaces usage of the deprecated oe.utils.getstatusoutput() with > Python > subprocess calls. > > Signed-off-by: Joshua Watt > --- > meta/classes/package.bbclass | 11 +++ > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff

Re: [OE-core] [PATCH 1/1] assimp.py: fix AttributeError in tearDownClass

2018-08-20 Thread Richard Purdie
On Fri, 2018-08-17 at 17:17 +0800, Chen Qi wrote: > When running this test case, we will see the following error. > > AttributeError: type object 'BuildAssimp' has no attribute > 'project' > > assimp.py test case does not make use of SDKBuildProject, so remove > the import statement and the

Re: [OE-core] Submission of 'emit-buildvars' class?

2018-08-20 Thread Alexander Kanavin
2018-08-20 17:58 GMT+02:00 Enrico Scholz : > I do not know, how this can be done with plain OE. As said, SDKs are too > heavy weighted, 'devshell' too slow and can not be scripted, 'externalsrc' > is broken, slow and can not be scripted. For better or worse, Yocto Project has standardized on

Re: [OE-core] Submission of 'emit-buildvars' class?

2018-08-20 Thread Enrico Scholz via Openembedded-core
Alexander Kanavin writes: >> we are using for some time an 'emit-buildvars' class which exports >> bitbake variables into makefile fragments. This class is used for for >> developing of kernel, u-boot and other low level software and for >> generic packaging. > > I don't quite understand how

[OE-core] [PATCH v2] classes/package: Clean up getstatusoutput

2018-08-20 Thread Joshua Watt
Replaces usage of the deprecated oe.utils.getstatusoutput() with Python subprocess calls. Signed-off-by: Joshua Watt --- meta/classes/package.bbclass | 11 +++ 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index

[OE-core] [PATCH] autoconf: update runtime perl module dependencies

2018-08-20 Thread Mikko Rapeli
Test in SDK was failing to execute: $ autoreconf --install --force due to missing perl modules. Add the needed perl modules for target build: perl-module-bytes perl-module-thread-queue perl-module-threads Duplicate the perl module dependencies for SDK as well. Now autoreconf runs with a

Re: [OE-core] Submission of 'emit-buildvars' class?

2018-08-20 Thread Alexander Kanavin
2018-08-20 16:01 GMT+02:00 Enrico Scholz via Openembedded-core : > we are using for some time an 'emit-buildvars' class which exports > bitbake variables into makefile fragments. This class is used for for > developing of kernel, u-boot and other low level software and for > generic packaging. I

[OE-core] Submission of 'emit-buildvars' class?

2018-08-20 Thread Enrico Scholz via Openembedded-core
Hello, we are using for some time an 'emit-buildvars' class which exports bitbake variables into makefile fragments. This class is used for for developing of kernel, u-boot and other low level software and for generic packaging. The class supports exporting images over userspace NFS and is

Re: [OE-core] [PATCH v5] kernel-devsrc: restructure for out of tree (and on target) module builds

2018-08-20 Thread Bruce Ashfield
On 08/19/2018 11:36 AM, richard.pur...@linuxfoundation.org wrote: On Sat, 2018-08-18 at 22:50 -0400, Bruce Ashfield wrote: [...] v5: - added failure catch for x86 purgatory files which changed in 4.18 and hence are not universal across versions - added explicity bison and flex

Re: [OE-core] [PATCH 2/2] wic: bootimg-partition: Select a preferred type if multi kernel images are installed

2018-08-20 Thread Tom Rini
On Mon, Aug 20, 2018 at 06:42:25PM +0800, Kevin Hao wrote: > Automatically select one kernel type image based on a predefined > precedence list if there are multi kernel images installed. > > Signed-off-by: Kevin Hao Reviewed-by: Tom Rini -- Tom signature.asc Description: PGP signature --

Re: [OE-core] [PATCH 8/9] gdb: Upgrade to 8.1.1

2018-08-20 Thread Richard Purdie
On Sun, 2018-08-19 at 19:41 -0700, Khem Raj wrote: > On Sun, Aug 19, 2018 at 7:19 PM ChenQi wrote: > > > > There's a build failure on autobuilder. > > > > https://autobuilder.yocto.io/builders/nightly-musl-x86-64/builds/70 > > 0/steps/BuildImages/logs/stdio > > > > I pushed a patch to pull

[OE-core] [PATCH 2/2] wic: bootimg-partition: Select a preferred type if multi kernel images are installed

2018-08-20 Thread Kevin Hao
Automatically select one kernel type image based on a predefined precedence list if there are multi kernel images installed. Signed-off-by: Kevin Hao --- .../lib/wic/plugins/source/bootimg-partition.py| 22 +- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git

[OE-core] [PATCH 1/2] wic: bootimg-partition: Add support to specify a custom extlinux.conf

2018-08-20 Thread Kevin Hao
Add support to specify a custom extlinux.conf via something like: bootloader --configfile="extlinux.conf" Signed-off-by: Kevin Hao --- .../lib/wic/plugins/source/bootimg-partition.py| 79 +- 1 file changed, 47 insertions(+), 32 deletions(-) diff --git

[OE-core] x86_64: ldd does not work (not a dynamic executable)

2018-08-20 Thread Ricardo Ribalda Delgado
Hi I think that I found a bug with ldd on sumo. Whenever I try to use it on the target with an dynamic binary, it returns: root@qt5122:~# ldd ./qtec_webcam not a dynamic executable The reason seems to be that it cannot find the dynamic linker: It is searching for: RTLDLIST="/lib/ld-linux.so.2

Re: [OE-core] [PATCH] busybox: Add a dependency on virtual/crypt

2018-08-20 Thread Richard Purdie
On Mon, 2018-08-20 at 04:46 +0200, Peter Kjellerstedt wrote: > busybox needs crypt() if CONFIG_USE_BB_CRYPT is not defined. > > Signed-off-by: Peter Kjellerstedt > --- > meta/recipes-core/busybox/busybox.inc | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git

Re: [OE-core] [PATCH 4/9] dos2unix.bbclass: Move to oe-core

2018-08-20 Thread Richard Purdie
On Mon, 2018-08-20 at 11:23 +0200, Martin Hundebøll wrote: > Hi Khem, > > On 19/08/2018 19.23, Khem Raj wrote: > > - Import from meta-oe layer > > > > - This is useful for many packages where CR-LF > >needs to be adjusted, many recipes depend on it > >e.g. meta-multimedia libebml and so

Re: [OE-core] [PATCH 1/9] mesa: Enable gallium-llvm on x86 and x86_64

2018-08-20 Thread Richard Purdie
On Sun, 2018-08-19 at 10:23 -0700, Khem Raj wrote: > Signed-off-by: Khem Raj > --- > meta/recipes-graphics/cairo/cairo.inc | 3 ++- > meta/recipes-graphics/mesa/mesa.inc | 3 +++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-graphics/cairo/cairo.inc

Re: [OE-core] [PATCH 4/9] dos2unix.bbclass: Move to oe-core

2018-08-20 Thread Martin Hundebøll
Hi Khem, On 19/08/2018 19.23, Khem Raj wrote: - Import from meta-oe layer - This is useful for many packages where CR-LF needs to be adjusted, many recipes depend on it e.g. meta-multimedia libebml and so on. Signed-off-by: Khem Raj --- meta/classes/dos2unix.bbclass | 14

Re: [OE-core] [oe-core][rocko][sumo][master][PATCH 1/2] bitbake.conf: add PERSISTENT_LOG_DIR variable

2018-08-20 Thread Ankur Tyagi
Initially I thought of doing that but then dropped it because it would create a dependency on syslog configuration file. If in future syslog configuration parameter (LOGFILE) gets renamed, then we need to make corresponding change as well. I think creating /var/log as a link is a less dependent

[OE-core] [PATCH 1/1] cmake-native: fix to function correctly in case of eSDK

2018-08-20 Thread Chen Qi
Our eSDK is expected to provide traditional SDK's functionality. But for cmake, it could not function well in eSDK. This problem is discovered by the assimp.py test case. The error message is as below. testsdkext/tmp/sysroots/x86_64/usr/lib/libz.so: error adding symbols: file in wrong format

[OE-core] [PATCH 0/1] cmake-native: fix to function correctly in case of eSDK

2018-08-20 Thread Chen Qi
*** BLURB HERE *** The following changes since commit 9af0f1a46bbb6ad9ee8b35957251f4aa826b023f: kernel-devsrc: restructure for out of tree (and on target) module builds (2018-08-19 16:35:22 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib

Re: [OE-core] [PATCH] classes/package: Clean up getstatusoutput

2018-08-20 Thread richard . purdie
On Sun, 2018-08-19 at 21:43 -0500, Joshua Watt wrote: > Replaces usage of the deprecated oe.utils.getstatusoutput() with Python > subprocess calls. > > Signed-off-by: Joshua Watt > --- > meta/classes/package.bbclass | 19 +++ > 1 file changed, 11 insertions(+), 8 deletions(-) >

[OE-core] [PATCH v3] rootfs-postcommands: put image testdata under sstate control

2018-08-20 Thread André Draszik
From: André Draszik The testdata.json is being written to DEPLOY_DIR_IMAGE directly, thus bypassing sstate, which results in an ever growing list of files. Write them to IMGDEPLOYDIR instead, so as to benefit from the automatic management via sstate. Signed-off-by: André Draszik --- v3: