Pull request 20130309
v2 cover Pull request 20130309
Hello,
The patches that come as a follow-up of this message fix an issue found while building muffinman-image on top of the 2011.03-maintenance branch, and also add the capability to build a ubi image for the ben-nanonote machine. This work is intended to be used as a basis for porting the JLime distribution to oe-core.
These modifications were tested by successfully building muffinman-image from scratch on a Debian Wheezy host.
Please pull into 2011.03-maintenance branch.
The following changes since commit ff679935b073a89c4e407d259bcc2eea9148fb91:
opkg-utils: bump SRCREV to latest (2012-10-26 11:11:59 +0200)
are available in the git repository at:
git://seketeli.fr/~apelete/oe.git muffinman-image-fix
Apelete Seketeli (2):
gnutls: update SRC_URI
jlime-2010.1: add capability to build ubi image for ben-nanonote
machine
conf/bitbake.conf | 2 +- conf/distro/jlime-2010.1.conf | 3 ++- conf/machine/ben-nanonote.conf | 12 ++++++++++++ recipes/gnutls/gnutls.inc | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.10.4
PATCH v2 1/2 gnutls: update SRC_URI
Update SRC_URI since the gnutls source packages were moved into a different directory on ftp.gnutls.org.
--- recipes/gnutls/gnutls.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes/gnutls/gnutls.inc +1 -1
@@ -8,7 +8,7 @@ LICENSE_${PN}-bin = "GPLv3+" LICENSE_${PN}-extra = "GPLv3+" LICENSE_${PN}-openssl = "GPLv3+" -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls" +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls" inherit autotools binconfig pkgconfig gettext
Signature · 1 line
1.7.10.4
PATCH v2 2/2 jlime-2010.1: add capability to build ubi image for ben-nanonote machine
In reply to Apelete SeketeliAdd capability to build a ubi image for the ben-nanonote machine when using the jlime-2010.1 distro. The resulting image is ready to use and fully functionnal.
--- conf/bitbake.conf | 2 +- conf/distro/jlime-2010.1.conf | 3 ++- conf/machine/ben-nanonote.conf | 12 ++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-)
conf/bitbake.conf +1 -1
@@ -399,7 +399,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} > ${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 -9 >${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}.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_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 ${EXTRA_IMAGECMD} ; 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 = ""
conf/distro/jlime-2010.1.conf +2 -1
@@ -30,13 +30,14 @@ DISTRO_EXTRA_RDEPENDS = "nano keymaps console-tools" # IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" SPLASH = "psplash" +UBI_VOLNAME = "rootfs" # # Naming schemes + packages # INHERIT += "debian package_tar package_ipk src_distribute_local" SRC_DIST_LOCAL ?= "symlink" -IMAGE_FSTYPES = "tar.gz tar.bz2 jffs2" +IMAGE_FSTYPES = "tar.gz tar.bz2 jffs2 ubi" PREFERRED_PROVIDER_virtual/update-alternatives = "opkg" #
conf/machine/ben-nanonote.conf +12 -0
@@ -13,6 +13,18 @@ KERNEL_IMAGETYPE = "vmlinux.bin" IMAGE_FSTYPES ?= "jffs2" +# do ubiattach /dev/ubi_ctrl -m 2 +# From dmesg: +# UBI: physical eraseblock size: 524288 bytes (512 KiB) +# UBI: logical eraseblock size: 516096 bytes +# UBI: smallest flash I/O unit: 4096 +# UBI: VID header offset: 4096 (aligned 4096) +# UBI: data offset: 8192 +MKUBIFS_ARGS = "-m 4096 -e 516096 -c 4095" +UBINIZE_ARGS = "-m 4096 -p 512KiB" + +EXTRA_IMAGECMD_ubi = "; echo vol_alignment=1 >> ubinize.cfg" + PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
Signature · 1 line
1.7.10.4
Re: [2011.03-maintenance][PATCH v2 1/2] gnutls: update SRC_URI
In reply to Apelete Seketelirecipes/gnutls/gnutls.inc LICENSE_${PN}-bin = "GPLv3+" · line 11
Quoted 2 lines · Apelete Seketeli
recipes/gnutls/gnutls.inc +1
-1-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls" +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"
can we use PV instead of 2.10 ? if not then move SRC_URI out of .inc into .bb
Re: [2011.03-maintenance][PATCH v2 1/2] gnutls: update SRC_URI
In reply to Apelete Seketelirecipes/gnutls/gnutls.inc LICENSE_${PN}-bin = "GPLv3+" · line 11
Quoted 2 lines · Apelete Seketeli
recipes/gnutls/gnutls.inc +1
-1-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls" +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"
can we use PV instead of 2.10 ? if not then move SRC_URI out of .inc into .bb
Re: [2011.03-maintenance][PATCH v2 1/2] gnutls: update SRC_URI
In reply to Khem RajQuoted 7 lines · Khem Raj
recipes/gnutls/gnutls.inc LICENSE_${PN}-bin = "GPLv3+" · line 11
Quoted 2 lines · Apelete Seketeli
recipes/gnutls/gnutls.inc +1
-1-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls" +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"can we use PV instead of 2.10 ? if not then move
SRC_URIout of .inc into .bb
PV is actually 2.10.4 here, it can't be used instead of 2.10 it seems. I'll move SRC_URI into .bb then.
Signature · 1 line
Apelete
Re: [2011.03-maintenance][PATCH v2 1/2] gnutls: update SRC_URI
Quoted 11 lines · Apelete Seketeli
Quoted 7 lines · Khem Raj
recipes/gnutls/gnutls.inc LICENSE_${PN}-bin = "GPLv3+" · line 11
Quoted 2 lines · Apelete Seketeli
recipes/gnutls/gnutls.inc +1
-1-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls" +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"can we use PV instead of 2.10 ? if not then move
SRC_URIout of .inc into .bbPV is actually 2.10.4 here, it can't be used instead of 2.10 it seems. I'll move
SRC_URIinto .bb then.
now that I looked into oe.classic tree there is only 1 recipe for gnutls so its ok to have it in .inc
Quoted 8 lines
Signature · 7 lines
-- Apelete _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [2011.03-maintenance][PATCH v2 1/2] gnutls: update SRC_URI
Quoted 12 lines · Khem Raj
Quoted 9 lines · Apelete Seketeli
Quoted 7 lines · Khem Raj
recipes/gnutls/gnutls.inc LICENSE_${PN}-bin = "GPLv3+" · line 11
Quoted 2 lines · Apelete Seketeli
recipes/gnutls/gnutls.inc +1
-1-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls" +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"can we use PV instead of 2.10 ? if not then move
SRC_URIout of .inc into .bb
Quoted 5 lines
Quoted 2 lines
PV is actually 2.10.4 here, it can't be used instead of 2.10 it seems. I'll move
SRC_URIinto .bb then.now that I looked into oe.classic tree there is only 1 recipe for gnutls so its ok to have it in .inc
Patch v3 already sent, I hope it's ok anyway :).
Cheers.
Signature · 1 line
Apelete
Re: [2011.03-maintenance][PATCH v2 1/2] gnutls: update SRC_URI
In reply to Apelete SeketeliQuoted 11 lines · Apelete Seketeli
Quoted 7 lines · Khem Raj
recipes/gnutls/gnutls.inc LICENSE_${PN}-bin = "GPLv3+" · line 11
Quoted 2 lines · Apelete Seketeli
recipes/gnutls/gnutls.inc +1
-1-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls" +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"can we use PV instead of 2.10 ? if not then move
SRC_URIout of .inc into .bbPV is actually 2.10.4 here, it can't be used instead of 2.10 it seems. I'll move
SRC_URIinto .bb then.
In couple of recipes we're using:SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" SRC_URI = "http://download.gnome.org/sources/${PN}/${SHRT_VER}/${PN}-${PV}.tar.gz"
This could be applied here too.
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [2011.03-maintenance][PATCH v2 1/2] gnutls: update SRC_URI
Quoted 10 lines · Martin Jansa
Quoted 9 lines · Apelete Seketeli
Quoted 7 lines · Khem Raj
recipes/gnutls/gnutls.inc LICENSE_${PN}-bin = "GPLv3+" · line 11
Quoted 2 lines · Apelete Seketeli
recipes/gnutls/gnutls.inc +1
-1-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2;name=gnutls" +SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls"can we use PV instead of 2.10 ? if not then move
SRC_URIout of .inc into .bb
Quoted 8 lines
Quoted 2 lines
PV is actually 2.10.4 here, it can't be used instead of 2.10 it seems. I'll move
SRC_URIinto .bb then.In couple of recipes we're using:
SHRT_VER= "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"SRC_URI= "http://download.gnome.org/sources/${PN}/${SHRT_VER}/${PN}-${PV}.tar.gz"This could be applied here too.
When I updated this SRC_URI I actually wondered if there was a way to filter the version in a generic fashion, but couldn't come up with any. This is it, thanks for the tip. I will fix SRC_URI in .inc then, instead of moving it into .bb like I did.
Cheers.
Signature · 1 line
Apelete