All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] kernel.bbclass: add lz4 dependency and fix the call to lz4
       [not found] <140262>
@ 2020-07-03 12:39 ` T. Ulrich
  2020-07-03 12:46   ` [OE-core] " Jacob Kroon
  0 siblings, 1 reply; 5+ messages in thread
From: T. Ulrich @ 2020-07-03 12:39 UTC (permalink / raw)
  To: openembedded-core; +Cc: Timon Ulrich

From: Timon Ulrich <t.ulrich@anapur.de>

If the initramfs image is type lz4, then a native lz4 is needed.

Additionally an output filename needs to be specified when calling lz4,
otherwise STDOUT will be used implicitly.

Signed-off-by: Timon Ulrich <t.ulrich@anapur.de>
---
 meta/classes/kernel.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 6d07b29e2d..9e3c34ad48 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -5,6 +5,7 @@ KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel")
 
 PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else "" }"
 DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native bison-native"
+DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lz4", "lz4-native", "", d)}"
 PACKAGE_WRITE_DEPS += "depmodwrapper-cross"
 
 do_deploy[depends] += "depmodwrapper-cross:do_populate_sysroot"
@@ -210,7 +211,7 @@ copy_initramfs() {
 				;;
 			*lz4)
 				echo "lz4 decompressing image"
-				lz4 -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
+				lz4 -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img ${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio
 				break
 				;;
 			*lzo)
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [OE-core] [PATCH v2] kernel.bbclass: add lz4 dependency and fix the call to lz4
  2020-07-03 12:39 ` [PATCH v2] kernel.bbclass: add lz4 dependency and fix the call to lz4 T. Ulrich
@ 2020-07-03 12:46   ` Jacob Kroon
  2020-07-03 13:10     ` Jacob Kroon
  0 siblings, 1 reply; 5+ messages in thread
From: Jacob Kroon @ 2020-07-03 12:46 UTC (permalink / raw)
  To: T. Ulrich, openembedded-core

On 7/3/20 2:39 PM, T. Ulrich wrote:
> From: Timon Ulrich <t.ulrich@anapur.de>
> 
> If the initramfs image is type lz4, then a native lz4 is needed.
> 
> Additionally an output filename needs to be specified when calling lz4,
> otherwise STDOUT will be used implicitly.
> 
> Signed-off-by: Timon Ulrich <t.ulrich@anapur.de>
> ---
>   meta/classes/kernel.bbclass | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 6d07b29e2d..9e3c34ad48 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -5,6 +5,7 @@ KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel")
>   
>   PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else "" }"
>   DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native bison-native"
> +DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lz4", "lz4-native", "", d)}"

Should/Could we do a similar thing for "lzop-native" above ? To me it 
looks like that would be possible, assuming I interpreted my taskexp 
correctly.

Jacob

>   PACKAGE_WRITE_DEPS += "depmodwrapper-cross"
>   
>   do_deploy[depends] += "depmodwrapper-cross:do_populate_sysroot"
> @@ -210,7 +211,7 @@ copy_initramfs() {
>   				;;
>   			*lz4)
>   				echo "lz4 decompressing image"
> -				lz4 -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
> +				lz4 -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img ${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio
>   				break
>   				;;
>   			*lzo)
> 
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [OE-core] [PATCH v2] kernel.bbclass: add lz4 dependency and fix the call to lz4
  2020-07-03 12:46   ` [OE-core] " Jacob Kroon
@ 2020-07-03 13:10     ` Jacob Kroon
  2020-07-03 13:31       ` Richard Purdie
  0 siblings, 1 reply; 5+ messages in thread
From: Jacob Kroon @ 2020-07-03 13:10 UTC (permalink / raw)
  To: T. Ulrich, openembedded-core

On 7/3/20 2:46 PM, Jacob Kroon wrote:
> On 7/3/20 2:39 PM, T. Ulrich wrote:
>> From: Timon Ulrich <t.ulrich@anapur.de>
>>
>> If the initramfs image is type lz4, then a native lz4 is needed.
>>
>> Additionally an output filename needs to be specified when calling lz4,
>> otherwise STDOUT will be used implicitly.
>>
>> Signed-off-by: Timon Ulrich <t.ulrich@anapur.de>
>> ---
>>   meta/classes/kernel.bbclass | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
>> index 6d07b29e2d..9e3c34ad48 100644
>> --- a/meta/classes/kernel.bbclass
>> +++ b/meta/classes/kernel.bbclass
>> @@ -5,6 +5,7 @@ KERNEL_DEPLOYSUBDIR ??= "${@ "" if 
>> (d.getVar("KERNEL_PACKAGE_NAME") == "kernel")
>>   PROVIDES += "${@ "virtual/kernel" if 
>> (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else "" }"
>>   DEPENDS += "virtual/${TARGET_PREFIX}binutils 
>> virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native 
>> bison-native"
>> +DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lz4", 
>> "lz4-native", "", d)}"
> 
> Should/Could we do a similar thing for "lzop-native" above ? To me it 
> looks like that would be possible, assuming I interpreted my taskexp 
> correctly.
> 

I took the liberty of doing some more history digging, lzop-native 
dependency was added in OE-Core commit

ee0640cb0c32b959ffaaac6752d582ed1d76e313
kernel.bbclass: add lzop dependency

and it looks to me it'd be worth doing the same fix.

Jacob

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [OE-core] [PATCH v2] kernel.bbclass: add lz4 dependency and fix the call to lz4
  2020-07-03 13:10     ` Jacob Kroon
@ 2020-07-03 13:31       ` Richard Purdie
  2020-07-03 13:50         ` [OE-core] [PATCH v2] kernel.bbclass: add lz4 dependency and fixthe " T. Ulrich
  0 siblings, 1 reply; 5+ messages in thread
From: Richard Purdie @ 2020-07-03 13:31 UTC (permalink / raw)
  To: Jacob Kroon, T. Ulrich, openembedded-core

On Fri, 2020-07-03 at 15:10 +0200, Jacob Kroon wrote:
> On 7/3/20 2:46 PM, Jacob Kroon wrote:
> > On 7/3/20 2:39 PM, T. Ulrich wrote:
> > > From: Timon Ulrich <t.ulrich@anapur.de>
> > > 
> > > If the initramfs image is type lz4, then a native lz4 is needed.
> > > 
> > > Additionally an output filename needs to be specified when calling lz4,
> > > otherwise STDOUT will be used implicitly.
> > > 
> > > Signed-off-by: Timon Ulrich <t.ulrich@anapur.de>
> > > ---
> > >   meta/classes/kernel.bbclass | 3 ++-
> > >   1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> > > index 6d07b29e2d..9e3c34ad48 100644
> > > --- a/meta/classes/kernel.bbclass
> > > +++ b/meta/classes/kernel.bbclass
> > > @@ -5,6 +5,7 @@ KERNEL_DEPLOYSUBDIR ??= "${@ "" if 
> > > (d.getVar("KERNEL_PACKAGE_NAME") == "kernel")
> > >   PROVIDES += "${@ "virtual/kernel" if 
> > > (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else "" }"
> > >   DEPENDS += "virtual/${TARGET_PREFIX}binutils 
> > > virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native 
> > > bison-native"
> > > +DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lz4", 
> > > "lz4-native", "", d)}"
> > 
> > Should/Could we do a similar thing for "lzop-native" above ? To me it 
> > looks like that would be possible, assuming I interpreted my taskexp 
> > correctly.
> > 
> 
> I took the liberty of doing some more history digging, lzop-native 
> dependency was added in OE-Core commit
> 
> ee0640cb0c32b959ffaaac6752d582ed1d76e313
> kernel.bbclass: add lzop dependency
> 
> and it looks to me it'd be worth doing the same fix.

Agreed, I was hoping that would be possible for this too.

Cheers,

Richard


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [OE-core] [PATCH v2] kernel.bbclass: add lz4 dependency and fixthe call to lz4
  2020-07-03 13:31       ` Richard Purdie
@ 2020-07-03 13:50         ` T. Ulrich
  0 siblings, 0 replies; 5+ messages in thread
From: T. Ulrich @ 2020-07-03 13:50 UTC (permalink / raw)
  To: Richard Purdie, Jacob Kroon, openembedded-core

[-- Attachment #1: Type: text/html, Size: 352 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-07-03 13:50 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <140262>
2020-07-03 12:39 ` [PATCH v2] kernel.bbclass: add lz4 dependency and fix the call to lz4 T. Ulrich
2020-07-03 12:46   ` [OE-core] " Jacob Kroon
2020-07-03 13:10     ` Jacob Kroon
2020-07-03 13:31       ` Richard Purdie
2020-07-03 13:50         ` [OE-core] [PATCH v2] kernel.bbclass: add lz4 dependency and fixthe " T. Ulrich

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.