Re: [yocto] [meta-raspberrypi][PATCH 3/3] sdcard-image: Use the size of the generated rootfs
On Sat, 2013-01-26 at 02:19 +0200, Andrei Gherzan wrote: > On Fri, Jan 25, 2013 at 3:33 PM, Jan Schmidt > wrote: > > > This is a good idea but you will have to align the new ROOTFS_SIZE > to IMAGE_ROOTFS_ALIGNMENT. > > + SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + > ${BOOT_SPACE_ALIGNED} + ${ROOTFS_SIZE}) > > > So you are actually removing IMAGE_ROOTFS_ALIGNMENT space at the end > of the sd image. Why are you doing this? Nothing stated in the > comment. Sorry, yeah - I forgot to mention it. I removed it because it's pointless. It's not actually aligning to anything (it doesn't calculate an alignment based on the difference between the ROOTFS_SIZE and some target multiple). Instead, it was just arbitrarily padding some megabytes onto the end of the image file. J. > > > > ag -- Jan Schmidt ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta-raspberrypi][PATCH 3/3] sdcard-image: Use the size of the generated rootfs
On Jan 26, 2013 10:53 AM, "Jan Schmidt" wrote: > > On Sat, 2013-01-26 at 02:19 +0200, Andrei Gherzan wrote: > > On Fri, Jan 25, 2013 at 3:33 PM, Jan Schmidt > > wrote: > > > > > > > This is a good idea but you will have to align the new ROOTFS_SIZE > > to IMAGE_ROOTFS_ALIGNMENT. > > > > + SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + > > ${BOOT_SPACE_ALIGNED} + ${ROOTFS_SIZE}) > > > > > > So you are actually removing IMAGE_ROOTFS_ALIGNMENT space at the end > > of the sd image. Why are you doing this? Nothing stated in the > > comment. > > Sorry, yeah - I forgot to mention it. I removed it because it's > pointless. It's not actually aligning to anything (it doesn't calculate > an alignment based on the difference between the ROOTFS_SIZE and some > target multiple). Instead, it was just arbitrarily padding some > megabytes onto the end of the image file. > Makes sense. I added that because we had a strange bug where the final sdimg file size was not enough. Maybe this was fixed now - something related to parted. Please add your comment and modify the asci partition layout in the bbclass file too. Thanks, Andrei Thanks, ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta-raspberrypi][PATCH 3/3] sdcard-image: Use the size of the generated rootfs
On Sat, 2013-01-26 at 12:26 +0200, Andrei Gherzan wrote: > > On Jan 26, 2013 10:53 AM, "Jan Schmidt" wrote: > > > > On Sat, 2013-01-26 at 02:19 +0200, Andrei Gherzan wrote: > > > On Fri, Jan 25, 2013 at 3:33 PM, Jan Schmidt > > > > wrote: > > > > > > > > > > > This is a good idea but you will have to align the new ROOTFS_SIZE > > > to IMAGE_ROOTFS_ALIGNMENT. > > > > > > + SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + > > > ${BOOT_SPACE_ALIGNED} + ${ROOTFS_SIZE}) > > > > > > > > > So you are actually removing IMAGE_ROOTFS_ALIGNMENT space at the > end > > > of the sd image. Why are you doing this? Nothing stated in the > > > comment. > > > > Sorry, yeah - I forgot to mention it. I removed it because it's > > pointless. It's not actually aligning to anything (it doesn't > calculate > > an alignment based on the difference between the ROOTFS_SIZE and > some > > target multiple). Instead, it was just arbitrarily padding some > > megabytes onto the end of the image file. > > > > Makes sense. I added that because we had a strange bug where the final > sdimg file size was not enough. Maybe this was fixed now - something > related to parted. Please add your comment and modify the asci > partition layout in the bbclass file too. It may have been the use of the inherited ROOTFS_SIZE, which will be slightly smaller than the ext3 fs produced, because it measure the size of the contents of the fs. I'll re-send the patch. > > Thanks, > Andrei > > > > Thanks, > -- Jan Schmidt ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 3/3] sdcard-image: Use the size of the generated rootfs
When constructing the SD card image, the code was using the inherited ROOTFS_SIZE, which is the size of the rootfs contents. When building (for example) a compressed rootfs, this allocates a partition much larger than necessary. Instead, take the size of the generated rootfs file that is about to be written into the generated image. Also remove the extra ${IMAGE_ROOTFS_ALIGNMENT} padding at the end of the image, as it isn't needed now. Signed-off-by: Jan Schmidt --- classes/sdcard_image-rpi.bbclass | 23 +-- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index 421f561..fdac3b2 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass @@ -13,14 +13,16 @@ inherit image_types # Default Free space = 1.3x # Use IMAGE_OVERHEAD_FACTOR to add more space # <-> -#4KiB 20MiB SDIMG_ROOTFS +#4KiB ~20MiB SDIMG_ROOTFS # <---> <--> <--> -# --- -# | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | ROOTFS_SIZE| IMAGE_ROOTFS_ALIGNMENT| -# --- -# ^^^^ ^ -# |||| | -# 0 4096 4KiB + 20MiB 4KiB + 20Mib + SDIMG_ROOTFS 4KiB + 20MiB + SDIMG_ROOTFS + 4KiB +# +# | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | ROOTFS_SIZE| +# +# ^^^^ +# |||| +# 0 4096 4KiB + ~20MiB 4KiB + ~20Mib + SDIMG_ROOTFS +# rounded up to +# IMAGE_ROOTFS_ALIGNMENT # Set kernel and boot loader @@ -29,7 +31,7 @@ IMAGE_BOOTLOADER ?= "bcm2835-bootfiles" # Boot partition volume id BOOTDD_VOLUME_ID ?= "${MACHINE}" -# Boot partition size [in KiB] +# Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT) BOOT_SPACE ?= "20480" # Set alignment to 4MB [in KiB] @@ -60,7 +62,8 @@ IMAGE_CMD_rpi-sdimg () { # Align partitions BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1) BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT}) - SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTFS_SIZE + ${IMAGE_ROOTFS_ALIGNMENT}) + ROOTFS_SIZE=`du -ks ${SDIMG_ROOTFS} | awk '{print $1}'` + SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + ${ROOTFS_SIZE}) # Initialize sdcard image file dd if=/dev/zero of=${SDIMG} bs=1 count=0 seek=$(expr 1024 \* ${SDIMG_SIZE}) @@ -71,7 +74,7 @@ IMAGE_CMD_rpi-sdimg () { parted -s ${SDIMG} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) parted -s ${SDIMG} set 1 boot on # Create rootfs partition - parted -s ${SDIMG} unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT} \+ ${ROOTFS_SIZE}) + parted -s ${SDIMG} unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) $(expr ${SDIMG_SIZE} - 1) parted ${SDIMG} print # Create a vfat image with boot files -- 1.7.10.4 ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta-raspberrypi][PATCH 2/2] xserver-xf86-config: fix do_install
On Thu, Jan 24, 2013 at 10:57:42PM +0100, Andreas Müller wrote: > for some reason wildcards don't work in current head. Error message was: > > | DEBUG: Executing shell function do_install > | install: cannot stat > `/home/Superandy/tmp/oe-core-eglibc/work/raspberrypi-angstrom-linux-gnueabi/xserver-xf86-config/0.1-r18/xorg.conf.d/*': > No such file or directory > I can't reproduce your error. For me this works. Maybe was something broken in oe-core? Anyway it seems to be fixed now. Would you retest it please > Signed-off-by: Andreas Müller > --- > .../xorg-xserver/xserver-xf86-config_0.1.bbappend |6 -- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend > b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend > index 65931e2..a8b8e8c 100644 > --- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend > +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend > @@ -1,12 +1,14 @@ > FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" > > # Don't forget to bump PRINC if you update the extra files. > -PRINC := "${@int(PRINC) + 5}" > +PRINC := "${@int(PRINC) + 6}" > > THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" > FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" > > -SRC_URI_append_raspberrypi = " file://xorg.conf.d/* " > +SRC_URI_append_raspberrypi = " \ > + file://xorg.conf.d/10-evdev.conf \ > +" > I don't find this lin ebreak necesssary here. And if it was, don't combine formating commits with other fixes. Thanks, -- Andrei Gherzan m: +40.744.478.414 | f: +40.31.816.28.12 ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta-raspberrypi][PATCH 1/2] layer.conf: fix parse
On Thu, Jan 24, 2013 at 10:57:41PM +0100, Andreas Müller wrote: > after meta-systemd commit [1] the following error was thrown during parsing: > > ERROR: Unable to parse > /home/Superandy/data/oe-core/sources/meta-raspberrypi/conf/layer.conf: > Failure expanding variable BBFILES, expression was > ... > /home/Superandy/data/oe-core/sources/meta-openembedded/meta-systemd/recipes-*/*/*.bb > /home/Superandy/data/oe-core/sources/meta-openembedded/meta-systemd/oe-core/recipes-*/*/*.bbappend > /home/Superandy/data/oe-core/sources/meta-openembedded/meta-systemd/meta-oe/recipes-*/*/*.bbappend > ${@base_contains('BBFILE_COLLECTIONS', 'systemd-layer','', > '/home/Superandy/data/oe-core/sources/meta-openembedded/meta-systemd/invalid.bb', > d)} > ${@base_contains('BBFILE_COLLECTIONS', > 'gnome-layer','/home/Superandy/data/oe-core/sources/meta-openembedded/meta-systemd/meta-gnome/recipes-*/*/*.bbappend', > '', d)} > ${@base_contains('BBFILE_COLLECTIONS', > 'efl-layer','/home/Superandy/data/oe-core/sources/meta-openembedded/meta-systemd/meta-efl/recipes-*/*/*.bbappend', > '', d)} > ${@base_contains('BBFILE_COLLECTIONS', > 'multimedia-layer','/home/Superandy/data/oe-core/sources/meta-openembedded/meta-systemd/meta-multimedia/recipes-*/*/*.bbappend', > '', d)} > ${@base_contains('BBFILE_COLLECTIONS', > 'networking','/home/Superandy/data/oe-core/sources/meta-openembedded/meta-systemd/meta-networking/recipes-*/*/*.bbappend', > '', d)} > ${@base_contains('BBFILE_COLLECTIONS', > 'xfce-layer','/home/Superandy/data/oe-core/sources/meta-openembedded/meta-systemd/meta-xfce/recipes-*/*/*.bbappend', > '', d)} > ... > which triggered exception NameError: name 'base_contains' is not defined > > [1] > http://cgit.openembedded.org/meta-openembedded/commit/?id=3c21a46020bd0816579648f684c41dbd6333583e > > Signed-off-by: Andreas Müller > --- > conf/layer.conf |2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/conf/layer.conf b/conf/layer.conf > index 32e1827..e8b87b2 100644 > --- a/conf/layer.conf > +++ b/conf/layer.conf > @@ -2,7 +2,7 @@ > BBPATH .= ":${LAYERDIR}" > > # We have a recipes directory containing .bb and .bbappend files, add to > BBFILES > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes*/*/*.bb \ > +BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ > ${LAYERDIR}/recipes*/*/*.bbappend" > > BBFILE_COLLECTIONS += "raspberrypi" > -- > 1.7.4.4 > > ___ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto Merged with a little commit message tweak. Thank you, -- Andrei Gherzan m: +40.744.478.414 | f: +40.31.816.28.12 ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [Package Report System]Manual check recipes name list
This mail was sent out by Package Report System. It will list all the recipes which can't check upstream version by script, and will show how long it is since their last mannual version check. You can check the detail information at http://packages.yoctoproject.org/manuallychkinfo PackageName Version LastChkVersion LastChkTime Maintainer NoUpgradeReason opkg 0.1.8+svnr649...0.1.8 149 day Radu Moisan ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto