Re: [OE-core] Reproducible build issues with buildpaths - take 2

2022-07-09 Thread Christopher Clark 
On Fri, Jul 8, 2022 at 6:55 PM Christopher Clark via
lists.openembedded.org
 wrote:
>
> On Fri, Jul 8, 2022 at 6:37 AM Bruce Ashfield  
> wrote:
> >
> > On Fri, Jul 8, 2022 at 7:07 AM Richard Purdie
> >  wrote:
> > >
> > > Hi All,
> > >
> > > We've made good progress and I appreciate the help from people. I ran a
> > > fresh build on the autobuilder and I forced it to rerun the QA checks
> > > for all recipes. The tricky bit about warnings is that they don't show
> > > up for objects from sstate and the addition of the buildpaths QA check
> > > doesn't cause the checks to rerun. Due to that a few more previsouly
> > > unseen issues cropped up.
> > >
> > > The list of issues now stands are:
> > >
> > > qemuppc:
> > > https://autobuilder.yoctoproject.org/typhoon/#/builders/63/builds/5428
> > > WARNING: kernel-devsrc-1.0-r0 do_package_qa: QA Issue: File 
> > > /lib/modules/5.15.48-yocto-standard/build/include/generated/.vdso32-offsets.h.cmd
> > >  in package kernel-devsrc contains reference to TMPDIR [buildpaths]
> >
> > I'll take this one. My fix was only for arch/arm, but I'll expand it
> > to cover ppc32.
> >
> > >
> > > meta-arm:
> > > https://autobuilder.yoctoproject.org/typhoon/#/builders/113/builds/2629
> > > stdio: WARNING: perl-5.36.0-r0 do_package_qa: QA Issue: File 
> > > /usr/lib/perl/ptest/dist/threads-shared/Makefile.old in package 
> > > perl-ptest contains reference to TMPDIR
> > >
> > > meta-gplv2:
> > > https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/5460
> > > WARNING: bash-3.2.57-r0 do_package_qa: QA Issue: File /usr/bin/bashbug in 
> > > package bash contains reference to TMPDIR [buildpaths]
> > > WARNING: tar-1.17-r3 do_package_qa: QA Issue: File 
> > > /usr/src/debug/tar/1.17-r3/build/lib/string.h in package tar-src contains 
> > > reference to TMPDIR
> > > WARNING: diffutils-2.8.1-r7.0 do_package_qa: QA Issue: File 
> > > /usr/bin/diff.diffutils in package diffutils contains reference to TMPDIR 
> > > [buildpaths]
> > > WARNING: findutils-4.2.31-r4 do_package_qa: QA Issue: File 
> > > /usr/bin/updatedb in package findutils contains reference to TMPDIR 
> > > [buildpaths]
> > > WARNING: mc-4.7.5.2-r3 do_package_qa: QA Issue: File 
> > > /usr/libexec/mc/extfs.d/iso9660 in package mc-helpers contains reference 
> > > to TMPDIR [buildpaths]
> > >
> > > There is a proposal on the oe-architecture list about simply disabling
> > > this layer going forward. The increased number of issues reinforces my
> > > view on that.
> > >
> > > meta-virt:
> > > https://autobuilder.yoctoproject.org/typhoon/#/builders/128/builds/292
> > > WARNING: xen-tools-4.16+stableAUTOINC+f265444922-r0 do_package_qa: QA 
> > > Issue: File /usr/lib/xen/boot/xen-shim in package xen-tools-shim contains 
> > > reference to TMPDIR [buildpaths]
> > > WARNING: xen-tools-4.16+stableAUTOINC+f265444922-r0 do_package_qa: QA 
> > > Issue: File 
> > > /usr/src/debug/xen-tools/4.16+stableAUTOINC+f265444922-r0/git/tools/libs/light/dsdt_pvh.c
> > >  in package xen-tools-src contains reference to TMPDIR [buildpaths]
> > > WARNING: xen-tools-4.16+stableAUTOINC+f265444922-r0 do_package_qa: QA 
> > > Issue: File /usr/lib/libxenlight.so.4.16.0 in package 
> > > xen-tools-libxenlight contains reference to TMPDIR [buildpaths]
> > > WARNING: xen-tools-4.16+stableAUTOINC+f265444922-r0 do_package_qa: QA 
> > > Issue: File /usr/lib/libxenlight.a in package xen-tools-staticdev 
> > > contains reference to TMPDIR [buildpaths]
> > > WARNING: xen-tools-4.16+stableAUTOINC+f265444922-r0 do_package_qa: QA 
> > > Issue: File /usr/lib/debug/usr/lib/xen/boot/xen-shim-syms in package 
> > > xen-tools-dbg contains reference to TMPDIR [buildpaths]
> > >
> >
> > Hopefully Christopher can chime in here. If not, I'll have a look
> > early next week (or over the weekend).
>
> Ack - I will be working on this over this weekend and will let you know.

ok, I've just posted a patch for this with what I've found so far this
weekend -- it fixes all the warnings that I can see in testing with
both x86 and Arm builds, so hopefully it's OK now.

thanks,

Christopher

>
> >
> > > There is also still the lttng-modules issue if we enable .debug
> > > checking. I disabled that for these tests to reduce the noise.
> >
> > This is one I can pick up as well, if no one else gets there first.
> >
> > Bruce
> >
> > >
> > > Cheers,
> > >
> > > Richard
> > >
> > >
> > >
> > >
> >
> >
> > --
> > - Thou shalt not follow the NULL pointer, for chaos and madness await
> > thee at its end
> > - "Use the force Harry" - Gandalf, Star Trek II
> >
> >
> >
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#167843): 
https://lists.openembedded.org/g/openembedded-core/message/167843
Mute This Topic: https://lists.openembedded.org/mt/92248896/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [meta-virtualization][PATCH] xen, xen-tools: pass prefix maps to fix buildpaths reproducible build issues

2022-07-09 Thread Christopher Clark 
To fix warnings when the buildpaths QA test is enabled, pass the file
and debug prefix map options that were previously supplied only for
reproducible builds, adding them to the DEBUG_PREFIX_MAP variable
and supplying that to CC.

Testing indicates that passing the prefix maps needs to be via CC
rather than the EXTRA_CFLAGS_XEN_CORE/TOOLS variables.

Signed-off-by: Christopher Clark 
---
 recipes-extended/xen/xen.inc | 21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index ed6e6a7..2bbf1e3 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -88,12 +88,13 @@ export CROSS_COMPILE="${TARGET_PREFIX}"
 # overide LDFLAGS to allow xen to build without: "x86_64-oe-linux-ld: 
unrecognized option '-Wl,-O1'"
 export LDFLAGS=""
 
-# Pass through the Yocto distro compiler flags via the Xen-provided variables.
-# Special handling:
-# - The Yocto distro compiler flags are typically set to be appropriate for
-#   user-space software rather than for generation of a hypervisor binary, so
-#   only pass the debug prefix map to the hypervisor build:
-EXTRA_CFLAGS_XEN_CORE="${DEBUG_PREFIX_MAP}"
+# No additional C flags for the main hypervisor build
+EXTRA_CFLAGS_XEN_CORE ?= ""
+# Add prefix maps to support buildpaths QA test and reproducibility
+DEBUG_PREFIX_MAP:append = " \
+-ffile-prefix-map=${S}=${PN}-source \
+-fdebug-prefix-map=${WORKDIR}=${PN} \
+"
 
 # - The Xen tools build for x86 systems with HVM-mode enabled includes 
hvmloader
 #   which fails to build when "-m64" is included in flags set via the
@@ -109,11 +110,11 @@ TUNE_CCARGS:x86-64=""
 #   It must not be compiled with SSE compiler options enabled and the Xen build
 #   explicitly clears CFLAGS to ensure that, so such options must not be passed
 #   in via the tool variable. hvmloader is required to run HVM-mode guest VMs.
-CC="${CCACHE}${HOST_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${CC_REPRODUCIBLE_OPTIONS}"
+CC="${CCACHE}${HOST_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${DEBUG_PREFIX_MAP} 
${CC_REPRODUCIBLE_OPTIONS}"
 EXTRA_CFLAGS_XEN_TOOLS="${HOST_CC_ARCH} ${CFLAGS}"
 # 32-bit ARM needs the TUNE_CCARGS component of HOST_CC_ARCH to be passed
 # in CC to ensure that configure can compile binaries for the right arch.
-CC:arm="${CCACHE}${HOST_PREFIX}gcc ${TUNE_CCARGS} ${TOOLCHAIN_OPTIONS} 
${CC_REPRODUCIBLE_OPTIONS}"
+CC:arm="${CCACHE}${HOST_PREFIX}gcc ${TUNE_CCARGS} ${TOOLCHAIN_OPTIONS} 
${DEBUG_PREFIX_MAP} ${CC_REPRODUCIBLE_OPTIONS}"
 
 # There are no Xen-provided variables for C++, so append to the tool variables:
 CPP:append = " ${CPPFLAGS}"
@@ -158,9 +159,7 @@ EXTRA_OEMAKE += "${@['', 'XEN_WHOAMI=${PF} 
XEN_DOMAIN=${DISTRO} XEN_BUILD_HOST=$
 [d.getVar('BUILD_REPRODUCIBLE_BINARIES') == 
'1']}${@get_build_time_vars(d)}"
 
 # Improve build reproducibility: compiler flags to remove filesystem 
differences.
-CC_REPRODUCIBLE_OPTIONS = "${@['', '-gno-record-gcc-switches ' + \
-   '-ffile-prefix-map=${S}=${PN}-source ' + \
-   '-fdebug-prefix-map=${WORKDIR}=${PN}'] \
+CC_REPRODUCIBLE_OPTIONS = "${@['', '-gno-record-gcc-switches'] \
  [d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1']}"
 
 # check for XSM in package config to allow XSM_ENABLE to be set
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#167842): 
https://lists.openembedded.org/g/openembedded-core/message/167842
Mute This Topic: https://lists.openembedded.org/mt/92285003/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] rng-tools: Only install one set of init scripts

2022-07-09 Thread An?bal Lim?n 
From: Aníbal Limón 

Check if systemd is enabled to install .service file only instead of
service and sysvinit files because it will to rngd service twice by
systemd compatibility.

One called rng-tools.service (sysv compat) and another rngd.service.

...
root@:~# ps  | grep rng
   23 root 0 SW   [hwrng]
13109 root  3528 R/usr/sbin/rngd -f -r /dev/hwrng
13117 root  2348 Sgrep rng
29418 root 12756 S/usr/sbin/rngd -r /dev/hwrng
...

Signed-off-by: Aníbal Limón 
---
 .../rng-tools/rng-tools_6.15.bb   | 35 +++
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/meta/recipes-support/rng-tools/rng-tools_6.15.bb 
b/meta/recipes-support/rng-tools/rng-tools_6.15.bb
index 0696351903..2e4c0a126b 100644
--- a/meta/recipes-support/rng-tools/rng-tools_6.15.bb
+++ b/meta/recipes-support/rng-tools/rng-tools_6.15.bb
@@ -17,7 +17,12 @@ SRCREV = "381f69828b782afda574f259c1b7549f48f9bb77"
 
 S = "${WORKDIR}/git"
 
-inherit autotools update-rc.d systemd pkgconfig
+inherit autotools pkgconfig
+
+inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager', 'systemd', 
'systemd', 'update-rc.d', d)}
+SYSTEMD_SERVICE:${PN} = "rngd.service"
+INITSCRIPT_NAME = "rng-tools"
+INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ."
 
 EXTRA_OECONF = "--without-rtlsdr"
 
@@ -29,11 +34,6 @@ PACKAGECONFIG[libjitterentropy] = 
"--enable-jitterentropy,--disable-jitterentrop
 PACKAGECONFIG[libp11] = "--with-pkcs11,--without-pkcs11,libp11 openssl"
 PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl 
libxml2 openssl"
 
-INITSCRIPT_NAME = "rng-tools"
-INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ."
-
-SYSTEMD_SERVICE:${PN} = "rngd.service"
-
 CFLAGS += " -DJENT_CONF_ENABLE_INTERNAL_TIMER "
 
 # Refer autogen.sh in rng-tools
@@ -43,14 +43,21 @@ do_configure:prepend() {
 
 do_install:append() {
 install -Dm 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools
-install -Dm 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools
-install -Dm 0644 ${WORKDIR}/rngd.service \
- ${D}${systemd_system_unitdir}/rngd.service
-sed -i \
--e 's,@SYSCONFDIR@,${sysconfdir},g' \
--e 's,@SBINDIR@,${sbindir},g' \
-${D}${sysconfdir}/init.d/rng-tools \
-${D}${systemd_system_unitdir}/rngd.service
+
+if [ "${VIRTUAL-RUNTIME_init_manager}" = "systemd" ]; then
+install -Dm 0644 ${WORKDIR}/rngd.service \
+ ${D}${systemd_system_unitdir}/rngd.service
+sed -i \
+-e 's,@SYSCONFDIR@,${sysconfdir},g' \
+-e 's,@SBINDIR@,${sbindir},g' \
+${D}${systemd_system_unitdir}/rngd.service
+else
+install -Dm 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools
+sed -i \
+-e 's,@SYSCONFDIR@,${sysconfdir},g' \
+-e 's,@SBINDIR@,${sbindir},g' \
+${D}${sysconfdir}/init.d/rng-tools 
+fi
 
 if [ "${@bb.utils.contains('PACKAGECONFIG', 'nistbeacon', 'yes', 'no', 
d)}" = "yes" ]; then
 sed -i \
-- 
2.36.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#167841): 
https://lists.openembedded.org/g/openembedded-core/message/167841
Mute This Topic: https://lists.openembedded.org/mt/92278770/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 1/2] rust-common: Fix use of target definitions for SDK generation

2022-07-09 Thread Otavio Salvador 
Em sáb., 9 de jul. de 2022 às 10:14, Richard Purdie <
richard.pur...@linuxfoundation.org> escreveu:

> On Thu, 2022-07-07 at 14:19 -0300, Otavio Salvador wrote:
> > We need full target passed for build so we changed the
> > rust-cross-canadian to use same code used in regular rust recipes and
> > added support to use specific llvm-target for the building host.
> >
> > Fixes: ef566af964 ("rust: fix issue building cross-canadian tools for
> aarch64 on x86_64")
> > Fixes: bd36593ba3 ("rust-common: Drop LLVM_TARGET and simplify")
> > Fixes: 8ed000debb ("rust-common: Fix for target definitions returning
> 'NoneType' for arm")
> > Signed-off-by: Otavio Salvador 
> > ---
> >
> >  meta/recipes-devtools/rust/rust-common.inc| 21 --
> >  .../rust/rust-cross-canadian-common.inc   | 22 ---
> >  2 files changed, 33 insertions(+), 10 deletions(-)
>
> I ran these through the autobuilder:
>
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/3809/steps/14/logs/stdio
>
> seems there is some syntax that recent python doesn't like. I do need
> to look at the patches in more detail but wanted to share the
> autobuilder results.
>

I will fix and send a v2.

-- 
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854  Mobile: +1 (347) 903-9750

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#167840): 
https://lists.openembedded.org/g/openembedded-core/message/167840
Mute This Topic: https://lists.openembedded.org/mt/92233379/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][master][kirkstone] qemu: add PACKAGECONFIG for capstone

2022-07-09 Thread Steve Sakoman 
Autobuilder workers were non-deterministically enabling capstone
depending on whether the worker had libcapstone installed.

Add PACKAGECONFIG for capstone with default off, since qemu does not
require capstone support.

Qemu version in dunfell has capstone in the source tree as a submodule
and has configure options to enable it using that source code or using
the system libcapstone.

Qemu versions in master and kirkstone have removed the capstone
submodule and configure options, but added libcapstone autodetection to
meson.

In all cases using PACKAGECONFIG will allow a deterministic build.

Signed-off-by: Steve Sakoman 
---
 meta/recipes-devtools/qemu/qemu.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-devtools/qemu/qemu.inc 
b/meta/recipes-devtools/qemu/qemu.inc
index e4ced6ac27..ef4e949805 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -185,6 +185,7 @@ PACKAGECONFIG[pmem] = 
"--enable-libpmem,--disable-libpmem,pmdk"
 PACKAGECONFIG[pulsedio] = "--enable-pa,--disable-pa,pulseaudio"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux"
 PACKAGECONFIG[bpf] = "--enable-bpf,--disable-bpf,libbpf"
+PACKAGECONFIG[capstone] = "--enable-capstone,--disable-capstone"
 
 INSANE_SKIP:${PN} = "arch"
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#167839): 
https://lists.openembedded.org/g/openembedded-core/message/167839
Mute This Topic: https://lists.openembedded.org/mt/92271779/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 1/2] rust-common: Fix use of target definitions for SDK generation

2022-07-09 Thread Richard Purdie 
On Thu, 2022-07-07 at 14:19 -0300, Otavio Salvador wrote:
> We need full target passed for build so we changed the
> rust-cross-canadian to use same code used in regular rust recipes and
> added support to use specific llvm-target for the building host.
> 
> Fixes: ef566af964 ("rust: fix issue building cross-canadian tools for aarch64 
> on x86_64")
> Fixes: bd36593ba3 ("rust-common: Drop LLVM_TARGET and simplify")
> Fixes: 8ed000debb ("rust-common: Fix for target definitions returning 
> 'NoneType' for arm")
> Signed-off-by: Otavio Salvador 
> ---
> 
>  meta/recipes-devtools/rust/rust-common.inc| 21 --
>  .../rust/rust-cross-canadian-common.inc   | 22 ---
>  2 files changed, 33 insertions(+), 10 deletions(-)

I ran these through the autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/3809/steps/14/logs/stdio

seems there is some syntax that recent python doesn't like. I do need
to look at the patches in more detail but wanted to share the
autobuilder results.

Cheers,

Richard


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#167838): 
https://lists.openembedded.org/g/openembedded-core/message/167838
Mute This Topic: https://lists.openembedded.org/mt/92233379/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 V2 1/1] meta: introduce UBOOT_MKIMAGE_KERNEL_TYPE

2022-07-09 Thread Ming Liu 
From: Ming Liu 

Sometimes an end user might want to choose another kernel type argument
for uboot-mkimage other than "kernel", for instance: "kernel_noload".

Let's introduce a variable UBOOT_MKIMAGE_KERNEL_TYPE to support that,
and it could be used by BSP layers as well.

Signed-off-by: Ming Liu 
---
 meta/classes/kernel-fitimage.bbclass | 2 +-
 meta/classes/kernel-uboot.bbclass| 3 +++
 meta/classes/kernel-uimage.bbclass   | 2 +-
 meta/lib/oeqa/selftest/cases/fitimage.py | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index 7e09b075ff..2112ae4cfa 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -148,7 +148,7 @@ fitimage_emit_section_kernel() {
 kernel-$2 {
 description = "Linux kernel";
 data = /incbin/("$3");
-type = "kernel";
+type = "${UBOOT_MKIMAGE_KERNEL_TYPE}";
 arch = "${UBOOT_ARCH}";
 os = "linux";
 compression = "$4";
diff --git a/meta/classes/kernel-uboot.bbclass 
b/meta/classes/kernel-uboot.bbclass
index 2facade818..1bc98e042d 100644
--- a/meta/classes/kernel-uboot.bbclass
+++ b/meta/classes/kernel-uboot.bbclass
@@ -2,6 +2,9 @@
 FIT_KERNEL_COMP_ALG ?= "gzip"
 FIT_KERNEL_COMP_ALG_EXTENSION ?= ".gz"
 
+# Kernel image type passed to mkimage (i.e. kernel kernel_noload...)
+UBOOT_MKIMAGE_KERNEL_TYPE ?= "kernel"
+
 uboot_prep_kimage() {
if [ -e arch/${ARCH}/boot/compressed/vmlinux ]; then
vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
diff --git a/meta/classes/kernel-uimage.bbclass 
b/meta/classes/kernel-uimage.bbclass
index cedb4fa070..2e661ea916 100644
--- a/meta/classes/kernel-uimage.bbclass
+++ b/meta/classes/kernel-uimage.bbclass
@@ -30,6 +30,6 @@ do_uboot_mkimage() {
awk '$3=="${UBOOT_ENTRYSYMBOL}" {print "0x"$1;exit}'`
fi
 
-   uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C "${linux_comp}" -a 
${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d 
linux.bin ${B}/arch/${ARCH}/boot/uImage
+   uboot-mkimage -A ${UBOOT_ARCH} -O linux -T ${UBOOT_MKIMAGE_KERNEL_TYPE} 
-C "${linux_comp}" -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n 
"${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${B}/arch/${ARCH}/boot/uImage
rm -f linux.bin
 }
diff --git a/meta/lib/oeqa/selftest/cases/fitimage.py 
b/meta/lib/oeqa/selftest/cases/fitimage.py
index e6bfd1257e..7e6479c9ca 100644
--- a/meta/lib/oeqa/selftest/cases/fitimage.py
+++ b/meta/lib/oeqa/selftest/cases/fitimage.py
@@ -763,6 +763,7 @@ FIT_HASH_ALG = "sha256"
 
 kernel_load = str(get_bb_var('UBOOT_LOADADDRESS'))
 kernel_entry = str(get_bb_var('UBOOT_ENTRYPOINT'))
+kernel_type = str(get_bb_var('UBOOT_MKIMAGE_KERNEL_TYPE'))
 kernel_compression = str(get_bb_var('FIT_KERNEL_COMP_ALG'))
 uboot_arch = str(get_bb_var('UBOOT_ARCH'))
 fit_hash_alg = str(get_bb_var('FIT_HASH_ALG'))
@@ -775,7 +776,7 @@ FIT_HASH_ALG = "sha256"
 'kernel-1 {',
 'description = "Linux kernel";',
 'data = /incbin/("linux.bin");',
-'type = "kernel";',
+'type = "' + kernel_type + '";',
 'arch = "' + uboot_arch + '";',
 'os = "linux";',
 'compression = "' + kernel_compression + '";',
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#167837): 
https://lists.openembedded.org/g/openembedded-core/message/167837
Mute This Topic: https://lists.openembedded.org/mt/92268338/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 V2 0/1] meta: introduce UBOOT_MKIMAGE_KERNEL_TYPE

2022-07-09 Thread Ming Liu 
From: Ming Liu 

Changes in patch set V2:

1 Fix a wrong parameter mess pointed out by Alexandre Belloni.

Ming Liu (1):
  meta: introduce UBOOT_MKIMAGE_KERNEL_TYPE

 meta/classes/kernel-fitimage.bbclass | 2 +-
 meta/classes/kernel-uboot.bbclass| 3 +++
 meta/classes/kernel-uimage.bbclass   | 2 +-
 meta/lib/oeqa/selftest/cases/fitimage.py | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#167836): 
https://lists.openembedded.org/g/openembedded-core/message/167836
Mute This Topic: https://lists.openembedded.org/mt/92268337/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-