From: Tom Zanussi <tom.zanussi@...>

This patchset is another step in some cleanup I'm doing for
the meta-intel bsps, basically removing unneeded or redundant
options and abstracting out useful features, in this case a
new vesafb feature used in this patchset by crownbay, emenlow,
and jasperforest.

Please pull into linux-yocto-3.0-(next).

Pull URL: git://git.pokylinux.org/linux-yocto-2.6.37-contrib
Branch: tzanussi/bsp-cleanup-2
Browse: http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h=tzanussi/bsp-cleanup-2

Thanks,

Tom

Tom Zanussi (5):
features/drm-psb: add related config options
meta: add vesafb feature
crownbay: cleanup bsp config
emenlow: cleanup bsp config
jasperforest: cleanup bsp config

meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg | 34 ++++--------------
meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc | 5 ++-
meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg | 35 +++++--------------
meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc | 2 +
.../kernel-cache/bsp/jasperforest/jasperforest.cfg | 7 +---
.../kernel-cache/bsp/jasperforest/jasperforest.scc | 2 +
meta/cfg/kernel-cache/features/drm-psb/drm-psb.cfg | 13 +++++++
.../kernel-cache/features/framebuffer/vesafb.cfg | 8 ++++
.../kernel-cache/features/framebuffer/vesafb.scc | 1 +
9 files changed, 48 insertions(+), 59 deletions(-)
create mode 100644 meta/cfg/kernel-cache/features/framebuffer/vesafb.cfg
create mode 100644 meta/cfg/kernel-cache/features/framebuffer/vesafb.scc

From: Tom Zanussi <tom.zanussi@...>

This allows us to move them out of the bsp config.

Signed-off-by: Tom Zanussi <tom.zanussi@...>
---
meta/cfg/kernel-cache/features/drm-psb/drm-psb.cfg | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/meta/cfg/kernel-cache/features/drm-psb/drm-psb.cfg b/meta/cfg/kernel-cache/features/drm-psb/drm-psb.cfg
index cdd805b..ea7cbfc 100644
--- a/meta/cfg/kernel-cache/features/drm-psb/drm-psb.cfg
+++ b/meta/cfg/kernel-cache/features/drm-psb/drm-psb.cfg
@@ -1,2 +1,15 @@
CONFIG_DRM=y
CONFIG_DRM_PSB=m
+
+CONFIG_I2C=y
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_IVTV=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_V4L2_COMMON=y
+CONFIG_I2C_ALGOBIT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_VIDEO_FB_IVTV=y
--
1.7.0.4

From: Tom Zanussi <tom.zanussi@...>

pkgconfig files belong in the -dev package. They automatically add
a runtime dependency (when packaging with RPM) for "pkgconfig", which
is not desired to be installed with this package.

This also fixes another problem in that FILES_{PN} was being assigned
instead of being appended and was adding libdir/*, preventing the
above from taking effect.

Signed-off-by: Tom Zanussi <tom.zanussi@...>
---
.../recipes-graphics/xpsb-glx/xpsb-glx_0.18.bb | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-emenlow/recipes-graphics/xpsb-glx/xpsb-glx_0.18.bb b/meta-emenlow/recipes-graphics/xpsb-glx/xpsb-glx_0.18.bb
index 8fb25d6..f6cee46 100644
--- a/meta-emenlow/recipes-graphics/xpsb-glx/xpsb-glx_0.18.bb
+++ b/meta-emenlow/recipes-graphics/xpsb-glx/xpsb-glx_0.18.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "X11 drivers for Poulsbo (psb) 3D acceleration"
# not Intel proprietary, but it has no obvious license attached to it.
LICENSE = "Intel-binary-only"
LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}-${PV}/COPYING;md5=02c597a2f082b4581596065bb5a521a8"
-PR = "r8"
+PR = "r9"

inherit autotools

@@ -38,7 +38,8 @@ EXTRA_OEMAKE = "linux-dri-x86"

DEPENDS += "libxfixes libxdamage libdrm-poulsbo libxxf86vm dri2proto libxmu libxi glproto makedepend-native"

-FILES_${PN} = "${libdir}/* ${libdir}/xorg/modules/dri/* \
+FILES_${PN}-dev += "${libdir}/pkgconfig"
+FILES_${PN} += "${libdir}/xorg/modules/dri/* \
${libdir}/xorg/modules/drivers/*"

PACKAGES =+ "libglu libglu-dev"
--
1.7.0.4

From: Tom Zanussi <tom.zanussi@...>

This patch fixes a do_rootfs failure I saw building emenlow:

| error: Failed dependencies:
| pkgconfig is needed by xpsb-glx-0.18-r8.core2

It should be pulled into both edison and master.

The following changes since commit 6041dcd0e6dee843437c23a0e76b5e9b12008314:
Tom Zanussi (1):
meta-crownbay: remove emgd-1.6

are available in the git repository at:

git://git.yoctoproject.org/meta-intel.git tzanussi/xpsb-glx-rootfs-fix
http://git.yoctoproject.org/cgit.cgi//log/?h=tzanussi/xpsb-glx-rootfs-fix

Tom Zanussi (1):
xpsb-glx: Move the pkgconfig file(s) to the -dev package

.../recipes-graphics/xpsb-glx/xpsb-glx_0.18.bb | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

Hello,

As a data point for where we stand in ensuring our packages are producing documentation, I have a script which builds all recipes (using the output of bitbake -s, not world), and then checks that a -doc package is generated which is populated with files.

A summary of the results using yesterday's master are as follows:

589 recipes in total
324 recipes are building documentation
265 recipes are not building documentation

6 recipes did not build, and are counted above as "not building documentation"

For comparison, here were the results from my last audit (June 10th):

584 recipes in total
307 recipes are building documentation
277 recipes are not building documentation

20 recipes did not build

So it's good to see the numbers are improving, if modestly.

The lists of recipes are attached to this email. We'd like to improve the percentage of recipes that produce documentation (separated into -doc packages, of course) for our next major release (1.2, in April).

Our userspace recipe maintainers should look into setting aside some time to know which of their recipes are in the "not building documentation" list and work to improve them. A lot of this is likely to be low-hanging fruit.

Thanks,

Scott

--
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center

On Thu, Sep 29, 2011 at 12:52 AM, Matthew McClintock <msm@...> wrote:

From: Kumar Gala <galak@...>

If a SOCKS5 gateway is needed for a proxy access like git it might also
require authentication to the proxy via a password and username.  Adding
SOCKS5_USER & SOCKS5_PASSWD to BB_ENV_EXTRAWHITE allow for automation
of the authentication request to occur when something like a git fetch
is going through the proxy.

Also, add several require git variables to be exported to the fetcher

I did not realize this when I just sent, but should this be two
separate patches with one going to bitbake-devel?

-M

On Thu, Sep 29, 2011 at 12:52 AM, Matthew McClintock <msm@...> wrote:

git fetches can fail (or at least return failed) when trying to
fetch and prune rebased branches. This patch simply adds a -f
to the git fetch command so these failure are ignore

Generally, if some SHA was rebased away it's not coming back so
there is no point in not doing this force

I already sent this to the bitbake-devel list as well.

-M

These packages need these deps for the RPM generation stage:

error: Failed dependencies:
| /usr/bin/python is needed by nfs-utils-1.2.3-r2.ppce5500
| /usr/bin/perl is needed by util-linux-2.19.1-r4.ppce5500
| /usr/bin/perl is needed by strace-4.5.20-r2.ppce5500

Signed-off-by: Matthew McClintock <msm@...>
---
.../nfs-utils/nfs-utils_1.2.3.bb | 2 +-
meta/recipes-core/util-linux/util-linux.inc | 2 +-
meta/recipes-devtools/strace/strace_4.5.20.bb | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
index 08468fe..e8b0490 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"

# util-linux for libblkid
DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers"
-RDEPENDS_${PN} = "portmap"
+RDEPENDS_${PN} = "portmap python"
RRECOMMENDS_${PN} = "kernel-module-nfsd"

PR = "r2"
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 1f242b7..afce673 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -55,7 +55,7 @@ FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdi
FILES_util-linux-lscpu = "${bindir}/lscpu"

RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
-RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
+RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup perl"

RRECOMMENDS_${PN}_virtclass-native = ""
RDEPENDS_${PN}_virtclass-native = ""
diff --git a/meta/recipes-devtools/strace/strace_4.5.20.bb b/meta/recipes-devtools/strace/strace_4.5.20.bb
index 391669f..b3d2aa5 100644
--- a/meta/recipes-devtools/strace/strace_4.5.20.bb
+++ b/meta/recipes-devtools/strace/strace_4.5.20.bb
@@ -5,6 +5,8 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4535377ede62550fdeaf39f595fd550a"
PR = "r2"

+RDEPENDS = "perl"
+
SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
file://sigmask.patch \
"
--
1.7.6.1

sysprof will not build properly without this defined

Signed-off-by: Matthew McClintock <msm@...>
---
meta/recipes-kernel/sysprof/sysprof_git.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index 1af5822..16a35b9 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "gtk+ libglade"

SRCREV = "38a6af1f0a45e528fd2842983da71e0f23c70d6a"
-PR = r1
+PR = "r2"
PV = "1.1.6+git${SRCPV}"

SRC_URI = "git://git.gnome.org/sysprof;protocol=git \
@@ -16,6 +16,8 @@ SRC_URI_append_arm = " file://rmb-arm.patch"
SRC_URI_append_mips = " file://rmb-mips.patch"
SRC_URI_append_powerpc = " file://ppc-macro-fix.patch"

+export CFLAGS_append_powerpc64 = " -D__ppc64__"
+
SRC_URI[md5sum] = "80902a7b3d6f7cb83eb6b47e87538747"
SRC_URI[sha256sum] = "1c6403278fa4f3b37a1fb9f0784e496dce1703fe84ac03b2650bf469133a0cb3"

--
1.7.6.1

From: Kumar Gala <galak@...>

If a SOCKS5 gateway is needed for a proxy access like git it might also
require authentication to the proxy via a password and username. Adding
SOCKS5_USER & SOCKS5_PASSWD to BB_ENV_EXTRAWHITE allow for automation
of the authentication request to occur when something like a git fetch
is going through the proxy.

Also, add several require git variables to be exported to the fetcher

Signed-off-by: Kumar Gala <galak@...>
Signed-off-by: Matthew McClintock <msm@...>
---
bitbake/lib/bb/fetch2/__init__.py | 3 ++-
scripts/oe-buildenv-internal | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index f6fa46c..fb6138b 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -385,7 +385,8 @@ def runfetchcmd(cmd, d, quiet = False, cleanup = []):
exportvars = ['PATH', 'GIT_PROXY_COMMAND', 'GIT_PROXY_HOST',
'GIT_PROXY_PORT', 'GIT_CONFIG', 'http_proxy', 'ftp_proxy',
'https_proxy', 'no_proxy', 'ALL_PROXY', 'all_proxy',
- 'SSH_AUTH_SOCK', 'SSH_AGENT_PID', 'HOME']
+ 'SSH_AUTH_SOCK', 'SSH_AGENT_PID', 'HOME',
+ 'GIT_PROXY_IGNORE', 'SOCKS5_USER', 'SOCKS5_PASSWD']

for var in exportvars:
val = bb.data.getVar(var, d, True)
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index 61ac18c..21b92b0 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -70,5 +70,4 @@ unset BITBAKEDIR
# Used by the runqemu script
export BUILDDIR
export PATH
-
-export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND"
+export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER"
--
1.7.6.1

Allows us to import classes only for images and not to the global
namespace

Signed-off-by: Matthew McClintock <msm@...>
---
meta-yocto/conf/local.conf.sample | 6 ++++++
meta/classes/image.bbclass | 3 ++-
2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
index f6951b0..b4eec0b 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -163,6 +163,12 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
USER_CLASSES ?= "image-mklibs image-prelink"

+# Additional image generation features
+#
+# The following is a list of classes to import to use in the generation of images
+# currently an example class is image_types_uboot
+# IMAGE_CLASSES ?= "image_types_uboot"
+
#
# Runtime testing of images
#
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index f17e989..f03df5b 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -111,7 +111,8 @@ def get_devtable_list(d):
str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
return str

-inherit image_types
+IMAGE_CLASESS ??= ""
+inherit image_types ${IMAGE_CLASSES}

IMAGE_POSTPROCESS_COMMAND ?= ""
MACHINE_POSTPROCESS_COMMAND ?= ""
--
1.7.6.1

git fetches can fail (or at least return failed) when trying to
fetch and prune rebased branches. This patch simply adds a -f
to the git fetch command so these failure are ignore

Generally, if some SHA was rebased away it's not coming back so
there is no point in not doing this force

Signed-off-by: Matthew McClintock <msm@...>
---
bitbake/lib/bb/fetch2/git.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index fb6125c..87a35d9 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -190,7 +190,7 @@ class Git(FetchMethod):
logger.debug(1, "No Origin")

runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d)
- fetch_cmd = "%s fetch --prune %s refs/*:refs/*" % (ud.basecmd, repourl)
+ fetch_cmd = "%s fetch -f --prune %s refs/*:refs/*" % (ud.basecmd, repourl)
bb.fetch2.check_network_access(d, fetch_cmd, ud.url)
runfetchcmd(fetch_cmd, d)
runfetchcmd("%s prune-packed" % ud.basecmd, d)
--
1.7.6.1

Machines can now add ext2.lzma and ext2.lzma.u-boot images as a
generated image type.

Signed-off-by: Matthew McClintock <msm@...>
---
meta/classes/image_types.bbclass | 11 ++++++++++-
meta/classes/image_types_uboot.bbclass | 6 +++++-
2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 4619ebe..2260915 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -53,6 +53,13 @@ IMAGE_CMD_ext2.bz2 () {
mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.bz2
rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz
}
+IMAGE_CMD_ext2.lzma () {
+ rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz
+ genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
+ lzma -f -7 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
+ mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.lzma ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.lzma
+ rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz
+}

IMAGE_CMD_ext3 () {
genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
@@ -134,6 +141,8 @@ IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
IMAGE_DEPENDS_cramfs = "cramfs-native"
IMAGE_DEPENDS_ext2 = "genext2fs-native"
IMAGE_DEPENDS_ext2.gz = "genext2fs-native"
+IMAGE_DEPENDS_ext2.bz2 = "genext2fs-native"
+IMAGE_DEPENDS_ext2.lzma = "genext2fs-native"
IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native"
IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native"
IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native"
@@ -148,4 +157,4 @@ IMAGE_DEPENDS_ubi = "mtd-utils-native"
IMAGE_DEPENDS_ubifs = "mtd-utils-native"

# This variable is available to request which values are suitable for IMAGE_FSTYPES
-IMAGE_TYPES = "jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma"
+IMAGE_TYPES = "jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma"
diff --git a/meta/classes/image_types_uboot.bbclass b/meta/classes/image_types_uboot.bbclass
index aee88a6..65dc91b 100644
--- a/meta/classes/image_types_uboot.bbclass
+++ b/meta/classes/image_types_uboot.bbclass
@@ -13,6 +13,10 @@ IMAGE_DEPENDS_ext2.bz2.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimag
IMAGE_CMD_ext2.bz2.u-boot = "${IMAGE_CMD_ext2.bz2} \
oe_mkimage ${IMAGE_NAME}.rootfs.ext2.bz2 bzip2"

+IMAGE_DEPENDS_ext2.lzma.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
+IMAGE_CMD_ext2.lzma.u-boot = "${IMAGE_CMD_ext2.lzma} \
+ oe_mkimage ${IMAGE_NAME}.rootfs.ext2.lzma lzma"
+
IMAGE_DEPENDS_ext3.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
IMAGE_CMD_ext3.gz.u-boot = "${IMAGE_CMD_ext3.gz} \
oe_mkimage ${IMAGE_NAME}.rootfs.ext3.gz gzip"
@@ -21,4 +25,4 @@ IMAGE_DEPENDS_ext4.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage
IMAGE_CMD_ext4.gz.u-boot = "${IMAGE_CMD_ext4.gz} \
oe_mkimage ${IMAGE_NAME}.rootfs.ext4.gz gzip"

-IMAGE_TYPES += "ext2.gz.u-boot ext2.bz2.u-boot ext3.gz.u-boot ext4.gz.u-boot"
+IMAGE_TYPES += "ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot ext3.gz.u-boot ext4.gz.u-boot"
--
1.7.6.1

Machines can now add ext2.bz2 and ext2.bz2.u-boot images as a
generated image type. This also adds an extra parameter to
oe_mkimage which is the image compression type for mkimage

Signed-off-by: Matthew McClintock <msm@...>
---
meta/classes/image_types.bbclass | 9 ++++++++-
meta/classes/image_types_uboot.bbclass | 14 +++++++++-----
2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index c24b326..4619ebe 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -46,6 +46,13 @@ IMAGE_CMD_ext2.gz () {
mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz
rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
}
+IMAGE_CMD_ext2.bz2 () {
+ rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz
+ genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
+ bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
+ mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.bz2
+ rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz
+}

IMAGE_CMD_ext3 () {
genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
@@ -141,4 +148,4 @@ IMAGE_DEPENDS_ubi = "mtd-utils-native"
IMAGE_DEPENDS_ubifs = "mtd-utils-native"

# This variable is available to request which values are suitable for IMAGE_FSTYPES
-IMAGE_TYPES = "jffs2 cramfs ext2 ext2.gz ext3 ext3.gz live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma"
+IMAGE_TYPES = "jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma"
diff --git a/meta/classes/image_types_uboot.bbclass b/meta/classes/image_types_uboot.bbclass
index 10fa2f7..aee88a6 100644
--- a/meta/classes/image_types_uboot.bbclass
+++ b/meta/classes/image_types_uboot.bbclass
@@ -1,20 +1,24 @@
inherit image_types kernel-arch

oe_mkimage () {
- mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C gzip -n ${IMAGE_NAME} \
+ mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_NAME} \
-d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot
}

IMAGE_DEPENDS_ext2.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
IMAGE_CMD_ext2.gz.u-boot = "${IMAGE_CMD_ext2.gz} \
- oe_mkimage ${IMAGE_NAME}.rootfs.ext2.gz"
+ oe_mkimage ${IMAGE_NAME}.rootfs.ext2.gz gzip"
+
+IMAGE_DEPENDS_ext2.bz2.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
+IMAGE_CMD_ext2.bz2.u-boot = "${IMAGE_CMD_ext2.bz2} \
+ oe_mkimage ${IMAGE_NAME}.rootfs.ext2.bz2 bzip2"

IMAGE_DEPENDS_ext3.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
IMAGE_CMD_ext3.gz.u-boot = "${IMAGE_CMD_ext3.gz} \
- oe_mkimage ${IMAGE_NAME}.rootfs.ext3.gz"
+ oe_mkimage ${IMAGE_NAME}.rootfs.ext3.gz gzip"

IMAGE_DEPENDS_ext4.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
IMAGE_CMD_ext4.gz.u-boot = "${IMAGE_CMD_ext4.gz} \
- oe_mkimage ${IMAGE_NAME}.rootfs.ext4.gz"
+ oe_mkimage ${IMAGE_NAME}.rootfs.ext4.gz gzip"

-IMAGE_TYPES += "ext2.gz.u-boot ext3.gz.u-boot ext4.gz.u-boot"
+IMAGE_TYPES += "ext2.gz.u-boot ext2.bz2.u-boot ext3.gz.u-boot ext4.gz.u-boot"
--
1.7.6.1

From: Elizabeth Flanagan <elizabeth.flanagan@...>

With 1.1 release coming, it's time to increment the DISTRO_VERSION
and poky version.

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@...>
---
meta-yocto/conf/distro/poky.conf | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 46b22f4..80d4e47 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -1,6 +1,6 @@
DISTRO = "poky"
-DISTRO_NAME = "Yocto (Built by Poky 5.0)"
-DISTRO_VERSION = "1.0+snapshot-${DATE}"
+DISTRO_NAME = "Yocto (Built by Poky 6.0)"
+DISTRO_VERSION = "1.1+snapshot-${DATE}"
SDK_VENDOR = "-pokysdk"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"

--
1.7.1

With the edison branch stable, it's safe to increment DISTRO_VERSION and
DISTRO_NAME

The following changes since commit 72928abdfc00af2a7a5fac27f82e23e5de8efc4b:

util-linux: Ensure perl scripts reference the correct perl (2011-09-28 21:51:52 +0100)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib eflanagan/distro_version
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/distro_version

Elizabeth Flanagan (1):
poky.conf: Increment DISTRO_VERSION

meta-yocto/conf/distro/poky.conf | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

On Wed, 2011-09-28 at 00:01 -0700, Zhai, Edwin wrote:

On 09/28/2011 04:08 AM, Zanussi, Tom wrote:

On Mon, 2011-09-26 at 18:03 -0700, Zhai, Edwin wrote:

From: Zhai Edwin<edwin.zhai@...>

Tom,
These changes, based on meta-intel/tzanussi/pegasus, are needed to enable
eGalax touch screen on Pegasus. Could you pls. help to review?

Hi Edwin,

First, I don't think this is the correct list for meta-intel stuff,
please use the yocto list.

Change it now:)

Anyway, the first two patches look ok to me, but the 3rd seems to be a
combination of what it says in the title, enabling touch screen kernel
config, and updating the BSP to work with the current kernel recipes.
The latter should I think be squashed into the base BSP, which isn't
posted.

When will you push Pegasus changes into meta-intel/master? We can have a common
place for people to try pegasus...

The meta-pegasus you pointed to seems to be an old version, basically
the same prototype version I gave you for the demo. I thought the
current one had been updated to address the comments from the quick
review of Aug 9:

- meta-pegasus - commented-out stuff in pegasus.conf, xorg.conf,
linux-yocto-2.6.37.bbappend, ReleaseNotes are unrelated to the BSP, etc.

Also, it has a blacksand.pdf and has old kernel recipes, etc.

Basically, it needs to be cleaned up a bit before it can be pulled in,
and should be buildable without relying on later patches.

Do you mean we need rebased against branch of
meta-intel/tzanussi/pegasus-v2?

I don't know - I would think you'd just clean up whatever version you've
been using...

Also, I'm wondering if there's a reason it's using 2.6.37 - we're at 3.0
now, and it would be good if it used that.

Have we tested 3.0 on Pegasus or N450 system? I remember your mentioned
graphic crash with linux 3.0...

The n450 BSP has been moved to 3.0, but I haven't worked on pegasus
since the initial prototype, so I don't know if it's been tested on 3.0.
I do recall running into problems with graphics, but don't remember the
details...

Tom

Finally, please also add yourself or whoever will be the maintainer
going forward to meta-intel/MAINTAINERS...

Sure.
Tom,
Thanks for your comments!

Thanks,

Tom

Thanks,
Edwin

The following changes since commit 59dc67f6e64a836fc01fa91a1200e76264bb954d:

meta-pegasus: new layer for Pegasus (N455) systems (2011-06-15 23:27:47 -0500)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/pegasus
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/pegasus

Zhai Edwin (3):
eGalax touchscreen offical xorg driver
Config xorg.conf with eGalax touchscreen input driver
Enabled kernel module for eGalax touch screen.

meta-pegasus/conf/machine/pegasus.conf | 2 +-
.../xf86-input-egalax/88eGalaxCalibrate.sh | 5 ++
.../xorg-driver/xf86-input-egalax_3.06.5605.bb | 49 ++++++++++++++++++++
.../xserver-xf86-config/pegasus/xorg.conf | 10 ++++
.../xorg-xserver/xserver-xf86-config_0.1.bbappend | 2 +
.../recipes-kernel/linux/linux-yocto/pegasus.cfg | 4 ++
.../linux/linux-yocto_2.6.37.bbappend | 12 +++++
7 files changed, 83 insertions(+), 1 deletions(-)
create mode 100755 meta-pegasus/recipes-graphics/xorg-driver/xf86-input-egalax/88eGalaxCalibrate.sh
create mode 100644 meta-pegasus/recipes-graphics/xorg-driver/xf86-input-egalax_3.06.5605.bb
create mode 100644 meta-pegasus/recipes-kernel/linux/linux-yocto/pegasus.cfg
create mode 100644 meta-pegasus/recipes-kernel/linux/linux-yocto_2.6.37.bbappend

On 28/09/2011 13:32, Jack Mitchell wrote:

Trying to build a standard qemuarm core-image-lsb-sdk I recieve the following build failure:

http://pastebin.com/05qNisPq

It seesm to be a versioning issue which won't be too difficult to put right, would a newer version support gettext 0.18?
_______________________________________________
yocto mailing list
yocto@...
https://lists.yoctoproject.org/listinfo/yocto

A quick -c clean, -c cleansstate gnutls sorted this out, I must have had an old package lying around somewhere.

On 27/09/2011 16:07, Zhang, Jessica wrote:

Hi Jack,

The minimal-dev image doesn't contain tcf-agent which is needed for any remote interaction. So can you build core-image-sato-sdk image and use it to boot up qemu, then your problem will be solved.

Thanks,
Jessica

-----Original Message-----
From: yocto-bounces@... [mailto:yocto-bounces@...] On Behalf Of Jack Mitchell
Sent: Tuesday, September 27, 2011 5:05 AM
To: yocto@...
Subject: Re: [yocto] QEMU nfs kernel panic

On 27/09/2011 10:05, Jack Mitchell wrote:

I am using the stock sysroot and arm kernel zImage downloaded from the
yocto site. When I try to boot QEMU all is well until it tries to
mount the nfs root filesystem. It can't find it and the kernel panics,
I have set --debug all on in the runqemu-export-rootfs script but it
throws no further errors. Does anyone have any idea why it would do
this, is it possible that there is something wrong with the nfs
implementation in the kernel and the module is not loaded correctly,
or is it more likely that the nfs share isn't mounted on my machine
and the kernel cannot find it.

Screenshot of kernel panic: http://imgur.com/UbPTT

The only thing that jumps out at me is in the kernel boot up the
rootfs doesn't have a value as can be seen in the screenshot, but I
don't know if this is normal or not?

Cheers,
Jack.
_______________________________________________
yocto mailing list
yocto@...
https://lists.yoctoproject.org/listinfo/yocto

Ok, I managed to fix it. I needed to load the tun module to get it
working. Maybe this should be added as a check in runqemu?

I am now having issues with connecting to the live image, I recieve a
connection refused message when I try to upload the file to the virtual
machine, I have just the stick minimal-dev image so no additional
passwords set.
_______________________________________________
yocto mailing list
yocto@...
https://lists.yoctoproject.org/listinfo/yocto

Thank you Jessica, that solved my problem of being unable to connect to the virtual machine.

Regards,
Jack.

Trying to build a standard qemuarm core-image-lsb-sdk I recieve the following build failure:

http://pastebin.com/05qNisPq

It seesm to be a versioning issue which won't be too difficult to put right, would a newer version support gettext 0.18?