[PATCH 00/11] Patchset being in use on O.S. Systems internal tree

[PATCH 00/11] Patchset being in use on O.S. Systems internal tree

[Otavio Salvador]

Hello,

This patchset has been in use in our internal tree and as usual we'd
like to have it synced with upstream so we're proposing those for
merging.

The patches that are included on this set are:

[PATCH 01/11] freerdp: workaround gcc linking bug forcing -lpthread
[PATCH 02/11] freerdp: add singleton support with PDU error handling
[PATCH 03/11] cmake.bbclass: drop CMAKE_MODULE_PATH as it works fine without it
[PATCH 04/11] bitbake.conf: add XZ_INTEGRITY_CHECK and LZMA_COMPRESSION_LEVEL variables
[PATCH 05/11] udev (165): move ConsoleKit support to udev-consolekit package
[PATCH 06/11] xkeyboard-config: use --with-xkb-rules-symlink=xorg option
[PATCH 07/11] xkeyboard-config (git): update to current version - 2.1 plus fixes
[PATCH 08/11] linux (2.6.37): update to 2.6.37.3 stable patch
[PATCH 09/11] libarchive: add
[PATCH 10/11] cmake: depends on libarchive
[PATCH 11/11] p910nd: update to 0.95 and improve packaging

The diffstat of whole series is:

 classes/cmake.bbclass                              |    2 -
 conf/bitbake.conf                                  |   10 +-
 recipes/cmake/cmake_2.8.3.bb                       |    4 +-
 recipes/freerdp/freerdp.inc                        |    7 +-
 recipes/freerdp/freerdp/singleton-mode.patch       |  208 ++++++++++++++++++++
 recipes/freerdp/freerdp_git.bb                     |    5 +-
 .../0001-Patch-from-upstream-revision-1990.patch   |   45 +++++
 .../0002-Patch-from-upstream-revision-1991.patch   |   34 ++++
 .../0003-Patch-from-upstream-rev-2516.patch        |   65 ++++++
 .../0004-Patch-from-upstream-rev-2514.patch        |   35 ++++
 .../0005-Patch-from-upstream-rev-2520.patch        |   33 +++
 .../0006-Patch-from-upstream-rev-2521.patch        |   30 +++
 ...YS-error-when-setting-up-xattrs.-Closes-5.patch |   33 +++
 recipes/libarchive/libarchive_2.8.4.bb             |   20 ++
 recipes/linux/linux_2.6.37.bb                      |    8 +-
 recipes/p910nd/p910nd_0.92.bb                      |   45 -----
 recipes/p910nd/p910nd_0.95.bb                      |   49 +++++
 recipes/udev/udev_165.bb                           |    7 +-
 recipes/xkeyboard-config/xkeyboard-config.inc      |    9 +-
 recipes/xkeyboard-config/xkeyboard-config_git.bb   |    6 +-
 20 files changed, 584 insertions(+), 71 deletions(-)

Thanks in advance,
Otavio Salvador

[PATCH 01/11] freerdp: workaround gcc linking bug forcing -lpthread

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes/freerdp/freerdp.inc |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/recipes/freerdp/freerdp.inc b/recipes/freerdp/freerdp.inc
index 0690d6e..10ce13c 100644
--- a/recipes/freerdp/freerdp.inc
+++ b/recipes/freerdp/freerdp.inc
@@ -8,10 +8,15 @@ RDEPENDS_${PN} += "xprop"
 SECTION = "x11/network"
 LICENSE = "Apache-2.0"
 
-INC_PR = "r6"
+INC_PR = "r7"
 
 inherit pkgconfig autotools
 
+do_configure_prepend() {
+	# workaround gcc linking bug
+	find ${S} -name 'Makefile.am' | xargs -n 1 sed 's,-pthread,-lpthread -D_REENTRANT,g' -i
+}
+
 do_install_append() {
 	rm ${D}${libdir}/freerdp/*.a ${D}${libdir}/freerdp/*.la
 }
-- 
1.7.2.3

[PATCH 02/11] freerdp: add singleton support with PDU error handling

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes/freerdp/freerdp/singleton-mode.patch |  208 ++++++++++++++++++++++++++
 recipes/freerdp/freerdp_git.bb               |    5 +-
 2 files changed, 211 insertions(+), 2 deletions(-)
 create mode 100644 recipes/freerdp/freerdp/singleton-mode.patch

diff --git a/recipes/freerdp/freerdp/singleton-mode.patch b/recipes/freerdp/freerdp/singleton-mode.patch
new file mode 100644
index 0000000..980ec96
--- /dev/null
+++ b/recipes/freerdp/freerdp/singleton-mode.patch
@@ -0,0 +1,208 @@
+From dd81b7b7902015d35e48117db7fb664aa75fdf62 Mon Sep 17 00:00:00 2001
+From: Eduardo Beloni <beloni@ossystems.com.br>
+Date: Thu, 3 Mar 2011 14:41:32 -0300
+Subject: [PATCH] xfreerdp: singleton mode
+
+Allows return code according to the Set Error Info PDU
+---
+ X11/xf_types.h |   21 +++++++++++++++++++++
+ X11/xfreerdp.c |   45 ++++++++++++++++++++++++++++++++++++---------
+ doc/xfreerdp.1 |    4 ++++
+ 3 files changed, 61 insertions(+), 9 deletions(-)
+
+diff --git a/X11/xf_types.h b/X11/xf_types.h
+index 0d355e2..75c7d88 100644
+--- a/X11/xf_types.h
++++ b/X11/xf_types.h
+@@ -88,6 +88,27 @@ struct xf_info
+ };
+ typedef struct xf_info xfInfo;
+ 
++
++enum STANDARD_EXIT_CODE
++{
++	EX_OK = 0,
++	EX_USAGE = 64,
++	EX_DATAERR = 65,
++	EX_NOINPUT = 66,
++	EX_NOUSER = 67,
++	EX_NOHOST = 68,
++	EX_UNAVAILABLE = 69,
++	EX_SOFTWARE = 70,
++	EX_OSERR = 71,
++	EX_OSFILE = 72,
++	EX_CANTCREAT = 73,
++	EX_IOERR = 74,
++	EX_TEMPFAIL = 75,
++	EX_PROTOCOL = 76,
++	EX_NOPERM = 77,
++	EX_CONFIG = 78,
++};
++
+ #ifdef WITH_DEBUG
+ #define DEBUG(fmt, ...)	printf("DBG %s (%d): " fmt, __FUNCTION__, __LINE__, ## __VA_ARGS__)
+ #else
+diff --git a/X11/xfreerdp.c b/X11/xfreerdp.c
+index 994e8ee..f9236e7 100644
+--- a/X11/xfreerdp.c
++++ b/X11/xfreerdp.c
+@@ -155,7 +155,7 @@ out_args(void)
+ 
+ /* Returns "true" on errors or other reasons to not continue normal operation */
+ static int
+-process_params(xfInfo * xfi, int argc, char ** argv, int * pindex)
++process_params(xfInfo * xfi, int argc, char ** argv, int * pindex, _Bool * singleton)
+ {
+ 	rdpSet * settings;
+ 	rdpKeyboardLayout * layouts;
+@@ -165,6 +165,9 @@ process_params(xfInfo * xfi, int argc, char ** argv, int * pindex)
+ 	int i, j;
+ 	struct passwd * pw;
+ 	int num_extensions;
++	int first_index;
++
++	first_index = *pindex;
+ 
+ 	set_default_params(xfi);
+ 	settings = xfi->settings;
+@@ -512,6 +515,16 @@ process_params(xfInfo * xfi, int argc, char ** argv, int * pindex)
+ 			}
+ 			num_extensions++;
+ 		}
++		else if (strcmp("--singleton", argv[*pindex]) == 0)
++		{
++			if (first_index != 1) /* this is not the first parse */
++			{
++				printf("Parsing error: you can't run more than one thread in singleton mode\n");
++				exit(EX_USAGE);
++			}
++
++			*singleton = 1;
++		}
+ 		else if ((strcmp("-h", argv[*pindex]) == 0) || strcmp("--help", argv[*pindex]) == 0)
+ 		{
+ 			out_args();
+@@ -577,6 +590,7 @@ run_xfreerdp(xfInfo * xfi)
+ 	int max_sck;
+ 	fd_set rfds;
+ 	fd_set wfds;
++	uint32 disc_reason;
+ 
+ 	/* create an instance of the library */
+ 	inst = freerdp_new(xfi->settings);
+@@ -611,7 +625,7 @@ run_xfreerdp(xfInfo * xfi)
+ 	if (inst->rdp_connect(inst) != 0)
+ 	{
+ 		printf("run_xfreerdp: inst->rdp_connect failed\n");
+-		return 1;
++		return EX_PROTOCOL;
+ 	}
+ 	if (freerdp_chanman_post_connect(xfi->chan_man, inst) != 0)
+ 	{
+@@ -687,7 +701,7 @@ run_xfreerdp(xfInfo * xfi)
+ 		/* check the libfreerdp fds */
+ 		if (inst->rdp_check_fds(inst) != 0)
+ 		{
+-			printf("run_xfreerdp: inst->rdp_check_fds failed\n");
++			printf("run_xfreerdp: inst->rdp_check_fds failed reason %u\n", inst->disc_reason);
+ 			break;
+ 		}
+ 		/* check x fds */
+@@ -703,21 +717,24 @@ run_xfreerdp(xfInfo * xfi)
+ 			break;
+ 		}
+ 	}
++
++	disc_reason = inst->disc_reason;
+ 	/* cleanup */
+ 	freerdp_chanman_close(xfi->chan_man, inst);
+ 	inst->rdp_disconnect(inst);
+ 	freerdp_free(inst);
+ 	xf_uninit(xfi);
+-	return 0;
++	return disc_reason;
+ }
+ 
+ static void *
+ thread_func(void * arg)
+ {
+ 	xfInfo * xfi;
++	uint32 disc_reason;
+ 
+ 	xfi = (xfInfo *) arg;
+-	run_xfreerdp(xfi);
++	disc_reason = run_xfreerdp(xfi);
+ 	free(xfi->settings);
+ 	freerdp_chanman_free(xfi->chan_man);
+ 	free(xfi);
+@@ -728,7 +745,7 @@ thread_func(void * arg)
+ 	{
+ 		freerdp_sem_signal(&g_sem);
+ 	}
+-	return NULL;
++	return (void *)disc_reason;
+ }
+ 
+ int
+@@ -738,6 +755,8 @@ main(int argc, char ** argv)
+ 	xfInfo * xfi;
+ 	pthread_t thread;
+ 	int index = 1;
++	_Bool singleton = 0;
++	int disc_reason = 0;
+ 
+ 	setlocale(LC_CTYPE, "");
+ 	if (argc == 1)
+@@ -760,7 +779,7 @@ main(int argc, char ** argv)
+ 		memset(xfi, 0, sizeof(xfInfo));
+ 		xfi->settings = (rdpSet *) malloc(sizeof(rdpSet));
+ 		xfi->chan_man = freerdp_chanman_new();
+-		rv = process_params(xfi, argc, argv, &index);
++		rv = process_params(xfi, argc, argv, &index, &singleton);
+ 		if (rv)
+ 		{
+ 			free(xfi->settings);
+@@ -776,9 +795,17 @@ main(int argc, char ** argv)
+ 		{
+ 			g_thread_count++;
+ 		}
++
++		if (singleton)
++			break;
+ 	}
+ 
+-	if (g_thread_count > 0)
++	if (singleton)
++	{
++		pthread_join(thread, (void **)&disc_reason);
++		printf("thread joint disconnect reason %d\n", disc_reason);
++	}
++	else if (g_thread_count > 0)
+ 	{
+ 		printf("main thread, waiting for all threads to exit\n");
+ 		freerdp_sem_wait(&g_sem);
+@@ -787,5 +814,5 @@ main(int argc, char ** argv)
+ 
+ 	freerdp_chanman_uninit();
+ 	freerdp_global_finish();
+-	return 0;
++	return disc_reason;
+ }
+diff --git a/doc/xfreerdp.1 b/doc/xfreerdp.1
+index 9fa07ca..1ad0d70 100644
+--- a/doc/xfreerdp.1
++++ b/doc/xfreerdp.1
+@@ -92,6 +92,10 @@ Disable TLS encryption.
+ .BR "--no-osb"
+ Disable off screen bitmaps.
+ .TP
++.BR "--singleton"
++Singleton mode. This mode allows only one thread of execution and also returns
++the Set Error Info PDU as the program exit code.
++.TP
+ .BR "-h"
+ Print help message.
+ .TP
+-- 
+1.6.6.1
+
diff --git a/recipes/freerdp/freerdp_git.bb b/recipes/freerdp/freerdp_git.bb
index 1ed2a19..beed2b8 100644
--- a/recipes/freerdp/freerdp_git.bb
+++ b/recipes/freerdp/freerdp_git.bb
@@ -7,9 +7,10 @@ inherit gitpkgv
 
 PV = "gitr${SRCPV}"
 PKGV = "${GITPKGVTAG}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRCREV = "6f7eb2abb077d60a09eeb66a10ad97d102336d3c"
-SRC_URI = "git://freerdp.git.sourceforge.net/gitroot/freerdp/freerdp.git;protocol=git"
+SRC_URI = "git://freerdp.git.sourceforge.net/gitroot/freerdp/freerdp.git;protocol=git \
+           file://singleton-mode.patch"
 
 S = "${WORKDIR}/git"
-- 
1.7.2.3

[PATCH 03/11] cmake.bbclass: drop CMAKE_MODULE_PATH as it works fine without it

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 classes/cmake.bbclass |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index d2d1c66..40fadea 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -42,8 +42,6 @@ cmake_do_generate_toolchain_file() {
   echo "set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )" >> ${WORKDIR}/toolchain.cmake
   echo "set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )" >> ${WORKDIR}/toolchain.cmake
   echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )" >> ${WORKDIR}/toolchain.cmake
-# Use native cmake modules
-  echo "set( CMAKE_MODULE_PATH ${STAGING_DIR_NATIVE}/usr/share/cmake-2.8/Modules/ )" >> ${WORKDIR}/toolchain.cmake
 # Use qt.conf settings
   echo "set( ENV{QT_CONF_PATH} ${WORKDIR}/qt.conf )" >> ${WORKDIR}/toolchain.cmake
 }
-- 
1.7.2.3

[PATCH 04/11] bitbake.conf: add XZ_INTEGRITY_CHECK and LZMA_COMPRESSION_LEVEL variables

[Otavio Salvador]

Linux kernel has support for XZ Embedded and it has limited support
for integrity checking. Currently only 'crc32' and 'none' are
supported.

This patch allows change it and defaults it to 'crc32' for safeness.

The LZMA_COMPRESSION_LEVEL variable has been add for cpio.lzma image
format since the XZ equivalent variable has already available and in
use. It defaults for best compression ratio.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/bitbake.conf |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 5d638df..903b9b7 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -149,6 +149,10 @@ QEMU_OPTIONS_armv7a   = "-cpu cortex-a8"
 
 # default compression levels
 XZ_COMPRESSION_LEVEL ?= "-e -9"
+LZMA_COMPRESSION_LEVEL ?= "-e -9"
+
+# default integrity check
+XZ_INTEGRITY_CHECK ?= "crc32"
 
 ##################################################################
 # Date/time variables.
@@ -386,7 +390,7 @@ IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096
 IMAGE_CMD_ext4 = "genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac;"
 IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; set +e;e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz"
 IMAGE_CMD_ext4.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.bz2"
-IMAGE_CMD_ext4.xz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.xz; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; xz -c ${XZ_COMPRESSION_LEVEL} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.xz ; rm -f ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ; rmdir ${DEPLOY_DIR_IMAGE}/tmp.xz"
+IMAGE_CMD_ext4.xz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.xz; genext2fs -i 4096 -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; xz -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.xz ; rm -f ${DEPLOY_DIR_IMAGE}/tmp.xz/${IMAGE_NAME}.rootfs.ext4 ; rmdir ${DEPLOY_DIR_IMAGE}/tmp.xz"
 
 IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
 IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma"
@@ -396,9 +400,9 @@ IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE
 IMAGE_CMD_tar.xz = "cd ${IMAGE_ROOTFS} && tar --xz -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.xz ."
 IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) ${EXTRA_IMAGECMD}"
 IMAGE_CMD_cpio.gz = "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}"
-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.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 -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.lzma) ${EXTRA_IMAGECMD}"
+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_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}"
 
-- 
1.7.2.3

[PATCH 05/11] udev (165): move ConsoleKit support to udev-consolekit package

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes/udev/udev_165.bb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes/udev/udev_165.bb b/recipes/udev/udev_165.bb
index 63e62f1..9605cb3 100644
--- a/recipes/udev/udev_165.bb
+++ b/recipes/udev/udev_165.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 LICENSE = "GPLv2+"
 
-PR = "r3"
+PR = "r4"
 
 # Untested
 DEFAULT_PREFERENCE = "-1"
@@ -71,7 +71,7 @@ EXTRA_OECONF += " --with-udev-prefix= \
 INITSCRIPT_NAME = "udev"
 INITSCRIPT_PARAMS = "start 03 S ."
 
-PACKAGES =+ "libudev libgudev udev-utils"
+PACKAGES =+ "libudev libgudev udev-utils udev-consolekit"
 
 FILES_libudev = "${base_libdir}/libudev.so.*"
 FILES_libgudev = "${base_libdir}/libgudev*.so.*"
@@ -84,7 +84,8 @@ FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
 
 # udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
 # is ${prefix}/lib64
-FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit"
+FILES_${PN} += "/lib/udev*"
+FILES_${PN}-consokekit += "${libdir}/ConsoleKit"
 FILES_${PN}-dbg += "/lib/udev/.debug"
 
 RPROVIDES_udev_append = " udev-compat-wrapper"
-- 
1.7.2.3

[PATCH 06/11] xkeyboard-config: use --with-xkb-rules-symlink=xorg option

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes/xkeyboard-config/xkeyboard-config.inc |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/recipes/xkeyboard-config/xkeyboard-config.inc b/recipes/xkeyboard-config/xkeyboard-config.inc
index b8aab8c..787e641 100644
--- a/recipes/xkeyboard-config/xkeyboard-config.inc
+++ b/recipes/xkeyboard-config/xkeyboard-config.inc
@@ -2,17 +2,14 @@ DESCRIPTION = "Common X11 Keyboard layouts"
 LICENSE = "MIT"
 DEPENDS = "intltool-native xkbcomp-native"
 RDEPENDS_${PN} = "xkbcomp"
-INC_PR = "r6"
+INC_PR = "r7"
 
 SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${PN}-${PV}"
 
-inherit autotools
+EXTRA_OECONF += "--with-xkb-rules-symlink=xorg"
 
-do_install_append () {
-    install -d ${D}${datadir}/X11/xkb/compiled
-    cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
-}
+inherit autotools
 
 FILES_${PN} += "${datadir}/X11/xkb"
-- 
1.7.2.3

[PATCH 07/11] xkeyboard-config (git): update to current version - 2.1 plus fixes

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes/xkeyboard-config/xkeyboard-config_git.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/xkeyboard-config/xkeyboard-config_git.bb b/recipes/xkeyboard-config/xkeyboard-config_git.bb
index c627b51..f69a0e5 100644
--- a/recipes/xkeyboard-config/xkeyboard-config_git.bb
+++ b/recipes/xkeyboard-config/xkeyboard-config_git.bb
@@ -1,9 +1,9 @@
 require xkeyboard-config.inc
 
-SRCREV = "547ae8589afb208d7b44ffe1e0ff7aba466c2ee3"
+SRCREV = "9333b2f3f0e3f1724b7a5c04b8ffc5eafb96fefa"
 SRCREV_palmpre = "a961c7b00f077e8923e32192243db46b10a702b7"
-PV = "2.0+gitr${SRCPV}"
-PR = "${INC_PR}.1"
+PV = "2.1+gitr${SRCPV}"
+PR = "${INC_PR}.2"
 
 SRC_URI = "git://anongit.freedesktop.org/xkeyboard-config;protocol=git;branch=master"
 SRC_URI_palmpre = "git://git.shr-project.org/repo/xkeyboard-config.git;protocol=http;branch=palmpre"
-- 
1.7.2.3

[PATCH 08/11] linux (2.6.37): update to 2.6.37.3 stable patch

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes/linux/linux_2.6.37.bb |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/linux/linux_2.6.37.bb b/recipes/linux/linux_2.6.37.bb
index 7dca582..e3d6c4e 100644
--- a/recipes/linux/linux_2.6.37.bb
+++ b/recipes/linux/linux_2.6.37.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r4"
+PR = "r5"
 
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
@@ -22,7 +22,7 @@ DEFAULT_PREFERENCE_ben-nanonote = "1"
 # DEFAULT_PREFERENCE_om-gta01 = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.2.bz2;apply=yes;name=stablepatch \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.3.bz2;apply=yes;name=stablepatch \
            file://defconfig "
 
 SRC_URI_append_ben-nanonote = " \
@@ -42,5 +42,5 @@ SRC_URI_append_om-gta01 = " \
 
 SRC_URI[kernel.md5sum] = "c8ee37b4fdccdb651e0603d35350b434"
 SRC_URI[kernel.sha256sum] = "edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a"
-SRC_URI[stablepatch.md5sum] = "bb5798f2a2a5af13219d1a250c4dad11"
-SRC_URI[stablepatch.sha256sum] = "3d65f2fb5f0018e8dafda4abe68d947d2ab5e21c386062cb0d6e011244a16aef"
+SRC_URI[stablepatch.md5sum] = "c0a38dd3b5bad43d5f5d07ed0fcf3692"
+SRC_URI[stablepatch.sha256sum] = "af6ccb6c85db09e78a85657b1013b2aa1399ef252ce552aafcf25684e6e5ad98"
-- 
1.7.2.3

[PATCH 09/11] libarchive: add

[Otavio Salvador]

This library provides C library and command-line tools for reading and
writing tar, cpio, zip, ISO, and other archive formats.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../0001-Patch-from-upstream-revision-1990.patch   |   45 ++++++++++++++
 .../0002-Patch-from-upstream-revision-1991.patch   |   34 ++++++++++
 .../0003-Patch-from-upstream-rev-2516.patch        |   65 ++++++++++++++++++++
 .../0004-Patch-from-upstream-rev-2514.patch        |   35 +++++++++++
 .../0005-Patch-from-upstream-rev-2520.patch        |   33 ++++++++++
 .../0006-Patch-from-upstream-rev-2521.patch        |   30 +++++++++
 ...YS-error-when-setting-up-xattrs.-Closes-5.patch |   33 ++++++++++
 recipes/libarchive/libarchive_2.8.4.bb             |   20 ++++++
 8 files changed, 295 insertions(+), 0 deletions(-)
 create mode 100644 recipes/libarchive/libarchive/0001-Patch-from-upstream-revision-1990.patch
 create mode 100644 recipes/libarchive/libarchive/0002-Patch-from-upstream-revision-1991.patch
 create mode 100644 recipes/libarchive/libarchive/0003-Patch-from-upstream-rev-2516.patch
 create mode 100644 recipes/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch
 create mode 100644 recipes/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch
 create mode 100644 recipes/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch
 create mode 100644 recipes/libarchive/libarchive/0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch
 create mode 100644 recipes/libarchive/libarchive_2.8.4.bb

diff --git a/recipes/libarchive/libarchive/0001-Patch-from-upstream-revision-1990.patch b/recipes/libarchive/libarchive/0001-Patch-from-upstream-revision-1990.patch
new file mode 100644
index 0000000..3b8607d
--- /dev/null
+++ b/recipes/libarchive/libarchive/0001-Patch-from-upstream-revision-1990.patch
@@ -0,0 +1,45 @@
+From 76210f42f52bb3e08fcbc9d78a7f92217762839c Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Thu, 25 Feb 2010 22:29:49 +0100
+Subject: [PATCH 1/7] Patch from upstream (revision 1990)
+
+---
+ libarchive/archive_read_disk_entry_from_file.c |   15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
+index 7473c50..27671df 100644
+--- a/libarchive/archive_read_disk_entry_from_file.c
++++ b/libarchive/archive_read_disk_entry_from_file.c
+@@ -163,15 +163,26 @@ archive_read_disk_entry_from_file(struct archive *_a,
+ 
+ #ifdef HAVE_READLINK
+ 	if (S_ISLNK(st->st_mode)) {
+-		char linkbuffer[PATH_MAX + 1];
+-		int lnklen = readlink(path, linkbuffer, PATH_MAX);
++		size_t linkbuffer_len = st->st_size + 1;
++		char *linkbuffer;
++		int lnklen;
++
++		linkbuffer = malloc(linkbuffer_len);
++		if (linkbuffer == NULL) {
++			archive_set_error(&a->archive, ENOMEM,
++			    "Couldn't read link data");
++			return (ARCHIVE_FAILED);
++		}
++		lnklen = readlink(path, linkbuffer, linkbuffer_len);
+ 		if (lnklen < 0) {
+ 			archive_set_error(&a->archive, errno,
+ 			    "Couldn't read link data");
++			free(linkbuffer);
+ 			return (ARCHIVE_FAILED);
+ 		}
+ 		linkbuffer[lnklen] = 0;
+ 		archive_entry_set_symlink(entry, linkbuffer);
++		free(linkbuffer);
+ 	}
+ #endif
+ 
+-- 
+1.7.1
+
diff --git a/recipes/libarchive/libarchive/0002-Patch-from-upstream-revision-1991.patch b/recipes/libarchive/libarchive/0002-Patch-from-upstream-revision-1991.patch
new file mode 100644
index 0000000..f3e4758
--- /dev/null
+++ b/recipes/libarchive/libarchive/0002-Patch-from-upstream-revision-1991.patch
@@ -0,0 +1,34 @@
+From 2ec43cc0e6f7d39a1570a7daf02a23aec8015626 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Thu, 25 Feb 2010 22:30:06 +0100
+Subject: [PATCH 2/7] Patch from upstream (revision 1991)
+
+---
+ libarchive/archive_write_disk.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c
+index caf958e..60699e0 100644
+--- a/libarchive/archive_write_disk.c
++++ b/libarchive/archive_write_disk.c
+@@ -434,7 +434,7 @@ _archive_write_header(struct archive *_a, struct archive_entry *entry)
+ 		if (ret != ARCHIVE_OK)
+ 			goto done;
+ 	}
+-#ifdef HAVE_FCHDIR
++#if defined(HAVE_FCHDIR) && defined(PATH_MAX)
+ 	/* If path exceeds PATH_MAX, shorten the path. */
+ 	edit_deep_directories(a);
+ #endif
+@@ -866,7 +866,7 @@ archive_write_disk_new(void)
+  * object creation is likely to fail, but any error will get handled
+  * at that time.
+  */
+-#ifdef HAVE_FCHDIR
++#if defined(HAVE_FCHDIR) && defined(PATH_MAX)
+ static void
+ edit_deep_directories(struct archive_write_disk *a)
+ {
+-- 
+1.7.1
+
diff --git a/recipes/libarchive/libarchive/0003-Patch-from-upstream-rev-2516.patch b/recipes/libarchive/libarchive/0003-Patch-from-upstream-rev-2516.patch
new file mode 100644
index 0000000..efb6f06
--- /dev/null
+++ b/recipes/libarchive/libarchive/0003-Patch-from-upstream-rev-2516.patch
@@ -0,0 +1,65 @@
+From 07cefd4d6db82e53b7bcf096be1e5e29c09de3c6 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Thu, 1 Jul 2010 15:28:25 +0200
+Subject: [PATCH 3/7] Patch from upstream (rev 2516)
+
+Fix Issue 100:  Allow a zero for the Type M Path Table Location, since
+WinISO (and probably other programs) set it this way.
+
+http://code.google.com/p/libarchive/source/detail?r=2516
+---
+ libarchive/archive_read_support_format_iso9660.c |   20 +++++++++++++-------
+ 1 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
+index 0c640c8..fdef3fb 100644
+--- a/libarchive/archive_read_support_format_iso9660.c
++++ b/libarchive/archive_read_support_format_iso9660.c
+@@ -714,11 +714,13 @@ isSVD(struct iso9660 *iso9660, const unsigned char *h)
+ 	if (location <= SYSTEM_AREA_BLOCK+2 || location >= volume_block)
+ 		return (0);
+ 
+-	/* Location of Occurrence of Type M Path Table must be
+-	 * available location,
++	/* The Type M Path Table must be at a valid location (WinISO
++	 * and probably other programs omit this, so we allow zero)
++	 *
+ 	 * > SYSTEM_AREA_BLOCK(16) + 2 and < Volume Space Size. */
+ 	location = archive_be32dec(h+SVD_type_M_path_table_offset);
+-	if (location <= SYSTEM_AREA_BLOCK+2 || location >= volume_block)
++	if ((location > 0 && location <= SYSTEM_AREA_BLOCK+2)
++	    || location >= volume_block)
+ 		return (0);
+ 
+ 	/* Read Root Directory Record in Volume Descriptor. */
+@@ -790,7 +792,8 @@ isEVD(struct iso9660 *iso9660, const unsigned char *h)
+ 	 * available location,
+ 	 * > SYSTEM_AREA_BLOCK(16) + 2 and < Volume Space Size. */
+ 	location = archive_be32dec(h+PVD_type_m_path_table_offset);
+-	if (location <= SYSTEM_AREA_BLOCK+2 || location >= volume_block)
++	if ((location > 0 && location <= SYSTEM_AREA_BLOCK+2)
++	    || location >= volume_block)
+ 		return (0);
+ 
+ 	/* Reserved field must be 0. */
+@@ -865,11 +868,14 @@ isPVD(struct iso9660 *iso9660, const unsigned char *h)
+ 	if (location <= SYSTEM_AREA_BLOCK+2 || location >= volume_block)
+ 		return (0);
+ 
+-	/* Location of Occurrence of Type M Path Table must be
+-	 * available location,
++	/* The Type M Path Table must also be at a valid location
++	 * (although ECMA 119 requires a Type M Path Table, WinISO and
++	 * probably other programs omit it, so we permit a zero here)
++	 *
+ 	 * > SYSTEM_AREA_BLOCK(16) + 2 and < Volume Space Size. */
+ 	location = archive_be32dec(h+PVD_type_m_path_table_offset);
+-	if (location <= SYSTEM_AREA_BLOCK+2 || location >= volume_block)
++	if ((location > 0 && location <= SYSTEM_AREA_BLOCK+2)
++	    || location >= volume_block)
+ 		return (0);
+ 
+ 	/* Reserved field must be 0. */
+-- 
+1.7.1
+
diff --git a/recipes/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch b/recipes/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch
new file mode 100644
index 0000000..b933966
--- /dev/null
+++ b/recipes/libarchive/libarchive/0004-Patch-from-upstream-rev-2514.patch
@@ -0,0 +1,35 @@
+From 178c9df2941d0c01afc44ca1e6ae795716e3b9fd Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Thu, 1 Jul 2010 18:12:22 +0200
+Subject: [PATCH 4/7] Patch from upstream (rev 2514)
+
+Enable version stripping code in joliet extension support for iso9660.
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=587316
+---
+ libarchive/archive_read_support_format_iso9660.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
+index fdef3fb..8dcfeb4 100644
+--- a/libarchive/archive_read_support_format_iso9660.c
++++ b/libarchive/archive_read_support_format_iso9660.c
+@@ -1755,7 +1755,6 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
+ 		}
+ 		*wp = L'\0';
+ 
+-#if 0 /* untested code, is it at all useful on Joliet? */
+ 		/* trim trailing first version and dot from filename.
+ 		 *
+ 		 * Remember we where in UTF-16BE land!
+@@ -1775,7 +1774,6 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
+ 		/* Chop off trailing '.' from filenames. */
+ 		if (*(wp-1) == '.')
+ 			*(--wp) = L'\0';
+-#endif
+ 
+ 		/* store the result in the file name field. */
+ 		archive_strappend_w_utf8(&file->name, wbuff);
+-- 
+1.7.1
+
diff --git a/recipes/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch b/recipes/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch
new file mode 100644
index 0000000..e9bd861
--- /dev/null
+++ b/recipes/libarchive/libarchive/0005-Patch-from-upstream-rev-2520.patch
@@ -0,0 +1,33 @@
+From bf4a8ba5a2f7a72d73765b95540acf56b0180990 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Thu, 1 Jul 2010 18:13:46 +0200
+Subject: [PATCH 5/7] Patch from upstream (rev 2520)
+
+Fix version/dot stripping code in joliet extension of iso9660.
+---
+ libarchive/archive_read_support_format_iso9660.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
+index 8dcfeb4..2d3a855 100644
+--- a/libarchive/archive_read_support_format_iso9660.c
++++ b/libarchive/archive_read_support_format_iso9660.c
+@@ -1766,13 +1766,13 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
+ 		 *       *, /, :, ;, ? and \.
+ 		 */
+ 		/* Chop off trailing ';1' from files. */
+-		if (*(wp-2) == ';' && *(wp-1) == '1') {
++		if (*(wp-2) == L';' && *(wp-1) == L'1') {
+ 			wp-=2;
+ 			*wp = L'\0';
+ 		}
+ 
+ 		/* Chop off trailing '.' from filenames. */
+-		if (*(wp-1) == '.')
++		if (*(wp-1) == L'.')
+ 			*(--wp) = L'\0';
+ 
+ 		/* store the result in the file name field. */
+-- 
+1.7.1
+
diff --git a/recipes/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch b/recipes/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch
new file mode 100644
index 0000000..412ee79
--- /dev/null
+++ b/recipes/libarchive/libarchive/0006-Patch-from-upstream-rev-2521.patch
@@ -0,0 +1,30 @@
+From 911c241d6d0d569074ecf05136dfd5cb9694876e Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Fri, 2 Jul 2010 09:41:10 +0200
+Subject: [PATCH 6/7] Patch from upstream (rev 2521).
+
+Disable dot stripping code since it's still broken
+and noone has been able to figure it out (yet).
+---
+ libarchive/archive_read_support_format_iso9660.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
+index 2d3a855..8661532 100644
+--- a/libarchive/archive_read_support_format_iso9660.c
++++ b/libarchive/archive_read_support_format_iso9660.c
+@@ -1771,9 +1771,11 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
+ 			*wp = L'\0';
+ 		}
+ 
++#if 0 /* XXX: this somehow manages to strip of single-character file extensions, like '.c'. */
+ 		/* Chop off trailing '.' from filenames. */
+ 		if (*(wp-1) == L'.')
+ 			*(--wp) = L'\0';
++#endif
+ 
+ 		/* store the result in the file name field. */
+ 		archive_strappend_w_utf8(&file->name, wbuff);
+-- 
+1.7.1
+
diff --git a/recipes/libarchive/libarchive/0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch b/recipes/libarchive/libarchive/0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch
new file mode 100644
index 0000000..4a272fd
--- /dev/null
+++ b/recipes/libarchive/libarchive/0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch
@@ -0,0 +1,33 @@
+From 8ad947aea083aad383eed753390bd6bff71f0cb6 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Thu, 15 Jul 2010 13:32:56 +0200
+Subject: [PATCH 7/7] Ignore ENOSYS error when setting up xattrs. (Closes: #588925)
+
+Modestas Vainius found out that HPPA returns errno ENOSYS
+on listxattrs. Currently, ENOTSUP is ignored so we'll do the
+same for ENOSYS as well.
+
+For full debug info about this see Modestas Vainius awesome
+report at:
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588925#10
+---
+ libarchive/archive_read_disk_entry_from_file.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
+index 27671df..c49e755 100644
+--- a/libarchive/archive_read_disk_entry_from_file.c
++++ b/libarchive/archive_read_disk_entry_from_file.c
+@@ -398,7 +398,7 @@ setup_xattrs(struct archive_read_disk *a,
+ 		list_size = listxattr(path, NULL, 0);
+ 
+ 	if (list_size == -1) {
+-		if (errno == ENOTSUP)
++		if (errno == ENOTSUP || errno == ENOSYS)
+ 			return (ARCHIVE_OK);
+ 		archive_set_error(&a->archive, errno,
+ 			"Couldn't list extended attributes");
+-- 
+1.7.1
+
diff --git a/recipes/libarchive/libarchive_2.8.4.bb b/recipes/libarchive/libarchive_2.8.4.bb
new file mode 100644
index 0000000..551746b
--- /dev/null
+++ b/recipes/libarchive/libarchive_2.8.4.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats"
+HOMEPAGE = "http://code.google.com/p/libarchive/"
+SECTION = "devel"
+LICENSE = "BSD"
+PR = "r0"
+
+SRC_URI = "http://libarchive.googlecode.com/files/${PN}-${PV}.tar.gz \
+           file://0001-Patch-from-upstream-revision-1990.patch \
+           file://0002-Patch-from-upstream-revision-1991.patch \
+           file://0003-Patch-from-upstream-rev-2516.patch \
+           file://0004-Patch-from-upstream-rev-2514.patch \
+           file://0005-Patch-from-upstream-rev-2520.patch \
+           file://0006-Patch-from-upstream-rev-2521.patch \
+           file://0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch \
+           "
+
+inherit autotools lib_package
+
+SRC_URI[md5sum] = "83b237a542f27969a8d68ac217dc3796"
+SRC_URI[sha256sum] = "86cffa3eaa28d3116f5d0b20284026c3762cf4a2b52b9844df2b494d4a89f688"
-- 
1.7.2.3

[PATCH 10/11] cmake: depends on libarchive

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes/cmake/cmake_2.8.3.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/cmake/cmake_2.8.3.bb b/recipes/cmake/cmake_2.8.3.bb
index cb5f7f7..0c8cb6d 100644
--- a/recipes/cmake/cmake_2.8.3.bb
+++ b/recipes/cmake/cmake_2.8.3.bb
@@ -1,10 +1,10 @@
 require cmake.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 inherit cmake
 
-DEPENDS += "curl expat zlib"
+DEPENDS += "curl expat zlib libarchive"
 
 SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921"
 SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288"
-- 
1.7.2.3

[PATCH 11/11] p910nd: update to 0.95 and improve packaging

[Otavio Salvador]

 * fix SRC_URI to use SOURCEFORGE_MIRROR;
 * use LDFLAGS to include GNU_HASH info;
 * move avahi support to p910nd-avahi package;

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes/p910nd/p910nd_0.92.bb |   45 -------------------------------------
 recipes/p910nd/p910nd_0.95.bb |   49 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 45 deletions(-)
 delete mode 100644 recipes/p910nd/p910nd_0.92.bb
 create mode 100644 recipes/p910nd/p910nd_0.95.bb

diff --git a/recipes/p910nd/p910nd_0.92.bb b/recipes/p910nd/p910nd_0.92.bb
deleted file mode 100644
index 4d90df1..0000000
--- a/recipes/p910nd/p910nd_0.92.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "A small network printer daemon for embedded situations that passes the job directly to the printer."
-SECTION = "console/utils"
-HOMEPAGE = "http://p910nd.sourceforge.net/"
-LICENSE = "GPLv2"
-SECTION = "console/utils"
-PR = "r1"
-RRECOMMENDS_${PN} = "avahi"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "p910nd"
-INITSCRIPT_PARAMS = "defaults 60 "
-
-SRC_URI = "http://internap.dl.sourceforge.net/sourceforge/p910nd/p910nd-0.92.tar.bz2 \
-           file://p910nd.init \
-           file://avahi"
-
-do_compile () {
-	${CC} -o p910nd p910nd.c 
-}
-
-# The avahi stuff makes it work with bonjour printing
-do_install () {
-	install -D -m 0755 ${S}/p910nd ${D}${sbindir}/p910nd
-	install -D -m 0644 ${S}/p910nd.conf ${D}${sysconfdir}/p910nd.conf
-	install -D -m 0755 ${WORKDIR}/p910nd.init ${D}${sysconfdir}/init.d/p910nd
-	install -D -m 0755 ${WORKDIR}/avahi ${D}${sysconfdir}/avahi/services/p910nd.service
-}
-
-pkg_postinst_append() {
-#!/bin/sh
-           
-if [ "x$D" != "x" ] ; then
-        exit 1
-fi
-
-# If avahi is already running reload it to pickup the p910nd config
-PAV=`pidof avahi-daemon`
-if [ "x$PAV" != "x" ] ; then
-        /etc/init.d/avahi-daemon reload
-fi
-}
-
-SRC_URI[md5sum] = "94a43d28794f2445cd5f9c8b970898c4"
-SRC_URI[sha256sum] = "a2295e525febfc3a1a93ad21c0843021e2b22e6720f148bf1c4822a83aea2b8c"
diff --git a/recipes/p910nd/p910nd_0.95.bb b/recipes/p910nd/p910nd_0.95.bb
new file mode 100644
index 0000000..faa095a
--- /dev/null
+++ b/recipes/p910nd/p910nd_0.95.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "A small network printer daemon for embedded situations that passes the job directly to the printer."
+SECTION = "console/utils"
+HOMEPAGE = "http://p910nd.sourceforge.net/"
+LICENSE = "GPLv2"
+SECTION = "console/utils"
+PR = "r1"
+RDEPENDS_${PN}-avahi = "avahi"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "p910nd"
+INITSCRIPT_PARAMS = "defaults 60 "
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/p910nd/p910nd-${PV}.tar.bz2 \
+           file://p910nd.init \
+           file://avahi"
+
+SRC_URI[md5sum] = "c7ac6afdf7730ac8387a8e87198d4491"
+SRC_URI[sha256sum] = "7d78642c86dc247fbdef1ff85c56629dcdc6b2a457c786420299e284fffcb029"
+
+PACKAGES_prepend = "${PN}-avahi "
+
+FILES_${PN}-avahi += "${sysconfdir}/avahi/services/p910nd.service"
+
+do_compile () {
+	${CC} ${LDFLAGS} -o p910nd p910nd.c
+}
+
+# The avahi stuff makes it work with bonjour printing
+do_install () {
+	install -D -m 0755 ${S}/p910nd ${D}${sbindir}/p910nd
+	install -D -m 0644 ${S}/p910nd.conf ${D}${sysconfdir}/p910nd.conf
+	install -D -m 0755 ${WORKDIR}/p910nd.init ${D}${sysconfdir}/init.d/p910nd
+	install -D -m 0755 ${WORKDIR}/avahi ${D}${sysconfdir}/avahi/services/p910nd.service
+}
+
+pkg_postinst_${PN}-avahi_append() {
+#!/bin/sh
+
+if [ "x$D" != "x" ] ; then
+        exit 1
+fi
+
+# If avahi is already running reload it to pickup the p910nd config
+PAV=`pidof avahi-daemon`
+if [ "x$PAV" != "x" ] ; then
+        /etc/init.d/avahi-daemon reload
+fi
+}
-- 
1.7.2.3

Re: [PATCH 05/11] udev (165): move ConsoleKit support to udev-consolekit package

[Otavio Salvador]

On Sat, Mar 12, 2011 at 16:27, Otavio Salvador <otavio@ossystems.com.br> wrote:
...
> -PACKAGES =+ "libudev libgudev udev-utils"
> +PACKAGES =+ "libudev libgudev udev-utils udev-consolekit"
...

Koen, can you take a look on this change?

It seems Angstrom is the only used of this version and seems better to
not provide support for consolekit by default so adding it as
recommends or suggests seems wrong to me.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [PATCH 05/11] udev (165): move ConsoleKit support to udev-consolekit package

[Koen Kooi]

Op 12 mrt 2011, om 21:21 heeft Otavio Salvador het volgende geschreven:

> On Sat, Mar 12, 2011 at 16:27, Otavio Salvador <otavio@ossystems.com.br> wrote:
> ...
>> -PACKAGES =+ "libudev libgudev udev-utils"
>> +PACKAGES =+ "libudev libgudev udev-utils udev-consolekit"
> ...
> 
> Koen, can you take a look on this change?
> 
> It seems Angstrom is the only used of this version and seems better to
> not provide support for consolekit by default so adding it as
> recommends or suggests seems wrong to me.

If someone can quickly explain me what it does then we can see what needs to get changed. Without having looked into it I think adding RRECOMMENDS_${PN} += "udev-consolekit" to the consolekit recipe should fix most possible breakage.

Adding oe-core to CC:

What are the plans in oe-core for udev? There currently is a recipe overlayed in meta-oe because I haven't had time to look into the differences between the oe-dev and oe-core version. If we're going to touch udev we might as well do it properly :)


regards,

Koen

Re: [PATCH 00/11] Patchset being in use on O.S. Systems internal tree

[Khem Raj]

On 3/12/2011 11:27 AM, Otavio Salvador wrote:
> Hello,
>
> This patchset has been in use in our internal tree and as usual we'd
> like to have it synced with upstream so we're proposing those for
> merging.
>
> The patches that are included on this set are:
>
> [PATCH 01/11] freerdp: workaround gcc linking bug forcing -lpthread
> [PATCH 02/11] freerdp: add singleton support with PDU error handling
> [PATCH 03/11] cmake.bbclass: drop CMAKE_MODULE_PATH as it works fine without it
> [PATCH 04/11] bitbake.conf: add XZ_INTEGRITY_CHECK and LZMA_COMPRESSION_LEVEL variables
> [PATCH 05/11] udev (165): move ConsoleKit support to udev-consolekit package
> [PATCH 06/11] xkeyboard-config: use --with-xkb-rules-symlink=xorg option
> [PATCH 07/11] xkeyboard-config (git): update to current version - 2.1 plus fixes
> [PATCH 08/11] linux (2.6.37): update to 2.6.37.3 stable patch
> [PATCH 09/11] libarchive: add
> [PATCH 10/11] cmake: depends on libarchive
> [PATCH 11/11] p910nd: update to 0.95 and improve packaging
>
> The diffstat of whole series is:
>
>   classes/cmake.bbclass                              |    2 -
>   conf/bitbake.conf                                  |   10 +-
>   recipes/cmake/cmake_2.8.3.bb                       |    4 +-
>   recipes/freerdp/freerdp.inc                        |    7 +-
>   recipes/freerdp/freerdp/singleton-mode.patch       |  208 ++++++++++++++++++++
>   recipes/freerdp/freerdp_git.bb                     |    5 +-
>   .../0001-Patch-from-upstream-revision-1990.patch   |   45 +++++
>   .../0002-Patch-from-upstream-revision-1991.patch   |   34 ++++
>   .../0003-Patch-from-upstream-rev-2516.patch        |   65 ++++++
>   .../0004-Patch-from-upstream-rev-2514.patch        |   35 ++++
>   .../0005-Patch-from-upstream-rev-2520.patch        |   33 +++
>   .../0006-Patch-from-upstream-rev-2521.patch        |   30 +++
>   ...YS-error-when-setting-up-xattrs.-Closes-5.patch |   33 +++
>   recipes/libarchive/libarchive_2.8.4.bb             |   20 ++
>   recipes/linux/linux_2.6.37.bb                      |    8 +-
>   recipes/p910nd/p910nd_0.92.bb                      |   45 -----
>   recipes/p910nd/p910nd_0.95.bb                      |   49 +++++
>   recipes/udev/udev_165.bb                           |    7 +-
>   recipes/xkeyboard-config/xkeyboard-config.inc      |    9 +-
>   recipes/xkeyboard-config/xkeyboard-config_git.bb   |    6 +-
>   20 files changed, 584 insertions(+), 71 deletions(-)
>
> Thanks in advance,

Except [PATCH 05/11] udev (165): move ConsoleKit support to 
udev-consolekit package

merged all.

Thanks

-Khem

Re: [PATCH 05/11] udev (165): move ConsoleKit support to udev-consolekit package

[Otavio Salvador]

On Sat, Mar 12, 2011 at 19:03, Koen Kooi <koen@beagleboard.org> wrote:
> If someone can quickly explain me what it does then we can see what needs to get changed. Without having looked into it I think adding RRECOMMENDS_${PN} += "udev-consolekit" to the consolekit recipe should fix most possible breakage.

I think it manages to register the 'seat' on consolekit. So I think
this would solve this issue.

> Adding oe-core to CC:
>
> What are the plans in oe-core for udev? There currently is a recipe overlayed in meta-oe because I haven't had time to look into the differences between the oe-dev and oe-core version. If we're going to touch udev we might as well do it properly :)

I think 165 ought to be our base there.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [PATCH 05/11] udev (165): move ConsoleKit support to udev-consolekit package

[Tom Rini]

On 03/12/2011 03:03 PM, Koen Kooi wrote:
>
> Op 12 mrt 2011, om 21:21 heeft Otavio Salvador het volgende geschreven:
>
>> On Sat, Mar 12, 2011 at 16:27, Otavio Salvador<otavio@ossystems.com.br>  wrote:
>> ...
>>> -PACKAGES =+ "libudev libgudev udev-utils"
>>> +PACKAGES =+ "libudev libgudev udev-utils udev-consolekit"
>> ...
>>
>> Koen, can you take a look on this change?
>>
>> It seems Angstrom is the only used of this version and seems better to
>> not provide support for consolekit by default so adding it as
>> recommends or suggests seems wrong to me.
>
> If someone can quickly explain me what it does then we can see what needs to get changed. Without having looked into it I think adding RRECOMMENDS_${PN} += "udev-consolekit" to the consolekit recipe should fix most possible breakage.
>
> Adding oe-core to CC:
>
> What are the plans in oe-core for udev? There currently is a recipe overlayed in meta-oe because I haven't had time to look into the differences between the oe-dev and oe-core version. If we're going to touch udev we might as well do it properly :)

Not sure off hand yet, but udev is one of the things we might need to 
keep a few versions around of, depending on how far back we want to 
support kernels out of the box.

-- 
Tom Rini
Mentor Graphics Corporation

Re: [PATCH 05/11] udev (165): move ConsoleKit support to udev-consolekit package

[Khem Raj]

On Mon, Mar 14, 2011 at 9:46 AM, Tom Rini <tom_rini@mentor.com> wrote:
> On 03/12/2011 03:03 PM, Koen Kooi wrote:
>>
>> Op 12 mrt 2011, om 21:21 heeft Otavio Salvador het volgende geschreven:
>>
>>> On Sat, Mar 12, 2011 at 16:27, Otavio Salvador<otavio@ossystems.com.br>
>>>  wrote:
>>> ...
>>>>
>>>> -PACKAGES =+ "libudev libgudev udev-utils"
>>>> +PACKAGES =+ "libudev libgudev udev-utils udev-consolekit"
>>>
>>> ...
>>>
>>> Koen, can you take a look on this change?
>>>
>>> It seems Angstrom is the only used of this version and seems better to
>>> not provide support for consolekit by default so adding it as
>>> recommends or suggests seems wrong to me.
>>
>> If someone can quickly explain me what it does then we can see what needs
>> to get changed. Without having looked into it I think adding
>> RRECOMMENDS_${PN} += "udev-consolekit" to the consolekit recipe should fix
>> most possible breakage.
>>
>> Adding oe-core to CC:
>>
>> What are the plans in oe-core for udev? There currently is a recipe
>> overlayed in meta-oe because I haven't had time to look into the differences
>> between the oe-dev and oe-core version. If we're going to touch udev we
>> might as well do it properly :)
>
> Not sure off hand yet, but udev is one of the things we might need to keep a
> few versions around of, depending on how far back we want to support kernels
> out of the box.
>

I would think this should be recommended into BSP layers then

> --
> Tom Rini
> Mentor Graphics Corporation
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [PATCH 05/11] udev (165): move ConsoleKit support to udev-consolekit package

[Tom Rini]

On 03/14/2011 11:00 AM, Khem Raj wrote:
> On Mon, Mar 14, 2011 at 9:46 AM, Tom Rini<tom_rini@mentor.com>  wrote:
>> On 03/12/2011 03:03 PM, Koen Kooi wrote:
>>>
>>> Op 12 mrt 2011, om 21:21 heeft Otavio Salvador het volgende geschreven:
>>>
>>>> On Sat, Mar 12, 2011 at 16:27, Otavio Salvador<otavio@ossystems.com.br>
>>>>   wrote:
>>>> ...
>>>>>
>>>>> -PACKAGES =+ "libudev libgudev udev-utils"
>>>>> +PACKAGES =+ "libudev libgudev udev-utils udev-consolekit"
>>>>
>>>> ...
>>>>
>>>> Koen, can you take a look on this change?
>>>>
>>>> It seems Angstrom is the only used of this version and seems better to
>>>> not provide support for consolekit by default so adding it as
>>>> recommends or suggests seems wrong to me.
>>>
>>> If someone can quickly explain me what it does then we can see what needs
>>> to get changed. Without having looked into it I think adding
>>> RRECOMMENDS_${PN} += "udev-consolekit" to the consolekit recipe should fix
>>> most possible breakage.
>>>
>>> Adding oe-core to CC:
>>>
>>> What are the plans in oe-core for udev? There currently is a recipe
>>> overlayed in meta-oe because I haven't had time to look into the differences
>>> between the oe-dev and oe-core version. If we're going to touch udev we
>>> might as well do it properly :)
>>
>> Not sure off hand yet, but udev is one of the things we might need to keep a
>> few versions around of, depending on how far back we want to support kernels
>> out of the box.
>
> I would think this should be recommended into BSP layers then

I wouldn't since we don't want every BSP to have to "re-invent" the udev 
wheel.  And there's other bits of userspace where there's a relationship 
between the kernel version (the whole kernel headers version and iirc 
hipox machines thread on oe-devel).

I'm not saying we need to keep every version of udev either, I'm just 
saying we know where there's cutoff points and we should have correct 
and maintained udev versions in the core.

-- 
Tom Rini
Mentor Graphics Corporation

Re: [PATCH 05/11] udev (165): move ConsoleKit support to udev-consolekit package

[Otavio Salvador]

On Sat, Mar 12, 2011 at 16:27, Otavio Salvador <otavio@ossystems.com.br> wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

ping?

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br