[OE-core][PATCH] maintainers.inc: maintainer for opensbi

2024-05-17 Thread Thomas Perrot via lists.openembedded.org
From: Thomas Perrot 

Signed-off-by: Thomas Perrot 
---
 meta/conf/distro/include/maintainers.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/distro/include/maintainers.inc 
b/meta/conf/distro/include/maintainers.inc
index 014cf32e4091..d98cb0f194bc 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -556,7 +556,7 @@ RECIPE_MAINTAINER:pn-npth = "Alexander Kanavin 
"
 RECIPE_MAINTAINER:pn-nss-myhostname = "Anuj Mittal "
 RECIPE_MAINTAINER:pn-numactl = "Richard Purdie 
"
 RECIPE_MAINTAINER:pn-ofono = "Ross Burton "
-RECIPE_MAINTAINER:pn-opensbi = "Unassigned "
+RECIPE_MAINTAINER:pn-opensbi = "Thomas Perrot "
 RECIPE_MAINTAINER:pn-openssh = "Unassigned "
 RECIPE_MAINTAINER:pn-openssl = "Alexander Kanavin "
 RECIPE_MAINTAINER:pn-opkg = "Alex Stewart "
-- 
2.45.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199509): 
https://lists.openembedded.org/g/openembedded-core/message/199509
Mute This Topic: https://lists.openembedded.org/mt/106150269/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] opensbi: bump to 1.4

2024-01-22 Thread Thomas Perrot via lists.openembedded.org
Hello Khem,

On Fri, 2024-01-19 at 15:56 -0800, Khem Raj wrote:
> On Fri, Jan 19, 2024 at 2:00 PM Alexandre Belloni
>  wrote:
> > 
> > 
> > On 19/01/2024 19:24:44+, Richard Purdie wrote:
> > > On Fri, 2024-01-19 at 18:48 +0100, Thomas Perrot wrote:
> > > > Hello Richard,
> > > > 
> > > > On Fri, 2024-01-19 at 17:22 +, Richard Purdie wrote:
> > > > > On Wed, 2024-01-17 at 10:47 +0100, Thomas Perrot via
> > > > > lists.openembedded.org wrote:
> > > > > > From: Thomas Perrot 
> > > > > > 
> > > > > > This release has:
> > > > > > - Synopsys DesignWare APB GPIO driver
> > > > > > - Zicntr and Zihpm support
> > > > > > - Console print improvements
> > > > > > - Smepmp support
> > > > > > - Simple FDT based syscon regmap driver
> > > > > > - Syscon based reboot and poweroff driver
> > > > > > - Non-contiguous hpm counters
> > > > > > - Smcntrpmf support
> > > > > > - Full sparse hartid support
> > > > > > - IPI improvements
> > > > > > - RFENCE improvements
> > > > > > - Zkr support
> > > > > > - Andes custom PMU support
> > > > > > Overall, this release mainly adds more ISA extensions,
> > > > > > drivers and
> > > > > > other improvements.
> > > > > > 
> > > > > > https://github.com/riscv-software-src/opensbi/compare/v1.3.1...v1.4
> > > > > > 
> > > > > > Signed-off-by: Thomas Perrot 
> > > > > 
> > > > > This all seems reasonable but why is there a revert below?
> > > > 
> > > > I reverted it otherwise the following link issue occurs:
> > > > 
> > > > "build/tmp-glibc/work/riscv64-oe-linux/opensbi/1.4/recipe-
> > > > sysroot-
> > > > native/usr/bin/riscv64-oe-linux/../../libexec/riscv64-oe-
> > > > linux/gcc/riscv64-oe-linux/13.2.0/ld.bfd:/src/build/tmp-
> > > > glibc/work/riscv64-oe-
> > > > linux/opensbi/1.4/git/build/platform/generic/firmware/fw_dynami
> > > > c.elf.ld
> > > > :54: undefined section `.dynsym' referenced in expression"
> > > 
> > > The commit should at least mention the issue.
> > > 
> > > I'm also not sure that is "Inappropriate", more like "Pending" as
> > > in
> > > needs further investigation.
> > 
> > The original commit states that relocations don't need to be
> > handled
> > because everything is linked statically which is not true in our
> > case,
> > else we wouldn't be trying to link dynamically.
> > 
> > > 
> > > > > > ---
> > > > > >  ...re-Remove-handling-of-R_RISCV_-32-64.patch | 88
> > > > > > +++
> > > > > >  .../{opensbi_1.3.bb => opensbi_1.4.bb}    |  8 +-
> > > > > >  2 files changed, 92 insertions(+), 4 deletions(-)
> > > > > >  create mode 100644 meta/recipes-bsp/opensbi/opensbi/0001-
> > > > > > Revert-
> > > > > > firmware-Remove-handling-of-R_RISCV_-32-64.patch
> > > > > >  rename meta/recipes-bsp/opensbi/{opensbi_1.3.bb =>
> > > > > > opensbi_1.4.bb}
> > > > > > (90%)
> > > > > > 
> > > > > > diff --git a/meta/recipes-bsp/opensbi/opensbi/0001-Revert-
> > > > > > firmware-
> > > > > > Remove-handling-of-R_RISCV_-32-64.patch b/meta/recipes-
> > > > > > bsp/opensbi/opensbi/0001-Revert-firmware-Remove-handling-
> > > > > > of-
> > > > > > R_RISCV_-32-64.patch
> > > > > > new file mode 100644
> > > > > > index ..d14e0b73a9bc
> > > > > > --- /dev/null
> > > > > > +++ b/meta/recipes-bsp/opensbi/opensbi/0001-Revert-
> > > > > > firmware-Remove-
> > > > > > handling-of-R_RISCV_-32-64.patch
> > > > > > @@ -0,0 +1,88 @@
> > > > > > +From bfe480929bcc966e1fdf5afdde8d4c22adba7f6f Mon Sep 17
> > > > > > 00:00:00
> > > > > > 2001
> > > > > > +From: Thomas Perrot 
> > > > > > +Date: Tue, 16 Jan 2024 15:16:58 +0100
> > > > > > +Subject: [PATCH] Revert "firmware: Remove handling of
>

[OE-core][PATCH v3] opensbi: bump to 1.4

2024-01-22 Thread Thomas Perrot via lists.openembedded.org
From: Thomas Perrot 

This release has:
- Synopsys DesignWare APB GPIO driver
- Zicntr and Zihpm support
- Console print improvements
- Smepmp support
- Simple FDT based syscon regmap driver
- Syscon based reboot and poweroff driver
- Non-contiguous hpm counters
- Smcntrpmf support
- Full sparse hartid support
- IPI improvements
- RFENCE improvements
- Zkr support
- Andes custom PMU support
Overall, this release mainly adds more ISA extensions, drivers and other 
improvements.

https://github.com/riscv-software-src/opensbi/compare/v1.3.1...v1.4

Signed-off-by: Thomas Perrot 
Signed-off-by: Khem Raj 
---
v2: Use FW_PIC=y and drop revert patch
v3: Skip ldflags QA

 .../opensbi/{opensbi_1.3.bb => opensbi_1.4.bb}| 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-bsp/opensbi/{opensbi_1.3.bb => opensbi_1.4.bb} (89%)

diff --git a/meta/recipes-bsp/opensbi/opensbi_1.3.bb 
b/meta/recipes-bsp/opensbi/opensbi_1.4.bb
similarity index 89%
rename from meta/recipes-bsp/opensbi/opensbi_1.3.bb
rename to meta/recipes-bsp/opensbi/opensbi_1.4.bb
index f01cae34d1ff..e36ada081428 100644
--- a/meta/recipes-bsp/opensbi/opensbi_1.3.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_1.4.bb
@@ -8,12 +8,12 @@ require opensbi-payloads.inc

 inherit autotools-brokensep deploy

-SRCREV = "057eb10b6d523540012e6947d5c9f63e95244e94"
-SRC_URI = 
"git://github.com/riscv/opensbi.git;branch=release-1.3.x;protocol=https"
+SRCREV = "a2b255b88918715173942f2c5e1f97ac9e90c877"
+SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https"

 S = "${WORKDIR}/git"

-EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=n CLANG_TARGET= "
+EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D} FW_PIC=y CLANG_TARGET= "
 # If RISCV_SBI_PAYLOAD is set then include it as a payload
 EXTRA_OEMAKE:append = " ${@riscv_get_extra_oemake_image(d)}"
 EXTRA_OEMAKE:append = " ${@riscv_get_extra_oemake_fdt(d)}"
@@ -44,4 +44,4 @@ FILES:${PN} += 
"/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*"
 COMPATIBLE_HOST = "(riscv64|riscv32).*"
 INHIBIT_PACKAGE_STRIP = "1"

-SECURITY_CFLAGS = ""
+INSANE_SKIP:${PN} = "ldflags"
--
2.43.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#194123): 
https://lists.openembedded.org/g/openembedded-core/message/194123
Mute This Topic: https://lists.openembedded.org/mt/103882705/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] opensbi: bump to 1.4

2024-01-19 Thread Thomas Perrot via lists.openembedded.org
Hello Richard,

On Fri, 2024-01-19 at 17:22 +, Richard Purdie wrote:
> On Wed, 2024-01-17 at 10:47 +0100, Thomas Perrot via
> lists.openembedded.org wrote:
> > From: Thomas Perrot 
> > 
> > This release has:
> > - Synopsys DesignWare APB GPIO driver
> > - Zicntr and Zihpm support
> > - Console print improvements
> > - Smepmp support
> > - Simple FDT based syscon regmap driver
> > - Syscon based reboot and poweroff driver
> > - Non-contiguous hpm counters
> > - Smcntrpmf support
> > - Full sparse hartid support
> > - IPI improvements
> > - RFENCE improvements
> > - Zkr support
> > - Andes custom PMU support
> > Overall, this release mainly adds more ISA extensions, drivers and
> > other improvements.
> > 
> > https://github.com/riscv-software-src/opensbi/compare/v1.3.1...v1.4
> > 
> > Signed-off-by: Thomas Perrot 
> 
> This all seems reasonable but why is there a revert below?

I reverted it otherwise the following link issue occurs:

"build/tmp-glibc/work/riscv64-oe-linux/opensbi/1.4/recipe-sysroot-
native/usr/bin/riscv64-oe-linux/../../libexec/riscv64-oe-
linux/gcc/riscv64-oe-linux/13.2.0/ld.bfd:/src/build/tmp-
glibc/work/riscv64-oe-
linux/opensbi/1.4/git/build/platform/generic/firmware/fw_dynamic.elf.ld
:54: undefined section `.dynsym' referenced in expression"

> 
> > ---
> >  ...re-Remove-handling-of-R_RISCV_-32-64.patch | 88
> > +++
> >  .../{opensbi_1.3.bb => opensbi_1.4.bb}    |  8 +-
> >  2 files changed, 92 insertions(+), 4 deletions(-)
> >  create mode 100644 meta/recipes-bsp/opensbi/opensbi/0001-Revert-
> > firmware-Remove-handling-of-R_RISCV_-32-64.patch
> >  rename meta/recipes-bsp/opensbi/{opensbi_1.3.bb => opensbi_1.4.bb}
> > (90%)
> > 
> > diff --git a/meta/recipes-bsp/opensbi/opensbi/0001-Revert-firmware-
> > Remove-handling-of-R_RISCV_-32-64.patch b/meta/recipes-
> > bsp/opensbi/opensbi/0001-Revert-firmware-Remove-handling-of-
> > R_RISCV_-32-64.patch
> > new file mode 100644
> > index 0000..d14e0b73a9bc
> > --- /dev/null
> > +++ b/meta/recipes-bsp/opensbi/opensbi/0001-Revert-firmware-Remove-
> > handling-of-R_RISCV_-32-64.patch
> > @@ -0,0 +1,88 @@
> > +From bfe480929bcc966e1fdf5afdde8d4c22adba7f6f Mon Sep 17 00:00:00
> > 2001
> > +From: Thomas Perrot 
> > +Date: Tue, 16 Jan 2024 15:16:58 +0100
> > +Subject: [PATCH] Revert "firmware: Remove handling of
> > R_RISCV_{32,64}"
> > +
> > +This reverts commit 2a6d72534d44c39e1de0614970a0dad97b1c41ba.
> > +
> > +Upstream-Status: Inappropriate [oe specific]
> > +Signed-off-by: Thomas Perrot 
> 
> If we're going to revert an upstream change, we need to say *why*. We
> need to revert it for some OE specific reason but what is that
> reason?
> 

I agree, maybe you have any advice to fix it in another way?

Kind regards,
Thomas Perrot

> We cannot take patches marked as Inappropriate without much more
> information.
> 
> Cheers,
> 
> Richard
> 
> 
> 
> 


signature.asc
Description: This is a digitally signed message part

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#194061): 
https://lists.openembedded.org/g/openembedded-core/message/194061
Mute This Topic: https://lists.openembedded.org/mt/103782707/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] opensbi: bump to 1.4

2024-01-17 Thread Thomas Perrot via lists.openembedded.org
From: Thomas Perrot 

This release has:
- Synopsys DesignWare APB GPIO driver
- Zicntr and Zihpm support
- Console print improvements
- Smepmp support
- Simple FDT based syscon regmap driver
- Syscon based reboot and poweroff driver
- Non-contiguous hpm counters
- Smcntrpmf support
- Full sparse hartid support
- IPI improvements
- RFENCE improvements
- Zkr support
- Andes custom PMU support
Overall, this release mainly adds more ISA extensions, drivers and other 
improvements.

https://github.com/riscv-software-src/opensbi/compare/v1.3.1...v1.4

Signed-off-by: Thomas Perrot 
---
 ...re-Remove-handling-of-R_RISCV_-32-64.patch | 88 +++
 .../{opensbi_1.3.bb => opensbi_1.4.bb}|  8 +-
 2 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 
meta/recipes-bsp/opensbi/opensbi/0001-Revert-firmware-Remove-handling-of-R_RISCV_-32-64.patch
 rename meta/recipes-bsp/opensbi/{opensbi_1.3.bb => opensbi_1.4.bb} (90%)

diff --git 
a/meta/recipes-bsp/opensbi/opensbi/0001-Revert-firmware-Remove-handling-of-R_RISCV_-32-64.patch
 
b/meta/recipes-bsp/opensbi/opensbi/0001-Revert-firmware-Remove-handling-of-R_RISCV_-32-64.patch
new file mode 100644
index ..d14e0b73a9bc
--- /dev/null
+++ 
b/meta/recipes-bsp/opensbi/opensbi/0001-Revert-firmware-Remove-handling-of-R_RISCV_-32-64.patch
@@ -0,0 +1,88 @@
+From bfe480929bcc966e1fdf5afdde8d4c22adba7f6f Mon Sep 17 00:00:00 2001
+From: Thomas Perrot 
+Date: Tue, 16 Jan 2024 15:16:58 +0100
+Subject: [PATCH] Revert "firmware: Remove handling of R_RISCV_{32,64}"
+
+This reverts commit 2a6d72534d44c39e1de0614970a0dad97b1c41ba.
+
+Upstream-Status: Inappropriate [oe specific]
+Signed-off-by: Thomas Perrot 
+---
+ firmware/fw_base.S  | 22 ++
+ firmware/fw_base.ldS|  6 ++
+ include/sbi/riscv_elf.h |  8 
+ 3 files changed, 36 insertions(+)
+
+diff --git a/firmware/fw_base.S b/firmware/fw_base.S
+index f7763f4d9e56..60efad39b231 100644
+--- a/firmware/fw_base.S
 b/firmware/fw_base.S
+@@ -88,8 +88,30 @@ _try_lottery:
+   add t5, t5, t2
+   add t3, t3, t2
+   REG_S   t5, 0(t3)   /* store runtime address to the GOT 
entry */
++  j   5f
+
+ 3:
++  lla t4, __dyn_sym_start
++
++4:
++  srlit6, t5, SYM_INDEX   /* t6 <--- sym table index */
++  andit5, t5, 0xFF/* t5 <--- relocation type */
++  li  t3, RELOC_TYPE
++  bne t5, t3, 5f
++
++  /* address R_RISCV_64 or R_RISCV_32 cases*/
++  REG_L   t3, 0(t0)
++  li  t5, SYM_SIZE
++  mul t6, t6, t5
++  add s5, t4, t6
++  REG_L   t6, (REGBYTES * 2)(t0)  /* t0 <-- addend */
++  REG_L   t5, REGBYTES(s5)
++  add t5, t5, t6
++  add t5, t5, t2  /* t5 <-- location to fix up in RAM */
++  add t3, t3, t2  /* t3 <-- location to fix up in RAM */
++  REG_S   t5, 0(t3)   /* store runtime address to the 
variable */
++
++5:
+   addit0, t0, (REGBYTES * 3)
+   blt t0, t1, 2b
+   j   _relocate_done
+diff --git a/firmware/fw_base.ldS b/firmware/fw_base.ldS
+index c15ccdbf6612..88b8dfd9cb56 100644
+--- a/firmware/fw_base.ldS
 b/firmware/fw_base.ldS
+@@ -40,6 +40,12 @@
+
+   . = ALIGN(0x1000); /* Ensure next section is page aligned */
+
++  .dynsym : {
++  PROVIDE(__dyn_sym_start = .);
++  *(.dynsym)
++  PROVIDE(__dyn_sym_end = .);
++  }
++
+   .rela.dyn : {
+   PROVIDE(__rel_dyn_start = .);
+   *(.rela*)
+diff --git a/include/sbi/riscv_elf.h b/include/sbi/riscv_elf.h
+index ed361e346155..3b62c38b4a2d 100644
+--- a/include/sbi/riscv_elf.h
 b/include/sbi/riscv_elf.h
+@@ -1,6 +1,14 @@
+ #ifndef __RISCV_ELF_H__
+ #define __RISCV_ELF_H__
+
++#include 
++
++#define R_RISCV_321
++#define R_RISCV_642
+ #define R_RISCV_RELATIVE  3
+
++#define RELOC_TYPE__REG_SEL(R_RISCV_64, R_RISCV_32)
++#define SYM_INDEX __REG_SEL(0x20, 0x8)
++#define SYM_SIZE  __REG_SEL(0x18,0x10)
++
+ #endif
+--
+2.43.0
diff --git a/meta/recipes-bsp/opensbi/opensbi_1.3.bb 
b/meta/recipes-bsp/opensbi/opensbi_1.4.bb
similarity index 90%
rename from meta/recipes-bsp/opensbi/opensbi_1.3.bb
rename to meta/recipes-bsp/opensbi/opensbi_1.4.bb
index f01cae34d1ff..6cb1a2680f2a 100644
--- a/meta/recipes-bsp/opensbi/opensbi_1.3.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_1.4.bb
@@ -8,8 +8,10 @@ require opensbi-payloads.inc
 
 inherit autotools-brokensep deploy
 
-SRCREV = "057eb10b6d523540012e6947d5c9f63e95244e94"
-SRC_URI = 
"git://github.com/riscv/opensbi.git;branch=release-1.3.x;protocol=https"
+SRCREV = "a2b255b88918715173942f2c5e1f97ac9e90c877"
+SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https \
+  file://0001-Revert-firmware-Remove-handling-of-R_RISCV_-32-64.patch \

[OE-core][PATCH] opensbi: Upgrade to 1.3.1 release

2023-11-07 Thread Thomas Perrot via lists.openembedded.org
From: Thomas Perrot 

Here is list of changes in this major release

https://github.com/riscv-software-src/opensbi/compare/v1.2...v1.3.1

Signed-off-by: Thomas Perrot 
---
 meta/recipes-bsp/opensbi/{opensbi_1.2.bb => opensbi_1.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-bsp/opensbi/{opensbi_1.2.bb => opensbi_1.3.bb} (93%)

diff --git a/meta/recipes-bsp/opensbi/opensbi_1.2.bb 
b/meta/recipes-bsp/opensbi/opensbi_1.3.bb
similarity index 93%
rename from meta/recipes-bsp/opensbi/opensbi_1.2.bb
rename to meta/recipes-bsp/opensbi/opensbi_1.3.bb
index a088fef41981..f01cae34d1ff 100644
--- a/meta/recipes-bsp/opensbi/opensbi_1.2.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_1.3.bb
@@ -8,8 +8,8 @@ require opensbi-payloads.inc
 
 inherit autotools-brokensep deploy
 
-SRCREV = "6b5188ca14e59ce7bf71afe4e7d3d557c3d31bf8"
-SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https"
+SRCREV = "057eb10b6d523540012e6947d5c9f63e95244e94"
+SRC_URI = 
"git://github.com/riscv/opensbi.git;branch=release-1.3.x;protocol=https"
 
 S = "${WORKDIR}/git"
 
-- 
2.41.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190266): 
https://lists.openembedded.org/g/openembedded-core/message/190266
Mute This Topic: https://lists.openembedded.org/mt/102440572/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] qemu.inc: add virtio input in required dependencies

2022-10-26 Thread Thomas Perrot via lists.openembedded.org
Hello Richard,

On Wed, 2022-10-26 at 12:14 +0100, Richard Purdie wrote:
> On Tue, 2022-10-18 at 11:32 +0200, Thomas Perrot via
> lists.openembedded.org wrote:
> > From: Thomas Perrot 
> > 
> > Otherwise, it isn't possible to interact with the UI of images
> > that provide graphic support.
> > 
> > This issue only occurs when NO_RECOMMENDATIONS = "1" for Qemu
> > targets which are kernel-modules in MACHINE_EXTRA_RRECOMMENDS.
> > 
> > Signed-off-by: Thomas Perrot 
> > ---
> >  meta/conf/machine/include/qemu.inc | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/meta/conf/machine/include/qemu.inc
> > b/meta/conf/machine/include/qemu.inc
> > index 0d71bcbbad0d..dabe7ed8f386 100644
> > --- a/meta/conf/machine/include/qemu.inc
> > +++ b/meta/conf/machine/include/qemu.inc
> > @@ -10,6 +10,8 @@ XSERVER ?= "xserver-xorg \
> >  xf86-video-fbdev \
> >  "
> >  
> > +MACHINE_EXTRA_RDEPENDS += "kernel-module-virtio-input"
> > +
> >  MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat"
> >  
> >  MACHINEOVERRIDES =. "qemuall:"
> 
> This will fail if the kernel has the module built in - kernel modules
> are always recommends for that reason. We'll have to find a different
> solution I'm afraid.

When this kernel module is built in, so the Qemu boot process stalled:
"please wait: booting..."
For this reason, is the proposed solution acceptable?

Kind regards,
Thomas

> 
> Cheers,
> 
> Richard
> 
> 
> 
> 

-- 
Thomas Perrot, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com



signature.asc
Description: This is a digitally signed message part

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#172151): 
https://lists.openembedded.org/g/openembedded-core/message/172151
Mute This Topic: https://lists.openembedded.org/mt/94404446/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] xserver-xorg: move some recommended dependencies in required

2022-10-18 Thread Thomas Perrot via lists.openembedded.org
From: Thomas Perrot 

Otherwise, xserver will no longer start when NO_RECOMMENDATIONS = “1”,
because dependencies in XSERVER_RRECOMMENDS are missing.

Signed-off-by: Thomas Perrot 
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 057a1ba6ad48..6b11c79be6ee 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -80,9 +80,9 @@ PACKAGES =+ "${PN}-sdl \
 SUMMARY:xf86-video-modesetting = "X.Org X server -- modesetting display driver"
 INSANE_SKIP:${MLPREFIX}xf86-video-modesetting = "xorg-driver-abi"
 
-XSERVER_RRECOMMENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp 
xf86-input-libinput"
-RRECOMMENDS:${PN} += "${XSERVER_RRECOMMENDS}"
-RRECOMMENDS:${PN}-xwayland += "${XSERVER_RRECOMMENDS}"
+XSERVER_RDEPENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp 
xf86-input-libinput"
+RDEPENDS:${PN} += "${XSERVER_RDEPENDS}"
+RDEPENDS:${PN}-xwayland += "${XSERVER_RDEPENDS}"
 RDEPENDS:${PN}-xvfb += "xkeyboard-config"
 RDEPENDS:${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
 
-- 
2.37.3


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171941): 
https://lists.openembedded.org/g/openembedded-core/message/171941
Mute This Topic: https://lists.openembedded.org/mt/94408660/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] qemu.inc: add virtio input in required dependencies

2022-10-18 Thread Thomas Perrot via lists.openembedded.org
From: Thomas Perrot 

Otherwise, it isn't possible to interact with the UI of images
that provide graphic support.

This issue only occurs when NO_RECOMMENDATIONS = "1" for Qemu
targets which are kernel-modules in MACHINE_EXTRA_RRECOMMENDS.

Signed-off-by: Thomas Perrot 
---
 meta/conf/machine/include/qemu.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/conf/machine/include/qemu.inc 
b/meta/conf/machine/include/qemu.inc
index 0d71bcbbad0d..dabe7ed8f386 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -10,6 +10,8 @@ XSERVER ?= "xserver-xorg \
 xf86-video-fbdev \
 "
 
+MACHINE_EXTRA_RDEPENDS += "kernel-module-virtio-input"
+
 MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat"
 
 MACHINEOVERRIDES =. "qemuall:"
-- 
2.37.3


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171936): 
https://lists.openembedded.org/g/openembedded-core/message/171936
Mute This Topic: https://lists.openembedded.org/mt/94404446/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] core-image-sato: install virtio input for Qemu targets

2022-10-06 Thread Thomas Perrot via lists.openembedded.org
Hello Bruce,

On Wed, 2022-10-05 at 13:19 -0400, Bruce Ashfield wrote:
> On Wed, Oct 5, 2022 at 12:51 PM Thomas Perrot via
> lists.openembedded.org
>  wrote:
> > 
> > Hello Khem,
> > 
> > On Wed, 2022-10-05 at 09:19 -0700, Khem Raj wrote:
> > > On Wed, Oct 5, 2022 at 8:01 AM Thomas Perrot via
> > > lists.openembedded.org
> > >  wrote:
> > > > 
> > > > Otherwise, it isn't possible to interact with the UI.
> > > 
> > > I wonder if it should be in the MACHINE_EXTRA_RRECOMMENDS in
> > > machine
> > > configs, it will help a wide range of users who may be using
> > > graphical images.
> > 
> > I hesitated to put it in MACHINE_EXTRA_RDEPENDS for Qemu targets.
> > 
> > Currently, kernel-modules are in MACHINE_EXTRA_RRECOMMENDS of Qemu
> > RISC-V and PPC64, which are not installed when
> > NO_RECOMMENDATIONS="1"
> > 
> 
> We don't control the kernel configuration to the point where we can
> guarantee that something is built as a module or not.
> 
> Have you tried assembling the image with that option built-in, versus
> a module ? 

I tried to use a built-in virtio-input on Qemu targets, so the boot
process stalled with the following message: "please wait: booting..."
Then it seems necessary to use this driver as a kernel module on Qemu
targets.

Kind regards,
Thomas

> Last I checked, a kernel-module* dependency won't be
> provided by the built-ins, and this will trigger an error.
> 
> With that option appended, it isn't something that can be overridden
> easily, and the qemu* + core images are used as a starting point for
> demos, etc (whether or not that is a good idea is also debatable). If
> a non-core kernel provider and qemu are used in a scenario like that
> .. they can trigger the error.
> 
> Bruce
> 
> > Kind regards,
> > Thomas
> > 
> > > 
> > > > 
> > > > Signed-off-by: Thomas Perrot 
> > > > ---
> > > >  meta/recipes-sato/images/core-image-sato.bb | 2 ++
> > > >  1 file changed, 2 insertions(+)
> > > > 
> > > > diff --git a/meta/recipes-sato/images/core-image-sato.bb
> > > > b/meta/recipes-sato/images/core-image-sato.bb
> > > > index e63a229d1257..0e37c15097b3 100644
> > > > --- a/meta/recipes-sato/images/core-image-sato.bb
> > > > +++ b/meta/recipes-sato/images/core-image-sato.bb
> > > > @@ -12,6 +12,8 @@ inherit core-image
> > > >  TOOLCHAIN_HOST_TASK:append = " nativesdk-intltool nativesdk-
> > > > glib-
> > > > 2.0"
> > > >  TOOLCHAIN_HOST_TASK:remove:task-populate-sdk-ext = "
> > > > nativesdk-
> > > > intltool nativesdk-glib-2.0"
> > > > 
> > > > +IMAGE_INSTALL:append:qemuall = " kernel-module-virtio-input"
> > > > +
> > > >  QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-
> > > > m
> > > > 512", "-m 256", d)}'
> > > >  QB_MEM:qemuarmv5 = "-m 256"
> > > >  QB_MEM:qemumips = "-m 256"
> > > > --
> > > > 2.37.3
> > > > 
> > > > 
> > > > 
> > > > 
> > 
> > --
> > Thomas Perrot, Bootlin
> > Embedded Linux and kernel engineering
> > https://bootlin.com
> > 
> > 
> > 
> > 
> 
> 
> 
> 
> 

-- 
Thomas Perrot, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com



signature.asc
Description: This is a digitally signed message part

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171488): 
https://lists.openembedded.org/g/openembedded-core/message/171488
Mute This Topic: https://lists.openembedded.org/mt/94137249/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] core-image-sato: install virtio input for Qemu targets

2022-10-06 Thread Thomas Perrot via lists.openembedded.org
Hello Alex,

On Wed, 2022-10-05 at 19:09 +0200, Alexander Kanavin wrote:
> > Does core-image-weston have the same problem? If it does, then this
> > certainly needs to go to qemu include in conf/machine/
> > 

Yes, the same issue occurs on core-image-weston, when
NO_RECOMMENDATIONS = "1".

So, instead of adding this rdepends in the sato image, I can add
kernel-module-virtio-input in MACHINE_EXTRA_RDEPENDS in
conf/machine/include/qemu.inc.

In addition, I'm looking to use a built-in virtio-input, as proposed by
Bruce Ashfield.

Kind regards,
Thomas

> > Alex
> > 
> > On Wed, 5 Oct 2022 at 18:51, Thomas Perrot via
> > lists.openembedded.org
> >  wrote:
> > > > 
> > > > Hello Khem,
> > > > 
> > > > On Wed, 2022-10-05 at 09:19 -0700, Khem Raj wrote:
> > > > > > On Wed, Oct 5, 2022 at 8:01 AM Thomas Perrot via
> > > > > > lists.openembedded.org
> > > > > >  wrote:
> > > > > > > > 
> > > > > > > > Otherwise, it isn't possible to interact with the UI.
> > > > > > 
> > > > > > I wonder if it should be in the MACHINE_EXTRA_RRECOMMENDS
> > > > > > in > > > machine
> > > > > > configs, it will help a wide range of users who may be
> > > > > > using
> > > > > > graphical images.
> > > > 
> > > > I hesitated to put it in MACHINE_EXTRA_RDEPENDS for Qemu
> > > > targets.
> > > > 
> > > > Currently, kernel-modules are in MACHINE_EXTRA_RRECOMMENDS of
> > > > Qemu
> > > > RISC-V and PPC64, which are not installed when > >
> > > > NO_RECOMMENDATIONS="1"
> > > > 
> > > > Kind regards,
> > > > Thomas
> > > > 
> > > > > > 
> > > > > > > > 
> > > > > > > > Signed-off-by: Thomas Perrot
> > > > > > > > 
> > > > > > > > ---
> > > > > > > >  meta/recipes-sato/images/core-image-sato.bb | 2 ++
> > > > > > > >  1 file changed, 2 insertions(+)
> > > > > > > > 
> > > > > > > > diff --git a/meta/recipes-sato/images/core-image-
> > > > > > > > sato.bb
> > > > > > > > b/meta/recipes-sato/images/core-image-sato.bb
> > > > > > > > index e63a229d1257..0e37c15097b3 100644
> > > > > > > > --- a/meta/recipes-sato/images/core-image-sato.bb
> > > > > > > > +++ b/meta/recipes-sato/images/core-image-sato.bb
> > > > > > > > @@ -12,6 +12,8 @@ inherit core-image
> > > > > > > >  TOOLCHAIN_HOST_TASK:append = " nativesdk-intltool > >
> > > > > > > > > > nativesdk-glib-
> > > > > > > > 2.0"
> > > > > > > >  TOOLCHAIN_HOST_TASK:remove:task-populate-sdk-ext = " >
> > > > > > > > > > > nativesdk-
> > > > > > > > intltool nativesdk-glib-2.0"
> > > > > > > > 
> > > > > > > > +IMAGE_INSTALL:append:qemuall = " kernel-module-virtio-
> > > > > > > > input"
> > > > > > > > +
> > > > > > > >  QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES",
> > > > > > > > "opengl", > > > > "-m
> > > > > > > > 512", "-m 256", d)}'
> > > > > > > >  QB_MEM:qemuarmv5 = "-m 256"
> > > > > > > >  QB_MEM:qemumips = "-m 256"
> > > > > > > > --
> > > > > > > > 2.37.3
> > > > > > > > 
> > > > > > > > 
> > > > > > > > 
> > > > > > > > 
> > > > 
> > > > --
> > > > Thomas Perrot, Bootlin
> > > > Embedded Linux and kernel engineering
> > > > https://bootlin.com
> > > > 
> > > > 
> > > > 
> > > > 
> > 
> > 
> > 

-- 
Thomas Perrot, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com



signature.asc
Description: This is a digitally signed message part

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171482): 
https://lists.openembedded.org/g/openembedded-core/message/171482
Mute This Topic: https://lists.openembedded.org/mt/94137249/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] core-image-sato: install virtio input for Qemu targets

2022-10-05 Thread Thomas Perrot via lists.openembedded.org
Hello Alex,

On Wed, 2022-10-05 at 17:31 +0200, Alexander Kanavin wrote:
> Has this regressed at some point? Why was it not needed before?

This issue occurs when the rrecommends are not installed.

Kind regards,
Thomas

> 
> Alex
> 
> On Wed 5. Oct 2022 at 17.01, Thomas Perrot via lists.openembedded.org
>  wrote:
> > Otherwise, it isn't possible to interact with the UI.
> > 
> > Signed-off-by: Thomas Perrot 
> > ---
> >  meta/recipes-sato/images/core-image-sato.bb | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/meta/recipes-sato/images/core-image-sato.bb
> > b/meta/recipes-sato/images/core-image-sato.bb
> > index e63a229d1257..0e37c15097b3 100644
> > --- a/meta/recipes-sato/images/core-image-sato.bb
> > +++ b/meta/recipes-sato/images/core-image-sato.bb
> > @@ -12,6 +12,8 @@ inherit core-image
> >  TOOLCHAIN_HOST_TASK:append = " nativesdk-intltool nativesdk-glib-
> > 2.0"
> >  TOOLCHAIN_HOST_TASK:remove:task-populate-sdk-ext = " nativesdk-
> > intltool nativesdk-glib-2.0"
> > 
> > +IMAGE_INSTALL:append:qemuall = " kernel-module-virtio-input"
> > +
> >  QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m
> > 512", "-m 256", d)}'
> >  QB_MEM:qemuarmv5 = "-m 256"
> >  QB_MEM:qemumips = "-m 256"
> > 
> > 
> > 

-- 
Thomas Perrot, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com



signature.asc
Description: This is a digitally signed message part

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171474): 
https://lists.openembedded.org/g/openembedded-core/message/171474
Mute This Topic: https://lists.openembedded.org/mt/94137249/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] psplash: add psplash-default in rdepends

2022-10-05 Thread Thomas Perrot via lists.openembedded.org
From: Thomas Perrot 

Otherwise when the installation of recommended packages is prevented
(NO_RECOMMENDATIONS = "1"), then splash screen will not be cast.

Signed-off-by: Thomas Perrot 
---
 meta/recipes-core/psplash/psplash_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/psplash/psplash_git.bb 
b/meta/recipes-core/psplash/psplash_git.bb
index edc0ac1d8961..9532ed1534a6 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -58,7 +58,7 @@ python __anonymous() {
 d.setVarFlag("ALTERNATIVE_TARGET_%s" % ep, 'psplash', '${bindir}/%s' % 
p)
 d.appendVar("RDEPENDS:%s" % ep, " %s" % pn)
 if p == "psplash-default":
-d.appendVar("RRECOMMENDS:%s" % pn, " %s" % ep)
+d.appendVar("RDEPENDS:%s" % pn, " %s" % ep)
 }
 
 S = "${WORKDIR}/git"
-- 
2.37.3


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171472): 
https://lists.openembedded.org/g/openembedded-core/message/171472
Mute This Topic: https://lists.openembedded.org/mt/94137129/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] core-image-sato: install virtio input for Qemu targets

2022-10-05 Thread Thomas Perrot via lists.openembedded.org
Hello Khem,

On Wed, 2022-10-05 at 09:19 -0700, Khem Raj wrote:
> On Wed, Oct 5, 2022 at 8:01 AM Thomas Perrot via
> lists.openembedded.org
>  wrote:
> > 
> > Otherwise, it isn't possible to interact with the UI.
> 
> I wonder if it should be in the MACHINE_EXTRA_RRECOMMENDS in machine
> configs, it will help a wide range of users who may be using
> graphical images.

I hesitated to put it in MACHINE_EXTRA_RDEPENDS for Qemu targets.

Currently, kernel-modules are in MACHINE_EXTRA_RRECOMMENDS of Qemu
RISC-V and PPC64, which are not installed when NO_RECOMMENDATIONS="1"

Kind regards,
Thomas

> 
> > 
> > Signed-off-by: Thomas Perrot 
> > ---
> >  meta/recipes-sato/images/core-image-sato.bb | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/meta/recipes-sato/images/core-image-sato.bb
> > b/meta/recipes-sato/images/core-image-sato.bb
> > index e63a229d1257..0e37c15097b3 100644
> > --- a/meta/recipes-sato/images/core-image-sato.bb
> > +++ b/meta/recipes-sato/images/core-image-sato.bb
> > @@ -12,6 +12,8 @@ inherit core-image
> >  TOOLCHAIN_HOST_TASK:append = " nativesdk-intltool nativesdk-glib-
> > 2.0"
> >  TOOLCHAIN_HOST_TASK:remove:task-populate-sdk-ext = " nativesdk-
> > intltool nativesdk-glib-2.0"
> > 
> > +IMAGE_INSTALL:append:qemuall = " kernel-module-virtio-input"
> > +
> >  QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m
> > 512", "-m 256", d)}'
> >  QB_MEM:qemuarmv5 = "-m 256"
> >  QB_MEM:qemumips = "-m 256"
> > --
> > 2.37.3
> > 
> > 
> > 
> > 

-- 
Thomas Perrot, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com



signature.asc
Description: This is a digitally signed message part

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171468): 
https://lists.openembedded.org/g/openembedded-core/message/171468
Mute This Topic: https://lists.openembedded.org/mt/94137249/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] core-image-sato: install virtio input for Qemu targets

2022-10-05 Thread Thomas Perrot via lists.openembedded.org
Otherwise, it isn't possible to interact with the UI.

Signed-off-by: Thomas Perrot 
---
 meta/recipes-sato/images/core-image-sato.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-sato/images/core-image-sato.bb 
b/meta/recipes-sato/images/core-image-sato.bb
index e63a229d1257..0e37c15097b3 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
@@ -12,6 +12,8 @@ inherit core-image
 TOOLCHAIN_HOST_TASK:append = " nativesdk-intltool nativesdk-glib-2.0"
 TOOLCHAIN_HOST_TASK:remove:task-populate-sdk-ext = " nativesdk-intltool 
nativesdk-glib-2.0"
 
+IMAGE_INSTALL:append:qemuall = " kernel-module-virtio-input"
+
 QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 
256", d)}'
 QB_MEM:qemuarmv5 = "-m 256"
 QB_MEM:qemumips = "-m 256"
-- 
2.37.3


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171461): 
https://lists.openembedded.org/g/openembedded-core/message/171461
Mute This Topic: https://lists.openembedded.org/mt/94137249/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] psplash: add psplash-default in rdepends

2022-10-05 Thread Thomas Perrot via lists.openembedded.org
Otherwise when the installation of recommended packages is prevented
(NO_RECOMMENDATIONS = "1"), then splash screen will not be cast.

Signed-off-by: Thomas Perrot 
---
 meta/recipes-core/psplash/psplash_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/psplash/psplash_git.bb 
b/meta/recipes-core/psplash/psplash_git.bb
index edc0ac1d8961..9532ed1534a6 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -58,7 +58,7 @@ python __anonymous() {
 d.setVarFlag("ALTERNATIVE_TARGET_%s" % ep, 'psplash', '${bindir}/%s' % 
p)
 d.appendVar("RDEPENDS:%s" % ep, " %s" % pn)
 if p == "psplash-default":
-d.appendVar("RRECOMMENDS:%s" % pn, " %s" % ep)
+d.appendVar("RDEPENDS:%s" % pn, " %s" % ep)
 }
 
 S = "${WORKDIR}/git"
-- 
2.37.3


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171460): 
https://lists.openembedded.org/g/openembedded-core/message/171460
Mute This Topic: https://lists.openembedded.org/mt/94137129/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] opensbi: Update to v1.1

2022-06-26 Thread Thomas Perrot via lists.openembedded.org
This release has:
* SBI PMU improvements
* RISC-V AIA v0.3.0 draft support
* Simple external interrupt handling framework
* Xilinx UART-Lite driver
* RISC-V privilege specification v1.12 support
* RISC-V Svpbmt extension support
* RISC-V Smstateen extension support
* RISC-V Sstc extension support
* RISC-V privilege specification version detection
* Platform callback to populate HART extensions
* Compile time C arrays support
* Probing FDT based drivers using compile time C arrays
* SBI HSM improvements
* Allwinner D1 platform support
* Trap redirection improvements related to [m|h]tinst CSR
* SBI v1.0 specification support

Overall, this release mainly adds support for various RISC-V ISA
extensions ratified in December 2021 along with other improvements.

Signed-off-by: Thomas Perrot 
---
 meta/recipes-bsp/opensbi/{opensbi_1.0.bb => opensbi_1.1.bb} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-bsp/opensbi/{opensbi_1.0.bb => opensbi_1.1.bb} (96%)

diff --git a/meta/recipes-bsp/opensbi/opensbi_1.0.bb 
b/meta/recipes-bsp/opensbi/opensbi_1.1.bb
similarity index 96%
rename from meta/recipes-bsp/opensbi/opensbi_1.0.bb
rename to meta/recipes-bsp/opensbi/opensbi_1.1.bb
index 8430f62543a2..d3a62965336a 100644
--- a/meta/recipes-bsp/opensbi/opensbi_1.0.bb
+++ b/meta/recipes-bsp/opensbi/opensbi_1.1.bb
@@ -8,9 +8,8 @@ require opensbi-payloads.inc
 
 inherit autotools-brokensep deploy
 
-SRCREV = "ce4c0188d96b2c20c2e08d24646a5e517fe15a4b"
-SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https \
-  "
+SRCREV = "4489876e933d8ba0d8bc6c64bae71e295d45faac"
+SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https"
 
 S = "${WORKDIR}/git"
 
-- 
2.35.3


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#167312): 
https://lists.openembedded.org/g/openembedded-core/message/167312
Mute This Topic: https://lists.openembedded.org/mt/92005569/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] man-pages: add an alternative link name for crypt_r.3

2022-05-20 Thread Thomas Perrot via lists.openembedded.org
Because crypt_r.3 is also provided by libxcrypt-doc.

Signed-off-by: Thomas Perrot 
---
 meta/recipes-extended/man-pages/man-pages_5.13.bb | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/man-pages/man-pages_5.13.bb 
b/meta/recipes-extended/man-pages/man-pages_5.13.bb
index c0198b77be8e..f8602c699ea5 100644
--- a/meta/recipes-extended/man-pages/man-pages_5.13.bb
+++ b/meta/recipes-extended/man-pages/man-pages_5.13.bb
@@ -30,7 +30,8 @@ FILES:${PN} = "${mandir}/*"
 inherit update-alternatives
 
 ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE:${PN} = "passwd.5 getspnam.3 crypt.3"
-ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5"
-ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3"
+ALTERNATIVE:${PN} = "crypt.3 crypt_r.3 getspnam.3 passwd.5"
 ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3"
+ALTERNATIVE_LINK_NAME[crypt_r.3] = "${mandir}/man3/crypt_r.3"
+ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3"
+ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5"
-- 
2.35.3


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#165934): 
https://lists.openembedded.org/g/openembedded-core/message/165934
Mute This Topic: https://lists.openembedded.org/mt/91230060/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] webkitgtk: limit the number of compilation threads

2022-05-20 Thread Thomas Perrot via lists.openembedded.org
Hi Alexander,

On Fri, 2022-05-20 at 14:27 +0200, Alexander Kanavin wrote:
> The correct way to address this is to restrict the amount of webkit
> make jobs in site.conf, specific to the build host. Or add RAM.
> 

I heard you

Kind regards,
Thomas Perrot

> Ale 
> 
> On Fri 20. May 2022 at 14.20, Jacob Kroon 
> wrote:
> > On 5/20/22 14:16, Thomas Perrot via lists.openembedded.org wrote:
> > > Otherwise the compilation may lead to out-of-memories.
> > > 
> > > Signed-off-by: Thomas Perrot 
> > > ---
> > >   meta/recipes-sato/webkit/webkitgtk_2.36.1.bb | 3 ++-
> > >   1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.36.1.bb
> > b/meta/recipes-sato/webkit/webkitgtk_2.36.1.bb
> > > index 65757c36a733..e7cfe49e2b87 100644
> > > --- a/meta/recipes-sato/webkit/webkitgtk_2.36.1.bb
> > > +++ b/meta/recipes-sato/webkit/webkitgtk_2.36.1.bb
> > > @@ -80,6 +80,8 @@ setup_python_link() {
> > >       fi
> > >   }
> > >   
> > > +PARALLEL_MAKE = ""
> > > +
> > >   EXTRA_OECMAKE = " \
> > >               -DPORT=GTK \
> > >               ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-
> > DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \
> > > @@ -164,4 +166,3 @@ src_package_preprocess () {
> > >               ${B}/WebKit2Gtk/DerivedSources/webkit2/*.h
> > >   
> > >   }
> > > -
> > > 
> > 
> > Why punish build machines with lots of RAM ? Maybe it could be set 
> > depending on available RAM/number of cores ?
> > 
> > Jacob
> > 
> > 
> > 
> 
> 
> 

-- 
Thomas Perrot, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com



signature.asc
Description: This is a digitally signed message part

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#165932): 
https://lists.openembedded.org/g/openembedded-core/message/165932
Mute This Topic: https://lists.openembedded.org/mt/91229473/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] webkitgtk: limit the number of compilation threads

2022-05-20 Thread Thomas Perrot via lists.openembedded.org
Hello Jacob,

On Fri, 2022-05-20 at 14:19 +0200, Jacob Kroon wrote:
> On 5/20/22 14:16, Thomas Perrot via lists.openembedded.org wrote:
> > Otherwise the compilation may lead to out-of-memories.
> > 
> > Signed-off-by: Thomas Perrot 
> > ---
> >   meta/recipes-sato/webkit/webkitgtk_2.36.1.bb | 3 ++-
> >   1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.36.1.bb
> > b/meta/recipes-sato/webkit/webkitgtk_2.36.1.bb
> > index 65757c36a733..e7cfe49e2b87 100644
> > --- a/meta/recipes-sato/webkit/webkitgtk_2.36.1.bb
> > +++ b/meta/recipes-sato/webkit/webkitgtk_2.36.1.bb
> > @@ -80,6 +80,8 @@ setup_python_link() {
> > fi
> >   }
> >   
> > +PARALLEL_MAKE = ""
> > +
> >   EXTRA_OECMAKE = " \
> > -DPORT=GTK \
> > ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-
> > DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \
> > @@ -164,4 +166,3 @@ src_package_preprocess () {
> >   ${B}/WebKit2Gtk/DerivedSources/webkit2/*.h
> >   
> >   }
> > -
> > 
> 
> Why punish build machines with lots of RAM ? Maybe it could be set 
> depending on available RAM/number of cores ?
> 

Why not.

I tested on a build server with more than ~12GB ram available and 16
cores, then I tried to reduce the number of threads and when the value
is greater than 1 the build fails.

Kind regards,
Thomas Perrot

> Jacob
> 
> 
> 

-- 
Thomas Perrot, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com



signature.asc
Description: This is a digitally signed message part

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#165930): 
https://lists.openembedded.org/g/openembedded-core/message/165930
Mute This Topic: https://lists.openembedded.org/mt/91229473/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] webkitgtk: limit the number of compilation threads

2022-05-20 Thread Thomas Perrot via lists.openembedded.org
Otherwise the compilation may lead to out-of-memories.

Signed-off-by: Thomas Perrot 
---
 meta/recipes-sato/webkit/webkitgtk_2.36.1.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.36.1.bb 
b/meta/recipes-sato/webkit/webkitgtk_2.36.1.bb
index 65757c36a733..e7cfe49e2b87 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.36.1.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.36.1.bb
@@ -80,6 +80,8 @@ setup_python_link() {
fi
 }
 
+PARALLEL_MAKE = ""
+
 EXTRA_OECMAKE = " \
-DPORT=GTK \
${@bb.utils.contains('GI_DATA_ENABLED', 'True', 
'-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \
@@ -164,4 +166,3 @@ src_package_preprocess () {
 ${B}/WebKit2Gtk/DerivedSources/webkit2/*.h
 
 }
-
-- 
2.35.3


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#165927): 
https://lists.openembedded.org/g/openembedded-core/message/165927
Mute This Topic: https://lists.openembedded.org/mt/91229473/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] uboot-sign: fix the concatenation when multiple U-BOOT configurations are specified

2021-10-29 Thread Thomas Perrot
Hello Richard,

On Wed, 2021-10-27 at 19:02 +0100, Richard Purdie wrote:
> On Wed, 2021-10-27 at 16:04 +0200, Thomas Perrot wrote:
> > Some BSPs, especially those of meta-freescale and meta-ti allow to
> > build U-Boot
> > binaries using different configuration for a given target, for
> > example:
> > - UBOOT_CONFIG ??= "tfa-secure-boot tfa"
> > - UBOOT_CONFIG ??= "nand sdcard spi nor"
> > 
> > When this is the case the public key wasn't concatenated to all U-
> > Boot binaries
> > built.
> > 
> > Signed-off-by: Thomas Perrot 
> > ---
> >  meta/classes/uboot-sign.bbclass | 16 +++-
> >  1 file changed, 15 insertions(+), 1 deletion(-)
> > 
> > diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-
> > sign.bbclass
> > index bae8cada0ac3..8d136e940589 100644
> > --- a/meta/classes/uboot-sign.bbclass
> > +++ b/meta/classes/uboot-sign.bbclass
> > @@ -131,6 +131,20 @@ concat_dtb_helper() {
> > elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e
> > "$deployed_uboot_dtb_binary" ]; then
> > cd ${DEPLOYDIR}
> > cat ${UBOOT_NODTB_IMAGE}
> > $deployed_uboot_dtb_binary | tee
> > ${B}/${CONFIG_B_PATH}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
> > +
> > +   if [ -n "${UBOOT_CONFIG}" ]
> > +   then
> > +   for config in ${UBOOT_MACHINE}; do
> > +   i=$(expr $i + 1);
> > +   for type in
> > ${UBOOT_CONFIG}; do
> > +   j=$(expr $j + 1);
> > +   if [ $j -eq $i ]
> > +   then
> > +   cp
> > ${UBOOT_IMAGE} ${B}/${CONFIG_B_PATH}/u-boot-$type.${UBOOT_SUFFIX}
> > +   fi
> > +   done
> > +   done
> > +   fi
> > else
> > bbwarn "Failure while adding public key to
> > u-boot binary. Verified boot won't be available."
> > fi
> > @@ -205,7 +219,7 @@ install_helper() {
> > fi
> >  }
> >  
> > -# Install SPL dtb and u-boot nodtb to datadir, 
> > +# Install SPL dtb and u-boot nodtb to datadir,
> >  install_spl_helper() {
> > if [ -f "${SPL_DIR}/${SPL_DTB_BINARY}" ]; then
> > install -Dm 0644 ${SPL_DIR}/${SPL_DTB_BINARY}
> > ${D}${datadir}/${SPL_DTB_IMAGE}
> 
> 
> We seem to be just piling more and more conditional code into these
> classes for
> different weird corner cases.
> 
> Are there some tests we should be adding to ensure people understand
> why this
> code is here and if/as/when something else changes it and regresses
> it?
> 

I should be able to add a test in "oeqa/selftest/fitimage". I will
resubmit when it's done.

Best regards,
Thomas

> Cheers,
> 
> Richard
> 
> 
> 
> 
> 

-- 
Thomas Perrot, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com



signature.asc
Description: This is a digitally signed message part

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157641): 
https://lists.openembedded.org/g/openembedded-core/message/157641
Mute This Topic: https://lists.openembedded.org/mt/86628322/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] uboot-sign: fix the concatenation when multiple U-BOOT configurations are specified

2021-10-27 Thread Thomas Perrot
Some BSPs, especially those of meta-freescale and meta-ti allow to build U-Boot
binaries using different configuration for a given target, for example:
- UBOOT_CONFIG ??= "tfa-secure-boot tfa"
- UBOOT_CONFIG ??= "nand sdcard spi nor"

When this is the case the public key wasn't concatenated to all U-Boot binaries
built.

Signed-off-by: Thomas Perrot 
---
 meta/classes/uboot-sign.bbclass | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index bae8cada0ac3..8d136e940589 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -131,6 +131,20 @@ concat_dtb_helper() {
elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e 
"$deployed_uboot_dtb_binary" ]; then
cd ${DEPLOYDIR}
cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | 
tee ${B}/${CONFIG_B_PATH}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
+
+   if [ -n "${UBOOT_CONFIG}" ]
+   then
+   for config in ${UBOOT_MACHINE}; do
+   i=$(expr $i + 1);
+   for type in ${UBOOT_CONFIG}; do
+   j=$(expr $j + 1);
+   if [ $j -eq $i ]
+   then
+   cp ${UBOOT_IMAGE} 
${B}/${CONFIG_B_PATH}/u-boot-$type.${UBOOT_SUFFIX}
+   fi
+   done
+   done
+   fi
else
bbwarn "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
fi
@@ -205,7 +219,7 @@ install_helper() {
fi
 }
 
-# Install SPL dtb and u-boot nodtb to datadir, 
+# Install SPL dtb and u-boot nodtb to datadir,
 install_spl_helper() {
if [ -f "${SPL_DIR}/${SPL_DTB_BINARY}" ]; then
install -Dm 0644 ${SPL_DIR}/${SPL_DTB_BINARY} 
${D}${datadir}/${SPL_DTB_IMAGE}
-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157513): 
https://lists.openembedded.org/g/openembedded-core/message/157513
Mute This Topic: https://lists.openembedded.org/mt/86628322/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] image_types: allow the creation of block devices on top of UBI volumes

2021-10-18 Thread Thomas Perrot
Currently, the function multiubi_mkfs doesn't allow using anything else than
UBIFS over UBI.

Here, we propose to introduce two variables that allow to customize the ubinize
configuration and the image dependency, in order to be able to build UBI
images using the ubiblock abstraction layer and block filesystems.

For example, with this change it is possible to build a UBI volume using a
compressed squashfs, with the following configuration:
UBI_VOLTYPE ?= "static"
UBI_IMGTYPE ?= "squasfs-lz4"

Signed-off-by: Thomas Perrot 
---
 meta/classes/image_types.bbclass | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 32d4cd4c768c..f643ed3ce7f1 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -139,16 +139,18 @@ IMAGE_CMD:cpio () {
 }
 
 UBI_VOLNAME ?= "${MACHINE}-rootfs"
+UBI_VOLTYPE ?= "dynamic"
+UBI_IMGTYPE ?= "ubifs"
 
 multiubi_mkfs() {
local mkubifs_args="$1"
local ubinize_args="$2"
-
+
 # Added prompt error message for ubi and ubifs image creation.
 if [ -z "$mkubifs_args" ] || [ -z "$ubinize_args" ]; then
 bbfatal "MKUBIFS_ARGS and UBINIZE_ARGS have to be set, see 
http://www.linux-mtd.infradead.org/faq/ubifs.html for details"
 fi
-
+
if [ -z "$3" ]; then
local vname=""
else
@@ -157,9 +159,9 @@ multiubi_mkfs() {
 
echo \[ubifs\] > ubinize${vname}-${IMAGE_NAME}.cfg
echo mode=ubi >> ubinize${vname}-${IMAGE_NAME}.cfg
-   echo 
image=${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.ubifs >> 
ubinize${vname}-${IMAGE_NAME}.cfg
+   echo 
image=${IMGDEPLOYDIR}/${IMAGE_NAME}${vname}${IMAGE_NAME_SUFFIX}.${UBI_IMGTYPE} 
>> ubinize${vname}-${IMAGE_NAME}.cfg
echo vol_id=0 >> ubinize${vname}-${IMAGE_NAME}.cfg
-   echo vol_type=dynamic >> ubinize${vname}-${IMAGE_NAME}.cfg
+   echo vol_type=${UBI_VOLTYPE} >> ubinize${vname}-${IMAGE_NAME}.cfg
echo vol_name=${UBI_VOLNAME} >> ubinize${vname}-${IMAGE_NAME}.cfg
echo vol_flags=autoresize >> ubinize${vname}-${IMAGE_NAME}.cfg
if [ -n "$vname" ]; then
@@ -198,7 +200,7 @@ IMAGE_CMD:multiubi () {
 IMAGE_CMD:ubi () {
multiubi_mkfs "${MKUBIFS_ARGS}" "${UBINIZE_ARGS}"
 }
-IMAGE_TYPEDEP:ubi = "ubifs"
+IMAGE_TYPEDEP:ubi = "${UBI_IMGTYPE}"
 
 IMAGE_CMD:ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o 
${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}"
 
@@ -329,7 +331,7 @@ CONVERSION_DEPENDS_gzsync = "zsync-curl-native"
 RUNNABLE_IMAGE_TYPES ?= "ext2 ext3 ext4"
 RUNNABLE_MACHINE_PATTERNS ?= "qemu"
 
-DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso" 
+DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso"
 
 # The IMAGE_TYPES_MASKED variable will be used to mask out from the 
IMAGE_FSTYPES,
 # images that will not be built at do_rootfs time: vmdk, vhd, vhdx, vdi, 
qcow2, hddimg, iso, etc.
-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157097): 
https://lists.openembedded.org/g/openembedded-core/message/157097
Mute This Topic: https://lists.openembedded.org/mt/86428034/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] oeqa/selftest/reproducibile: Include rust packages

2021-10-14 Thread Thomas Perrot
Hi Pgowda,

On Fri, 2021-10-08 at 13:34 +0100, Richard Purdie wrote:
> On Fri, 2021-10-08 at 17:29 +0530, pgowda cve wrote:
> > Hi Richard,
> > 
> > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/118/builds/764
> > 
> > Thanks very much for sharing your inputs and comments on the issue.
> > 
> > I could see some more builds where rust exclusions were unused:-
> > Some of the example builds are:-
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/118/builds/757
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/118/builds/755
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/118/builds/751
> > 
> > Can you please let me know about this inconsistent behavior?
> 
> The reproducible test runs on different hosts and has two builds it
> compares.
> The first build can come from sstate. The second build is built on the
> specific
> worker the builds runs on.
> 
> We can see from my link above that the build that shows reproducibility
> issues
> ran on fedora33 so it is probably something specific to that distro.
> 
> The most likely way to reproduce the issue is therefore to build on
> something
> like an ubuntu system and compare the packages with those built on a
> fedora33
> system.
> 
> > I will try to check the issue based on your inputs.
> > 
> > I tried to build the reproducible with and without rust exclusions on
> > many poky sources.
> > Could not see this error on any sources ranging over the past two
> > months.
> > More details on the issue are shared at:-
> > https://bugzilla.yoctoproject.org/show_bug.cgi?id=14525
> 
> It sounds like you're only testing on debian whilst the autobuilder has
> multiple
> different hosts which is the difference.
> 
> Cheers,
> 
> Richard
> 

There is a new occurrence of the reproducibility issue on Fedora 33 :
https://autobuilder.yoctoproject.org/typhoon/#/builders/118/builds/782/steps/12/logs/stdio

Best regards,
Thomas

> 
> 
> 

-- 
Thomas Perrot, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com



signature.asc
Description: This is a digitally signed message part

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#156936): 
https://lists.openembedded.org/g/openembedded-core/message/156936
Mute This Topic: https://lists.openembedded.org/mt/86165875/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] ruby: fix the reproducibility issue

2021-09-30 Thread Thomas Perrot
Hello,

On Thu, 2021-09-30 at 16:12 +0200, Alexander Kanavin wrote:
> Does this mean ruby can be dropped from reproducibility exception
> list?
> 

I think so, but it would be nice to run some additional build tests on
autobuilder before, because it's not often obvious to reproduce this
kind of issue locally.

Best regards,
Thomas

> Alex
> 
> On Thu, 30 Sept 2021 at 16:04, Thomas Perrot <
> thomas.per...@bootlin.com> wrote:
> > Apply some changes on the Ruby makefiles in order to fix the
> > reproducibility:
> > - use a fixed timestamp,
> > - sort linked objects,
> > - doesn't use the current date,
> > - and use UTC date.
> > 
> > [YOCTO #14268]
> > 
> > Signed-off-by: Thomas Perrot 
> > ---
> >  ...doc-build-reproducible-documentation.patch | 35 ++
> >  ...-list-of-object-files-in-generated-M.patch | 28 
> >  ...eproducible-change-fixing-784225-too.patch | 28 
> >  .../0006-Make-gemspecs-reproducible.patch     | 67
> > +++
> >  meta/recipes-devtools/ruby/ruby_3.0.2.bb      |  4 ++
> >  5 files changed, 162 insertions(+)
> >  create mode 100644 meta/recipes-devtools/ruby/ruby/0003-rdoc-
> > build-
> > reproducible-documentation.patch
> >  create mode 100644 meta/recipes-devtools/ruby/ruby/0004-lib-
> > mkmf.rb-
> > sort-list-of-object-files-in-generated-M.patch
> >  create mode 100644 meta/recipes-devtools/ruby/ruby/0005-Mark-
> > Gemspec-reproducible-change-fixing-784225-too.patch
> >  create mode 100644 meta/recipes-devtools/ruby/ruby/0006-Make-
> > gemspecs-reproducible.patch
> > 
> > diff --git a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-
> > reproducible-documentation.patch b/meta/recipes-
> > devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch
> > new file mode 100644
> > index ..f92f0e1ba683
> > --- /dev/null
> > +++ b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-
> > documentation.patch
> > @@ -0,0 +1,35 @@
> > +From: Christian Hofstaedtler 
> > +Date: Tue, 10 Oct 2017 15:04:34 -0300
> > +Subject: rdoc: build reproducible documentation
> > +
> > +- provide a fixed timestamp to the gzip compression
> > +
> > +Upstream-Status: Backport [debian]
> > +
> > +Signed-off-by: Antonio Terceiro 
> > +Signed-off-by: Christian Hofstaedtler 
> > +---
> > + lib/rdoc/generator/json_index.rb | 4 ++--
> > + lib/rdoc/rdoc.rb                 | 2 +-
> > + 2 files changed, 3 insertions(+), 3 deletions(-)
> > +
> > +--- a/lib/rdoc/generator/json_index.rb
> >  b/lib/rdoc/generator/json_index.rb
> > +@@ -178,7 +178,7 @@
> > +     debug_msg "Writing gzipped search index to %s" % outfile
> > +
> > +     Zlib::GzipWriter.open(outfile) do |gz|
> > +-      gz.mtime = File.mtime(search_index_file)
> > ++      gz.mtime = -1
> > +       gz.orig_name = search_index_file.basename.to_s
> > +       gz.write search_index
> > +       gz.close
> > +@@ -196,7 +196,7 @@
> > +         debug_msg "Writing gzipped file to %s" % outfile
> > +
> > +         Zlib::GzipWriter.open(outfile) do |gz|
> > +-          gz.mtime = File.mtime(dest)
> > ++          gz.mtime = -1
> > +           gz.orig_name = dest.basename.to_s
> > +           gz.write data
> > +           gz.close
> > diff --git a/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-
> > list-of-object-files-in-generated-M.patch b/meta/recipes-
> > devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-
> > generated-M.patch
> > new file mode 100644
> > index ..e0aca0dcfc10
> > --- /dev/null
> > +++ b/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-
> > of-
> > object-files-in-generated-M.patch
> > @@ -0,0 +1,28 @@
> > +From: Reiner Herrmann 
> > +Date: Tue, 10 Oct 2017 15:06:13 -0300
> > +Subject: lib/mkmf.rb: sort list of object files in generated
> > Makefile
> > +
> > +Without sorting the list explicitly, its order is indeterministic,
> > +because readdir() is also not deterministic.
> > +When the list of object files varies between builds, they are
> > linked
> > +in a different order, which results in an unreproducible build.
> > +
> > +Upstream-Status: Backport [debian]
> > +
> > +Signed-off-by: Antonio Terceiro 
> > +Signed-off-by: Reiner Herrmann 
> > +---
> > + lib/mkmf.rb | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +--- a/lib/mkmf.rb
> >  b/lib/mkmf.r

Re: [OE-core][PATCH v4] libevent: mark util/monotonic_prc_fallback as retriable

2021-09-30 Thread Thomas Perrot
Hello,

On Thu, 2021-09-30 at 16:11 +0200, Alexander Kanavin wrote:
> How is this different to the previous patch submission?
> 

I have indicated where patch 0003 comes from in the upstream status.

Was there any other change to make?

Best regards,
Thomas

> Alex
> 
> On Thu, 30 Sept 2021 at 16:08, Thomas Perrot <
> thomas.per...@bootlin.com> wrote:
> > Backport a patch to fix the below ptest failure:
> >  # ./run-ptest
> >  Running tests:
> >  EVPORT
> >  Skipping test
> >  KQUEUE
> >  Skipping test
> >  EPOLL
> >  test-eof: OKAY
> >  test-dumpevents: OKAY (output not checked)
> >  regress:
> >   FAIL ../libevent-2.1.12-stable/test/regress_util.c:1478:
> > assert(diff.tv_sec == 0): 1 vs 0 util/monotonic_prc_fallback:
> >   [monotonic_prc_fallback FAILED]
> >  1/312 TESTS FAILED. (33 skipped)
> >  FAILED
> >  regress_debug:
> >   FAIL ../libevent-2.1.12-stable/test/regress_util.c:1478:
> > assert(diff.tv_sec == 0): 1 vs 0 util/monotonic_prc_fallback:
> >   [monotonic_prc_fallback FAILED]
> >  1/312 TESTS FAILED. (33 skipped)
> >  FAILED
> >  [snip]
> > 
> > (From OE-Core rev: edecbbdacab5227c75e4a199e124389f8036b421)
> > 
> > [YOCTO #14507]
> > 
> > Signed-off-by: Mingli Yu 
> > Signed-off-by: Alexandre Belloni 
> > Signed-off-by: Thomas Perrot 
> > ---
> >  ...-monotonic_prc_fallback-as-retriable.patch | 28 +++
> >  ...ts-are-marked-failed-only-when-all-a.patch | 81
> > +++
> >  .../libevent/libevent/run-ptest               | 10 +--
> >  .../libevent/libevent_2.1.12.bb               |  4 +-
> >  4 files changed, 117 insertions(+), 6 deletions(-)
> >  create mode 100644 meta/recipes-support/libevent/libevent/0003-test-
> > mark-util-monotonic_prc_fallback-as-retriable.patch
> >  create mode 100644 meta/recipes-support/libevent/libevent/0004-test-
> > retriable-tests-are-marked-failed-only-when-all-a.patch
> > 
> > diff --git a/meta/recipes-support/libevent/libevent/0003-test-mark-
> > util-monotonic_prc_fallback-as-retriable.patch b/meta/recipes-
> > support/libevent/libevent/0003-test-mark-util-monotonic_prc_fallback-
> > as-retriable.patch
> > new file mode 100644
> > index ..ea322511d7e9
> > --- /dev/null
> > +++ b/meta/recipes-support/libevent/libevent/0003-test-mark-util-
> > monotonic_prc_fallback-as-retriable.patch
> > @@ -0,0 +1,28 @@
> > +From 5a9a5faf27d85c89b40fb610cd23a4b62a7dbf0e Mon Sep 17 00:00:00
> > 2001
> > +From: Azat Khuzhin 
> > +Date: Sun, 19 Sep 2021 00:57:31 +0300
> > +Subject: [PATCH] test: mark util/monotonic_prc_fallback as retriable
> > +
> > +Refs: #1193
> > +
> > +Upstream-status: Backported
> > [
> > https://github.com/libevent/libevent/commit/04fcd7c6df158bb65261867de4b9ec8439696934
> > ]
> > +---
> > + test/regress_util.c | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/test/regress_util.c b/test/regress_util.c
> > +index 45caa2700a40..a9e80db20149 100644
> > +--- a/test/regress_util.c
> >  b/test/regress_util.c
> > +@@ -1672,7 +1672,7 @@ struct testcase_t util_testcases[] = {
> > +       { "monotonic_res_fallback", test_evutil_monotonic_res,
> > TT_OFF_BY_DEFAULT, _setup, (void*)"fallback" },
> > +       { "monotonic_prc", test_evutil_monotonic_prc, 0,
> > _setup, (void*)"" },
> > +       { "monotonic_prc_precise", test_evutil_monotonic_prc,
> > TT_RETRIABLE, _setup, (void*)"precise" },
> > +-      { "monotonic_prc_fallback", test_evutil_monotonic_prc, 0,
> > _setup, (void*)"fallback" },
> > ++      { "monotonic_prc_fallback", test_evutil_monotonic_prc,
> > TT_RETRIABLE, _setup, (void*)"fallback" },
> > +       { "date_rfc1123", test_evutil_date_rfc1123, 0, NULL, NULL },
> > +       { "evutil_v4addr_is_local", test_evutil_v4addr_is_local, 0,
> > NULL, NULL },
> > +       { "evutil_v6addr_is_local", test_evutil_v6addr_is_local, 0,
> > NULL, NULL },
> > +-- 
> > +2.31.1
> > +
> > diff --git a/meta/recipes-support/libevent/libevent/0004-test-
> > retriable-tests-are-marked-failed-only-when-all-a.patch
> > b/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-
> > are-marked-failed-only-when-all-a.patch
> > new file mode 100644
> > index ..ae7db0b7aa85
> > --- /dev/null
> > +++ b/meta/recipes-support/libevent/libevent/0004-tes

[OE-core][PATCH v4] libevent: mark util/monotonic_prc_fallback as retriable

2021-09-30 Thread Thomas Perrot
Backport a patch to fix the below ptest failure:
 # ./run-ptest
 Running tests:
 EVPORT
 Skipping test
 KQUEUE
 Skipping test
 EPOLL
 test-eof: OKAY
 test-dumpevents: OKAY (output not checked)
 regress:
  FAIL ../libevent-2.1.12-stable/test/regress_util.c:1478: assert(diff.tv_sec 
== 0): 1 vs 0 util/monotonic_prc_fallback:
  [monotonic_prc_fallback FAILED]
 1/312 TESTS FAILED. (33 skipped)
 FAILED
 regress_debug:
  FAIL ../libevent-2.1.12-stable/test/regress_util.c:1478: assert(diff.tv_sec 
== 0): 1 vs 0 util/monotonic_prc_fallback:
  [monotonic_prc_fallback FAILED]
 1/312 TESTS FAILED. (33 skipped)
 FAILED
 [snip]

(From OE-Core rev: edecbbdacab5227c75e4a199e124389f8036b421)

[YOCTO #14507]

Signed-off-by: Mingli Yu 
Signed-off-by: Alexandre Belloni 
Signed-off-by: Thomas Perrot 
---
 ...-monotonic_prc_fallback-as-retriable.patch | 28 +++
 ...ts-are-marked-failed-only-when-all-a.patch | 81 +++
 .../libevent/libevent/run-ptest   | 10 +--
 .../libevent/libevent_2.1.12.bb   |  4 +-
 4 files changed, 117 insertions(+), 6 deletions(-)
 create mode 100644 
meta/recipes-support/libevent/libevent/0003-test-mark-util-monotonic_prc_fallback-as-retriable.patch
 create mode 100644 
meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch

diff --git 
a/meta/recipes-support/libevent/libevent/0003-test-mark-util-monotonic_prc_fallback-as-retriable.patch
 
b/meta/recipes-support/libevent/libevent/0003-test-mark-util-monotonic_prc_fallback-as-retriable.patch
new file mode 100644
index ..ea322511d7e9
--- /dev/null
+++ 
b/meta/recipes-support/libevent/libevent/0003-test-mark-util-monotonic_prc_fallback-as-retriable.patch
@@ -0,0 +1,28 @@
+From 5a9a5faf27d85c89b40fb610cd23a4b62a7dbf0e Mon Sep 17 00:00:00 2001
+From: Azat Khuzhin 
+Date: Sun, 19 Sep 2021 00:57:31 +0300
+Subject: [PATCH] test: mark util/monotonic_prc_fallback as retriable
+
+Refs: #1193
+
+Upstream-status: Backported 
[https://github.com/libevent/libevent/commit/04fcd7c6df158bb65261867de4b9ec8439696934]
+---
+ test/regress_util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/regress_util.c b/test/regress_util.c
+index 45caa2700a40..a9e80db20149 100644
+--- a/test/regress_util.c
 b/test/regress_util.c
+@@ -1672,7 +1672,7 @@ struct testcase_t util_testcases[] = {
+   { "monotonic_res_fallback", test_evutil_monotonic_res, 
TT_OFF_BY_DEFAULT, _setup, (void*)"fallback" },
+   { "monotonic_prc", test_evutil_monotonic_prc, 0, _setup, 
(void*)"" },
+   { "monotonic_prc_precise", test_evutil_monotonic_prc, TT_RETRIABLE, 
_setup, (void*)"precise" },
+-  { "monotonic_prc_fallback", test_evutil_monotonic_prc, 0, _setup, 
(void*)"fallback" },
++  { "monotonic_prc_fallback", test_evutil_monotonic_prc, TT_RETRIABLE, 
_setup, (void*)"fallback" },
+   { "date_rfc1123", test_evutil_date_rfc1123, 0, NULL, NULL },
+   { "evutil_v4addr_is_local", test_evutil_v4addr_is_local, 0, NULL, NULL 
},
+   { "evutil_v6addr_is_local", test_evutil_v6addr_is_local, 0, NULL, NULL 
},
+-- 
+2.31.1
+
diff --git 
a/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch
 
b/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch
new file mode 100644
index ..ae7db0b7aa85
--- /dev/null
+++ 
b/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch
@@ -0,0 +1,81 @@
+From 36ebd92fa53c0097f1e2f9ec5aa5b5c6ec1b411d Mon Sep 17 00:00:00 2001
+From: Thomas Perrot 
+Date: Wed, 29 Sep 2021 13:50:35 +0200
+Subject: [PATCH] test: retriable tests are marked failed only when all
+ attempts have failed
+
+Fixes: #1193
+
+Upstream-status: Pending
+
+Signed-off-by: Thomas Perrot 
+---
+ test/tinytest.c | 13 ++---
+ test/tinytest.h |  2 +-
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/test/tinytest.c b/test/tinytest.c
+index 85dfe74a720e..bf2882418eb6 100644
+--- a/test/tinytest.c
 b/test/tinytest.c
+@@ -310,7 +310,8 @@ testcase_run_forked_(const struct testgroup_t *group,
+ 
+ int
+ testcase_run_one(const struct testgroup_t *group,
+-   const struct testcase_t *testcase)
++   const struct testcase_t *testcase,
++   const int test_attempts)
+ {
+   enum outcome outcome;
+ 
+@@ -348,7 +349,7 @@ testcase_run_one(const struct testgroup_t *group,
+   if (opt_verbosity>0 && !opt_forked)
+   puts("SKIPPED");
+   } else {
+-  if (!opt_forked)
++  if (!opt_forked && (testcase->flags & TT_RETRIABLE) && 
!test_attempts)
+   printf("\n  [%s FAILED]\n", testcase->name

[OE-core][PATCH] ruby: fix the reproducibility issue

2021-09-30 Thread Thomas Perrot
Apply some changes on the Ruby makefiles in order to fix the reproducibility:
- use a fixed timestamp,
- sort linked objects,
- doesn't use the current date,
- and use UTC date.

[YOCTO #14268]

Signed-off-by: Thomas Perrot 
---
 ...doc-build-reproducible-documentation.patch | 35 ++
 ...-list-of-object-files-in-generated-M.patch | 28 
 ...eproducible-change-fixing-784225-too.patch | 28 
 .../0006-Make-gemspecs-reproducible.patch | 67 +++
 meta/recipes-devtools/ruby/ruby_3.0.2.bb  |  4 ++
 5 files changed, 162 insertions(+)
 create mode 100644 
meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch
 create mode 100644 
meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch
 create mode 100644 
meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch
 create mode 100644 
meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch

diff --git 
a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch
 
b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch
new file mode 100644
index ..f92f0e1ba683
--- /dev/null
+++ 
b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch
@@ -0,0 +1,35 @@
+From: Christian Hofstaedtler 
+Date: Tue, 10 Oct 2017 15:04:34 -0300
+Subject: rdoc: build reproducible documentation
+
+- provide a fixed timestamp to the gzip compression
+
+Upstream-Status: Backport [debian]
+
+Signed-off-by: Antonio Terceiro 
+Signed-off-by: Christian Hofstaedtler 
+---
+ lib/rdoc/generator/json_index.rb | 4 ++--
+ lib/rdoc/rdoc.rb | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/lib/rdoc/generator/json_index.rb
 b/lib/rdoc/generator/json_index.rb
+@@ -178,7 +178,7 @@
+ debug_msg "Writing gzipped search index to %s" % outfile
+
+ Zlib::GzipWriter.open(outfile) do |gz|
+-  gz.mtime = File.mtime(search_index_file)
++  gz.mtime = -1
+   gz.orig_name = search_index_file.basename.to_s
+   gz.write search_index
+   gz.close
+@@ -196,7 +196,7 @@
+ debug_msg "Writing gzipped file to %s" % outfile
+
+ Zlib::GzipWriter.open(outfile) do |gz|
+-  gz.mtime = File.mtime(dest)
++  gz.mtime = -1
+   gz.orig_name = dest.basename.to_s
+   gz.write data
+   gz.close
diff --git 
a/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch
 
b/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch
new file mode 100644
index ..e0aca0dcfc10
--- /dev/null
+++ 
b/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch
@@ -0,0 +1,28 @@
+From: Reiner Herrmann 
+Date: Tue, 10 Oct 2017 15:06:13 -0300
+Subject: lib/mkmf.rb: sort list of object files in generated Makefile
+
+Without sorting the list explicitly, its order is indeterministic,
+because readdir() is also not deterministic.
+When the list of object files varies between builds, they are linked
+in a different order, which results in an unreproducible build.
+
+Upstream-Status: Backport [debian]
+
+Signed-off-by: Antonio Terceiro 
+Signed-off-by: Reiner Herrmann 
+---
+ lib/mkmf.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lib/mkmf.rb
 b/lib/mkmf.rb
+@@ -2315,7 +2315,7 @@
+ LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
+ ORIG_SRCS = #{orig_srcs.collect((:basename)).join(' ')}
+ SRCS = $(ORIG_SRCS) #{(srcs - 
orig_srcs).collect((:basename)).join(' ')}
+-OBJS = #{$objs.join(" ")}
++OBJS = #{$objs.sort.join(" ")}
+ HDRS = #{hdrs.map{|h| '$(srcdir)/' + File.basename(h)}.join(' ')}
+ LOCAL_HDRS = #{$headers.join(' ')}
+ TARGET = #{target}
diff --git 
a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch
 
b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch
new file mode 100644
index ..b7faa58655b2
--- /dev/null
+++ 
b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch
@@ -0,0 +1,28 @@
+From: Christian Hofstaedtler 
+Date: Tue, 10 Oct 2017 15:07:11 -0300
+Subject: Mark Gemspec-reproducible change fixing #784225, too
+
+I think the UTC date change will fix the Multi-Arch not-same file issue,
+too.
+
+Upstream-Status: Backport [debian]
+
+Signed-off-by: Antonio Terceiro 
+Signed-off-by: Christian Hofstaedtler 
+---
+ lib/rubygems/specification.rb | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/lib/rubygems/specification.rb
 b/lib/rubygems/specification.rb
+@@ -1695,7 +1695,9 @@
+ raise(Gem::InvalidSpecificationException,
+   "invalid date format in specification: #{date.inspect}")
+   end
+-  

Re: [OE-core][PATCH v3] libevent: mark util/monotonic_prc_fallback as retriable

2021-09-30 Thread Thomas Perrot
Hello,

On Thu, 2021-09-30 at 10:50 +0200, Alexander Kanavin wrote:
> Please submit the patch upstream first. Also note the syntax:
> 
> Upstream-Status: Pending
> Upstream-Status: Backport [from where]
> 

I'm currently submitting a reworked patch for the libevent master
branch, because since 2.1.12 there were some changes that required
reworking the patch 0004.

I will correct the syntax of upstream status, thank you.

Best regards,
Thomas

> Alex
> 
> On Wed, 29 Sept 2021 at 17:02, Thomas Perrot <
> thomas.per...@bootlin.com> wrote:
> > Backport a patch to fix the below ptest failure:
> >  # ./run-ptest
> >  Running tests:
> >  EVPORT
> >  Skipping test
> >  KQUEUE
> >  Skipping test
> >  EPOLL
> >  test-eof: OKAY
> >  test-dumpevents: OKAY (output not checked)
> >  regress:
> >   FAIL ../libevent-2.1.12-stable/test/regress_util.c:1478:
> > assert(diff.tv_sec == 0): 1 vs 0 util/monotonic_prc_fallback:
> >   [monotonic_prc_fallback FAILED]
> >  1/312 TESTS FAILED. (33 skipped)
> >  FAILED
> >  regress_debug:
> >   FAIL ../libevent-2.1.12-stable/test/regress_util.c:1478:
> > assert(diff.tv_sec == 0): 1 vs 0 util/monotonic_prc_fallback:
> >   [monotonic_prc_fallback FAILED]
> >  1/312 TESTS FAILED. (33 skipped)
> >  FAILED
> >  [snip]
> > 
> > (From OE-Core rev: edecbbdacab5227c75e4a199e124389f8036b421)
> > 
> > [YOCTO #14507]
> > 
> > Signed-off-by: Mingli Yu 
> > Signed-off-by: Alexandre Belloni 
> > Signed-off-by: Thomas Perrot 
> > ---
> >  ...-monotonic_prc_fallback-as-retriable.patch | 28 +++
> >  ...ts-are-marked-failed-only-when-all-a.patch | 81
> > +++
> >  .../libevent/libevent/run-ptest               | 10 +--
> >  .../libevent/libevent_2.1.12.bb               |  4 +-
> >  4 files changed, 117 insertions(+), 6 deletions(-)
> >  create mode 100644 meta/recipes-support/libevent/libevent/0003-
> > test-
> > mark-util-monotonic_prc_fallback-as-retriable.patch
> >  create mode 100644 meta/recipes-support/libevent/libevent/0004-
> > test-
> > retriable-tests-are-marked-failed-only-when-all-a.patch
> > 
> > diff --git a/meta/recipes-support/libevent/libevent/0003-test-mark-
> > util-monotonic_prc_fallback-as-retriable.patch b/meta/recipes-
> > support/libevent/libevent/0003-test-mark-util-
> > monotonic_prc_fallback-
> > as-retriable.patch
> > new file mode 100644
> > index ..8a2c78983e1d
> > --- /dev/null
> > +++ b/meta/recipes-support/libevent/libevent/0003-test-mark-util-
> > monotonic_prc_fallback-as-retriable.patch
> > @@ -0,0 +1,28 @@
> > +From d01a57a998798da977c470f3b8d6a457c1adb144 Mon Sep 17 00:00:00
> > 2001
> > +From: Azat Khuzhin 
> > +Date: Sun, 19 Sep 2021 00:57:31 +0300
> > +Subject: [PATCH] test: mark util/monotonic_prc_fallback as
> > retriable
> > +
> > +Refs: #1193
> > +
> > +Upstream-status: Backported
> > +---
> > + test/regress_util.c | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/test/regress_util.c b/test/regress_util.c
> > +index 45caa2700a40..a9e80db20149 100644
> > +--- a/test/regress_util.c
> >  b/test/regress_util.c
> > +@@ -1672,7 +1672,7 @@ struct testcase_t util_testcases[] = {
> > +       { "monotonic_res_fallback", test_evutil_monotonic_res,
> > TT_OFF_BY_DEFAULT, _setup, (void*)"fallback" },
> > +       { "monotonic_prc", test_evutil_monotonic_prc, 0,
> > _setup, (void*)"" },
> > +       { "monotonic_prc_precise", test_evutil_monotonic_prc,
> > TT_RETRIABLE, _setup, (void*)"precise" },
> > +-      { "monotonic_prc_fallback", test_evutil_monotonic_prc, 0,
> > _setup, (void*)"fallback" },
> > ++      { "monotonic_prc_fallback", test_evutil_monotonic_prc,
> > TT_RETRIABLE, _setup, (void*)"fallback" },
> > +       { "date_rfc1123", test_evutil_date_rfc1123, 0, NULL, NULL
> > },
> > +       { "evutil_v4addr_is_local", test_evutil_v4addr_is_local, 0,
> > NULL, NULL },
> > +       { "evutil_v6addr_is_local", test_evutil_v6addr_is_local, 0,
> > NULL, NULL },
> > +-- 
> > +2.31.1
> > +
> > diff --git a/meta/recipes-support/libevent/libevent/0004-test-
> > retriable-tests-are-marked-failed-only-when-all-a.patch
> > b/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-
> > are-marked-failed-only-when-all-a.patch
> > new file mode 100644
> > in

[OE-core][PATCH v3] libevent: mark util/monotonic_prc_fallback as retriable

2021-09-29 Thread Thomas Perrot
Backport a patch to fix the below ptest failure:
 # ./run-ptest
 Running tests:
 EVPORT
 Skipping test
 KQUEUE
 Skipping test
 EPOLL
 test-eof: OKAY
 test-dumpevents: OKAY (output not checked)
 regress:
  FAIL ../libevent-2.1.12-stable/test/regress_util.c:1478: assert(diff.tv_sec 
== 0): 1 vs 0 util/monotonic_prc_fallback:
  [monotonic_prc_fallback FAILED]
 1/312 TESTS FAILED. (33 skipped)
 FAILED
 regress_debug:
  FAIL ../libevent-2.1.12-stable/test/regress_util.c:1478: assert(diff.tv_sec 
== 0): 1 vs 0 util/monotonic_prc_fallback:
  [monotonic_prc_fallback FAILED]
 1/312 TESTS FAILED. (33 skipped)
 FAILED
 [snip]

(From OE-Core rev: edecbbdacab5227c75e4a199e124389f8036b421)

[YOCTO #14507]

Signed-off-by: Mingli Yu 
Signed-off-by: Alexandre Belloni 
Signed-off-by: Thomas Perrot 
---
 ...-monotonic_prc_fallback-as-retriable.patch | 28 +++
 ...ts-are-marked-failed-only-when-all-a.patch | 81 +++
 .../libevent/libevent/run-ptest   | 10 +--
 .../libevent/libevent_2.1.12.bb   |  4 +-
 4 files changed, 117 insertions(+), 6 deletions(-)
 create mode 100644 
meta/recipes-support/libevent/libevent/0003-test-mark-util-monotonic_prc_fallback-as-retriable.patch
 create mode 100644 
meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch

diff --git 
a/meta/recipes-support/libevent/libevent/0003-test-mark-util-monotonic_prc_fallback-as-retriable.patch
 
b/meta/recipes-support/libevent/libevent/0003-test-mark-util-monotonic_prc_fallback-as-retriable.patch
new file mode 100644
index ..8a2c78983e1d
--- /dev/null
+++ 
b/meta/recipes-support/libevent/libevent/0003-test-mark-util-monotonic_prc_fallback-as-retriable.patch
@@ -0,0 +1,28 @@
+From d01a57a998798da977c470f3b8d6a457c1adb144 Mon Sep 17 00:00:00 2001
+From: Azat Khuzhin 
+Date: Sun, 19 Sep 2021 00:57:31 +0300
+Subject: [PATCH] test: mark util/monotonic_prc_fallback as retriable
+
+Refs: #1193
+
+Upstream-status: Backported
+---
+ test/regress_util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/regress_util.c b/test/regress_util.c
+index 45caa2700a40..a9e80db20149 100644
+--- a/test/regress_util.c
 b/test/regress_util.c
+@@ -1672,7 +1672,7 @@ struct testcase_t util_testcases[] = {
+   { "monotonic_res_fallback", test_evutil_monotonic_res, 
TT_OFF_BY_DEFAULT, _setup, (void*)"fallback" },
+   { "monotonic_prc", test_evutil_monotonic_prc, 0, _setup, 
(void*)"" },
+   { "monotonic_prc_precise", test_evutil_monotonic_prc, TT_RETRIABLE, 
_setup, (void*)"precise" },
+-  { "monotonic_prc_fallback", test_evutil_monotonic_prc, 0, _setup, 
(void*)"fallback" },
++  { "monotonic_prc_fallback", test_evutil_monotonic_prc, TT_RETRIABLE, 
_setup, (void*)"fallback" },
+   { "date_rfc1123", test_evutil_date_rfc1123, 0, NULL, NULL },
+   { "evutil_v4addr_is_local", test_evutil_v4addr_is_local, 0, NULL, NULL 
},
+   { "evutil_v6addr_is_local", test_evutil_v6addr_is_local, 0, NULL, NULL 
},
+-- 
+2.31.1
+
diff --git 
a/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch
 
b/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch
new file mode 100644
index ..ae7db0b7aa85
--- /dev/null
+++ 
b/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch
@@ -0,0 +1,81 @@
+From 36ebd92fa53c0097f1e2f9ec5aa5b5c6ec1b411d Mon Sep 17 00:00:00 2001
+From: Thomas Perrot 
+Date: Wed, 29 Sep 2021 13:50:35 +0200
+Subject: [PATCH] test: retriable tests are marked failed only when all
+ attempts have failed
+
+Fixes: #1193
+
+Upstream-status: Pending
+
+Signed-off-by: Thomas Perrot 
+---
+ test/tinytest.c | 13 ++---
+ test/tinytest.h |  2 +-
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/test/tinytest.c b/test/tinytest.c
+index 85dfe74a720e..bf2882418eb6 100644
+--- a/test/tinytest.c
 b/test/tinytest.c
+@@ -310,7 +310,8 @@ testcase_run_forked_(const struct testgroup_t *group,
+ 
+ int
+ testcase_run_one(const struct testgroup_t *group,
+-   const struct testcase_t *testcase)
++   const struct testcase_t *testcase,
++   const int test_attempts)
+ {
+   enum outcome outcome;
+ 
+@@ -348,7 +349,7 @@ testcase_run_one(const struct testgroup_t *group,
+   if (opt_verbosity>0 && !opt_forked)
+   puts("SKIPPED");
+   } else {
+-  if (!opt_forked)
++  if (!opt_forked && (testcase->flags & TT_RETRIABLE) && 
!test_attempts)
+   printf("\n  [%s FAILED]\n", testcase->name);
+   }
+ 
+@@ -525,22 +526,20 @@ tinytest_main(int c, const char **v, struct tes

[OE-core][PATCH v2] libevent: mark util/monotonic_prc_fallback as retriable

2021-09-29 Thread Thomas Perrot
Backport a patch to fix the below ptest failure:
 # ./run-ptest
 Running tests:
 EVPORT
 Skipping test
 KQUEUE
 Skipping test
 EPOLL
 test-eof: OKAY
 test-dumpevents: OKAY (output not checked)
 regress:
  FAIL ../libevent-2.1.12-stable/test/regress_util.c:1478: assert(diff.tv_sec 
== 0): 1 vs 0 util/monotonic_prc_fallback:
  [monotonic_prc_fallback FAILED]
 1/312 TESTS FAILED. (33 skipped)
 FAILED
 regress_debug:
  FAIL ../libevent-2.1.12-stable/test/regress_util.c:1478: assert(diff.tv_sec 
== 0): 1 vs 0 util/monotonic_prc_fallback:
  [monotonic_prc_fallback FAILED]
 1/312 TESTS FAILED. (33 skipped)
 FAILED
 [snip]

(From OE-Core rev: edecbbdacab5227c75e4a199e124389f8036b421)

[YOCTO #14507]

Signed-off-by: Mingli Yu 
Signed-off-by: Alexandre Belloni 
Signed-off-by: Thomas Perrot 
---
 ...-monotonic_prc_fallback-as-retriable.patch | 26 ++
 ...ts-are-marked-failed-only-when-all-a.patch | 79 +++
 .../libevent/libevent/run-ptest   | 10 +--
 .../libevent/libevent_2.1.12.bb   |  4 +-
 4 files changed, 113 insertions(+), 6 deletions(-)
 create mode 100644 
meta/recipes-support/libevent/libevent/0003-test-mark-util-monotonic_prc_fallback-as-retriable.patch
 create mode 100644 
meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch

diff --git 
a/meta/recipes-support/libevent/libevent/0003-test-mark-util-monotonic_prc_fallback-as-retriable.patch
 
b/meta/recipes-support/libevent/libevent/0003-test-mark-util-monotonic_prc_fallback-as-retriable.patch
new file mode 100644
index ..2c96a24c985c
--- /dev/null
+++ 
b/meta/recipes-support/libevent/libevent/0003-test-mark-util-monotonic_prc_fallback-as-retriable.patch
@@ -0,0 +1,26 @@
+From 04fcd7c6df158bb65261867de4b9ec8439696934 Mon Sep 17 00:00:00 2001
+From: Azat Khuzhin 
+Date: Sun, 19 Sep 2021 00:57:31 +0300
+Subject: [PATCH] test: mark util/monotonic_prc_fallback as retriable
+
+Refs: #1193
+---
+ test/regress_util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/regress_util.c b/test/regress_util.c
+index 0f33ea0ea11c..eb362b32301f 100644
+--- a/test/regress_util.c
 b/test/regress_util.c
+@@ -1848,7 +1848,7 @@ struct testcase_t util_testcases[] = {
+   { "monotonic_res_fallback", test_evutil_monotonic_res, 
TT_OFF_BY_DEFAULT, _setup, (void*)"fallback" },
+   { "monotonic_prc", test_evutil_monotonic_prc, 0, _setup, 
(void*)"" },
+   { "monotonic_prc_precise", test_evutil_monotonic_prc, TT_RETRIABLE, 
_setup, (void*)"precise" },
+-  { "monotonic_prc_fallback", test_evutil_monotonic_prc, 0, _setup, 
(void*)"fallback" },
++  { "monotonic_prc_fallback", test_evutil_monotonic_prc, TT_RETRIABLE, 
_setup, (void*)"fallback" },
+   { "date_rfc1123", test_evutil_date_rfc1123, 0, NULL, NULL },
+   { "evutil_v4addr_is_local", test_evutil_v4addr_is_local, 0, NULL, NULL 
},
+   { "evutil_v6addr_is_local", test_evutil_v6addr_is_local, 0, NULL, NULL 
},
+-- 
+2.31.1
+
diff --git 
a/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch
 
b/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch
new file mode 100644
index ..1d16fb9276fe
--- /dev/null
+++ 
b/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch
@@ -0,0 +1,79 @@
+From f554c75209038c3f2cd81c4271306fe53d3adfe8 Mon Sep 17 00:00:00 2001
+From: Thomas Perrot 
+Date: Wed, 29 Sep 2021 13:50:35 +0200
+Subject: [PATCH] test: retriable tests are marked failed only when all
+ attempts have failed
+
+Fixes: #1193
+
+Signed-off-by: Thomas Perrot 
+---
+ test/tinytest.c | 13 ++---
+ test/tinytest.h |  2 +-
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/test/tinytest.c b/test/tinytest.c
+index 85dfe74a720e..bf2882418eb6 100644
+--- a/test/tinytest.c
 b/test/tinytest.c
+@@ -310,7 +310,8 @@ testcase_run_forked_(const struct testgroup_t *group,
+ 
+ int
+ testcase_run_one(const struct testgroup_t *group,
+-   const struct testcase_t *testcase)
++   const struct testcase_t *testcase,
++   const int test_attempts)
+ {
+   enum outcome outcome;
+ 
+@@ -348,7 +349,7 @@ testcase_run_one(const struct testgroup_t *group,
+   if (opt_verbosity>0 && !opt_forked)
+   puts("SKIPPED");
+   } else {
+-  if (!opt_forked)
++  if (!opt_forked && (testcase->flags & TT_RETRIABLE) && 
!test_attempts)
+   printf("\n  [%s FAILED]\n", testcase->name);
+   }
+ 
+@@ -525,22 +526,20 @@ tinytest_main(int c, const char **v, struct testgroup_t 
*groups)
+   struct testgr

[OE-core] [PATCH 2/2] oeqa/selftest/fitimage: update tests to use two keys

2021-08-10 Thread Thomas Perrot
Other keys (UBOOT_SIGN_IMG_KEYNAME) are required to sign individually the images
nodes, and these keys must be different from the ones used to sign the
configurations nodes (UBOOT_SIGN_KEYNAME), then fitimage tests need to be
updated.

Signed-off-by: Thomas Perrot 
---
 meta/lib/oeqa/selftest/cases/fitimage.py | 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/fitimage.py 
b/meta/lib/oeqa/selftest/cases/fitimage.py
index 815ee48c0541..184c8778d23f 100644
--- a/meta/lib/oeqa/selftest/cases/fitimage.py
+++ b/meta/lib/oeqa/selftest/cases/fitimage.py
@@ -114,7 +114,8 @@ KERNEL_CLASSES = " kernel-fitimage test-mkimage-wrapper "
 UBOOT_SIGN_ENABLE = "1"
 FIT_GENERATE_KEYS = "1"
 UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys"
-UBOOT_SIGN_KEYNAME = "oe-selftest"
+UBOOT_SIGN_IMG_KEYNAME = "img-oe-selftest"
+UBOOT_SIGN_KEYNAME = "cfg-oe-selftest"
 FIT_SIGN_INDIVIDUAL = "1"
 UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'"
 """
@@ -173,11 +174,11 @@ UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'"
 
 reqsigvalues_image = {
 'algo': '"sha256,rsa2048"',
-'key-name-hint': '"oe-selftest"',
+'key-name-hint': '"img-oe-selftest"',
 }
 reqsigvalues_config = {
 'algo': '"sha256,rsa2048"',
-'key-name-hint': '"oe-selftest"',
+'key-name-hint': '"cfg-oe-selftest"',
 'sign-images': '"kernel", "fdt"',
 }
 
@@ -215,7 +216,10 @@ UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'"
 self.assertIn('conf-am335x-boneblack.dtb', signed_sections)
 for signed_section, values in signed_sections.items():
 value = values.get('Sign algo', None)
-self.assertEqual(value, 'sha256,rsa2048:oe-selftest', 'Signature 
algorithm for %s not expected value' % signed_section)
+if signed_section.startswith("conf"):
+self.assertEqual(value, 'sha256,rsa2048:cfg-oe-selftest', 
'Signature algorithm for %s not expected value' % signed_section)
+else:
+self.assertEqual(value, 'sha256,rsa2048:img-oe-selftest', 
'Signature algorithm for %s not expected value' % signed_section)
 value = values.get('Sign value', None)
 self.assertEqual(len(value), 512, 'Signature value for section %s 
not expected length' % signed_section)
 
@@ -266,7 +270,8 @@ KERNEL_CLASSES = " kernel-fitimage"
 UBOOT_SIGN_ENABLE = "1"
 FIT_GENERATE_KEYS = "1"
 UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys"
-UBOOT_SIGN_KEYNAME = "oe-selftest"
+UBOOT_SIGN_IMG_KEYNAME = "img-oe-selftest"
+UBOOT_SIGN_KEYNAME = "cfg-oe-selftest"
 FIT_SIGN_INDIVIDUAL = "1"
 """
 self.write_config(config)
@@ -348,7 +353,8 @@ KERNEL_CLASSES = " kernel-fitimage test-mkimage-wrapper "
 UBOOT_SIGN_ENABLE = "1"
 FIT_GENERATE_KEYS = "1"
 UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys"
-UBOOT_SIGN_KEYNAME = "oe-selftest"
+UBOOT_SIGN_IMG_KEYNAME = "img-oe-selftest"
+UBOOT_SIGN_KEYNAME = "cfg-oe-selftest"
 FIT_SIGN_INDIVIDUAL = "1"
 UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart U-Boot comment'"
 """
@@ -592,7 +598,8 @@ KERNEL_CLASSES = " kernel-fitimage test-mkimage-wrapper "
 UBOOT_SIGN_ENABLE = "1"
 FIT_GENERATE_KEYS = "1"
 UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys"
-UBOOT_SIGN_KEYNAME = "kernel-oe-selftest"
+UBOOT_SIGN_IMG_KEYNAME = "img-oe-selftest"
+UBOOT_SIGN_KEYNAME = "cfg-oe-selftest"
 FIT_SIGN_INDIVIDUAL = "1"
 """
 self.write_config(config)
-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154681): 
https://lists.openembedded.org/g/openembedded-core/message/154681
Mute This Topic: https://lists.openembedded.org/mt/84791635/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] kernel-fitimage: images should not be signed with the same keys as the configurations

2021-08-10 Thread Thomas Perrot
Otherwise the "required" property, from UBOOT_DTB_BINARY, will be set to "conf"
and no error will be raised in case of error.

Signed-off-by: Thomas Perrot 
---
 meta/classes/kernel-fitimage.bbclass | 40 
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index a9d1002200c9..2ef8f06b1428 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -60,6 +60,14 @@ FIT_DESC ?= "Kernel fitImage for 
${DISTRO_NAME}/${PV}/${MACHINE}"
 # Sign individual images as well
 FIT_SIGN_INDIVIDUAL ?= "0"
 
+# Keys used to sign individually image nodes.
+# The keys to sign image nodes must be different from those used to sign
+# configuration nodes, otherwise the "required" property, from
+# UBOOT_DTB_BINARY, will be set to "conf", because "conf" prevails on "image".
+# Then the images signature checking will not be mandatory and no error will be
+# raised in case of failure.
+# UBOOT_SIGN_IMG_KEYNAME = "dev2" # keys name in keydir (eg. "dev2.crt", 
"dev2.key")
+
 #
 # Emit the fitImage ITS header
 #
@@ -121,7 +129,7 @@ fitimage_emit_section_kernel() {
 
kernel_csum="${FIT_HASH_ALG}"
kernel_sign_algo="${FIT_SIGN_ALG}"
-   kernel_sign_keyname="${UBOOT_SIGN_KEYNAME}"
+   kernel_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
 
ENTRYPOINT="${UBOOT_ENTRYPOINT}"
if [ -n "${UBOOT_ENTRYSYMBOL}" ]; then
@@ -167,7 +175,7 @@ fitimage_emit_section_dtb() {
 
dtb_csum="${FIT_HASH_ALG}"
dtb_sign_algo="${FIT_SIGN_ALG}"
-   dtb_sign_keyname="${UBOOT_SIGN_KEYNAME}"
+   dtb_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
 
dtb_loadline=""
dtb_ext=${DTB##*.}
@@ -214,7 +222,7 @@ fitimage_emit_section_boot_script() {
 
 bootscr_csum="${FIT_HASH_ALG}"
bootscr_sign_algo="${FIT_SIGN_ALG}"
-   bootscr_sign_keyname="${UBOOT_SIGN_KEYNAME}"
+   bootscr_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
 
 cat << EOF >> ${1}
 bootscr-${2} {
@@ -278,7 +286,7 @@ fitimage_emit_section_ramdisk() {
 
ramdisk_csum="${FIT_HASH_ALG}"
ramdisk_sign_algo="${FIT_SIGN_ALG}"
-   ramdisk_sign_keyname="${UBOOT_SIGN_KEYNAME}"
+   ramdisk_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
ramdisk_loadline=""
ramdisk_entryline=""
 
@@ -475,6 +483,10 @@ fitimage_assemble() {
bootscr_id=""
rm -f ${1} arch/${ARCH}/boot/${2}
 
+   if [ ! -z "${UBOOT_SIGN_IMG_KEYNAME}" -a "${UBOOT_SIGN_KEYNAME}" = 
"${UBOOT_SIGN_IMG_KEYNAME}" ]; then
+   bbfatal "Keys used to sign images and configuration nodes must 
be different."
+   fi
+
fitimage_emit_fit_header ${1}
 
#
@@ -674,7 +686,7 @@ do_kernel_generate_rsa_keys() {
 
if [ "${UBOOT_SIGN_ENABLE}" = "1" ] && [ "${FIT_GENERATE_KEYS}" = "1" 
]; then
 
-   # Generate keys only if they don't already exist
+   # Generate keys to sign configuration nodes, only if they don't 
already exist
if [ ! -f "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".key ] || 
\
[ ! -f "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".crt 
]; then
 
@@ -691,6 +703,24 @@ do_kernel_generate_rsa_keys() {
-key 
"${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".key \
-out 
"${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".crt
fi
+
+   # Generate keys to sign image nodes, only if they don't already 
exist
+   if [ ! -f "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".key 
] || \
+   [ ! -f 
"${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".crt ]; then
+
+   # make directory if it does not already exist
+   mkdir -p "${UBOOT_SIGN_KEYDIR}"
+
+   echo "Generating RSA private key for signing fitImage"
+   openssl genrsa ${FIT_KEY_GENRSA_ARGS} -out \
+   
"${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".key \
+   "${FIT_SIGN_NUMBITS}"
+
+   echo "Generating certificate for signing fitImage"
+   openssl req ${FIT_KEY_REQ_ARGS} "${FIT_KEY_SIGN_PKCS}" \
+   -key 
"${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".key \
+   -out 
"${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".crt
+   fi
fi
 }
 
-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154680): 
https://lists.openembedded.org/g/openembedded-core/message/154680
Mute This Topic: https://lists.openembedded.org/mt/84791634/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 0/2] Sign the image nodes with keys different from those for configuration nodes.

2021-08-10 Thread Thomas Perrot
The keys to sign image nodes must be different from those used to sign
configuration nodes, otherwise the "required" property, from UBOOT_DTB_BINARY,
will be set to "conf", because "conf" prevails on "image". Then the images
signature checking will not be mandatory and no error will be raised in case of
failure.

Thomas Perrot (2):
  kernel-fitimage: images should not be signed with the same keys as the
configurations
  oeqa/selftest/fitimage: update tests to use two keys

 meta/classes/kernel-fitimage.bbclass | 40 +---
 meta/lib/oeqa/selftest/cases/fitimage.py | 21 -
 2 files changed, 49 insertions(+), 12 deletions(-)

-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154679): 
https://lists.openembedded.org/g/openembedded-core/message/154679
Mute This Topic: https://lists.openembedded.org/mt/84791631/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] kernel-fitimage: images should not be signed with the same keys as the configurations

2021-08-09 Thread Thomas Perrot
Hello Alexandre,

On Sun, 2021-08-08 at 21:19 +0200, Alexandre Belloni wrote:
> Hello,
> 
> On 06/08/2021 18:10:38+0200, Thomas Perrot wrote:
> > Otherwise the "required" property, from UBOOT_DTB_BINARY, will be set
> > to "conf"
> > and no error will be raised in case of error.
> > 
> > Signed-off-by: Thomas Perrot 
> > ---
> >  meta/classes/kernel-fitimage.bbclass | 40 --
> > --
> >  1 file changed, 35 insertions(+), 5 deletions(-)
> > 
> > diff --git a/meta/classes/kernel-fitimage.bbclass
> > b/meta/classes/kernel-fitimage.bbclass
> > index a9d1002200c9..72f692e40e63 100644
> > --- a/meta/classes/kernel-fitimage.bbclass
> > +++ b/meta/classes/kernel-fitimage.bbclass
> > @@ -60,6 +60,14 @@ FIT_DESC ?= "Kernel fitImage for
> > ${DISTRO_NAME}/${PV}/${MACHINE}"
> >  # Sign individual images as well
> >  FIT_SIGN_INDIVIDUAL ?= "0"
> >  
> > +# Keys used to sign individually images nodes.
> > +# The keys to sign images nodes must be different from those used to
> > sign
> > +# configurations nodes, otherwise the "required" property, from
> > +# UBOOT_DTB_BINARY, will be set to "conf", because "conf" prevails
> > on "image".
> > +# Then images signature checking will not be mandatory and no error
> > will be
> > +# raised.
> > +# UBOOT_SIGN_IMG_KEYNAME = "dev2" # keys name in keydir (eg.
> > "dev2.crt", "dev2.key")
> > +
> >  #
> >  # Emit the fitImage ITS header
> >  #
> > @@ -121,7 +129,7 @@ fitimage_emit_section_kernel() {
> >  
> > kernel_csum="${FIT_HASH_ALG}"
> > kernel_sign_algo="${FIT_SIGN_ALG}"
> > -   kernel_sign_keyname="${UBOOT_SIGN_KEYNAME}"
> > +   kernel_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
> >  
> > ENTRYPOINT="${UBOOT_ENTRYPOINT}"
> > if [ -n "${UBOOT_ENTRYSYMBOL}" ]; then
> > @@ -167,7 +175,7 @@ fitimage_emit_section_dtb() {
> >  
> > dtb_csum="${FIT_HASH_ALG}"
> > dtb_sign_algo="${FIT_SIGN_ALG}"
> > -   dtb_sign_keyname="${UBOOT_SIGN_KEYNAME}"
> > +   dtb_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
> >  
> > dtb_loadline=""
> > dtb_ext=${DTB##*.}
> > @@ -214,7 +222,7 @@ fitimage_emit_section_boot_script() {
> >  
> >  bootscr_csum="${FIT_HASH_ALG}"
> > bootscr_sign_algo="${FIT_SIGN_ALG}"
> > -   bootscr_sign_keyname="${UBOOT_SIGN_KEYNAME}"
> > +   bootscr_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
> >  
> >  cat << EOF >> ${1}
> >  bootscr-${2} {
> > @@ -278,7 +286,7 @@ fitimage_emit_section_ramdisk() {
> >  
> > ramdisk_csum="${FIT_HASH_ALG}"
> > ramdisk_sign_algo="${FIT_SIGN_ALG}"
> > -   ramdisk_sign_keyname="${UBOOT_SIGN_KEYNAME}"
> > +   ramdisk_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
> > ramdisk_loadline=""
> > ramdisk_entryline=""
> >  
> > @@ -475,6 +483,10 @@ fitimage_assemble() {
> > bootscr_id=""
> > rm -f ${1} arch/${ARCH}/boot/${2}
> >  
> > +   if [ "${UBOOT_SIGN_KEYNAME}" = "${UBOOT_SIGN_IMG_KEYNAME}" ];
> > then
> > +   bbfatal "Keys used to sign images and configuration
> > nodes must be different."
> 
> This breaks oe-selftest, as seen in:
> https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/2383/steps/14/logs/stdio
> 

Thank you for the feedback.

The tests also need to be updated, so I will submit a v2, including the
required changes on the test side.

Best regards,
Thomas Perrot

> 
> 
> 
> 

-- 
Thomas Perrot, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com



signature.asc
Description: This is a digitally signed message part

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154605): 
https://lists.openembedded.org/g/openembedded-core/message/154605
Mute This Topic: https://lists.openembedded.org/mt/84711813/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] kernel-fitimage: images should not be signed with the same keys as the configurations

2021-08-06 Thread Thomas Perrot
Otherwise the "required" property, from UBOOT_DTB_BINARY, will be set to "conf"
and no error will be raised in case of error.

Signed-off-by: Thomas Perrot 
---
 meta/classes/kernel-fitimage.bbclass | 40 
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index a9d1002200c9..72f692e40e63 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -60,6 +60,14 @@ FIT_DESC ?= "Kernel fitImage for 
${DISTRO_NAME}/${PV}/${MACHINE}"
 # Sign individual images as well
 FIT_SIGN_INDIVIDUAL ?= "0"
 
+# Keys used to sign individually images nodes.
+# The keys to sign images nodes must be different from those used to sign
+# configurations nodes, otherwise the "required" property, from
+# UBOOT_DTB_BINARY, will be set to "conf", because "conf" prevails on "image".
+# Then images signature checking will not be mandatory and no error will be
+# raised.
+# UBOOT_SIGN_IMG_KEYNAME = "dev2" # keys name in keydir (eg. "dev2.crt", 
"dev2.key")
+
 #
 # Emit the fitImage ITS header
 #
@@ -121,7 +129,7 @@ fitimage_emit_section_kernel() {
 
kernel_csum="${FIT_HASH_ALG}"
kernel_sign_algo="${FIT_SIGN_ALG}"
-   kernel_sign_keyname="${UBOOT_SIGN_KEYNAME}"
+   kernel_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
 
ENTRYPOINT="${UBOOT_ENTRYPOINT}"
if [ -n "${UBOOT_ENTRYSYMBOL}" ]; then
@@ -167,7 +175,7 @@ fitimage_emit_section_dtb() {
 
dtb_csum="${FIT_HASH_ALG}"
dtb_sign_algo="${FIT_SIGN_ALG}"
-   dtb_sign_keyname="${UBOOT_SIGN_KEYNAME}"
+   dtb_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
 
dtb_loadline=""
dtb_ext=${DTB##*.}
@@ -214,7 +222,7 @@ fitimage_emit_section_boot_script() {
 
 bootscr_csum="${FIT_HASH_ALG}"
bootscr_sign_algo="${FIT_SIGN_ALG}"
-   bootscr_sign_keyname="${UBOOT_SIGN_KEYNAME}"
+   bootscr_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
 
 cat << EOF >> ${1}
 bootscr-${2} {
@@ -278,7 +286,7 @@ fitimage_emit_section_ramdisk() {
 
ramdisk_csum="${FIT_HASH_ALG}"
ramdisk_sign_algo="${FIT_SIGN_ALG}"
-   ramdisk_sign_keyname="${UBOOT_SIGN_KEYNAME}"
+   ramdisk_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
ramdisk_loadline=""
ramdisk_entryline=""
 
@@ -475,6 +483,10 @@ fitimage_assemble() {
bootscr_id=""
rm -f ${1} arch/${ARCH}/boot/${2}
 
+   if [ "${UBOOT_SIGN_KEYNAME}" = "${UBOOT_SIGN_IMG_KEYNAME}" ]; then
+   bbfatal "Keys used to sign images and configuration nodes must 
be different."
+   fi
+
fitimage_emit_fit_header ${1}
 
#
@@ -674,7 +686,7 @@ do_kernel_generate_rsa_keys() {
 
if [ "${UBOOT_SIGN_ENABLE}" = "1" ] && [ "${FIT_GENERATE_KEYS}" = "1" 
]; then
 
-   # Generate keys only if they don't already exist
+   # Generate keys to sign configuration nodes, only if they don't 
already exist
if [ ! -f "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".key ] || 
\
[ ! -f "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".crt 
]; then
 
@@ -691,6 +703,24 @@ do_kernel_generate_rsa_keys() {
-key 
"${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".key \
-out 
"${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".crt
fi
+
+   # Generate keys to sign image nodes, only if they don't already 
exist
+   if [ ! -f "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".key 
] || \
+   [ ! -f 
"${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".crt ]; then
+
+   # make directory if it does not already exist
+   mkdir -p "${UBOOT_SIGN_KEYDIR}"
+
+   echo "Generating RSA private key for signing fitImage"
+   openssl genrsa ${FIT_KEY_GENRSA_ARGS} -out \
+   
"${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".key \
+   "${FIT_SIGN_NUMBITS}"
+
+   echo "Generating certificate for signing fitImage"
+   openssl req ${FIT_KEY_REQ_ARGS} "${FIT_KEY_SIGN_PKCS}" \
+   -key 
"${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".key \
+   -out 
"${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".crt
+   fi
fi
 }
 
-- 
2.31.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154568): 
https://lists.openembedded.org/g/openembedded-core/message/154568
Mute This Topic: https://lists.openembedded.org/mt/84711813/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] kernel-fitimage: use sha256 checksum

2018-01-17 Thread Thomas Perrot
Update the bbclass to use sha256 instead of sha1.

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index a50f8a18ee..b8c2815fba 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -100,7 +100,7 @@ EOF
 # $4 ... Compression type
 fitimage_emit_section_kernel() {
 
-   kernel_csum="sha1"
+   kernel_csum="sha256"
 
ENTRYPOINT=${UBOOT_ENTRYPOINT}
if [ -n "${UBOOT_ENTRYSYMBOL}" ]; then
@@ -133,7 +133,7 @@ EOF
 # $3 ... Path to DTB image
 fitimage_emit_section_dtb() {
 
-   dtb_csum="sha1"
+   dtb_csum="sha256"
 
cat << EOF >> ${1}
 fdt@${2} {
@@ -157,7 +157,7 @@ EOF
 # $3 ... Path to setup image
 fitimage_emit_section_setup() {
 
-   setup_csum="sha1"
+   setup_csum="sha256"
 
cat << EOF >> ${1}
 setup@${2} {
@@ -184,7 +184,7 @@ EOF
 # $3 ... Path to ramdisk image
 fitimage_emit_section_ramdisk() {
 
-   ramdisk_csum="sha1"
+   ramdisk_csum="sha256"
ramdisk_ctype="none"
ramdisk_loadline=""
ramdisk_entryline=""
@@ -242,7 +242,7 @@ EOF
 # $6 ... default flag
 fitimage_emit_section_config() {
 
-   conf_csum="sha1"
+   conf_csum="sha256"
if [ -n "${UBOOT_SIGN_ENABLE}" ] ; then
conf_sign_keyname="${UBOOT_SIGN_KEYNAME}"
fi
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] kernel-fitimage: Allow unset load address for device tree binary

2018-01-17 Thread Thomas Perrot
Allow the load address to remain unset if the UBOOT_DTB_LOADADDRESS
variable is also unset for dtb entries in the image tree. This
allows for U-Boot to decide dynamically where to load the dtb.

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index a50f8a18ee..b9eb2e3b65 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -134,6 +134,11 @@ EOF
 fitimage_emit_section_dtb() {
 
dtb_csum="sha1"
+   dtb_loadline=""
+
+   if [ -n "${UBOOT_DTB_LOADADDRESS}" ]; then
+   dtb_loadline="load = <${UBOOT_DTB_LOADADDRESS}>;"
+   fi
 
cat << EOF >> ${1}
 fdt@${2} {
@@ -142,6 +147,7 @@ fitimage_emit_section_dtb() {
 type = "flat_dt";
 arch = "${UBOOT_ARCH}";
 compression = "none";
+${dtb_loadline}
 hash@1 {
 algo = "${dtb_csum}";
 };
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] uboot-sign: avoid a circular dependency with the task to assemble a fitimage

2018-01-17 Thread Thomas Perrot
Between do_concat_dtb and do_assemble_fitimage when UBOOT_SIGN_ENABLE is active:

Dependency loop #1 found:
  do_concat_dtb (dependent Tasks ['linux-yocto_4.10.bb:do_assemble_fitimage'])
  do_install (dependent Tasks ['pseudo_1.8.2.bb:do_populate_sysroot', 
'u-boot_2017.01.bb:do_compile', 'u-boot_2017.01.bb:do_concat_dtb'])
  do_deploy (dependent Tasks ['u-boot_2017.01.bb:do_deploy_dtb', 
'u-boot_2017.01.bb:do_install'])
  do_assemble_fitimage (dependent Tasks ['linux-yocto_4.10.bb:do_compile', 
'u-boot_2017.01.bb:do_deploy'])

Signed-off-by: Thomas Perrot <thomas.per...@sigfox.com>
---
 meta/classes/uboot-sign.bbclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 8ee904e7df..f36f9dfda1 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -74,7 +74,7 @@ do_concat_dtb () {
cd ${DEPLOYDIR}
cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee 
${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
else
-   bbwarn "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
+   bbfatal "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
fi
fi
 }
@@ -82,7 +82,6 @@ do_concat_dtb () {
 python () {
uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'
if d.getVar('UBOOT_SIGN_ENABLE') == '1' and d.getVar('PN') == uboot_pn:
-   kernel_pn = d.getVar('PREFERRED_PROVIDER_virtual/kernel')
 
# u-boot.dtb and u-boot-nodtb.bin are deployed _before_ 
do_deploy
# Thus, do_deploy_setscene will also populate them in 
DEPLOY_IMAGE_DIR
@@ -91,5 +90,5 @@ python () {
# do_concat_dtb is scheduled _before_ do_install as it 
overwrite the
# u-boot.bin in both DEPLOYDIR and DEPLOY_IMAGE_DIR.
bb.build.addtask('do_concat_dtb', 'do_install', None, d)
-   d.appendVarFlag('do_concat_dtb', 'depends', ' 
%s:do_assemble_fitimage' % kernel_pn)
+   d.appendVarFlag('do_concat_dtb', 'depends', ' %s:do_deploy_dtb' 
% uboot_pn)
 }
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] kernel: Use KERNEL_IMAGETYPE_FOR_MAKE in do_bundle_initramfs

2018-01-17 Thread Thomas Perrot
In the case of a fitImage the this step should be done on the
image use to assemble the fitImage.

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index c42f85c665..ff09d4c4c7 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -231,7 +231,7 @@ do_bundle_initramfs () {
copy_initramfs
# Backing up kernel image relies on its type(regular file or 
symbolic link)
tmp_path=""
-   for type in ${KERNEL_IMAGETYPES} ; do
+   for type in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do
if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
linkpath=`readlink -n 
${KERNEL_OUTPUT_DIR}/$type`
realpath=`readlink -fn 
${KERNEL_OUTPUT_DIR}/$type`
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] kernel-fitimage: Fix bad image type replacement for aarch64

2017-11-13 Thread Thomas Perrot
Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index 179185b6b2..9baf399f2e 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -7,9 +7,12 @@ python __anonymous () {
 depends = "%s u-boot-mkimage-native dtc-native" % depends
 d.setVar("DEPENDS", depends)
 
-if d.getVar("UBOOT_ARCH") == "mips":
+uarch = d.getVar("UBOOT_ARCH")
+if uarch == "arm64":
+replacementtype = "Image"
+elif uarch == "mips":
 replacementtype = "vmlinuz.bin"
-elif d.getVar("UBOOT_ARCH") == "x86":
+elif uarch == "x86":
 replacementtype = "bzImage"
 else:
 replacementtype = "zImage"
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] toolchain-scripts: Add PYTHONHOME in sdk env script

2017-11-13 Thread Thomas Perrot
Otherwise, the host Python environment is used instead of Python environment
provided by the SDK.

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/toolchain-scripts.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/toolchain-scripts.bbclass 
b/meta/classes/toolchain-scripts.bbclass
index 9bcfe708c7..03bc652cd7 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -51,6 +51,7 @@ toolchain_create_sdk_env_script () {
echo "export OECORE_NATIVE_SYSROOT=\"$sdkpathnative\"" >> $script
echo 'export OECORE_TARGET_SYSROOT="$SDKTARGETSYSROOT"' >> $script
echo "export OECORE_ACLOCAL_OPTS=\"-I 
$sdkpathnative/usr/share/aclocal\"" >> $script
+   echo "export PYTHONHOME=\"$sdkpathnative$libdir\"" >> $script
echo 'unset command_not_found_handle' >> $script
 
toolchain_shared_env_script
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] runqemu: correct rootfs setup to boot an ide hddimg

2017-11-05 Thread Thomas Perrot
vm_drive variable is malformed when the drive type is an ide device.

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 scripts/runqemu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index f0ddeea1bf..7d3b69bc01 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -990,7 +990,7 @@ class BaseConfig(object):
% (self.rootfs, rootfs_format)
 elif drive_type.startswith("/dev/hd"):
 logger.info('Using ide drive')
-vm_drive = "%s,format=%s" % (self.rootfs, 
rootfs_format)
+vm_drive = "-drive file=%s,format=%s" % (self.rootfs, 
rootfs_format)
 else:
 # virtio might have been selected explicitly (just use 
it), or
 # is used as fallback (then warn about that).
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [meta][PATCH 1/2] Fix some issues in the fitImage generation

2017-10-25 Thread Thomas PERROT
Hi,

I agree, so I cleaned up, split into several commits, then superseded this
one.

Best regards,
Thomas P.

On Wed, Oct 25, 2017 at 1:06 PM, André Draszik <g...@andred.net> wrote:

> On Wed, 2017-10-25 at 11:13 +0100, André Draszik wrote:
> > On Wed, 2017-10-25 at 09:32 +0200, Thomas Perrot wrote:
> > > - Bad image type replacement for aarch64
> > > - Fix DTB path in fitimage.its
> >
> > It doesn't look like the DTB bit is still relevant in this commit.
> >
> > > - Ignore fitImage type in do_bundle_initramfs task because the
> packaging
> > > is made by do_assemble_fitimage_initramfs
> > > - the images for arm64 are not compressed the linux_comp variable must
> > > therefore be none
> >
> > I think it would also make sense to split this into multiple commits, as
> > your aarch64 fixes and fitimage fixes aren't directly related.
>
> To be more clear, your fix to kernel.bbclass is independent of everything
> else and doesn't apply to aarch64 only, so it should be a separate commit.
>
>
> Cheers,
> Andre'
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] kernel-fitimage: add DTB_LOAD to set dtb address

2017-10-25 Thread Thomas PERROT
Hi,

it would seem that it is also necessary to add the entry field on some
targets.

I think the best would to be do as for UBOOT_RD_LOADADDRESS and
UBOOT_RD_ENTRYPOINT.

Best regards,
Thomas P.

On Wed, Oct 25, 2017 at 6:52 PM, Otavio Salvador <
otavio.salva...@ossystems.com.br> wrote:

> On Wed, Oct 25, 2017 at 5:55 AM, Chunrong Guo 
> wrote:
> > From: Chunrong Guo 
> >
> > kernel-fitimage for arm64 and arm need dynamically sets dtb address,
> > thus we need a flexible way to load dtb address value.
> >
> > Signed-off-by: Chunrong Guo 
> > ---
> >  meta/classes/kernel-fitimage.bbclass | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-
> fitimage.bbclass
> > index 179185b..479ffd4 100644
> > --- a/meta/classes/kernel-fitimage.bbclass
> > +++ b/meta/classes/kernel-fitimage.bbclass
> > @@ -36,6 +36,8 @@ python __anonymous () {
> >  # Options for the device tree compiler passed to mkimage '-D' feature:
> >  UBOOT_MKIMAGE_DTCOPTS ??= ""
> >
> > +# Options for load dtb address
> > +DTB_LOAD ??= ""
> >  #
> >  # Emit the fitImage ITS header
> >  #
> > @@ -137,6 +139,7 @@ fitimage_emit_section_dtb() {
> >  type = "flat_dt";
> >  arch = "${UBOOT_ARCH}";
> >  compression = "none";
> > +load = <${DTB_LOAD}>;
>
> What happens if it is empty?
>
>
> >  hash@1 {
> >  algo = "${dtb_csum}";
> >  };
> > --
> > 1.9.0
> >
> > --
> > ___
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>
> --
> Otavio Salvador O.S. Systems
> http://www.ossystems.com.brhttp://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750
> --
> ___
> 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] [meta][PATCH 3/3] Fix some issues in the fitImage generation

2017-10-25 Thread Thomas Perrot
Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage
when UBOOT_SIGN_ENABLE is active:

Dependency loop #1 found:
  do_concat_dtb (dependent Tasks ['linux-yocto_4.10.bb:do_assemble_fitimage'])
  do_install (dependent Tasks ['pseudo_1.8.2.bb:do_populate_sysroot', 
'u-boot_2017.01.bb:do_compile', 'u-boot_2017.01.bb:do_concat_dtb'])
  do_deploy (dependent Tasks ['u-boot_2017.01.bb:do_deploy_dtb', 
'u-boot_2017.01.bb:do_install'])
  do_assemble_fitimage (dependent Tasks ['linux-yocto_4.10.bb:do_compile', 
'u-boot_2017.01.bb:do_deploy'])

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass |  2 +-
 meta/classes/uboot-sign.bbclass  | 21 +
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index 9baf399f2e..2779ce5226 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -33,7 +33,7 @@ python __anonymous () {
 # the fitImage:
 if d.getVar('UBOOT_SIGN_ENABLE') == "1":
 uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'
-d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_deploy' 
% uboot_pn)
+d.appendVarFlag('do_assemble_fitimage', 'depends', ' 
%s:do_deploy_dtb' % uboot_pn)
 }
 
 # Options for the device tree compiler passed to mkimage '-D' feature:
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 8ee904e7df..2f616bf2a9 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -47,16 +47,14 @@ do_deploy_dtb () {
cd ${DEPLOYDIR}
 
if [ -f ${B}/${UBOOT_DTB_BINARY} ]; then
-   install ${B}/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
-   rm -f ${UBOOT_DTB_BINARY} ${UBOOT_DTB_SYMLINK}
-   ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_SYMLINK}
-   ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_BINARY}
+   install ${B}/${UBOOT_DTB_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_SYMLINK}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}
fi
if [ -f ${B}/${UBOOT_NODTB_BINARY} ]; then
-   install ${B}/${UBOOT_NODTB_BINARY} 
${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}
-   rm -f ${UBOOT_NODTB_BINARY} ${UBOOT_NODTB_SYMLINK}
-   ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_SYMLINK}
-   ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_BINARY}
+   install ${B}/${UBOOT_NODTB_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_SYMLINK}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_BINARY}
fi
 }
 
@@ -70,11 +68,10 @@ do_concat_dtb () {
oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
install ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
install ${B}/${UBOOT_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
-   elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e 
"${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
-   cd ${DEPLOYDIR}
-   cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee 
${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
+   elif [ -e "${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}" -a -e 
"${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}" ]; then
+   cat ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} > 
${UBOOT_IMAGE}
else
-   bbwarn "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
+   bbfatal "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
fi
fi
 }
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [meta][PATCH 1/3] Fix some issues in the fitImage generation

2017-10-25 Thread Thomas Perrot
Bad image type replacement for aarch64

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index 179185b6b2..9baf399f2e 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -7,9 +7,12 @@ python __anonymous () {
 depends = "%s u-boot-mkimage-native dtc-native" % depends
 d.setVar("DEPENDS", depends)
 
-if d.getVar("UBOOT_ARCH") == "mips":
+uarch = d.getVar("UBOOT_ARCH")
+if uarch == "arm64":
+replacementtype = "Image"
+elif uarch == "mips":
 replacementtype = "vmlinuz.bin"
-elif d.getVar("UBOOT_ARCH") == "x86":
+elif uarch == "x86":
 replacementtype = "bzImage"
 else:
 replacementtype = "zImage"
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [meta][PATCH 2/3] Fix some issues in the fitImage generation

2017-10-25 Thread Thomas Perrot
Ignore fitImage type in do_bundle_initramfs task because the packaging is made 
by do_assemble_fitimage_initramfs

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 756707a3c2..7f8c8985f3 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -208,7 +208,9 @@ do_bundle_initramfs () {
# Backing up kernel image relies on its type(regular file or 
symbolic link)
tmp_path=""
for type in ${KERNEL_IMAGETYPES} ; do
-   if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
+   if [ "$type" = "fitImage" ] ; then
+   continue
+   elif [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
linkpath=`readlink -n 
${KERNEL_OUTPUT_DIR}/$type`
realpath=`readlink -fn 
${KERNEL_OUTPUT_DIR}/$type`
mv -f $realpath $realpath.bak
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [meta][PATCH 3/4] Fix some issues in the fitImage generation

2017-10-25 Thread Thomas Perrot
Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage
when UBOOT_SIGN_ENABLE is active:

Dependency loop #1 found:
  do_concat_dtb (dependent Tasks ['linux-yocto_4.10.bb:do_assemble_fitimage'])
  do_install (dependent Tasks ['pseudo_1.8.2.bb:do_populate_sysroot', 
'u-boot_2017.01.bb:do_compile', 'u-boot_2017.01.bb:do_concat_dtb'])
  do_deploy (dependent Tasks ['u-boot_2017.01.bb:do_deploy_dtb', 
'u-boot_2017.01.bb:do_install'])
  do_assemble_fitimage (dependent Tasks ['linux-yocto_4.10.bb:do_compile', 
'u-boot_2017.01.bb:do_deploy'])

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass |  2 +-
 meta/classes/uboot-sign.bbclass  | 21 +
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index 9baf399f2e..2779ce5226 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -33,7 +33,7 @@ python __anonymous () {
 # the fitImage:
 if d.getVar('UBOOT_SIGN_ENABLE') == "1":
 uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'
-d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_deploy' 
% uboot_pn)
+d.appendVarFlag('do_assemble_fitimage', 'depends', ' 
%s:do_deploy_dtb' % uboot_pn)
 }
 
 # Options for the device tree compiler passed to mkimage '-D' feature:
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 8ee904e7df..2f616bf2a9 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -47,16 +47,14 @@ do_deploy_dtb () {
cd ${DEPLOYDIR}
 
if [ -f ${B}/${UBOOT_DTB_BINARY} ]; then
-   install ${B}/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
-   rm -f ${UBOOT_DTB_BINARY} ${UBOOT_DTB_SYMLINK}
-   ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_SYMLINK}
-   ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_BINARY}
+   install ${B}/${UBOOT_DTB_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_SYMLINK}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}
fi
if [ -f ${B}/${UBOOT_NODTB_BINARY} ]; then
-   install ${B}/${UBOOT_NODTB_BINARY} 
${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}
-   rm -f ${UBOOT_NODTB_BINARY} ${UBOOT_NODTB_SYMLINK}
-   ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_SYMLINK}
-   ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_BINARY}
+   install ${B}/${UBOOT_NODTB_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_SYMLINK}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_BINARY}
fi
 }
 
@@ -70,11 +68,10 @@ do_concat_dtb () {
oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
install ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
install ${B}/${UBOOT_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
-   elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e 
"${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
-   cd ${DEPLOYDIR}
-   cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee 
${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
+   elif [ -e "${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}" -a -e 
"${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}" ]; then
+   cat ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} > 
${UBOOT_IMAGE}
else
-   bbwarn "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
+   bbfatal "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
fi
fi
 }
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [meta][PATCH 2/4] Fix some issues in the fitImage generation

2017-10-25 Thread Thomas Perrot
Ignore fitImage type in do_bundle_initramfs task because the packaging is made 
by do_assemble_fitimage_initramfs

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 756707a3c2..7f8c8985f3 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -208,7 +208,9 @@ do_bundle_initramfs () {
# Backing up kernel image relies on its type(regular file or 
symbolic link)
tmp_path=""
for type in ${KERNEL_IMAGETYPES} ; do
-   if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
+   if [ "$type" = "fitImage" ] ; then
+   continue
+   elif [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
linkpath=`readlink -n 
${KERNEL_OUTPUT_DIR}/$type`
realpath=`readlink -fn 
${KERNEL_OUTPUT_DIR}/$type`
mv -f $realpath $realpath.bak
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [meta][PATCH 4/4] Fix some issues in the fitImage generation

2017-10-25 Thread Thomas Perrot
aarch64 compression

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-uboot.bbclass | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/meta/classes/kernel-uboot.bbclass 
b/meta/classes/kernel-uboot.bbclass
index 87f02654fa..06d293039a 100644
--- a/meta/classes/kernel-uboot.bbclass
+++ b/meta/classes/kernel-uboot.bbclass
@@ -1,5 +1,5 @@
 uboot_prep_kimage() {
-   if [ -e arch/${ARCH}/boot/compressed/vmlinux ]; then
+   if [ -e arch/${ARCH}/boot/compressed/vmlinux ] ; then
vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
linux_suffix=""
linux_comp="none"
@@ -11,8 +11,13 @@ uboot_prep_kimage() {
linux_comp="none"
else
vmlinux_path="vmlinux"
-   linux_suffix=".gz"
-   linux_comp="gzip"
+   if [ "${ARCH}" = "arm64" ] ; then
+   linux_suffix=""
+   linux_comp="none"
+   else
+   linux_suffix=".gz"
+   linux_comp="gzip"
+   fi
fi
 
[ -n "${vmlinux_path}" ] && ${OBJCOPY} -O binary -R .note -R .comment 
-S "${vmlinux_path}" linux.bin
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [meta][PATCH 1/4] Fix some issues in the fitImage generation

2017-10-25 Thread Thomas Perrot
Bad image type replacement for aarch64

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index 179185b6b2..9baf399f2e 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -7,9 +7,12 @@ python __anonymous () {
 depends = "%s u-boot-mkimage-native dtc-native" % depends
 d.setVar("DEPENDS", depends)
 
-if d.getVar("UBOOT_ARCH") == "mips":
+uarch = d.getVar("UBOOT_ARCH")
+if uarch == "arm64":
+replacementtype = "Image"
+elif uarch == "mips":
 replacementtype = "vmlinuz.bin"
-elif d.getVar("UBOOT_ARCH") == "x86":
+elif uarch == "x86":
 replacementtype = "bzImage"
 else:
 replacementtype = "zImage"
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [meta][pyro][PATCHv2] Fix some issues in the fitImage generation

2017-10-25 Thread Thomas PERROT
Hi,

It's done, I just submit the path for the master branch.

Best regards,
Thomas P.

On Tue, Oct 24, 2017 at 9:38 AM, akuster808 <akuster...@gmail.com> wrote:

>
>
> On 10/20/2017 02:47 AM, Thomas Perrot wrote:
> > - Bad image type replacement for aarch64
> > - Fix DTB path in fitimage.its
> > - Ignore fitImage type in do_bundle_initramfs task because the packaging
> is made by do_assemble_fitimage_initramfs
> > - the images for arm64 are not compressed the linux_comp variable must
> therefore be none
> >
> > Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
> > ---
> >  meta/classes/kernel-fitimage.bbclass |  6 +-
> >  meta/classes/kernel-uboot.bbclass| 11 ---
> >  meta/classes/kernel.bbclass  |  4 +++-
> I don't see this in master. Please resubmit for Master.
>
> - armin
> >  3 files changed, 16 insertions(+), 5 deletions(-)
> >
> > diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-
> fitimage.bbclass
> > index 2630b47316..abbc309b09 100644
> > --- a/meta/classes/kernel-fitimage.bbclass
> > +++ b/meta/classes/kernel-fitimage.bbclass
> > @@ -7,8 +7,11 @@ python __anonymous () {
> >  depends = "%s u-boot-mkimage-native dtc-native" % depends
> >  d.setVar("DEPENDS", depends)
> >
> > -if d.getVar("UBOOT_ARCH") == "x86":
> > +uarch = d.getVar("UBOOT_ARCH")
> > +if uarch == "x86":
> >  replacementtype = "bzImage"
> > +elif uarch == "arm64":
> > +replacementtype = "Image"
> >  else:
> >  replacementtype = "zImage"
> >
> > @@ -351,6 +354,7 @@ fitimage_assemble() {
> >   DTB_PATH="arch/${ARCH}/boot/${DTB}"
> >   fi
> >
> > + DTB=$(echo "${DTB}" | tr '/' '_')
> >   DTBS="${DTBS} ${DTB}"
> >   fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}
> >   done
> > diff --git a/meta/classes/kernel-uboot.bbclass
> b/meta/classes/kernel-uboot.bbclass
> > index 868e97d7a7..940f91d90e 100644
> > --- a/meta/classes/kernel-uboot.bbclass
> > +++ b/meta/classes/kernel-uboot.bbclass
> > @@ -1,12 +1,17 @@
> >  uboot_prep_kimage() {
> > - if [ -e arch/${ARCH}/boot/compressed/vmlinux ]; then
> > + if [ -e arch/${ARCH}/boot/compressed/vmlinux ] ; then
> >   vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
> >   linux_suffix=""
> >   linux_comp="none"
> >   else
> >   vmlinux_path="vmlinux"
> > - linux_suffix=".gz"
> > - linux_comp="gzip"
> > + if [ "${ARCH}" = "arm64" ] ; then
> > + linux_suffix=""
> > + linux_comp="none"
> > + else
> > + linux_suffix=".gz"
> > + linux_comp="gzip"
> > + fi
> >   fi
> >
> >   ${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}"
> linux.bin
> > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> > index ce2cab65ae..14677ac0fc 100644
> > --- a/meta/classes/kernel.bbclass
> > +++ b/meta/classes/kernel.bbclass
> > @@ -219,7 +219,9 @@ do_bundle_initramfs () {
> >   # Backing up kernel image relies on its type(regular file
> or symbolic link)
> >   tmp_path=""
> >   for type in ${KERNEL_IMAGETYPES} ; do
> > - if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
> > + if [ "$type" = "fitImage" ] ; then
> > + continue
> > + elif [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
> >   linkpath=`readlink -n
> ${KERNEL_OUTPUT_DIR}/$type`
> >   realpath=`readlink -fn
> ${KERNEL_OUTPUT_DIR}/$type`
> >   mv -f $realpath $realpath.bak
>
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [meta][PATCH 2/2] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage

2017-10-25 Thread Thomas Perrot
When UBOOT_SIGN_ENABLE is active:

Dependency loop #1 found:
  do_concat_dtb (dependent Tasks ['linux-yocto_4.10.bb:do_assemble_fitimage'])
  do_install (dependent Tasks ['pseudo_1.8.2.bb:do_populate_sysroot', 
'u-boot_2017.01.bb:do_compile', 'u-boot_2017.01.bb:do_concat_dtb'])
  do_deploy (dependent Tasks ['u-boot_2017.01.bb:do_deploy_dtb', 
'u-boot_2017.01.bb:do_install'])
  do_assemble_fitimage (dependent Tasks ['linux-yocto_4.10.bb:do_compile', 
'u-boot_2017.01.bb:do_deploy'])

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass |  2 +-
 meta/classes/uboot-sign.bbclass  | 21 +
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index 0789ba611f..13d61a2298 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -33,7 +33,7 @@ python __anonymous () {
 # the fitImage:
 if d.getVar('UBOOT_SIGN_ENABLE') == "1":
 uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'
-d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_deploy' 
% uboot_pn)
+d.appendVarFlag('do_assemble_fitimage', 'depends', ' 
%s:do_deploy_dtb' % uboot_pn)
 }
 
 # Options for the device tree compiler passed to mkimage '-D' feature:
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 8ee904e7df..2f616bf2a9 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -47,16 +47,14 @@ do_deploy_dtb () {
cd ${DEPLOYDIR}
 
if [ -f ${B}/${UBOOT_DTB_BINARY} ]; then
-   install ${B}/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
-   rm -f ${UBOOT_DTB_BINARY} ${UBOOT_DTB_SYMLINK}
-   ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_SYMLINK}
-   ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_BINARY}
+   install ${B}/${UBOOT_DTB_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_SYMLINK}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}
fi
if [ -f ${B}/${UBOOT_NODTB_BINARY} ]; then
-   install ${B}/${UBOOT_NODTB_BINARY} 
${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}
-   rm -f ${UBOOT_NODTB_BINARY} ${UBOOT_NODTB_SYMLINK}
-   ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_SYMLINK}
-   ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_BINARY}
+   install ${B}/${UBOOT_NODTB_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_SYMLINK}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_BINARY}
fi
 }
 
@@ -70,11 +68,10 @@ do_concat_dtb () {
oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
install ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
install ${B}/${UBOOT_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
-   elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e 
"${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
-   cd ${DEPLOYDIR}
-   cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee 
${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
+   elif [ -e "${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}" -a -e 
"${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}" ]; then
+   cat ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} > 
${UBOOT_IMAGE}
else
-   bbwarn "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
+   bbfatal "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
fi
fi
 }
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [meta][PATCH 1/2] Fix some issues in the fitImage generation

2017-10-25 Thread Thomas Perrot
- Bad image type replacement for aarch64
- Fix DTB path in fitimage.its
- Ignore fitImage type in do_bundle_initramfs task because the packaging is 
made by do_assemble_fitimage_initramfs
- the images for arm64 are not compressed the linux_comp variable must 
therefore be none

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass |  7 +--
 meta/classes/kernel-uboot.bbclass| 11 ---
 meta/classes/kernel.bbclass  |  4 +++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index 179185b6b2..0789ba611f 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -7,10 +7,13 @@ python __anonymous () {
 depends = "%s u-boot-mkimage-native dtc-native" % depends
 d.setVar("DEPENDS", depends)
 
-if d.getVar("UBOOT_ARCH") == "mips":
+uarch = d.getVar("UBOOT_ARCH")
+if uarch == "mips":
 replacementtype = "vmlinuz.bin"
-elif d.getVar("UBOOT_ARCH") == "x86":
+elif uarch == "x86":
 replacementtype = "bzImage"
+elif uarch == "arm64":
+replacementtype = "Image"
 else:
 replacementtype = "zImage"
 
diff --git a/meta/classes/kernel-uboot.bbclass 
b/meta/classes/kernel-uboot.bbclass
index 87f02654fa..06d293039a 100644
--- a/meta/classes/kernel-uboot.bbclass
+++ b/meta/classes/kernel-uboot.bbclass
@@ -1,5 +1,5 @@
 uboot_prep_kimage() {
-   if [ -e arch/${ARCH}/boot/compressed/vmlinux ]; then
+   if [ -e arch/${ARCH}/boot/compressed/vmlinux ] ; then
vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
linux_suffix=""
linux_comp="none"
@@ -11,8 +11,13 @@ uboot_prep_kimage() {
linux_comp="none"
else
vmlinux_path="vmlinux"
-   linux_suffix=".gz"
-   linux_comp="gzip"
+   if [ "${ARCH}" = "arm64" ] ; then
+   linux_suffix=""
+   linux_comp="none"
+   else
+   linux_suffix=".gz"
+   linux_comp="gzip"
+   fi
fi
 
[ -n "${vmlinux_path}" ] && ${OBJCOPY} -O binary -R .note -R .comment 
-S "${vmlinux_path}" linux.bin
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 756707a3c2..7f8c8985f3 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -208,7 +208,9 @@ do_bundle_initramfs () {
# Backing up kernel image relies on its type(regular file or 
symbolic link)
tmp_path=""
for type in ${KERNEL_IMAGETYPES} ; do
-   if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
+   if [ "$type" = "fitImage" ] ; then
+   continue
+   elif [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
linkpath=`readlink -n 
${KERNEL_OUTPUT_DIR}/$type`
realpath=`readlink -fn 
${KERNEL_OUTPUT_DIR}/$type`
mv -f $realpath $realpath.bak
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [meta][pyro][PATCHv2] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage

2017-10-25 Thread Thomas PERROT
Hi,

It is an issue with the fitImage generation when UBOOT_SIGN_ENABLE is
enabled, unrelated to extlinux.

I just update the commit message and push a v3 of this patch.

Best regards,
Thomas P.



On Tue, Oct 24, 2017 at 10:08 AM, André Draszik <g...@andred.net> wrote:

> Hi,
>
> On Mon, 2017-10-23 at 18:23 +0200, Thomas Perrot wrote:
> > Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
>
> Your commit message doesn't explain what problem you're trying to solve.
>
> I can only guess that it's the same as this:
> http://lists.openembedded.org/pipermail/openembedded-core/
> 2017-September/142619.html
> http://lists.openembedded.org/pipermail/openembedded-core/
> 2017-September/142621.html
>
> ? If so, just submit requests for backporting, or explain why this doesn't
> work in pyro.
>
>
> > ---
> >  meta/classes/kernel-fitimage.bbclass |  2 +-
> >  meta/classes/uboot-sign.bbclass  | 21 +
> >  2 files changed, 10 insertions(+), 13 deletions(-)
> >
> > diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-
> > fitimage.bbclass
> > index abbc309b09..5ad439e82d 100644
> > --- a/meta/classes/kernel-fitimage.bbclass
> > +++ b/meta/classes/kernel-fitimage.bbclass
> > @@ -31,7 +31,7 @@ python __anonymous () {
> >  # the fitImage:
> >  if d.getVar('UBOOT_SIGN_ENABLE') == "1":
> >  uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or
> 'u-boot'
> > -d.appendVarFlag('do_assemble_fitimage', 'depends', '
> > %s:do_deploy' % uboot_pn)
> > +d.appendVarFlag('do_assemble_fitimage', 'depends', '
> > %s:do_deploy_dtb' % uboot_pn)
>
> You should also update the description of the executed tasks at the top of
> uboot-sign.bbclass if you're changing this.
>
> Cheers,
> Andre'
>
>
> >  }
> >
> >  # Options for the device tree compiler passed to mkimage '-D' feature:
> > diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-
> > sign.bbclass
> > index 8ee904e7df..2f616bf2a9 100644
> > --- a/meta/classes/uboot-sign.bbclass
> > +++ b/meta/classes/uboot-sign.bbclass
> > @@ -47,16 +47,14 @@ do_deploy_dtb () {
> >   cd ${DEPLOYDIR}
> >
> >   if [ -f ${B}/${UBOOT_DTB_BINARY} ]; then
> > - install ${B}/${UBOOT_DTB_BINARY}
> > ${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
> > - rm -f ${UBOOT_DTB_BINARY} ${UBOOT_DTB_SYMLINK}
> > - ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_SYMLINK}
> > - ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_BINARY}
> > + install ${B}/${UBOOT_DTB_BINARY}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
> > + ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_SYMLINK}
> > + ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}
> >   fi
> >   if [ -f ${B}/${UBOOT_NODTB_BINARY} ]; then
> > - install ${B}/${UBOOT_NODTB_BINARY}
> > ${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}
> > - rm -f ${UBOOT_NODTB_BINARY} ${UBOOT_NODTB_SYMLINK}
> > - ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_SYMLINK}
> > - ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_BINARY}
> > + install ${B}/${UBOOT_NODTB_BINARY}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
> > + ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_SYMLINK}
> > + ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_BINARY}
> >   fi
> >  }
> >
> > @@ -70,11 +68,10 @@ do_concat_dtb () {
> >   oe_runmake
> > EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
> >   install ${B}/${UBOOT_BINARY}
> > ${DEPLOYDIR}/${UBOOT_IMAGE}
> >   install ${B}/${UBOOT_BINARY}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
> > - elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e
> > "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
> > - cd ${DEPLOYDIR}
> > - cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee
> > ${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
> > + elif [ -e "${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}" -a
> > -e "${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}" ]; then
> > + cat ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
> > ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} >
> > ${UBOOT_IMAGE}
> >  

[OE-core] [meta][pyro][PATCHv3] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage

2017-10-25 Thread Thomas Perrot
When UBOOT_SIGN_ENABLE is active:

Dependency loop #1 found:
  do_concat_dtb (dependent Tasks ['linux-yocto_4.10.bb:do_assemble_fitimage'])
  do_install (dependent Tasks ['pseudo_1.8.2.bb:do_populate_sysroot', 
'u-boot_2017.01.bb:do_compile', 'u-boot_2017.01.bb:do_concat_dtb'])
  do_deploy (dependent Tasks ['u-boot_2017.01.bb:do_deploy_dtb', 
'u-boot_2017.01.bb:do_install'])
  do_assemble_fitimage (dependent Tasks ['linux-yocto_4.10.bb:do_compile', 
'u-boot_2017.01.bb:do_deploy'])

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass |  2 +-
 meta/classes/uboot-sign.bbclass  | 21 +
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index abbc309b09..5ad439e82d 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -31,7 +31,7 @@ python __anonymous () {
 # the fitImage:
 if d.getVar('UBOOT_SIGN_ENABLE') == "1":
 uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'
-d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_deploy' 
% uboot_pn)
+d.appendVarFlag('do_assemble_fitimage', 'depends', ' 
%s:do_deploy_dtb' % uboot_pn)
 }
 
 # Options for the device tree compiler passed to mkimage '-D' feature:
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 8ee904e7df..2f616bf2a9 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -47,16 +47,14 @@ do_deploy_dtb () {
cd ${DEPLOYDIR}
 
if [ -f ${B}/${UBOOT_DTB_BINARY} ]; then
-   install ${B}/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
-   rm -f ${UBOOT_DTB_BINARY} ${UBOOT_DTB_SYMLINK}
-   ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_SYMLINK}
-   ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_BINARY}
+   install ${B}/${UBOOT_DTB_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_SYMLINK}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}
fi
if [ -f ${B}/${UBOOT_NODTB_BINARY} ]; then
-   install ${B}/${UBOOT_NODTB_BINARY} 
${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}
-   rm -f ${UBOOT_NODTB_BINARY} ${UBOOT_NODTB_SYMLINK}
-   ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_SYMLINK}
-   ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_BINARY}
+   install ${B}/${UBOOT_NODTB_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_SYMLINK}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_BINARY}
fi
 }
 
@@ -70,11 +68,10 @@ do_concat_dtb () {
oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
install ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
install ${B}/${UBOOT_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
-   elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e 
"${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
-   cd ${DEPLOYDIR}
-   cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee 
${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
+   elif [ -e "${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}" -a -e 
"${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}" ]; then
+   cat ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} > 
${UBOOT_IMAGE}
else
-   bbwarn "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
+   bbfatal "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
fi
fi
 }
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [meta][pyro][PATCH] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage

2017-10-23 Thread Thomas PERROT
Sorry, there is a bad copy/paste into this patch, I just pushed a version 2.

Still sorry for my mistake

Thomas P.

On Mon, Oct 23, 2017 at 5:59 PM, Thomas Perrot <thomas.per...@tupi.fr>
wrote:

> Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
> ---
>  meta/classes/kernel-fitimage.bbclass |  2 +-
>  meta/classes/uboot-sign.bbclass  | 21 +
>  2 files changed, 10 insertions(+), 13 deletions(-)
>
> diff --git a/meta/classes/kernel-fitimage.bbclass
> b/meta/classes/kernel-fitimage.bbclass
> index abbc309b09..5ad439e82d 100644
> --- a/meta/classes/kernel-fitimage.bbclass
> +++ b/meta/classes/kernel-fitimage.bbclass
> @@ -31,7 +31,7 @@ python __anonymous () {
>  # the fitImage:
>  if d.getVar('UBOOT_SIGN_ENABLE') == "1":
>  uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'
> -d.appendVarFlag('do_assemble_fitimage', 'depends', '
> %s:do_deploy' % uboot_pn)
> +d.appendVarFlag('do_assemble_fitimage', 'depends', '
> %s:do_deploy_dtb' % uboot_pn)
>  }
>
>  # Options for the device tree compiler passed to mkimage '-D' feature:
> diff --git a/meta/classes/uboot-sign.bbclass
> b/meta/classes/uboot-sign.bbclass
> index 8ee904e7df..86d531abc4 100644
> --- a/meta/classes/uboot-sign.bbclass
> +++ b/meta/classes/uboot-sign.bbclass
> @@ -47,16 +47,14 @@ do_deploy_dtb () {
> cd ${DEPLOYDIR}
>
> if [ -f ${B}/${UBOOT_DTB_BINARY} ]; then
> -   install ${B}/${UBOOT_DTB_BINARY}
> ${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
> -   rm -f ${UBOOT_DTB_BINARY} ${UBOOT_DTB_SYMLINK}
> -   ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_SYMLINK}
> -   ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_BINARY}
> +   install ${B}/${UBOOT_DTB_BINARY}
> ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
> +   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
> ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_SYMLINK}
> +   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
> ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}
> fi
> if [ -f ${B}/${UBOOT_NODTB_BINARY} ]; then
> -   install ${B}/${UBOOT_NODTB_BINARY}
> ${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}
> -   rm -f ${UBOOT_NODTB_BINARY} ${UBOOT_NODTB_SYMLINK}
> -   ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_SYMLINK}
> -   ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_BINARY}
> +   install ${B}/${UBOOT_DTB_BINARY}
> ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
> +   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
> ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_SYMLINK}
> +   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
> ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_BINARY}
> fi
>  }
>
> @@ -70,11 +68,10 @@ do_concat_dtb () {
> oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
> install ${B}/${UBOOT_BINARY}
> ${DEPLOYDIR}/${UBOOT_IMAGE}
> install ${B}/${UBOOT_BINARY}
> ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
> -   elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e
> "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
> -   cd ${DEPLOYDIR}
> -   cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee
> ${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
> +   elif [ -e "${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}" -a
> -e "${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}" ]; then
> +   cat ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
> ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} >
> ${UBOOT_IMAGE}
> else
> -   bbwarn "Failure while adding public key to u-boot
> binary. Verified boot won't be available."
> +   bbfatal "Failure while adding public key to u-boot
> binary. Verified boot won't be available."
> fi
> fi
>  }
> --
> 2.13.6
>
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [meta][pyro][PATCHv2] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage

2017-10-23 Thread Thomas Perrot
Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass |  2 +-
 meta/classes/uboot-sign.bbclass  | 21 +
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index abbc309b09..5ad439e82d 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -31,7 +31,7 @@ python __anonymous () {
 # the fitImage:
 if d.getVar('UBOOT_SIGN_ENABLE') == "1":
 uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'
-d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_deploy' 
% uboot_pn)
+d.appendVarFlag('do_assemble_fitimage', 'depends', ' 
%s:do_deploy_dtb' % uboot_pn)
 }
 
 # Options for the device tree compiler passed to mkimage '-D' feature:
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 8ee904e7df..2f616bf2a9 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -47,16 +47,14 @@ do_deploy_dtb () {
cd ${DEPLOYDIR}
 
if [ -f ${B}/${UBOOT_DTB_BINARY} ]; then
-   install ${B}/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
-   rm -f ${UBOOT_DTB_BINARY} ${UBOOT_DTB_SYMLINK}
-   ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_SYMLINK}
-   ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_BINARY}
+   install ${B}/${UBOOT_DTB_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_SYMLINK}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}
fi
if [ -f ${B}/${UBOOT_NODTB_BINARY} ]; then
-   install ${B}/${UBOOT_NODTB_BINARY} 
${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}
-   rm -f ${UBOOT_NODTB_BINARY} ${UBOOT_NODTB_SYMLINK}
-   ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_SYMLINK}
-   ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_BINARY}
+   install ${B}/${UBOOT_NODTB_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_SYMLINK}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_BINARY}
fi
 }
 
@@ -70,11 +68,10 @@ do_concat_dtb () {
oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
install ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
install ${B}/${UBOOT_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
-   elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e 
"${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
-   cd ${DEPLOYDIR}
-   cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee 
${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
+   elif [ -e "${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}" -a -e 
"${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}" ]; then
+   cat ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} > 
${UBOOT_IMAGE}
else
-   bbwarn "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
+   bbfatal "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
fi
fi
 }
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [meta][pyro][PATCH] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage

2017-10-23 Thread Thomas Perrot
Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass |  2 +-
 meta/classes/uboot-sign.bbclass  | 21 +
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index abbc309b09..5ad439e82d 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -31,7 +31,7 @@ python __anonymous () {
 # the fitImage:
 if d.getVar('UBOOT_SIGN_ENABLE') == "1":
 uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'
-d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_deploy' 
% uboot_pn)
+d.appendVarFlag('do_assemble_fitimage', 'depends', ' 
%s:do_deploy_dtb' % uboot_pn)
 }
 
 # Options for the device tree compiler passed to mkimage '-D' feature:
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 8ee904e7df..86d531abc4 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -47,16 +47,14 @@ do_deploy_dtb () {
cd ${DEPLOYDIR}
 
if [ -f ${B}/${UBOOT_DTB_BINARY} ]; then
-   install ${B}/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
-   rm -f ${UBOOT_DTB_BINARY} ${UBOOT_DTB_SYMLINK}
-   ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_SYMLINK}
-   ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_BINARY}
+   install ${B}/${UBOOT_DTB_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_SYMLINK}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}
fi
if [ -f ${B}/${UBOOT_NODTB_BINARY} ]; then
-   install ${B}/${UBOOT_NODTB_BINARY} 
${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}
-   rm -f ${UBOOT_NODTB_BINARY} ${UBOOT_NODTB_SYMLINK}
-   ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_SYMLINK}
-   ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_BINARY}
+   install ${B}/${UBOOT_DTB_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_SYMLINK}
+   ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_BINARY}
fi
 }
 
@@ -70,11 +68,10 @@ do_concat_dtb () {
oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
install ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
install ${B}/${UBOOT_BINARY} 
${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
-   elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e 
"${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
-   cd ${DEPLOYDIR}
-   cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee 
${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
+   elif [ -e "${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}" -a -e 
"${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}" ]; then
+   cat ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} 
${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} > 
${UBOOT_IMAGE}
else
-   bbwarn "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
+   bbfatal "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
fi
fi
 }
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [meta][pyro][PATCHv2] Fix some issues in the fitImage generation

2017-10-20 Thread Thomas Perrot
- Bad image type replacement for aarch64
- Fix DTB path in fitimage.its
- Ignore fitImage type in do_bundle_initramfs task because the packaging is 
made by do_assemble_fitimage_initramfs
- the images for arm64 are not compressed the linux_comp variable must 
therefore be none

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass |  6 +-
 meta/classes/kernel-uboot.bbclass| 11 ---
 meta/classes/kernel.bbclass  |  4 +++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index 2630b47316..abbc309b09 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -7,8 +7,11 @@ python __anonymous () {
 depends = "%s u-boot-mkimage-native dtc-native" % depends
 d.setVar("DEPENDS", depends)
 
-if d.getVar("UBOOT_ARCH") == "x86":
+uarch = d.getVar("UBOOT_ARCH")
+if uarch == "x86":
 replacementtype = "bzImage"
+elif uarch == "arm64":
+replacementtype = "Image"
 else:
 replacementtype = "zImage"
 
@@ -351,6 +354,7 @@ fitimage_assemble() {
DTB_PATH="arch/${ARCH}/boot/${DTB}"
fi
 
+   DTB=$(echo "${DTB}" | tr '/' '_')
DTBS="${DTBS} ${DTB}"
fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}
done
diff --git a/meta/classes/kernel-uboot.bbclass 
b/meta/classes/kernel-uboot.bbclass
index 868e97d7a7..940f91d90e 100644
--- a/meta/classes/kernel-uboot.bbclass
+++ b/meta/classes/kernel-uboot.bbclass
@@ -1,12 +1,17 @@
 uboot_prep_kimage() {
-   if [ -e arch/${ARCH}/boot/compressed/vmlinux ]; then
+   if [ -e arch/${ARCH}/boot/compressed/vmlinux ] ; then
vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
linux_suffix=""
linux_comp="none"
else
vmlinux_path="vmlinux"
-   linux_suffix=".gz"
-   linux_comp="gzip"
+   if [ "${ARCH}" = "arm64" ] ; then
+   linux_suffix=""
+   linux_comp="none"
+   else
+   linux_suffix=".gz"
+   linux_comp="gzip"
+   fi
fi
 
${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index ce2cab65ae..14677ac0fc 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -219,7 +219,9 @@ do_bundle_initramfs () {
# Backing up kernel image relies on its type(regular file or 
symbolic link)
tmp_path=""
for type in ${KERNEL_IMAGETYPES} ; do
-   if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
+   if [ "$type" = "fitImage" ] ; then
+   continue
+   elif [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
linkpath=`readlink -n 
${KERNEL_OUTPUT_DIR}/$type`
realpath=`readlink -fn 
${KERNEL_OUTPUT_DIR}/$type`
mv -f $realpath $realpath.bak
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [meta][pyro][PATCH] Fix some issues in the fitImage generation

2017-10-18 Thread Thomas PERROT
Hi,

I updated the commit message with the reason for the third change.

When INITRAMFS_IMAGE_BUNDLE is set to 1 and the kernel image type is a
fitimage the task do_bundle_initramfs should be only substitute the
initramfs of KERNEL_IMAGETYPE_FOR_MAKE (e.g Image for aarch64, zImage for
arm...).

Best regards,
Thomas P.




On Wed, Oct 18, 2017 at 9:02 AM, André Draszik <g...@andred.net> wrote:

> On Tue, 2017-10-17 at 18:54 +0200, Thomas Perrot wrote:
> > - Bad image type replacement for aarch64
> > - Fix DTB path in fitimage.its
> > - Ignore fitImage type during the packaging of the initramfs
> >
> > Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
> > ---
> >  meta/classes/kernel-fitimage.bbclass | 6 +-
> >  meta/classes/kernel.bbclass  | 4 +++-
> >  2 files changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-
> > fitimage.bbclass
> > index 2630b47316..abbc309b09 100644
> > --- a/meta/classes/kernel-fitimage.bbclass
> > +++ b/meta/classes/kernel-fitimage.bbclass
> > @@ -7,8 +7,11 @@ python __anonymous () {
> >  depends = "%s u-boot-mkimage-native dtc-native" % depends
> >  d.setVar("DEPENDS", depends)
> >
> > -if d.getVar("UBOOT_ARCH") == "x86":
> > +uarch = d.getVar("UBOOT_ARCH")
> > +if uarch == "x86":
> >  replacementtype = "bzImage"
> > +elif uarch == "arm64":
> > +replacementtype = "Image"
>
> I can't see this in master - it should go there first.
>
> Cheers,
> Andre'
>
> --
> ___
> 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] [meta][pyro][PATCH] Fix some issues in the fitImage generation

2017-10-18 Thread Thomas Perrot
- Bad image type replacement for aarch64
- Fix DTB path in fitimage.its
- Ignore fitImage type in do_bundle_initramfs task because the packaging is 
made by do_assemble_fitimage_initramfs

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass | 6 +-
 meta/classes/kernel.bbclass  | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index 2630b47316..abbc309b09 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -7,8 +7,11 @@ python __anonymous () {
 depends = "%s u-boot-mkimage-native dtc-native" % depends
 d.setVar("DEPENDS", depends)
 
-if d.getVar("UBOOT_ARCH") == "x86":
+uarch = d.getVar("UBOOT_ARCH")
+if uarch == "x86":
 replacementtype = "bzImage"
+elif uarch == "arm64":
+replacementtype = "Image"
 else:
 replacementtype = "zImage"
 
@@ -351,6 +354,7 @@ fitimage_assemble() {
DTB_PATH="arch/${ARCH}/boot/${DTB}"
fi
 
+   DTB=$(echo "${DTB}" | tr '/' '_')
DTBS="${DTBS} ${DTB}"
fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}
done
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index ce2cab65ae..a8b0d0a061 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -219,7 +219,9 @@ do_bundle_initramfs () {
# Backing up kernel image relies on its type(regular file or 
symbolic link)
tmp_path=""
for type in ${KERNEL_IMAGETYPES} ; do
-   if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
+   if [ "$type" == "fitImage" ] ; then
+   continue
+   elif [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
linkpath=`readlink -n 
${KERNEL_OUTPUT_DIR}/$type`
realpath=`readlink -fn 
${KERNEL_OUTPUT_DIR}/$type`
mv -f $realpath $realpath.bak
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [meta][pyro][PATCH] Fix some issues in the fitImage generation

2017-10-17 Thread Thomas Perrot
- Bad image type replacement for aarch64
- Fix DTB path in fitimage.its
- Ignore fitImage type during the packaging of the initramfs

Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel-fitimage.bbclass | 6 +-
 meta/classes/kernel.bbclass  | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index 2630b47316..abbc309b09 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -7,8 +7,11 @@ python __anonymous () {
 depends = "%s u-boot-mkimage-native dtc-native" % depends
 d.setVar("DEPENDS", depends)
 
-if d.getVar("UBOOT_ARCH") == "x86":
+uarch = d.getVar("UBOOT_ARCH")
+if uarch == "x86":
 replacementtype = "bzImage"
+elif uarch == "arm64":
+replacementtype = "Image"
 else:
 replacementtype = "zImage"
 
@@ -351,6 +354,7 @@ fitimage_assemble() {
DTB_PATH="arch/${ARCH}/boot/${DTB}"
fi
 
+   DTB=$(echo "${DTB}" | tr '/' '_')
DTBS="${DTBS} ${DTB}"
fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}
done
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index ce2cab65ae..a8b0d0a061 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -219,7 +219,9 @@ do_bundle_initramfs () {
# Backing up kernel image relies on its type(regular file or 
symbolic link)
tmp_path=""
for type in ${KERNEL_IMAGETYPES} ; do
-   if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
+   if [ "$type" == "fitImage" ] ; then
+   continue
+   elif [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
linkpath=`readlink -n 
${KERNEL_OUTPUT_DIR}/$type`
realpath=`readlink -fn 
${KERNEL_OUTPUT_DIR}/$type`
mv -f $realpath $realpath.bak
-- 
2.13.6

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] kernel: Fix a typo in kernel.bbclass

2016-05-23 Thread Thomas Perrot
Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/classes/kernel.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 6e3e81e..fa0864c 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -361,7 +361,7 @@ inherit cml1
 EXPORT_FUNCTIONS do_compile do_install do_configure
 
 # kernel-base becomes kernel-${KERNEL_VERSION}
-# kernel-image becomes kernel-image-${KERNEL_VERISON}
+# kernel-image becomes kernel-image-${KERNEL_VERSION}
 PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev 
kernel-modules"
 FILES_${PN} = ""
 FILES_kernel-base = "/lib/modules/${KERNEL_VERSION}/modules.order 
/lib/modules/${KERNEL_VERSION}/modules.builtin"
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [oe][fido][PATCH] Corrects the URI of the openssl's recipe from fido. The sources were moved to a new subdirectory.

2016-01-04 Thread Thomas Perrot
Signed-off-by: Thomas Perrot <thomas.per...@tupi.fr>
---
 meta/recipes-connectivity/openssl/openssl.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssl/openssl.inc 
b/meta/recipes-connectivity/openssl/openssl.inc
index ba9bca6..a5b8ed3 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = 
"file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 DEPENDS = "perl-native-runtime"
 DEPENDS_append_class-target = " openssl-native"
 
-SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
+SRC_URI = "http://www.openssl.org/source/old/1.0.2/openssl-${PV}.tar.gz \
   "
 S = "${WORKDIR}/openssl-${PV}"
 
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [oe-core][PATCH 2/2] Set S to fix QA warning on volatile-binds.

2015-06-25 Thread Thomas Perrot
Signed-off-by: Thomas Perrot thomas.per...@tupi.fr
---
 meta/recipes-core/volatile-binds/volatile-binds.bb |2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-core/volatile-binds/volatile-binds.bb 
b/meta/recipes-core/volatile-binds/volatile-binds.bb
index 694ba1e..c5d7b5b 100644
--- a/meta/recipes-core/volatile-binds/volatile-binds.bb
+++ b/meta/recipes-core/volatile-binds/volatile-binds.bb
@@ -9,6 +9,8 @@ SRC_URI = \
 file://volatile-binds.service.in \
 
 
+S = ${WORKDIR}/${PN}-${PV}
+
 inherit allarch systemd distro_features_check
 
 REQUIRED_DISTRO_FEATURES = systemd
-- 
1.7.10.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [oe-core][PATCH 1/2] Set S to fix QA warning on systemd-serialgetty.

2015-06-25 Thread Thomas Perrot
Signed-off-by: Thomas Perrot thomas.per...@tupi.fr
---
 meta/recipes-core/systemd/systemd-serialgetty.bb |2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb 
b/meta/recipes-core/systemd/systemd-serialgetty.bb
index 1c34d5c..399a88f 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
@@ -8,6 +8,8 @@ SERIAL_CONSOLE ?= 115200 ttyS0
 
 SRC_URI = file://serial-getty@.service
 
+S = ${WORKDIR}/${PN}-${PV}
+
 do_install() {
if [ ! -z ${SERIAL_CONSOLES} ] ; then
default_baudrate=`echo ${SERIAL_CONSOLES} | sed 's/\;.*//'`
-- 
1.7.10.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [oe-core][PATCH v2 1/2] Set S to prevent QA warning on systemd-serialgetty.

2015-06-25 Thread Thomas Perrot
Signed-off-by: Thomas Perrot thomas.per...@tupi.fr
---
 meta/recipes-core/systemd/systemd-serialgetty.bb |2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb 
b/meta/recipes-core/systemd/systemd-serialgetty.bb
index 1c34d5c..768b130 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
@@ -8,6 +8,8 @@ SERIAL_CONSOLE ?= 115200 ttyS0
 
 SRC_URI = file://serial-getty@.service
 
+S = ${WORKDIR}
+
 do_install() {
if [ ! -z ${SERIAL_CONSOLES} ] ; then
default_baudrate=`echo ${SERIAL_CONSOLES} | sed 's/\;.*//'`
-- 
1.7.10.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [oe-core][PATCH v2 2/2] Set S to prevent QA warning on volatile-binds and corrects the path to COPYING.MIT.

2015-06-25 Thread Thomas Perrot
Signed-off-by: Thomas Perrot thomas.per...@tupi.fr
---
 meta/recipes-core/volatile-binds/volatile-binds.bb |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/volatile-binds/volatile-binds.bb 
b/meta/recipes-core/volatile-binds/volatile-binds.bb
index 694ba1e..fee7275 100644
--- a/meta/recipes-core/volatile-binds/volatile-binds.bb
+++ b/meta/recipes-core/volatile-binds/volatile-binds.bb
@@ -1,7 +1,7 @@
 SUMMARY = Volatile bind mount setup and configuration for read-only-rootfs
 DESCRIPTION = ${SUMMARY}
 LICENSE = MIT
-LIC_FILES_CHKSUM = file://../COPYING.MIT;md5=5750f3aa4ea2b00c2bf21b2b2a7b714d
+LIC_FILES_CHKSUM = file://COPYING.MIT;md5=5750f3aa4ea2b00c2bf21b2b2a7b714d
 
 SRC_URI = \
 file://mount-copybind \
@@ -9,6 +9,8 @@ SRC_URI = \
 file://volatile-binds.service.in \
 
 
+S = ${WORKDIR}
+
 inherit allarch systemd distro_features_check
 
 REQUIRED_DISTRO_FEATURES = systemd
-- 
1.7.10.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [oe-core][PATCH 1/2] Set S to fix QA warning on systemd-serialgetty.

2015-06-25 Thread Thomas PERROT
Hi Ross,

Since a recent patch on base.bbclass, if S is not set correctly then sanity
checks raise a warning message. If I have correctly understood, S should be
set within the recipe to point where the has been unpacked when this
warning message is raised.

I have upstream a patch v2 because, I have not correctly fixed the S value
in the recipe of systemd-serialgetty and to fix a linked bug on the second
patch on the recipe of volatile-binds.

Best regards,
Thomas P.

On Thu, Jun 25, 2015 at 4:23 PM, Burton, Ross ross.bur...@intel.com wrote:


 On 25 June 2015 at 12:24, Thomas Perrot thomas.per...@tupi.fr wrote:

 +S = ${WORKDIR}/${PN}-${PV}


 But that's the default value for S (well, S uses BPN), so how does this
 help anything?

 Ross

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [oe-core][PATCH] systemd-serialgetty: Remove SERIAL_CONSOLE definition, because it depends of machine definition. Set it, here, can be make the value is not good.

2015-05-22 Thread Thomas Perrot
Signed-off-by: Thomas Perrot thomas.per...@tupi.fr
---
 meta/recipes-core/systemd/systemd-serialgetty.bb |2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb 
b/meta/recipes-core/systemd/systemd-serialgetty.bb
index 1c34d5c..06cb1b4 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
@@ -4,8 +4,6 @@ LIC_FILES_CHKSUM = 
file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80
 
 PR = r5
 
-SERIAL_CONSOLE ?= 115200 ttyS0
-
 SRC_URI = file://serial-getty@.service
 
 do_install() {
-- 
1.7.10.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [oe-core][PATCH] systemd-serialgetty: Remove SERIAL_CONSOLE definition, because it depends of machine definition. Set it, here, can be make the value is not good.

2015-05-22 Thread Thomas PERROT
Sorry, I meant systemd-serialgetty.bb from meta instead of meta-systemd.
So replace ?= by ??= should be a better solution.
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [oe-core][PATCH] systemd-serialgetty: Remove SERIAL_CONSOLE definition, because it depends of machine definition. Set it, here, can be make the value is not good.

2015-05-22 Thread Thomas PERROT
Hi Otavio,

If the machine layer definition is applied after meta-systemd also
with a default setting operator instead an affectation, this var will
be bad initialized. It's the case with meta-raspberrypi layer.


On Fri, May 22, 2015 at 1:11 PM, Otavio Salvador
ota...@ossystems.com.br wrote:
 On Fri, May 22, 2015 at 7:09 AM, Thomas Perrot thomas.per...@tupi.fr wrote:
 Signed-off-by: Thomas Perrot thomas.per...@tupi.fr

 Nack! The setting here is the default if machine does not define it. I
 see no benefit in dropping this.

 --
 Otavio Salvador O.S. Systems
 http://www.ossystems.com.brhttp://code.ossystems.com.br
 Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [oe-core][PATCH] systemd-serialgetty: Remove SERIAL_CONSOLE definition, because it depends of machine definition. Set it, here, can be make the value is not good.

2015-05-22 Thread Thomas PERROT
Ok, thank you for your help, so I should be a problem elsewhere.

I thought that it was the problem because, I just replaced sysvinit by
systemd on this build and serial console still terribly empty. I have
checked if the serial device was well mounted and kernel cmdline was
well formated. So I thought at an incompatibility between systemd and
rpi recipes.

On Fri, May 22, 2015 at 4:32 PM, Paul Eggleton
paul.eggle...@linux.intel.com wrote:
 On Friday 22 May 2015 16:27:05 Thomas PERROT wrote:
 On Fri, May 22, 2015 at 4:06 PM, Paul Eggleton 
 paul.eggle...@linux.intel.com wrote:
  On Friday 22 May 2015 15:58:58 Thomas PERROT wrote:
   Sorry, I meant systemd-serialgetty.bb from meta instead of meta-systemd.
   So replace ?= by ??= should be a better solution.
 
  You still haven't described the actual problem, because what you did
  describe (the machine config being overridden by this) shouldn't be
  possible. Again, did  you check bitbake -e systemd-serialgetty | less ?

 Attached the result of the command bitbake -e systemd-serialgetty

 So from what you've just sent, the final value is 115200 ttyAMA0 which is 
 the
 value set by the machine config - so it seems like it's working as it should.
 How are you determining that there is a problem?

 Cheers,
 Paul

 --

 Paul Eggleton
 Intel Open Source Technology Centre
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [oe-core][PATCH] systemd-serialgetty: Remove SERIAL_CONSOLE definition, because it depends of machine definition. Set it, here, can be make the value is not good.

2015-05-22 Thread Thomas PERROT
So it was a hardware issue, the USB to serial converter is dead. :-#
On May 22, 2015 5:20 PM, Thomas PERROT thomas.per...@tupi.fr wrote:

 Ok, thank you for your help, so I should be a problem elsewhere.

 I thought that it was the problem because, I just replaced sysvinit by
 systemd on this build and serial console still terribly empty. I have
 checked if the serial device was well mounted and kernel cmdline was
 well formated. So I thought at an incompatibility between systemd and
 rpi recipes.

 On Fri, May 22, 2015 at 4:32 PM, Paul Eggleton
 paul.eggle...@linux.intel.com wrote:
  On Friday 22 May 2015 16:27:05 Thomas PERROT wrote:
  On Fri, May 22, 2015 at 4:06 PM, Paul Eggleton 
  paul.eggle...@linux.intel.com wrote:
   On Friday 22 May 2015 15:58:58 Thomas PERROT wrote:
Sorry, I meant systemd-serialgetty.bb from meta instead of
 meta-systemd.
So replace ?= by ??= should be a better solution.
  
   You still haven't described the actual problem, because what you did
   describe (the machine config being overridden by this) shouldn't be
   possible. Again, did  you check bitbake -e systemd-serialgetty | less
 ?
 
  Attached the result of the command bitbake -e systemd-serialgetty
 
  So from what you've just sent, the final value is 115200 ttyAMA0 which
 is the
  value set by the machine config - so it seems like it's working as it
 should.
  How are you determining that there is a problem?
 
  Cheers,
  Paul
 
  --
 
  Paul Eggleton
  Intel Open Source Technology Centre

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [oe-core][PATCH] systemd-systemctl-native: fix checksum error

2015-05-05 Thread Thomas PERROT
Thanks you Ross, that was it the problem.

On Tue, May 5, 2015 at 7:10 PM, Thomas PERROT thomas.per...@tupi.fr wrote:
 Hi,

 Yes, I used combo-layer to create combined repository.
 -
 http://fr.linkedin.com/pub/thomas-perrot/37/436/876
 https://plus.google.com/u/0/111501193434241021399
 https://github.com/tprrt


 On Fri, May 1, 2015 at 10:41 PM, Burton, Ross ross.bur...@intel.com wrote:

 On 22 April 2015 at 17:39, Thomas Perrot thomas.per...@tupi.fr wrote:

 ERROR: systemd-systemctl-native: md5 data is not matching for
 file:///home/tprrt/dev/oe-build-easy/combination/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690
 ERROR: systemd-systemctl-native: The new md5 checksum is
 751419260aa954499f7abaabaa882bbe


 The LICENSE in oe-core definitely has the md5sum 4d92[...].  Are you using a
 tool to create a combined repository that is overriding the LICENSE file?

 Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [oe-core][PATCH] systemd-systemctl-native: fix checksum error

2015-05-05 Thread Thomas PERROT
Hi,

Yes, I used combo-layer to create combined repository.
-
http://fr.linkedin.com/pub/thomas-perrot/37/436/876
https://plus.google.com/u/0/111501193434241021399
https://github.com/tprrt


On Fri, May 1, 2015 at 10:41 PM, Burton, Ross ross.bur...@intel.com wrote:

 On 22 April 2015 at 17:39, Thomas Perrot thomas.per...@tupi.fr wrote:

 ERROR: systemd-systemctl-native: md5 data is not matching for
 file:///home/tprrt/dev/oe-build-easy/combination/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690
 ERROR: systemd-systemctl-native: The new md5 checksum is
 751419260aa954499f7abaabaa882bbe


 The LICENSE in oe-core definitely has the md5sum 4d92[...].  Are you using a
 tool to create a combined repository that is overriding the LICENSE file?

 Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [oe-core][PATCH] systemd-systemctl-native: fix checksum error

2015-04-22 Thread Thomas Perrot
From: tprrt tp...@tupi.fr

ERROR: systemd-systemctl-native: md5 data is not matching for 
file:///home/tprrt/dev/oe-build-easy/combination/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690
ERROR: systemd-systemctl-native: The new md5 checksum is 
751419260aa954499f7abaabaa882bbe

Signed-off-by: tprrt tp...@tupi.fr
---
 meta/recipes-core/systemd/systemd-systemctl-native.bb |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd-systemctl-native.bb 
b/meta/recipes-core/systemd/systemd-systemctl-native.bb
index fbdc9c0..8cc2c21 100644
--- a/meta/recipes-core/systemd/systemd-systemctl-native.bb
+++ b/meta/recipes-core/systemd/systemd-systemctl-native.bb
@@ -1,7 +1,7 @@
 SUMMARY = Wrapper for enabling systemd services
 
 LICENSE = MIT
-LIC_FILES_CHKSUM = 
file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690
+LIC_FILES_CHKSUM = 
file://${COREBASE}/LICENSE;md5=751419260aa954499f7abaabaa882bbe
 
 PR = r6
 
-- 
1.7.10.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [meta-oe][PATCH] zap_empty_root_password doesn't work with toybox, /etc/passwd isn't never edit if /etc/shadow exist.

2015-04-13 Thread Thomas Perrot
From: tprrt tp...@tupi.fr

Signed-off-by: tprrt tp...@tupi.fr
---
 meta/classes/image.bbclass |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 03cbbf7..541daef 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -328,7 +328,8 @@ MULTILIB_TEMP_ROOTFS = ${WORKDIR}/multilib
 zap_empty_root_password () {
if [ -e ${IMAGE_ROOTFS}/etc/shadow ]; then
sed -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/shadow
-   elif [ -e ${IMAGE_ROOTFS}/etc/passwd ]; then
+fi
+   if [ -e ${IMAGE_ROOTFS}/etc/passwd ]; then
sed -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/passwd
fi
 } 
-- 
1.7.10.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [meta-oe][PATCH] zap_empty_root_password doesn't work with toybox, /etc/passwd isn't never edit if /etc/shadow exist.

2015-04-13 Thread Thomas PERROT
Hi Ross,

Yes, It's a logic bug, but I don't if there are another cases with this issue.

Best regards,
Thomas P.


On Tue, Apr 14, 2015 at 12:12 AM, Burton, Ross ross.bur...@intel.com wrote:
 On 13 April 2015 at 23:08, Thomas Perrot thomas.per...@tupi.fr wrote:

 -   elif [ -e ${IMAGE_ROOTFS}/etc/passwd ]; then
 +fi
 +   if [ -e ${IMAGE_ROOTFS}/etc/passwd ]; then


 So this is a logic bug and has nothing to do with toybox?

 Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] State of bitbake world, Failed tasks 2015-02-20

2015-02-24 Thread Thomas PERROT
Hi Martin,

Please, what is it your configuration to run bitbake world ?
I tried to run bitbake world only on oe-core, for some targets and I
obtain already the same issue, and I don't see this issue in your list of
failed tasks.

Here https://travis-ci.org/tprrt/meta-musl, I also tried with meta-musl
and I obtain the same issue.

The issue:

ERROR: Nothing PROVIDES 'virtual/egl' (but
/tmp/build_env/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb,
/tmp/build_env/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.bb,
/tmp/build_env/meta/recipes-graphics/cogl/cogl-1.0_1.18.2.bb,
/tmp/build_env/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb,
/tmp/build_env/meta/recipes-multimedia/gstreamer/gst-plugins-gl_0.10.3.bb,
/tmp/build_env/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb,
/tmp/build_env/meta/recipes-graphics/wayland/weston_1.6.0.bb DEPENDS
on or otherwise requires it)

ERROR: mesa PROVIDES virtual/egl but was skipped: missing required
distro feature 'opengl' (not in DISTRO_FEATURES)

ERROR: mesa PROVIDES virtual/egl but was skipped: missing required
distro feature 'opengl' (not in DISTRO_FEATURES)

ERROR: Required build target 'clutter-gst-1.0' has no buildable providers.

Missing or unbuildable dependency chain was: ['clutter-gst-1.0',
'clutter-1.0', 'virtual/egl']


*Best regards*

-

*Thomas P.*


On 22 February 2015 at 18:00, akuster808 akuster...@gmail.com wrote:

 Martin

 On 02/20/2015 03:09 PM, Martin Jansa wrote:

 http://www.openembedded.org/wiki/Bitbake_World_Status

 == Failed tasks 2015-02-20 ==

 INFO: jenkins-job.sh-1.1.0 Complete log available at
 http://logs.nslu2-linux.org/buildlogs/oe/world/log.report.
 20150220_202958.log

 === common (5) ===
  * /meta-openembedded/meta-efl/recipes-navigation/mcnavi/mcna
 vi_0.3.4.bb, do_compile
  * /meta-openembedded/meta-networking/recipes-daemons/ptpd/
 ptpd_2.3.1-rc2.bb, do_compile
  * /meta-openembedded/meta-networking/recipes-support/nis/
 yp-tools_2.12.bb, do_compile
  * /meta-openembedded/meta-oe/recipes-extended/unixodbc/unix
 odbc_2.3.2.bb, do_configure
  * /meta-openembedded/meta-oe/recipes-support/start-stop-daemon/
 start-stop-daemon_1.16.0.2.bb, do_compile

 === common-x86 (2) ===
  * /meta-openembedded/meta-oe/recipes-kernel/ktap/ktap-module_0.4.bb,
 do_compile
  * /meta-openembedded/meta-oe/recipes-support/emacs/emacs_23.4.bb,
 do_compile

 === qemuarm (6) ===
  * /meta-openembedded/meta-networking/recipes-connectivity/snort/
 snort_2.9.6.0.bb, do_configure
  * /meta-openembedded/meta-networking/recipes-support/wireshark/
 wireshark_1.12.3.bb, do_configure


 Do you have my latest patch for wireshark?

  b51998bf63a625757f0497342b53e0c351814fba in master-next

 - armin


   * /meta-openembedded/meta-oe/recipes-benchmark/fio/fio_2.0.5.bb,
 do_compile
  * /meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs
 4_0.4.12.bb, do_compile
  * /meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs
 _0.8.18.bb, do_compile
  * /meta-smartphone/meta-android/recipes-multimedia/android-
 audiosystem/android-audiosystem_bzr.bb, do_compile

 === qemux86 (0) ===

 === qemux86_64 (1) ===
  * /meta-qt5/recipes-qt/qt5/qt5-creator_3.3.0.bb, do_populate_sysroot

 === Number of failed tasks (27) ===
 {| class=wikitable
 |-
 || qemuarm  || 11|| http://logs.nslu2-linux.org/
 buildlogs/oe/world//log.world.20150218_225838.log// ||
 http://errors.yoctoproject.org:80/Errors/Build/4802/
 |-
 || qemux86  || 8 || http://logs.nslu2-linux.org/
 buildlogs/oe/world//log.world.20150219_132710.log// ||
 http://errors.yoctoproject.org:80/Errors/Build/4806/
 |-
 || qemux86_64   || 8 || http://logs.nslu2-linux.org/
 buildlogs/oe/world//log.world.20150220_044745.log// ||
 http://errors.yoctoproject.org:80/Errors/Build/4811/
 |}

 === PNBLACKLISTs (52) ===

 === QA issues (143) ===
 {| class=wikitable
 !| Count||Issue
 |-
 ||0 ||version-going-backwards
 |-
 ||1 ||libdir
 |-
 ||26||build-deps
 |-
 ||3 ||already-stripped
 |-
 ||50||file-rdeps
 |-
 ||63||textrel
 |}


 PNBLACKLISTs:
 openembedded-core/:
 meta-browser:
 meta-openembedded:
 meta-efl/recipes-efl/e17/diskio_svn.bb:PNBLACKLIST[diskio] ?= broken:
 switch to https://git.enlightenment.org/enlightenment/modules/diskio.git/
 and fix 0.0.1+svnr82070-r0.0/E-MODULES-EXTRA/diskio/e-module-diskio.edc:58.
 invalid state name: 'off'. default state must always be first.
 meta-efl/recipes-efl/efl/entrance_svn.bb:PNBLACKLIST[entrance] ?=
 broken: switch to https://git.enlightenment.org/misc/entrance.git and
 fix 0.0.4+svnr82070-r7/entrance/data/themes/old/default.edc:678. invalid
 state name: 'defaault'. default state must always be first.
 meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.2.bb:PNBLACKLIST[ifuse]
 ?= depends on blacklisted libimobiledevice