[PATCH 0/2] Add support for initramfs

[PATCH 0/2] Add support for initramfs

[Andrea Adami]

* Sync with org.openembedded.dev and allow the inclusion of
* lzma and xz compressed images.

Andrea Adami (2):
  kernel.bbclass: handle embedding of initramfs images
  image_types.bbclass: support xz compressed initramfs.cpio and
    tarballs

 meta/classes/image_types.bbclass |   13 +++++++++++++
 meta/classes/kernel.bbclass      |   22 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 0 deletions(-)

-- 
1.7.3.4

[PATCH 1/2] kernel.bbclass: handle embedding of initramfs images

[Andrea Adami]

* from org.openembedded.dev (oe-classic)

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 meta/classes/kernel.bbclass |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 943252a..03b321d 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -14,8 +14,20 @@ python __anonymous () {
     	depends = bb.data.getVar("DEPENDS", d, 1)
     	depends = "%s u-boot-mkimage-native" % depends
     	bb.data.setVar("DEPENDS", depends, d)
+
+    image = bb.data.getVar('INITRAMFS_IMAGE', d, True)
+    if image != '' and image is not None:
+        bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d)
+
+    machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True)
+
+    if machine_kernel_pr:
+        bb.data.setVar('PR', machine_kernel_pr, d)
 }
 
+INITRAMFS_IMAGE ?= ""
+INITRAMFS_TASK ?= ""
+
 inherit kernel-arch deploy
 
 PACKAGES_DYNAMIC += "kernel-module-*"
@@ -179,8 +191,18 @@ kernel_do_configure() {
 		cp "${WORKDIR}/defconfig" "${S}/.config"
 	fi
         yes '' | oe_runmake oldconfig
+
+	if [ ! -z "${INITRAMFS_IMAGE}" ]; then
+		for img in cpio.gz cpio.lzo cpio.lzma; do
+		if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img"
+			cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$i
+		fi
+		done
+	fi
 }
 
+kernel_do_configure[depends] += "${INITRAMFS_TASK}"
+
 do_menuconfig() {
         export DISPLAY='${DISPLAY}'
         export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}'
-- 
1.7.3.4

[PATCH 2/2] image_types.bbclass: support xz compressed initramfs.cpio and tarballs

[Andrea Adami]

* from org.openembedded.dev (oe-classic)

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 meta/classes/image_types.bbclass |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 8c86227..2b0c589 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -20,6 +20,10 @@ runimagecmd () {
 	ln -s ${IMAGE_NAME}.rootfs.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type}
 }
 
+
+XZ_COMPRESSION_LEVEL ?= "-e -9"
+XZ_INTEGRITY_CHECK ?= "crc32"
+
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
 
 IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
@@ -55,8 +59,13 @@ IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/$
 IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."
 IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ."
 IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
+IMAGE_CMD_tar.xz = "cd ${IMAGE_ROOTFS} && tar --xz -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.xz ."
 IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)"
 IMAGE_CMD_cpio.gz = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz)"
+IMAGE_CMD_cpio.xz = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | xz -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.xz) ${EXTRA_IMAGECMD}"
+IMAGE_CMD_cpio.gz.u-boot = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz) ${EXTRA_IMAGECMD}; mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C gzip -n ${IMAGE_NAME} -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz.u-boot"
+IMAGE_CMD_cpio.lzma = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | xz --format=lzma -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.lzma) ${EXTRA_IMAGECMD}"
+
 IMAGE_CMD_ubi () {
 	echo \[ubifs\] > ubinize.cfg 
 	echo mode=ubi >> ubinize.cfg
@@ -88,6 +97,10 @@ IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native"
 IMAGE_DEPENDS_btrfs = "btrfs-tools-native"
 IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
 IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native"
+IMAGE_DEPENDS_tar.xz = "tar-native xz-native"
+IMAGE_DEPENDS_cpio.gz.u-boot = "u-boot-mkimage-native"
+IMAGE_DEPENDS_cpio.lzma = "xz-native"
+IMAGE_DEPENDS_cpio.xz = "xz-native"
 IMAGE_DEPENDS_ubi = "mtd-utils-native"
 IMAGE_DEPENDS_ubifs = "mtd-utils-native"
 
-- 
1.7.3.4

Re: [PATCH 1/2] kernel.bbclass: handle embedding of initramfs images

[Andrea Adami]

Ehm,
some cruft slipped in :/

On Fri, Jul 8, 2011 at 1:11 AM, Andrea Adami <andrea.adami@gmail.com> wrote:
> * from org.openembedded.dev (oe-classic)
>
> Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
> ---
>  meta/classes/kernel.bbclass |   22 ++++++++++++++++++++++
>  1 files changed, 22 insertions(+), 0 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 943252a..03b321d 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -14,8 +14,20 @@ python __anonymous () {
>        depends = bb.data.getVar("DEPENDS", d, 1)
>        depends = "%s u-boot-mkimage-native" % depends
>        bb.data.setVar("DEPENDS", depends, d)
> +
> +    image = bb.data.getVar('INITRAMFS_IMAGE', d, True)
> +    if image != '' and image is not None:
> +        bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d)
> +


> +    machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True)
> +
> +    if machine_kernel_pr:
> +        bb.data.setVar('PR', machine_kernel_pr, d)

Those bits are extraneous and copied and pasted by mistake.



>  }
>
> +INITRAMFS_IMAGE ?= ""
> +INITRAMFS_TASK ?= ""
> +
>  inherit kernel-arch deploy
>
>  PACKAGES_DYNAMIC += "kernel-module-*"
> @@ -179,8 +191,18 @@ kernel_do_configure() {
>                cp "${WORKDIR}/defconfig" "${S}/.config"
>        fi
>         yes '' | oe_runmake oldconfig
> +
> +       if [ ! -z "${INITRAMFS_IMAGE}" ]; then

> +               for img in cpio.gz cpio.lzo cpio.lzma; do

We'll have to add cpio.xz as bonus too, being there is support for it
in image_types.bbclass


> +               if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img"
> +                       cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$i
> +               fi
> +               done
> +       fi
>  }
>
> +kernel_do_configure[depends] += "${INITRAMFS_TASK}"
> +
>  do_menuconfig() {
>         export DISPLAY='${DISPLAY}'
>         export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}'
> --
> 1.7.3.4
>
>

If you mind, I'll resend a corrected V2 of the patch

Regards

Andrea

Re: [PATCH 1/2] kernel.bbclass: handle embedding of initramfs images

[Khem Raj]

On Jul 7, 2011, at 5:00 PM, Andrea Adami <andrea.adami@gmail.com> wrote:

> Ehm,
> some cruft slipped in :/
> 
> On Fri, Jul 8, 2011 at 1:11 AM, Andrea Adami <andrea.adami@gmail.com> wrote:
>> * from org.openembedded.dev (oe-classic)
>> 
>> Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
>> ---
>>  meta/classes/kernel.bbclass |   22 ++++++++++++++++++++++
>>  1 files changed, 22 insertions(+), 0 deletions(-)
>> 
>> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
>> index 943252a..03b321d 100644
>> --- a/meta/classes/kernel.bbclass
>> +++ b/meta/classes/kernel.bbclass
>> @@ -14,8 +14,20 @@ python __anonymous () {
>>        depends = bb.data.getVar("DEPENDS", d, 1)
>>        depends = "%s u-boot-mkimage-native" % depends
>>        bb.data.setVar("DEPENDS", depends, d)
>> +
>> +    image = bb.data.getVar('INITRAMFS_IMAGE', d, True)
>> +    if image != '' and image is not None:
                        ^^^
Is this ok ?

>> +        bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d)
>> +
> 
> 
>> +    machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True)
>> +
>> +    if machine_kernel_pr:
>> +        bb.data.setVar('PR', machine_kernel_pr, d)
> 
> Those bits are extraneous and copied and pasted by mistake.
> 
> 
> 
>>  }
>> 
>> +INITRAMFS_IMAGE ?= ""
>> +INITRAMFS_TASK ?= ""
>> +
>>  inherit kernel-arch deploy
>> 
>>  PACKAGES_DYNAMIC += "kernel-module-*"
>> @@ -179,8 +191,18 @@ kernel_do_configure() {
>>                cp "${WORKDIR}/defconfig" "${S}/.config"
>>        fi
>>         yes '' | oe_runmake oldconfig
>> +
>> +       if [ ! -z "${INITRAMFS_IMAGE}" ]; then
> 
>> +               for img in cpio.gz cpio.lzo cpio.lzma; do
> 
> We'll have to add cpio.xz as bonus too, being there is support for it
> in image_types.bbclass
> 
> 
>> +               if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img"
>> +                       cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$i
>> +               fi
>> +               done
>> +       fi
>>  }
>> 
>> +kernel_do_configure[depends] += "${INITRAMFS_TASK}"
>> +
>>  do_menuconfig() {
>>         export DISPLAY='${DISPLAY}'
>>         export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}'
>> --
>> 1.7.3.4
>> 
>> 
> 
> If you mind, I'll resend a corrected V2 of the patch

Please do 

> 
> Regards
> 
> Andrea
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 1/2] kernel.bbclass: handle embedding of initramfs images

[Paul Eggleton]

On Friday 08 July 2011 01:53:38 Khem Raj wrote:
> > On Fri, Jul 8, 2011 at 1:11 AM, Andrea Adami <andrea.adami@gmail.com> > >> 
> >> +    image = bb.data.getVar('INITRAMFS_IMAGE', d, True)
> >> +    if image != '' and image is not None:
>                         ^^^
> Is this ok ?

Probably "if image:" would be better.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 1/2] kernel.bbclass: handle embedding of initramfs images

[Darren Hart]

On 07/07/2011 04:11 PM, Andrea Adami wrote:
> * from org.openembedded.dev (oe-classic)

Hi Andrea,

Please include a descriptive blurb about the patch. When people read
through the commit log they need to know what problem this patch
addresses and how it intends to go about it. If possible, it should also
include the commit id from the source (I suspect that isn't an option here).


> +INITRAMFS_IMAGE ?= ""
> +INITRAMFS_TASK ?= ""
> +
>  inherit kernel-arch deploy
>  
>  PACKAGES_DYNAMIC += "kernel-module-*"
> @@ -179,8 +191,18 @@ kernel_do_configure() {
>  		cp "${WORKDIR}/defconfig" "${S}/.config"
>  	fi
>          yes '' | oe_runmake oldconfig
> +
> +	if [ ! -z "${INITRAMFS_IMAGE}" ]; then
> +		for img in cpio.gz cpio.lzo cpio.lzma; do
> +		if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img"
> +			cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$i
> +		fi
> +		done
> +	fi


Hrm... Why is this part of do_configure? Seems a lot more like a deploy
or install step. Also, the cp line has been truncated here.

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Re: [PATCH 1/2] kernel.bbclass: handle embedding of initramfs images

[Koen Kooi]

Op 8 jul. 2011 om 16:38 heeft Darren Hart <dvhart@linux.intel.com> het volgende geschreven:

> 
> 
> On 07/07/2011 04:11 PM, Andrea Adami wrote:
>> * from org.openembedded.dev (oe-classic)
> 
> Hi Andrea,
> 
> Please include a descriptive blurb about the patch. When people read
> through the commit log they need to know what problem this patch
> addresses and how it intends to go about it. If possible, it should also
> include the commit id from the source (I suspect that isn't an option here).
> 
> 
>> +INITRAMFS_IMAGE ?= ""
>> +INITRAMFS_TASK ?= ""
>> +
>> inherit kernel-arch deploy
>> 
>> PACKAGES_DYNAMIC += "kernel-module-*"
>> @@ -179,8 +191,18 @@ kernel_do_configure() {
>>        cp "${WORKDIR}/defconfig" "${S}/.config"
>>    fi
>>         yes '' | oe_runmake oldconfig
>> +
>> +    if [ ! -z "${INITRAMFS_IMAGE}" ]; then
>> +        for img in cpio.gz cpio.lzo cpio.lzma; do
>> +        if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img"
>> +            cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$i
>> +        fi
>> +        done
>> +    fi
> 
> 
> Hrm... Why is this part of do_configure? Seems a lot more like a deploy
> or install step. Also, the cp line has been truncated here.

the initramfs gets embedded into the kernel, so it needs to happen before do-compile. maybe a seperate task is better



> 
> -- 
> Darren Hart
> Intel Open Source Technology Center
> Yocto Project - Linux Kernel
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 1/2] kernel.bbclass: handle embedding of initramfs images

[Andrea Adami]

On Fri, Jul 8, 2011 at 5:38 PM, Darren Hart <dvhart@linux.intel.com> wrote:
>
>
> On 07/07/2011 04:11 PM, Andrea Adami wrote:
>> * from org.openembedded.dev (oe-classic)
>
> Hi Andrea,
>
> Please include a descriptive blurb about the patch. When people read
> through the commit log they need to know what problem this patch
> addresses and how it intends to go about it. If possible, it should also
> include the commit id from the source (I suspect that isn't an option here).
>
Well, there isn't  really much to say: whether you know what an
initramfs is or not :)
Seriously, about the history of the patch, there have been so many
commits that I could not choose one. See next comment.

>
> Hrm... Why is this part of do_configure? Seems a lot more like a deploy
> or install step.

If you look at the history at
http://cgit.openembedded.org/cgit.cgi/openembedded/log/classes/kernel.bbclass?h=org.openembedded.dev&ofs=50
you'll discover that there was a separate task (72761e4) which has
been unified by the author as of commit  3e3f297.

After some rounds of fixes,  the code was moved in do_configure with
commit id fc03e2b (kernel.bbclass: move initramfs stuff to configure
so we can do postprocessing on it with do_configure_append).


>Also, the cp line has been truncated here.
The original patch sent by git send.email should be sane.

> --
> Darren Hart
> Intel Open Source Technology Center
> Yocto Project - Linux Kernel
>

Regards

Andrea

Re: [PATCH 1/2] kernel.bbclass: handle embedding of initramfs images

[Andrea Adami]

On Fri, Jul 8, 2011 at 11:44 PM, Andrea Adami <andrea.adami@gmail.com> wrote:
> On Fri, Jul 8, 2011 at 5:38 PM, Darren Hart <dvhart@linux.intel.com> wrote:
>>
>>
>> On 07/07/2011 04:11 PM, Andrea Adami wrote:
>>> * from org.openembedded.dev (oe-classic)
>>
>> Hi Andrea,
>>
>> Please include a descriptive blurb about the patch. When people read
>> through the commit log they need to know what problem this patch
>> addresses and how it intends to go about it. If possible, it should also
>> include the commit id from the source (I suspect that isn't an option here).
>>
> Well, there isn't  really much to say: whether you know what an
> initramfs is or not :)
> Seriously, about the history of the patch, there have been so many
> commits that I could not choose one. See next comment.
>

Anyway, you're right. I'm putting together something more descriptive :)

>>
>> Hrm... Why is this part of do_configure? Seems a lot more like a deploy
>> or install step.
>
> If you look at the history at
> http://cgit.openembedded.org/cgit.cgi/openembedded/log/classes/kernel.bbclass?h=org.openembedded.dev&ofs=50
> you'll discover that there was a separate task (72761e4) which has
> been unified by the author as of commit  3e3f297.
>
> After some rounds of fixes,  the code was moved in do_configure with
> commit id fc03e2b (kernel.bbclass: move initramfs stuff to configure
> so we can do postprocessing on it with do_configure_append).
>

If there are any further remarks I would keep the code in do_configure
for the initial commit.

<cut>


Regards
Andrea