[2011.03-maintenance][PATCH v3 0/2] Pull request 20130309

[2011.03-maintenance][PATCH v3 0/2] Pull request 20130309

[Apelete Seketeli]

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 --
 recipes/gnutls/gnutls_2.10.4.bb |    7 ++++---
 5 files changed, 19 insertions(+), 7 deletions(-)

-- 
1.7.10.4

[2011.03-maintenance][PATCH v3 1/2] gnutls: update SRC_URI

[Apelete Seketeli]

Update SRC_URI since the gnutls source packages were moved into a
different directory on ftp.gnutls.org.
---
 recipes/gnutls/gnutls.inc       |    2 --
 recipes/gnutls/gnutls_2.10.4.bb |    7 ++++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/recipes/gnutls/gnutls.inc b/recipes/gnutls/gnutls.inc
index a8e1e0d..146a0c8 100644
--- a/recipes/gnutls/gnutls.inc
+++ b/recipes/gnutls/gnutls.inc
@@ -8,8 +8,6 @@ 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"
-
 inherit autotools binconfig pkgconfig gettext
 
 INC_PR = "r12"
diff --git a/recipes/gnutls/gnutls_2.10.4.bb b/recipes/gnutls/gnutls_2.10.4.bb
index 9f40684..c5619b2 100644
--- a/recipes/gnutls/gnutls_2.10.4.bb
+++ b/recipes/gnutls/gnutls_2.10.4.bb
@@ -4,9 +4,10 @@ PR = "${INC_PR}.0"
 
 EXTRA_OECONF += " --without-libgcrypt-prefix "
 
-SRC_URI += "file://gettextize-with-gettext-0.18.patch \
-            file://gnutls-openssl.patch \
-            file://gnutls-replace-siginterrupt.patch \
+SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.10/gnutls-${PV}.tar.bz2;name=gnutls \
+	   file://gettextize-with-gettext-0.18.patch \
+           file://gnutls-openssl.patch \
+           file://gnutls-replace-siginterrupt.patch \
            "
 
 do_configure_prepend() {
-- 
1.7.10.4

[2011.03-maintenance][PATCH v3 2/2] jlime-2010.1: add capability to build ubi image for ben-nanonote machine

[Apelete Seketeli]

Add 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(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 01b9321..527127e 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -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 = ""
diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf
index a3ec20e..d6a92cf 100644
--- a/conf/distro/jlime-2010.1.conf
+++ b/conf/distro/jlime-2010.1.conf
@@ -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"
 
 #
diff --git a/conf/machine/ben-nanonote.conf b/conf/machine/ben-nanonote.conf
index fd4aba4..e92992d 100644
--- a/conf/machine/ben-nanonote.conf
+++ b/conf/machine/ben-nanonote.conf
@@ -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"
 
-- 
1.7.10.4