[PATCH 1/2] image.bbclass: add link to .rootfs.<type> or .<type>.img

[PATCH 1/2] image.bbclass: add link to .rootfs.<type> or .<type>.img

[Ben Gardiner]

The current image link-creation code will unconditionaly create a link
from .<type> pointing to the .rootfs.<type> output.

This is not compatible with the UBIFS images produced which have
.<type>.img extension since they are not considered to be valid rootfs
images when they are not included in a UBI container.

Check for existence of the link target .rootfs.<type> before creating the
link and fallback to a check for the .<type>.img target after that.

Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
CC: Tom Rini <trini@embeddedalley.com>

---

Tested successfully in arago; I'm sorry I couldn't find a combination of
MACHINE and DISTRO and image that would build on org.openembedded.dev.

This patch is a git am fix-up of the patch tested in arago.

---

 classes/image.bbclass |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/classes/image.bbclass b/classes/image.bbclass
index 9621614..d7fe9b0 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -140,7 +140,11 @@ def get_imagecmds(d):
         cmd  = "\t#Code for image type " + type + "\n"
         cmd += "\t${IMAGE_CMD_" + type + "}\n"
         cmd += "\tcd ${DEPLOY_DIR_IMAGE}/\n"
-        cmd += "\tln -fs ${IMAGE_NAME}.rootfs." + type + " ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n\n"
+        cmd += "\tif [ -f ${IMAGE_NAME}.rootfs." + type + " ]; then\n"
+        cmd += "\tln -fs ${IMAGE_NAME}.rootfs." + type + " ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n"
+        cmd += "\telif [ -f ${IMAGE_NAME}." + type + ".img ]; then\n"
+        cmd += "\tln -fs ${IMAGE_NAME}." + type + ".img ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n"
+        cmd += "\tfi\n\n"
         cmds += bb.data.expand(cmd, localdata)
     return cmds
 
-- 
1.7.1

[PATCH 2/2] bitbake.conf: use .ubifs.img extension in IMAGE_CMD_ubi

[Ben Gardiner]

The current IMAGE_CMD_ubi creates an interim image with a .rootfs.ubifs
extension.

The ubifs image created is not considered a valid rootfs without a UBI
container.

Change the filename of the iterim ubifs image used by IMAGE_CMD_ubi to
.ubifs.img to match the IMAGE_CMD_ubifs command.

Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
CC: Tom Rini <trini@embeddedalley.com>

---

Tested successfully in arago; I'm sorry I couldn't find a combination of
MACHINE and DISTRO and image that would build on org.openembedded.dev.

This patch is a git am fix-up of the patch tested in arago.

---

 conf/bitbake.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 903b9b7..e57a7ad 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -403,7 +403,7 @@ IMAGE_CMD_cpio.gz = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio
 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 | lzma -c ${LZMA_COMPRESSION_LEVEL} >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.lzma) ${EXTRA_IMAGECMD}"
-IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg"
+IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg"
 IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}"
 
 EXTRA_IMAGECMD = ""
-- 
1.7.1

Re: [PATCH 2/2] bitbake.conf: use .ubifs.img extension in IMAGE_CMD_ubi

[Denys Dmytriyenko]

On Tue, Mar 15, 2011 at 02:13:55PM -0400, Ben Gardiner wrote:
> The current IMAGE_CMD_ubi creates an interim image with a .rootfs.ubifs
> extension.
> 
> The ubifs image created is not considered a valid rootfs without a UBI
> container.
> 
> Change the filename of the iterim ubifs image used by IMAGE_CMD_ubi to
> .ubifs.img to match the IMAGE_CMD_ubifs command.
> 
> Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
> CC: Tom Rini <trini@embeddedalley.com>

Same comments, as to patch #1...

Acked-by: Denys Dmytriyenko <denys@ti.com>
 
> ---
> 
> Tested successfully in arago; I'm sorry I couldn't find a combination of
> MACHINE and DISTRO and image that would build on org.openembedded.dev.
> 
> This patch is a git am fix-up of the patch tested in arago.
> 
> ---
> 
>  conf/bitbake.conf |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/conf/bitbake.conf b/conf/bitbake.conf
> index 903b9b7..e57a7ad 100644
> --- a/conf/bitbake.conf
> +++ b/conf/bitbake.conf
> @@ -403,7 +403,7 @@ IMAGE_CMD_cpio.gz = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio
>  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 | lzma -c ${LZMA_COMPRESSION_LEVEL} >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.lzma) ${EXTRA_IMAGECMD}"
> -IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg"
> +IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg"
>  IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}"
>  
>  EXTRA_IMAGECMD = ""
> -- 
> 1.7.1
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [PATCH 1/2] image.bbclass: add link to .rootfs.<type> or .<type>.img

[Denys Dmytriyenko]

On Tue, Mar 15, 2011 at 02:13:54PM -0400, Ben Gardiner wrote:
> The current image link-creation code will unconditionaly create a link
> from .<type> pointing to the .rootfs.<type> output.
> 
> This is not compatible with the UBIFS images produced which have
> .<type>.img extension since they are not considered to be valid rootfs
> images when they are not included in a UBI container.
> 
> Check for existence of the link target .rootfs.<type> before creating the
> link and fallback to a check for the .<type>.img target after that.
> 
> Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
> CC: Tom Rini <trini@embeddedalley.com>

The naming seems reasonable to me, considering the previous discussion on this 
topic.

Acked-by: Denys Dmytriyenko <denys@ti.com>


> Tested successfully in arago; I'm sorry I couldn't find a combination of
> MACHINE and DISTRO and image that would build on org.openembedded.dev.
> 
> This patch is a git am fix-up of the patch tested in arago.

I'll try building it from the tip of oe.dev, but arago should be reasonable up 
to date with no changes to image.bbclass or bitbake.conf...

> ---
> 
>  classes/image.bbclass |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/classes/image.bbclass b/classes/image.bbclass
> index 9621614..d7fe9b0 100644
> --- a/classes/image.bbclass
> +++ b/classes/image.bbclass
> @@ -140,7 +140,11 @@ def get_imagecmds(d):
>          cmd  = "\t#Code for image type " + type + "\n"
>          cmd += "\t${IMAGE_CMD_" + type + "}\n"
>          cmd += "\tcd ${DEPLOY_DIR_IMAGE}/\n"
> -        cmd += "\tln -fs ${IMAGE_NAME}.rootfs." + type + " ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n\n"
> +        cmd += "\tif [ -f ${IMAGE_NAME}.rootfs." + type + " ]; then\n"
> +        cmd += "\tln -fs ${IMAGE_NAME}.rootfs." + type + " ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n"
> +        cmd += "\telif [ -f ${IMAGE_NAME}." + type + ".img ]; then\n"
> +        cmd += "\tln -fs ${IMAGE_NAME}." + type + ".img ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}." + type + "\n"
> +        cmd += "\tfi\n\n"
>          cmds += bb.data.expand(cmd, localdata)
>      return cmds
>  
> -- 
> 1.7.1
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [PATCH 1/2] image.bbclass: add link to .rootfs.<type> or .<type>.img

[Ben Gardiner]

Thanks, Denys for the Ack and Tom for picking up the patches.

Now that they have hit mainline, I would like to request that they get
into arago-oe-dev. From the 2010.03-maintenance announcement I'm
guessing that means that they need to be backported to
2010.03-maintenance branch first.

I've cherry-picked the following commits (some with fixups) to get a
successful build of hello-worldimage with externa-toolchain and
Build Configuration:
BB_VERSION        = "1.10.2"
METADATA_BRANCH   =
"upstream/oe/releases/2011.03-maintenance/features/BenGardiner/backport-ubifs-links"
METADATA_REVISION = "64d4245"
TARGET_ARCH       = "arm"
TARGET_OS         = "linux-gnueabi"
MACHINE           = "da850-omapl138-evm"
DISTRO            = "angstrom"
DISTRO_VERSION    = "2011.03"
TARGET_FPU        = "soft"

commit 64d42452395f0c02d355516943c8493dc770ade2Author: Denys
Dmytriyenko <denys@ti.com>
Date:   Thu Mar 3 13:37:19 2011 -0500

    toolchain-external.conf: set the default provider for gdbserver

    Signed-off-by: Denys Dmytriyenko <denys@ti.com>
    (cherry picked from commit df59f77a2eb37d9807c6d9167488110e92601d7b)

    Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>

 conf/distro/include/toolchain-external.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 2641cb6d7e2db1dcd2608bae7d84909915b1f023
Author: Denys Dmytriyenko <denys@ti.com>
Date:   Thu Mar 3 13:27:26 2011 -0500

    external-toolchain-csl: handle packaging of gdbserver based on
PREFERRED_PROVIDER

    Allow packaging independent copy of specific version of gdbserver with
    external-toolchain-csl by setting PREFERRED_PROVIDER. E.g. for GPLv2
    gdbserver, add these lines to your distro/local.conf:

    PREFERRED_PROVIDER_gdbserver = "gdbserver"
    PREFERRED_VERSION_gdbserver = "6.6"

    Thanks to Ben Gardiner for providing valuable feedback.

    Signed-off-by: Denys Dmytriyenko <denys@ti.com>
    (cherry picked from commit a47c14c83cf97a2c90ee50ec7212ec33bdafb58b)

    Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>

 recipes/meta/external-toolchain-csl.bb |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

commit 1775a7d2fdc6b7cc242b2b4e9f0a6516edf0ad83
Author: Tom Rini <tom_rini@mentor.com>
Date:   Wed Mar 2 11:39:48 2011 -0700

    external-toolchain-csl: Drop do_stage, add gdbserver

    Based on work from Noor Ahsan, we merge the important part of do_stage
    into do_install and then set NATIVE_INSTALL_WORKS.  We also add a function
    for getting the gdb version for packaging up gdbserver and ship that.

    Signed-off-by: Tom Rini <tom_rini@mentor.com>
    (cherry picked from commit 207971b244ee6958dab1fb41d6f3cd94ac416b73)

    Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>

 recipes/meta/external-toolchain-csl.bb |   39 +++++++++++++++++--------------
 1 files changed, 21 insertions(+), 18 deletions(-)

commit a96c10d6cff4f8298c43eccd9139dd20d41a4cc8
Author: Ben Gardiner <bengardiner@nanometrics.ca>
Date:   Wed Mar 2 10:05:14 2011 -0500

    external-toolchain-csl: allow linux-libc-headers

    If PREFERRED_PROVIDER_linux-libc-headers is defined as anything
    other than external-toolchain-csl then don't PROVIDE, install or
    stage the linux headers packaged with the CSL toolchain.

    (Updated by Tom Rini to not modify local.conf.sample yet and to use
    cp + rm -rf rather than rsync)

    Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
    Tested-by: Andrea Galbusera <gizero@gmail.com>
    Signed-off-by: Tom Rini <tom_rini@mentor.com>
    (cherry picked from commit 3116ad58e507c6e5dc7b7249f521c395db586b9f)

    Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>

 recipes/meta/external-toolchain-csl.bb |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

commit 925e89153270dc162957903bc793ecbfdbf6ec05
Author: Ben Gardiner <bengardiner@nanometrics.ca>
Date:   Wed Mar 2 10:05:13 2011 -0500

    external-toolchain: allow override of linux-libc-headers provider

    only set PREFERRED_PROVIDER_linux-libc-headers if it is not
    already assigned a value.

    Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
    Tested-by: Andrea Galbusera <gizero@gmail.com>
    Signed-off-by: Tom Rini <tom_rini@mentor.com>
    (cherry picked from commit 829ea5110bc82f71a225f168bcb6a9a327b1b5c8)

    Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>

 conf/distro/include/toolchain-external.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 5156e672c781e8a44e02f9eb4351cb8c476c3a60
Author: Ben Gardiner <bengardiner@nanometrics.ca>
Date:   Tue Mar 15 14:13:55 2011 -0400

    bitbake.conf: use .ubifs.img extension in IMAGE_CMD_ubi

    The current IMAGE_CMD_ubi creates an interim image with a .rootfs.ubifs
    extension.

    The ubifs image created is not considered a valid rootfs without a UBI
    container.

    Change the filename of the iterim ubifs image used by IMAGE_CMD_ubi to
    .ubifs.img to match the IMAGE_CMD_ubifs command.

    Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
    Acked-by: Denys Dmytriyenko <denys@ti.com>
    Signed-off-by: Tom Rini <tom_rini@mentor.com>
    (backported from commit 7308e68fc26cdbffa08d311a2319c8d1c3b2805f -- some
    changes were needed since commit 312b42bcf2cc9b11266ba497ade68e8ddabb3007
    bitbake.conf: add XZ_INTEGRITY_CHECK and LZMA_COMPRESSION_LEVEL variables
    has not been applied to 2011.03-maintenance)

    Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>

 conf/bitbake.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 08cb84d24fdd8e9d40a5db836b98a3706187c7c6
Author: Ben Gardiner <bengardiner@nanometrics.ca>
Date:   Tue Mar 15 14:13:54 2011 -0400

    image.bbclass: add link to .rootfs.<type> or .<type>.img

    The current image link-creation code will unconditionaly create a link
    from .<type> pointing to the .rootfs.<type> output.

    This is not compatible with the UBIFS images produced which have
    .<type>.img extension since they are not considered to be valid rootfs
    images when they are not included in a UBI container.

    Check for existence of the link target .rootfs.<type> before creating the
    link and fallback to a check for the .<type>.img target after that.

    Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
    Acked-by: Denys Dmytriyenko <denys@ti.com>
    Signed-off-by: Tom Rini <tom_rini@mentor.com>
    (cherry picked from commit cfde49e8d0f1cf09d589910f1a342849db148519)

    Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>

 classes/image.bbclass |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

It seems a little strange to me to re-post the patches to the list; so
I'm asking first. Please let me know if I'm on the right track for the
procedure.

Best Regards,
Ben Gardiner

---
Nanometrics Inc.
http://www.nanometrics.ca

Re: [PATCH 1/2] image.bbclass: add link to .rootfs.<type> or .<type>.img

[Tom Rini]

On 03/16/2011 08:25 AM, Ben Gardiner wrote:
> Thanks, Denys for the Ack and Tom for picking up the patches.
>
> Now that they have hit mainline, I would like to request that they get
> into arago-oe-dev. From the 2010.03-maintenance announcement I'm
> guessing that means that they need to be backported to
> 2010.03-maintenance branch first.
>
> I've cherry-picked the following commits (some with fixups) to get a
> successful build of hello-worldimage with externa-toolchain and
> Build Configuration:
> BB_VERSION        = "1.10.2"
> METADATA_BRANCH   =
> "upstream/oe/releases/2011.03-maintenance/features/BenGardiner/backport-ubifs-links"
> METADATA_REVISION = "64d4245"
> TARGET_ARCH       = "arm"
> TARGET_OS         = "linux-gnueabi"
> MACHINE           = "da850-omapl138-evm"
> DISTRO            = "angstrom"
> DISTRO_VERSION    = "2011.03"
> TARGET_FPU        = "soft"

OK.  I don't have a problem merging things into the maintenance branch 
that I pushed into mainline but I would like a few acks from other 
people.  And I'd also like the patches you tested (helloworld-image + 
beagleboard + angstrom-2008.1 should build and isn't too much to build) 
themselves posted as a request (and a pullable git tree on 
githib/gitorosis/local/whatever would be nice but isn't required).  Thanks!

-- 
Tom Rini
Mentor Graphics Corporation

Re: [PATCH 1/2] image.bbclass: add link to .rootfs.<type> or .<type>.img

[Denys Dmytriyenko]

On Wed, Mar 16, 2011 at 09:18:59AM -0700, Tom Rini wrote:
> On 03/16/2011 08:25 AM, Ben Gardiner wrote:
>> Thanks, Denys for the Ack and Tom for picking up the patches.
>>
>> Now that they have hit mainline, I would like to request that they get
>> into arago-oe-dev. From the 2010.03-maintenance announcement I'm
>> guessing that means that they need to be backported to
>> 2010.03-maintenance branch first.
>>
>> I've cherry-picked the following commits (some with fixups) to get a
>> successful build of hello-worldimage with externa-toolchain and
>> Build Configuration:
>> BB_VERSION        = "1.10.2"
>> METADATA_BRANCH   =
>> "upstream/oe/releases/2011.03-maintenance/features/BenGardiner/backport-ubifs-links"
>> METADATA_REVISION = "64d4245"
>> TARGET_ARCH       = "arm"
>> TARGET_OS         = "linux-gnueabi"
>> MACHINE           = "da850-omapl138-evm"
>> DISTRO            = "angstrom"
>> DISTRO_VERSION    = "2011.03"
>> TARGET_FPU        = "soft"
>
> OK.  I don't have a problem merging things into the maintenance branch that 
> I pushed into mainline but I would like a few acks from other people.  And 

Sent my Acks, but mail server is slow again, so it may take some time to see 
them... :)

> I'd also like the patches you tested (helloworld-image + beagleboard + 
> angstrom-2008.1 should build and isn't too much to build) themselves posted 
> as a request (and a pullable git tree on githib/gitorosis/local/whatever 
> would be nice but isn't required).  Thanks!
>
> -- 
> Tom Rini
> Mentor Graphics Corporation
>

Re: [PATCH 1/2] image.bbclass: add link to .rootfs.<type> or .<type>.img

[Denys Dmytriyenko]

On Wed, Mar 16, 2011 at 11:25:48AM -0400, Ben Gardiner wrote:
> Thanks, Denys for the Ack and Tom for picking up the patches.
> 
> Now that they have hit mainline, I would like to request that they get
> into arago-oe-dev. From the 2010.03-maintenance announcement I'm
> guessing that means that they need to be backported to
> 2010.03-maintenance branch first.

Ben,

I'm in the process of switching arago-oe-dev snapshot to track 
2011.03-maintenance branch instead of the mainline, as Arago is currently 
based on Angstrom-2008.1 and that was removed from the mainline.

I've acked the cherry-picks for the maintenance branch, so once Tom pushes 
them there, you should see them appear in arago-oe-dev in a day or two...

And thank you for your help.

> I've cherry-picked the following commits (some with fixups) to get a
> successful build of hello-worldimage with externa-toolchain and
> Build Configuration:
> BB_VERSION        = "1.10.2"
> METADATA_BRANCH   =
> "upstream/oe/releases/2011.03-maintenance/features/BenGardiner/backport-ubifs-links"
> METADATA_REVISION = "64d4245"
> TARGET_ARCH       = "arm"
> TARGET_OS         = "linux-gnueabi"
> MACHINE           = "da850-omapl138-evm"
> DISTRO            = "angstrom"
> DISTRO_VERSION    = "2011.03"
> TARGET_FPU        = "soft"
> 
> commit 64d42452395f0c02d355516943c8493dc770ade2Author: Denys
> Dmytriyenko <denys@ti.com>
> Date:   Thu Mar 3 13:37:19 2011 -0500
> 
>     toolchain-external.conf: set the default provider for gdbserver
> 
>     Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>     (cherry picked from commit df59f77a2eb37d9807c6d9167488110e92601d7b)
> 
>     Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
> 
>  conf/distro/include/toolchain-external.inc |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> commit 2641cb6d7e2db1dcd2608bae7d84909915b1f023
> Author: Denys Dmytriyenko <denys@ti.com>
> Date:   Thu Mar 3 13:27:26 2011 -0500
> 
>     external-toolchain-csl: handle packaging of gdbserver based on
> PREFERRED_PROVIDER
> 
>     Allow packaging independent copy of specific version of gdbserver with
>     external-toolchain-csl by setting PREFERRED_PROVIDER. E.g. for GPLv2
>     gdbserver, add these lines to your distro/local.conf:
> 
>     PREFERRED_PROVIDER_gdbserver = "gdbserver"
>     PREFERRED_VERSION_gdbserver = "6.6"
> 
>     Thanks to Ben Gardiner for providing valuable feedback.
> 
>     Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>     (cherry picked from commit a47c14c83cf97a2c90ee50ec7212ec33bdafb58b)
> 
>     Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
> 
>  recipes/meta/external-toolchain-csl.bb |   11 ++++++-----
>  1 files changed, 6 insertions(+), 5 deletions(-)
> 
> commit 1775a7d2fdc6b7cc242b2b4e9f0a6516edf0ad83
> Author: Tom Rini <tom_rini@mentor.com>
> Date:   Wed Mar 2 11:39:48 2011 -0700
> 
>     external-toolchain-csl: Drop do_stage, add gdbserver
> 
>     Based on work from Noor Ahsan, we merge the important part of do_stage
>     into do_install and then set NATIVE_INSTALL_WORKS.  We also add a function
>     for getting the gdb version for packaging up gdbserver and ship that.
> 
>     Signed-off-by: Tom Rini <tom_rini@mentor.com>
>     (cherry picked from commit 207971b244ee6958dab1fb41d6f3cd94ac416b73)
> 
>     Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
> 
>  recipes/meta/external-toolchain-csl.bb |   39 +++++++++++++++++--------------
>  1 files changed, 21 insertions(+), 18 deletions(-)
> 
> commit a96c10d6cff4f8298c43eccd9139dd20d41a4cc8
> Author: Ben Gardiner <bengardiner@nanometrics.ca>
> Date:   Wed Mar 2 10:05:14 2011 -0500
> 
>     external-toolchain-csl: allow linux-libc-headers
> 
>     If PREFERRED_PROVIDER_linux-libc-headers is defined as anything
>     other than external-toolchain-csl then don't PROVIDE, install or
>     stage the linux headers packaged with the CSL toolchain.
> 
>     (Updated by Tom Rini to not modify local.conf.sample yet and to use
>     cp + rm -rf rather than rsync)
> 
>     Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
>     Tested-by: Andrea Galbusera <gizero@gmail.com>
>     Signed-off-by: Tom Rini <tom_rini@mentor.com>
>     (cherry picked from commit 3116ad58e507c6e5dc7b7249f521c395db586b9f)
> 
>     Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
> 
>  recipes/meta/external-toolchain-csl.bb |    9 ++++++---
>  1 files changed, 6 insertions(+), 3 deletions(-)
> 
> commit 925e89153270dc162957903bc793ecbfdbf6ec05
> Author: Ben Gardiner <bengardiner@nanometrics.ca>
> Date:   Wed Mar 2 10:05:13 2011 -0500
> 
>     external-toolchain: allow override of linux-libc-headers provider
> 
>     only set PREFERRED_PROVIDER_linux-libc-headers if it is not
>     already assigned a value.
> 
>     Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
>     Tested-by: Andrea Galbusera <gizero@gmail.com>
>     Signed-off-by: Tom Rini <tom_rini@mentor.com>
>     (cherry picked from commit 829ea5110bc82f71a225f168bcb6a9a327b1b5c8)
> 
>     Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
> 
>  conf/distro/include/toolchain-external.inc |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> commit 5156e672c781e8a44e02f9eb4351cb8c476c3a60
> Author: Ben Gardiner <bengardiner@nanometrics.ca>
> Date:   Tue Mar 15 14:13:55 2011 -0400
> 
>     bitbake.conf: use .ubifs.img extension in IMAGE_CMD_ubi
> 
>     The current IMAGE_CMD_ubi creates an interim image with a .rootfs.ubifs
>     extension.
> 
>     The ubifs image created is not considered a valid rootfs without a UBI
>     container.
> 
>     Change the filename of the iterim ubifs image used by IMAGE_CMD_ubi to
>     .ubifs.img to match the IMAGE_CMD_ubifs command.
> 
>     Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
>     Acked-by: Denys Dmytriyenko <denys@ti.com>
>     Signed-off-by: Tom Rini <tom_rini@mentor.com>
>     (backported from commit 7308e68fc26cdbffa08d311a2319c8d1c3b2805f -- some
>     changes were needed since commit 312b42bcf2cc9b11266ba497ade68e8ddabb3007
>     bitbake.conf: add XZ_INTEGRITY_CHECK and LZMA_COMPRESSION_LEVEL variables
>     has not been applied to 2011.03-maintenance)
> 
>     Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
> 
>  conf/bitbake.conf |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> commit 08cb84d24fdd8e9d40a5db836b98a3706187c7c6
> Author: Ben Gardiner <bengardiner@nanometrics.ca>
> Date:   Tue Mar 15 14:13:54 2011 -0400
> 
>     image.bbclass: add link to .rootfs.<type> or .<type>.img
> 
>     The current image link-creation code will unconditionaly create a link
>     from .<type> pointing to the .rootfs.<type> output.
> 
>     This is not compatible with the UBIFS images produced which have
>     .<type>.img extension since they are not considered to be valid rootfs
>     images when they are not included in a UBI container.
> 
>     Check for existence of the link target .rootfs.<type> before creating the
>     link and fallback to a check for the .<type>.img target after that.
> 
>     Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
>     Acked-by: Denys Dmytriyenko <denys@ti.com>
>     Signed-off-by: Tom Rini <tom_rini@mentor.com>
>     (cherry picked from commit cfde49e8d0f1cf09d589910f1a342849db148519)
> 
>     Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
> 
>  classes/image.bbclass |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> It seems a little strange to me to re-post the patches to the list; so
> I'm asking first. Please let me know if I'm on the right track for the
> procedure.
> 
> Best Regards,
> Ben Gardiner
> 
> ---
> Nanometrics Inc.
> http://www.nanometrics.ca
> 

Re: [PATCH 1/2] image.bbclass: add link to .rootfs.<type> or .<type>.img

[Ben Gardiner]

Hi Denys,

On Wed, Mar 16, 2011 at 4:30 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> I've acked the cherry-picks for the maintenance branch, so once Tom pushes
> them there, you should see them appear in arago-oe-dev in a day or two...

Thanks -- I couldn't ask for more.

> And thank you for your help.

You're most welcome.

Best Regards,
Ben Gardiner

---
Nanometrics Inc.
http://www.nanometrics.ca