[CONSOLIDATED PULL 00/12] Updated and Fixes

[CONSOLIDATED PULL 00/12] Updated and Fixes

[Saul Wold]

Richard,

Pull in the backlog of changes from this week.  Bigest change
that need looking at are Chris's.

Sau!

The following changes since commit 2cf6e7cf81c0b864b5d51be60094a6eb3e584383:

  fotowall: Add #include ui_wizard.h to ExportWizard.cpp (2012-05-16 07:33:15 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/stage
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Alexandru DAMIAN (1):
  xf86-video-vmware: update package to 12.0.2

Bogdan Marinescu (1):
  gnutls: update to 2.12.19

Christopher Larson (3):
  csl-versions: fix bb.process.CmdError reference
  oe.types: give the regex type more sane semantics
  kernel.bbclass: add deploy link to KERNEL_IMAGETYPE

Joshua Lock (2):
  meta/classes/sstate.bbclass: ensure sstate files have group R/W
  sanity.bbclass: check user can read and write to SSTATE_DIR

Laurentiu Palcu (1):
  gnupg: Update to upstream version 2.0.19

Marko Lindqvist (1):
  dpkg: update to upstream version 1.16.3

Martin Jansa (1):
  xserver-xorg-lite: disable xmlto like full xserver-xorg does

Saul Wold (1):
  xinetd: Update to 2.3.15

Xiaofeng Yan (1):
  archiver.bbclass: Add two default set for avoiding error when missing
    assignment

 meta/classes/archiver.bbclass                      |    4 +-
 meta/classes/kernel.bbclass                        |    1 +
 meta/classes/sanity.bbclass                        |   17 ++-
 meta/classes/sstate.bbclass                        |    1 +
 meta/conf/distro/include/csl-versions.inc          |    2 +-
 meta/lib/oe/types.py                               |   31 +++
 meta/recipes-devtools/dpkg/dpkg.inc                |    5 +-
 .../recipes-devtools/dpkg/dpkg/check_version.patch |   26 ++-
 .../dpkg/dpkg/dpkg-deb-avoid-fflush.patch          |  198 --------------------
 .../dpkg/dpkg/ignore_extra_fields.patch            |   39 ++--
 .../dpkg/dpkg/ignore_lutimes_errors.patch          |   26 +++
 meta/recipes-devtools/dpkg/dpkg/perllibdir.patch   |   22 ---
 meta/recipes-devtools/dpkg/dpkg/preinst.patch      |   45 +++--
 .../dpkg/{dpkg_1.15.8.7.bb => dpkg_1.16.3.bb}      |   10 +-
 .../xinetd/{xinetd_2.3.14.bb => xinetd_2.3.15.bb}  |    6 +-
 ...mware_12.0.1.bb => xf86-video-vmware_12.0.2.bb} |    6 +-
 .../xorg-xserver/xserver-xorg-1.11.2.inc           |    2 +-
 .../xorg-xserver/xserver-xorg-lite.inc             |    1 +
 .../gnupg/{gnupg_2.0.18.bb => gnupg_2.0.19.bb}     |    6 +-
 .../configure-fix.patch                            |    0
 .../correct_rpl_gettimeofday_signature.patch       |    0
 .../fix-gettext-version.patch                      |    0
 .../gnutls-openssl.patch                           |    0
 .../gnutls-texinfo-euro.patch                      |    0
 .../{gnutls_2.12.18.bb => gnutls_2.12.19.bb}       |    4 +-
 25 files changed, 159 insertions(+), 293 deletions(-)
 delete mode 100644 meta/recipes-devtools/dpkg/dpkg/dpkg-deb-avoid-fflush.patch
 create mode 100644 meta/recipes-devtools/dpkg/dpkg/ignore_lutimes_errors.patch
 delete mode 100644 meta/recipes-devtools/dpkg/dpkg/perllibdir.patch
 rename meta/recipes-devtools/dpkg/{dpkg_1.15.8.7.bb => dpkg_1.16.3.bb} (42%)
 rename meta/recipes-extended/xinetd/{xinetd_2.3.14.bb => xinetd_2.3.15.bb} (90%)
 rename meta/recipes-graphics/xorg-driver/{xf86-video-vmware_12.0.1.bb => xf86-video-vmware_12.0.2.bb} (74%)
 rename meta/recipes-support/gnupg/{gnupg_2.0.18.bb => gnupg_2.0.19.bb} (81%)
 rename meta/recipes-support/gnutls/{gnutls-2.12.18 => gnutls-2.12.19}/configure-fix.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.12.18 => gnutls-2.12.19}/correct_rpl_gettimeofday_signature.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.12.18 => gnutls-2.12.19}/fix-gettext-version.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.12.18 => gnutls-2.12.19}/gnutls-openssl.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.12.18 => gnutls-2.12.19}/gnutls-texinfo-euro.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls_2.12.18.bb => gnutls_2.12.19.bb} (77%)

-- 
1.7.7.6

[CONSOLIDATED PULL 01/12] xinetd: Update to 2.3.15

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../xinetd/{xinetd_2.3.14.bb => xinetd_2.3.15.bb}  |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/xinetd/{xinetd_2.3.14.bb => xinetd_2.3.15.bb} (90%)

diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.14.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
similarity index 90%
rename from meta/recipes-extended/xinetd/xinetd_2.3.14.bb
rename to meta/recipes-extended/xinetd/xinetd_2.3.15.bb
index 26ba78f..3d55e99 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.14.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
@@ -7,7 +7,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"
 
 DEPENDS = ""
-PR ="r1"
+PR = "r0"
 
 SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
       file://xinetd.init \
@@ -17,8 +17,8 @@ SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
       file://xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch \
       "
 
-SRC_URI[md5sum] = "567382d7972613090215c6c54f9b82d9"
-SRC_URI[sha256sum] = "760e0e617c609a0509ef63fc7e9580d2f1d88c6113bb6d63273de7de7cd0bc1f"
+SRC_URI[md5sum] = "77358478fd58efa6366accae99b8b04c"
+SRC_URI[sha256sum] = "bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3"
 
 inherit autotools update-rc.d
 
-- 
1.7.7.6

[CONSOLIDATED PULL 02/12] csl-versions: fix bb.process.CmdError reference

[Saul Wold]

From: Christopher Larson <chris_larson@mentor.com>

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta/conf/distro/include/csl-versions.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/conf/distro/include/csl-versions.inc b/meta/conf/distro/include/csl-versions.inc
index ec7a6ba..0790b8a 100644
--- a/meta/conf/distro/include/csl-versions.inc
+++ b/meta/conf/distro/include/csl-versions.inc
@@ -83,7 +83,7 @@ def csl_get_kernel_version(d):
 def csl_get_gdb_version(d):
 	try:
 		stdout, stderr = csl_run(d, 'gdb', '-v')
-	except CmdError:
+	except bb.process.CmdError:
 		return 'UNKNOWN'
 	else:
 		first_line = stdout.splitlines()[0]
-- 
1.7.7.6

[CONSOLIDATED PULL 03/12] oe.types: give the regex type more sane semantics

[Saul Wold]

From: Christopher Larson <chris_larson@mentor.com>

Currently, if a variable is unset or has an empty value, the regex type
will return a match object which always matches. Not all variable types
will necessarily have the same behavior for handling defaults. I believe
that returning a match object which matches nothing when a variable is
unset is superior to returning one which matches anything, and the user
can always explicitly request anything via '.*', if that's what they
want.

This constructs a null pattern object which will never match, and uses
it when encountering an unset or empty variable (currently, these two
things are one and the same, as maketype is handling the default. we may
well want to shift that logic into the individual types, giving them
more control over default behavior, but currently the behavior is at
least relatively consistent -- no difference between unset and empty
variables).

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta/lib/oe/types.py |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/meta/lib/oe/types.py b/meta/lib/oe/types.py
index ea31cf4..ea53df9 100644
--- a/meta/lib/oe/types.py
+++ b/meta/lib/oe/types.py
@@ -40,6 +40,31 @@ def choice(value, choices):
                          (value, choices))
     return value
 
+class NoMatch(object):
+    """Stub python regex pattern object which never matches anything"""
+    def findall(self, string, flags=0):
+        return None
+
+    def finditer(self, string, flags=0):
+        return None
+
+    def match(self, flags=0):
+        return None
+
+    def search(self, string, flags=0):
+        return None
+
+    def split(self, string, maxsplit=0):
+        return None
+
+    def sub(pattern, repl, string, count=0):
+        return None
+
+    def subn(pattern, repl, string, count=0):
+        return None
+
+NoMatch = NoMatch()
+
 def regex(value, regexflags=None):
     """OpenEmbedded 'regex' type
 
@@ -59,6 +84,12 @@ def regex(value, regexflags=None):
             except AttributeError:
                 raise ValueError("Invalid regex flag '%s'" % flag)
 
+    if not value:
+        # Let's ensure that the default behavior for an undefined or empty
+        # variable is to match nothing. If the user explicitly wants to match
+        # anything, they can match '.*' instead.
+        return NoMatch
+
     try:
         return re.compile(value, flagval)
     except re.error, exc:
-- 
1.7.7.6

[CONSOLIDATED PULL 04/12] kernel.bbclass: add deploy link to KERNEL_IMAGETYPE

[Saul Wold]

From: Christopher Larson <chris_larson@mentor.com>

It's common to provide a non-machine-suffixed link in DEPLOY_DIR_IMAGE, so
let's be consistent and do so here as well.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta/classes/kernel.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index a85f130..90af597 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -538,6 +538,7 @@ kernel_do_deploy() {
 	cd ${DEPLOYDIR}
 	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
 	ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
+	ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGETYPE}
 
 	cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
 }
-- 
1.7.7.6

[CONSOLIDATED PULL 05/12] dpkg: update to upstream version 1.16.3

[Saul Wold]

From: Marko Lindqvist <cazfi@cazfi-64>

Update dpkg recipe to get latest upstream version (1.16.3) as
1.15.8.7 is no longer available.

* check_version.patch : updated to apply cleanly
* dpkg-dev-avoid-fflush.patch : removed as already part of upstream
* ignore_extra_fields.patch : updated to apply cleanly
* perllibdir.patch : removed as unnecessary after upstream changes
* preinst.patch : updated to apply cleanly
* ignore_lutimes_errors.patch : new patch to fix unpack failures

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 meta/recipes-devtools/dpkg/dpkg.inc                |    5 +-
 .../recipes-devtools/dpkg/dpkg/check_version.patch |   26 ++-
 .../dpkg/dpkg/dpkg-deb-avoid-fflush.patch          |  198 --------------------
 .../dpkg/dpkg/ignore_extra_fields.patch            |   39 ++--
 .../dpkg/dpkg/ignore_lutimes_errors.patch          |   26 +++
 meta/recipes-devtools/dpkg/dpkg/perllibdir.patch   |   22 ---
 meta/recipes-devtools/dpkg/dpkg/preinst.patch      |   45 +++--
 .../dpkg/{dpkg_1.15.8.7.bb => dpkg_1.16.3.bb}      |   10 +-
 8 files changed, 95 insertions(+), 276 deletions(-)
 delete mode 100644 meta/recipes-devtools/dpkg/dpkg/dpkg-deb-avoid-fflush.patch
 create mode 100644 meta/recipes-devtools/dpkg/dpkg/ignore_lutimes_errors.patch
 delete mode 100644 meta/recipes-devtools/dpkg/dpkg/perllibdir.patch
 rename meta/recipes-devtools/dpkg/{dpkg_1.15.8.7.bb => dpkg_1.16.3.bb} (42%)

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 09bfbbc..93bf7c1 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -2,10 +2,11 @@ DESCRIPTION = "Package maintenance system for Debian."
 LICENSE = "GPLv2.0+"
 SECTION = "base"
 
-INC_PR = "r16"
+INC_PR = "r17"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2 \
-           file://ignore_extra_fields.patch"
+           file://ignore_extra_fields.patch \
+           file://ignore_lutimes_errors.patch"
 
 DEPENDS = "zlib bzip2 perl"
 DEPENDS_virtclass-native = "bzip2-native zlib-native virtual/update-alternatives-native gettext-native perl-native-runtime"
diff --git a/meta/recipes-devtools/dpkg/dpkg/check_version.patch b/meta/recipes-devtools/dpkg/dpkg/check_version.patch
index 524e715..385e4c6 100644
--- a/meta/recipes-devtools/dpkg/dpkg/check_version.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/check_version.patch
@@ -4,20 +4,24 @@ Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
 
 Upstream-Status: Inappropriate [embedded specific]
 
-diff -ruN dpkg-1.15.8.5-orig/lib/dpkg/parsehelp.c dpkg-1.15.8.5/lib/dpkg/parsehelp.c
---- dpkg-1.15.8.5-orig/lib/dpkg/parsehelp.c	2010-10-08 12:27:15.058572774 +0800
-+++ dpkg-1.15.8.5/lib/dpkg/parsehelp.c	2010-10-09 11:18:15.484190771 +0800
-@@ -268,11 +268,11 @@
- 
-   /* XXX: Would be faster to use something like cisversion and cisrevision. */
-   for (ptr = rversion->version; *ptr; ptr++) {
+Updated to apply over dpkg-1.16.3
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+
+diff -Nurd dpkg-1.16.3/lib/dpkg/parsehelp.c dpkg-1.16.3/lib/dpkg/parsehelp.c
+--- dpkg-1.16.3/lib/dpkg/parsehelp.c	2012-04-27 05:49:02.000000000 +0300
++++ dpkg-1.16.3/lib/dpkg/parsehelp.c	2012-05-04 13:46:27.000000000 +0300
+@@ -253,11 +253,11 @@
+   if (*ptr && !cisdigit(*ptr++))
+     return dpkg_put_warn(err, _("version number does not start with digit"));
+   for (; *ptr; ptr++) {
 -    if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:", *ptr) == NULL)
 +    if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:_", *ptr) == NULL)
-       return _("invalid character in version number");
+       return dpkg_put_warn(err, _("invalid character in version number"));
    }
    for (ptr = rversion->revision; *ptr; ptr++) {
--    if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~", *ptr) == NULL)
-+    if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~_", *ptr) == NULL)
-       return _("invalid character in revision number");
+-    if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".+~", *ptr) == NULL)
++    if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".+~_", *ptr) == NULL)
+       return dpkg_put_warn(err, _("invalid character in revision number"));
    }
  
diff --git a/meta/recipes-devtools/dpkg/dpkg/dpkg-deb-avoid-fflush.patch b/meta/recipes-devtools/dpkg/dpkg/dpkg-deb-avoid-fflush.patch
deleted file mode 100644
index a5d6b61..0000000
--- a/meta/recipes-devtools/dpkg/dpkg/dpkg-deb-avoid-fflush.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-From 78eaf928d30d0b16e05d8d63c55a3632a135ed9a Mon Sep 17 00:00:00 2001
-From: Guillem Jover <guillem@debian.org>
-Date: Thu, 4 Nov 2010 00:51:13 +0100
-Subject: [PATCH] dpkg-deb: Use fd instead of stream based buffered I/O
-
-Behaviour of fflush() on input streams is undefined per POSIX, avoid
-mixing stream and file descriptor based I/O, and only use the latter
-instead.
-
-Upstream-Status: Backport of revision 2d420ee1d05033d237462a0075facfe406b08043 (in 1.16.x)
-
----
- dpkg-deb/extract.c |   83 ++++++++++++++++++++++++++++++++++++++-------------
- 1 files changed, 62 insertions(+), 21 deletions(-)
-
-diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
-index 22aea98..0f5ac88 100644
---- a/dpkg-deb/extract.c
-+++ b/dpkg-deb/extract.c
-@@ -31,6 +31,7 @@
- #include <ctype.h>
- #include <string.h>
- #include <dirent.h>
-+#include <fcntl.h>
- #include <unistd.h>
- #include <ar.h>
- #include <stdbool.h>
-@@ -61,13 +62,41 @@ static void movecontrolfiles(const char *thing) {
- }
- 
- static void DPKG_ATTR_NORET
--readfail(FILE *a, const char *filename, const char *what)
-+read_fail(int rc, const char *filename, const char *what)
- {
--  if (ferror(a)) {
--    ohshite(_("error reading %s from file %.255s"), what, filename);
--  } else {
-+  if (rc == 0)
-     ohshit(_("unexpected end of file in %s in %.255s"),what,filename);
-+  else
-+    ohshite(_("error reading %s from file %.255s"), what, filename);
-+}
-+
-+static ssize_t
-+read_line(int fd, char *buf, size_t min_size, size_t max_size)
-+{
-+  ssize_t line_size = 0;
-+  size_t n = min_size;
-+
-+  while (line_size < (ssize_t)max_size) {
-+    ssize_t r;
-+    char *nl;
-+
-+    r = read(fd, buf + line_size, n);
-+    if (r <= 0)
-+      return r;
-+
-+    nl = strchr(buf + line_size, '\n');
-+    line_size += r;
-+
-+    if (nl != NULL) {
-+      nl[1] = '\0';
-+      return line_size;
-+    }
-+
-+    n = 1;
-   }
-+
-+  buf[line_size] = '\0';
-+  return line_size;
- }
- 
- static size_t
-@@ -115,19 +144,26 @@ void extracthalf(const char *debar, const char *directory,
-   char versionbuf[40];
-   float versionnum;
-   size_t ctrllennum, memberlen= 0;
-+  ssize_t r;
-   int dummy;
-   pid_t c1=0,c2,c3;
-   int p1[2], p2[2];
--  FILE *ar;
-+  int arfd;
-   struct stat stab;
-   char nlc;
-   int adminmember;
-   bool oldformat, header_done;
-   struct compressor *decompressor = &compressor_gzip;
-   
--  ar= fopen(debar,"r"); if (!ar) ohshite(_("failed to read archive `%.255s'"),debar);
--  if (fstat(fileno(ar),&stab)) ohshite(_("failed to fstat archive"));
--  if (!fgets(versionbuf,sizeof(versionbuf),ar)) readfail(ar,debar,_("version number"));
-+  arfd = open(debar, O_RDONLY);
-+  if (arfd < 0)
-+    ohshite(_("failed to read archive `%.255s'"), debar);
-+  if (fstat(arfd, &stab))
-+    ohshite(_("failed to fstat archive"));
-+
-+  r = read_line(arfd, versionbuf, strlen(DPKG_AR_MAGIC), sizeof(versionbuf));
-+  if (r < 0)
-+    read_fail(r, debar, _("archive magic version number"));
- 
-   if (!strcmp(versionbuf, DPKG_AR_MAGIC)) {
-     oldformat = false;
-@@ -137,8 +173,9 @@ void extracthalf(const char *debar, const char *directory,
-     for (;;) {
-       struct ar_hdr arh;
- 
--      if (fread(&arh,1,sizeof(arh),ar) != sizeof(arh))
--        readfail(ar,debar,_("between members"));
-+      r = read(arfd, &arh, sizeof(arh));
-+      if (r != sizeof(arh))
-+        read_fail(r, debar, _("archive member header"));
- 
-       dpkg_ar_normalize_name(&arh);
- 
-@@ -153,8 +190,9 @@ void extracthalf(const char *debar, const char *directory,
-         if (strncmp(arh.ar_name, DEBMAGIC, sizeof(arh.ar_name)) != 0)
-           ohshit(_("file `%.250s' is not a debian binary archive (try dpkg-split?)"),debar);
-         infobuf= m_malloc(memberlen+1);
--        if (fread(infobuf,1, memberlen + (memberlen&1), ar) != memberlen + (memberlen&1))
--          readfail(ar,debar,_("header info member"));
-+        r = read(arfd, infobuf, memberlen + (memberlen & 1));
-+        if ((size_t)r != (memberlen + (memberlen & 1)))
-+          read_fail(r, debar, _("archive information header member"));
-         infobuf[memberlen] = '\0';
-         cur= strchr(infobuf,'\n');
-         if (!cur) ohshit(_("archive has no newlines in header"));
-@@ -174,7 +212,8 @@ void extracthalf(const char *debar, const char *directory,
-           /* Members with `_' are noncritical, and if we don't understand them
-            * we skip them.
-            */
--	stream_null_copy(ar, memberlen + (memberlen&1),_("skipped member data from %s"), debar);
-+        fd_null_copy(arfd, memberlen + (memberlen & 1),
-+                     _("skipped archive member data from %s"), debar);
-       } else {
- 	if (strncmp(arh.ar_name, ADMINMEMBER, sizeof(arh.ar_name)) == 0)
- 	  adminmember = 1;
-@@ -198,7 +237,8 @@ void extracthalf(const char *debar, const char *directory,
-           ctrllennum= memberlen;
-         }
-         if (!adminmember != !admininfo) {
--	  stream_null_copy(ar, memberlen + (memberlen&1),_("skipped member data from %s"), debar);
-+          fd_null_copy(arfd, memberlen + (memberlen & 1),
-+                       _("skipped archive member data from %s"), debar);
-         } else {
-           break; /* Yes ! - found it. */
-         }
-@@ -221,8 +261,10 @@ void extracthalf(const char *debar, const char *directory,
-     l = strlen(versionbuf);
-     if (l && versionbuf[l - 1] == '\n')
-       versionbuf[l - 1] = '\0';
--    if (!fgets(ctrllenbuf,sizeof(ctrllenbuf),ar))
--      readfail(ar, debar, _("control information length"));
-+
-+    r = read_line(arfd, ctrllenbuf, 1, sizeof(ctrllenbuf));
-+    if (r < 0)
-+      read_fail(r, debar, _("archive control member size"));
-     if (sscanf(ctrllenbuf,"%zi%c%d",&ctrllennum,&nlc,&dummy) !=2 || nlc != '\n')
-       ohshit(_("archive has malformatted control length `%s'"), ctrllenbuf);
- 
-@@ -230,7 +272,8 @@ void extracthalf(const char *debar, const char *directory,
-       memberlen = ctrllennum;
-     } else {
-       memberlen = stab.st_size - ctrllennum - strlen(ctrllenbuf) - l;
--      stream_null_copy(ar, ctrllennum, _("skipped control area from %s"), debar);
-+      fd_null_copy(arfd, ctrllennum,
-+                   _("skipped archive control member data from %s"), debar);
-     }
- 
-     if (admininfo >= 2) {
-@@ -252,13 +295,11 @@ void extracthalf(const char *debar, const char *directory,
- 
-   }
- 
--  safe_fflush(ar);
--
-   m_pipe(p1);
-   c1 = subproc_fork();
-   if (!c1) {
-     close(p1[0]);
--    stream_fd_copy(ar, p1[1], memberlen, _("failed to write to pipe in copy"));
-+    fd_fd_copy(arfd, p1[1], memberlen, _("failed to write to pipe in copy"));
-     if (close(p1[1]))
-       ohshite(_("failed to close pipe in copy"));
-     exit(0);
-@@ -275,7 +316,7 @@ void extracthalf(const char *debar, const char *directory,
-     decompress_filter(decompressor, 0, 1, _("data"));
-   }
-   close(p1[0]);
--  fclose(ar);
-+  close(arfd);
-   if (taroption) close(p2[1]);
- 
-   if (taroption && directory) {
--- 
-1.7.7.6
-
diff --git a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
index 0ff09e7..2dbb5a2 100644
--- a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
@@ -1,22 +1,25 @@
 Upstream-Status: Inappropriate [workaround]
 
-diff -ruN dpkg-1.15.8.5-orig/dpkg-deb/build.c dpkg-1.15.8.5/dpkg-deb/build.c
---- dpkg-1.15.8.5-orig/dpkg-deb/build.c	2010-10-08 12:27:15.042083703 +0800
-+++ dpkg-1.15.8.5/dpkg-deb/build.c	2010-10-08 12:31:53.822534277 +0800
-@@ -275,14 +275,14 @@
-               controlfile, checkedinfo->otherpriority);
-       warns++;
-     }
--    for (field= checkedinfo->available.arbs; field; field= field->next) {
-+    /*for (field= checkedinfo->available.arbs; field; field= field->next) {
-       if (known_arbitrary_field(field))
-         continue;
+Updated to apply over dpkg-1.16.3
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+
+diff -Nurd dpkg-1.16.3/dpkg-deb/build.c dpkg-1.16.3/dpkg-deb/build.c
+--- dpkg-1.16.3/dpkg-deb/build.c	2012-04-27 05:49:02.000000000 +0300
++++ dpkg-1.16.3/dpkg-deb/build.c	2012-05-04 13:28:39.000000000 +0300
+@@ -340,6 +340,7 @@
+   if (pkg->priority == pri_other)
+     warning(_("'%s' contains user-defined Priority value '%s'"),
+             controlfile, pkg->otherpriority);
++#if 0
+   for (field = pkg->available.arbs; field; field = field->next) {
+     if (known_arbitrary_field(field))
+       continue;
+@@ -347,6 +348,7 @@
+     warning(_("'%s' contains user-defined field '%s'"), controlfile,
+             field->name);
+   }
++#endif
  
-       warning(_("'%s' contains user-defined field '%s'"),
-               controlfile, field->name);
-       warns++;
--    }
-+    }*/
+   free(controlfile);
  
-     if (subdir) {
-       versionstring= versiondescribe(&checkedinfo->available.version,vdew_never);
diff --git a/meta/recipes-devtools/dpkg/dpkg/ignore_lutimes_errors.patch b/meta/recipes-devtools/dpkg/dpkg/ignore_lutimes_errors.patch
new file mode 100644
index 0000000..f0dcf91
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/ignore_lutimes_errors.patch
@@ -0,0 +1,26 @@
+do not error out if symbolic link modification time setting fails
+
+In OE environment setting that timestamp could fail for several
+non-error reasons, thus aborting package unpacking.
+
+Upstream-Status: Pending [http://bugs.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=672715]]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+
+diff -Nurd dpkg-1.16.3/src/archives.c dpkg-1.16.3/src/archives.c
+--- dpkg-1.16.3/src/archives.c	2012-04-27 05:49:03.000000000 +0300
++++ dpkg-1.16.3/src/archives.c	2012-05-13 03:14:08.000000000 +0300
+@@ -432,8 +432,11 @@
+ 
+   if (te->type == tar_filetype_symlink) {
+ #ifdef HAVE_LUTIMES
+-    if (lutimes(path, tv) && errno != ENOSYS)
+-      ohshite(_("error setting timestamps of `%.255s'"), path);
++    if (lutimes(path, tv) && errno != ENOSYS) {
++      /* In OE environment lutimes() could fail for several reasons and we don't
++       * want that to abort unpacking. For example link can be absolute path to
++       * something that is not present in host system. */
++    }
+ #endif
+   } else {
+     if (utimes(path, tv))
diff --git a/meta/recipes-devtools/dpkg/dpkg/perllibdir.patch b/meta/recipes-devtools/dpkg/dpkg/perllibdir.patch
deleted file mode 100644
index 45973f0..0000000
--- a/meta/recipes-devtools/dpkg/dpkg/perllibdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-We want to be able to set PERL_LIBDIR from the environment. This
-hardcoded assignment prevents us from doing so and obtains an 
-incorrect value.
-
-Upstream-Status: Inappropriate [in this form at least]
-
-RP 14/11/2011
-
-Index: dpkg-1.15.8.7/m4/dpkg-progs.m4
-===================================================================
---- dpkg-1.15.8.7.orig/m4/dpkg-progs.m4	2011-11-14 17:32:21.252053239 +0000
-+++ dpkg-1.15.8.7/m4/dpkg-progs.m4	2011-11-14 17:32:55.180052455 +0000
-@@ -9,9 +9,6 @@
- [AC_ARG_VAR([PERL], [Perl interpreter])dnl
- AC_PATH_PROG([PERL], [perl], [/usr/bin/perl])dnl
- AC_ARG_VAR([PERL_LIBDIR], [Perl library directory])dnl
--PERL_LIBDIR=$($PERL -MConfig -e 'my $r = $Config{vendorlibexp};
--                                 $r =~ s/$Config{vendorprefixexp}/\$(prefix)/;
--                                 print $r')dnl
- ])# DPKG_PROG_PERL
- 
- # DPKG_PROG_PO4A
diff --git a/meta/recipes-devtools/dpkg/dpkg/preinst.patch b/meta/recipes-devtools/dpkg/dpkg/preinst.patch
index 06d2aac..557b423 100644
--- a/meta/recipes-devtools/dpkg/dpkg/preinst.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/preinst.patch
@@ -6,41 +6,48 @@ Upstream-Status: Inappropriate [OE Specific]
 
 RP 2011/12/07
 
-Index: dpkg-1.15.8.7/src/help.c
-===================================================================
---- dpkg-1.15.8.7.orig/src/help.c	2010-12-20 01:25:36.000000000 +0000
-+++ dpkg-1.15.8.7/src/help.c	2011-12-07 14:51:02.783461487 +0000
-@@ -181,30 +181,9 @@
-    * FIXME: none of the stuff here will work if admindir isn't inside
-    * instdir as expected.
-    */
--  size_t instdirl;
+Updated to apply over dpkg-1.16.3
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+
+diff -Nurd dpkg-1.16.3/src/help.c dpkg-1.16.3/src/help.c
+--- dpkg-1.16.3/src/help.c	2012-04-27 05:49:03.000000000 +0300
++++ dpkg-1.16.3/src/help.c	2012-05-04 13:55:44.000000000 +0300
+@@ -204,35 +204,10 @@
+ static const char *
+ preexecscript(struct command *cmd)
+ {
+-  const char *admindir = dpkg_db_get_dir();
+-  size_t instdirl = strlen(instdir);
+-
+   if (*instdir) {
+-    if (strncmp(admindir, instdir, instdirl) != 0)
+-      ohshit(_("admindir must be inside instdir for dpkg to work properly"));
+-    if (setenv("DPKG_ADMINDIR", admindir + instdirl, 1) < 0)
+-      ohshite(_("unable to setenv for subprocesses"));
 -
--  if (*instdir) {
 -    if (chroot(instdir)) ohshite(_("failed to chroot to `%.250s'"),instdir);
 -    if (chdir("/"))
 -      ohshite(_("failed to chdir to `%.255s'"), "/");
 -  }
--  if (f_debug & dbg_scripts) {
+-  if (debug_has_flag(dbg_scripts)) {
 -    struct varbuf args = VARBUF_INIT;
 -    const char **argv = cmd->argv;
 -
 -    while (*++argv) {
--      varbufaddc(&args, ' ');
--      varbufaddstr(&args, *argv);
+-      varbuf_add_char(&args, ' ');
+-      varbuf_add_str(&args, *argv);
 -    }
--    varbufaddc(&args, '\0');
+-    varbuf_end_str(&args);
 -    debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename, args.buf);
 -    varbuf_destroy(&args);
--  }
--  instdirl= strlen(instdir);
++    setenv("D", instdir, 1);
+   }
 -  if (!instdirl)
 -    return cmd->filename;
 -  assert(strlen(cmd->filename) >= instdirl);
 -  return cmd->filename + instdirl;
-+  if (*instdir)
-+    setenv("D", instdir, 1);
 +  return cmd->filename;
- }  
+ }
  
  void
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb b/meta/recipes-devtools/dpkg/dpkg_1.16.3.bb
similarity index 42%
rename from meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb
rename to meta/recipes-devtools/dpkg/dpkg_1.16.3.bb
index 1e7ef25..df7c876 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.16.3.bb
@@ -4,12 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SRC_URI += "file://noman.patch \
             file://check_snprintf.patch \
             file://check_version.patch \
-            file://perllibdir.patch \
-            file://preinst.patch \
-            file://dpkg-deb-avoid-fflush.patch"
+            file://preinst.patch"
 
-SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc"
-SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5"
+SRC_URI[md5sum] = "20189e2926ada3dda4f77ef2e36999af"
+SRC_URI[sha256sum] = "8048890ca92a3ca317a4fdd557f8e9b2b3ce560743e8e70813496f9a7096d8d8"
 
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.0"
 
-- 
1.7.7.6

[CONSOLIDATED PULL 06/12] meta/classes/sstate.bbclass: ensure sstate files have group R/W

[Saul Wold]

From: Joshua Lock <josh@linux.intel.com>

In order to make sharing sstate files easier chmod them with 0664 permissions	so that they are readable and writable by the user and any other members of 	their group.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/classes/sstate.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 3fc615d..ccef4a9 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -473,6 +473,7 @@ sstate_create_package () {
 	else
 		tar -cz --file=$TFILE --files-from=/dev/null
 	fi
+	chmod 0664 $TFILE 
 	mv $TFILE ${SSTATE_PKG}
 
 	cd ${WORKDIR}
-- 
1.7.7.6

[CONSOLIDATED PULL 07/12] archiver.bbclass: Add two default set for avoiding error when missing assignment

[Saul Wold]

From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

Add two default set(SOURCE_ARCHIVE_LOG_WITH_SCRIPTS, \
SOURCE_ARCHIVE_PACKAGE_TYPE) to archiver.bbclass for avoiding \
building error when forgetting to assign to them.

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 meta/classes/archiver.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 59b58f4..ac8aa95 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -6,6 +6,8 @@ ARCHIVE_EXCLUDE_FROM ?= ".pc autom4te.cache"
 ARCHIVE_TYPE ?= "TAR SRPM"
 DISTRO ?= "poky"
 PATCHES_ARCHIVE_WITH_SERIES = 'TRUE'
+SOURCE_ARCHIVE_LOG_WITH_SCRIPTS ?= 'logs_with_scripts'
+SOURCE_ARCHIVE_PACKAGE_TYPE ?= 'tar'
 
 def get_bb_inc(d):
 	'''create a directory "script-logs" including .bb and .inc file in ${WORKDIR}'''
@@ -277,7 +279,7 @@ def get_package(d):
 	try:
 		f = open(tarpackage,'r')
 		line = list(set(f.readline().replace('\n','').split()))
-	except IOError:
+	except UnboundLocalError,IOError:
 		pass
 	f.close()
 	return line
-- 
1.7.7.6

[CONSOLIDATED PULL 08/12] gnutls: update to 2.12.19

[Saul Wold]

From: Bogdan Marinescu <bogdan.a.marinescu@intel.com>

Tested with curl in qemux86/core-image-lsb.

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
---
 .../configure-fix.patch                            |    0
 .../correct_rpl_gettimeofday_signature.patch       |    0
 .../fix-gettext-version.patch                      |    0
 .../gnutls-openssl.patch                           |    0
 .../gnutls-texinfo-euro.patch                      |    0
 .../{gnutls_2.12.18.bb => gnutls_2.12.19.bb}       |    4 ++--
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/gnutls/{gnutls-2.12.18 => gnutls-2.12.19}/configure-fix.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.12.18 => gnutls-2.12.19}/correct_rpl_gettimeofday_signature.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.12.18 => gnutls-2.12.19}/fix-gettext-version.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.12.18 => gnutls-2.12.19}/gnutls-openssl.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.12.18 => gnutls-2.12.19}/gnutls-texinfo-euro.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls_2.12.18.bb => gnutls_2.12.19.bb} (77%)

diff --git a/meta/recipes-support/gnutls/gnutls-2.12.18/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.12.19/configure-fix.patch
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.12.18/configure-fix.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.19/configure-fix.patch
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.18/correct_rpl_gettimeofday_signature.patch b/meta/recipes-support/gnutls/gnutls-2.12.19/correct_rpl_gettimeofday_signature.patch
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.12.18/correct_rpl_gettimeofday_signature.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.19/correct_rpl_gettimeofday_signature.patch
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.18/fix-gettext-version.patch b/meta/recipes-support/gnutls/gnutls-2.12.19/fix-gettext-version.patch
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.12.18/fix-gettext-version.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.19/fix-gettext-version.patch
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.18/gnutls-openssl.patch b/meta/recipes-support/gnutls/gnutls-2.12.19/gnutls-openssl.patch
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.12.18/gnutls-openssl.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.19/gnutls-openssl.patch
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.18/gnutls-texinfo-euro.patch b/meta/recipes-support/gnutls/gnutls-2.12.19/gnutls-texinfo-euro.patch
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.12.18/gnutls-texinfo-euro.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.19/gnutls-texinfo-euro.patch
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.18.bb b/meta/recipes-support/gnutls/gnutls_2.12.19.bb
similarity index 77%
rename from meta/recipes-support/gnutls/gnutls_2.12.18.bb
rename to meta/recipes-support/gnutls/gnutls_2.12.19.bb
index 7355855..7d76510 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.18.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.19.bb
@@ -7,8 +7,8 @@ SRC_URI += "file://gnutls-openssl.patch \
             file://configure-fix.patch \
            "
 
-SRC_URI[md5sum] = "e9215d00d2930e09bc8f23f02b54f2d1"
-SRC_URI[sha256sum] = "780b12e3f05191316390611a3d9d982d29ca3f3abc234517b2fc542064b6f07a"
+SRC_URI[md5sum] = "14228b34e3d8ed176a617df40693b441"
+SRC_URI[sha256sum] = "8f167b39de4e2fddd83f7e29c98ce2e7fc76f4d79ccf4d3d66d1379b971160ec"
 
 python() {
     if not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1):
-- 
1.7.7.6

[CONSOLIDATED PULL 09/12] gnupg: Update to upstream version 2.0.19

[Saul Wold]

From: Laurentiu Palcu <laurentiu.palcu@intel.com>

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 .../gnupg/{gnupg_2.0.18.bb => gnupg_2.0.19.bb}     |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-support/gnupg/{gnupg_2.0.18.bb => gnupg_2.0.19.bb} (81%)

diff --git a/meta/recipes-support/gnupg/gnupg_2.0.18.bb b/meta/recipes-support/gnupg/gnupg_2.0.19.bb
similarity index 81%
rename from meta/recipes-support/gnupg/gnupg_2.0.18.bb
rename to meta/recipes-support/gnupg/gnupg_2.0.19.bb
index 3085494..1d19fe3 100644
--- a/meta/recipes-support/gnupg/gnupg_2.0.18.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.0.19.bb
@@ -5,14 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
                     file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 
 DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt"
-PR = "r1"
+PR = "r0"
 
 inherit autotools gettext
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "2f37e0722666a0fedbe4d9f9227ac4d7"
-SRC_URI[sha256sum] = "48aedd762ca443fb952a9e859efe3c66706d7c2c9c77c32dbdbac4fe962dae5b"
+SRC_URI[md5sum] = "6a8589381ca1b0c1a921e9955f42b016"
+SRC_URI[sha256sum] = "efa23a8a925adb51c7d3b708c25b6d000300f5ce37de9bdec6453be7b419c622"
 
 EXTRA_OECONF = "--disable-ldap \
 		--with-zlib=${STAGING_LIBDIR}/.. \
-- 
1.7.7.6

[CONSOLIDATED PULL 10/12] xf86-video-vmware: update package to 12.0.2

[Saul Wold]

From: Alexandru DAMIAN <alexandru.damian@intel.com>

This patch updates the package version for the vmware xorg driver
to 12.0.2, following upstream. No other changes made beside updating
the checksums.
---
 ...mware_12.0.1.bb => xf86-video-vmware_12.0.2.bb} |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-video-vmware_12.0.1.bb => xf86-video-vmware_12.0.2.bb} (74%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.1.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb
similarity index 74%
rename from meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.1.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb
index a5655fc..71f0339 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.1.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb
@@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
 DEPENDS += "virtual/libx11 libxvmc drm glproto \
 	    virtual/libgl xineramaproto libpciaccess"
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
-SRC_URI[md5sum] = "08101a9b09774ec2f432db5118928c53"
-SRC_URI[sha256sum] = "ded644af1f74ca0ebdc759e3db715519c476b341c1783c3d92c93a76591ed496"
+SRC_URI[md5sum] = "0743ec7c479603fba60d118858fd5783"
+SRC_URI[sha256sum] = "c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147"
 
 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
 
-- 
1.7.7.6

[CONSOLIDATED PULL 11/12] sanity.bbclass: check user can read and write to SSTATE_DIR

[Saul Wold]

From: Joshua Lock <josh@linux.intel.com>

The user needs read and write permissions to SSTATE_DIR, check
whether they have sufficient permissions and if not recommend
use of SSTATE_MIRRORS.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/classes/sanity.bbclass |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 05545f4..ff3c413 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -96,10 +96,16 @@ def check_conf_exists(fn, data):
 def check_sanity_sstate_dir_change(sstate_dir, data):
     # Sanity checks to be done when the value of SSTATE_DIR changes
 
-    # Check that SSTATE_DIR isn't on a filesystem with limited filename length (eg. eCryptFS)
     testmsg = ""
     if sstate_dir != "":
-        testmsg = check_create_long_filename(sstate_dir, "SSTATE_DIR")
+        # Check that the user can read and write to SSTATE_DIR
+        sstatemsg = check_can_read_write_directory(sstate_dir) or None
+        if sstatemsg:
+            sstatemsg = sstatemsg + ". You could try using it as an SSTATE_MIRRORS instead of SSTATE_CACHE.\n"
+            testmsg = testmsg + sstatemsg
+        # Check that SSTATE_DIR isn't on a filesystem with limited filename length (eg. eCryptFS)
+        testmsg = testmsg + check_create_long_filename(sstate_dir, "SSTATE_DIR")
+
     return testmsg
 
 def check_sanity_tmpdir_change(tmpdir, data):
@@ -150,7 +156,12 @@ def check_create_long_filename(filepath, pathname):
         if errno == 36: # ENAMETOOLONG
             return "Failed to create a file with a long name in %s. Please use a filesystem that does not unreasonably limit filename length.\n" % pathname
         else:
-            return "Failed to create a file in %s: %s" % (pathname, strerror)
+            return "Failed to create a file in %s: %s\n" % (pathname, strerror)
+    return ""
+
+def check_can_read_write_directory(directory):
+    if not os.access(directory, os.R_OK|os.W_OK):
+       return "Insufficient permissions for %s" % directory
     return ""
 
 def check_connectivity(d):
-- 
1.7.7.6

[CONSOLIDATED PULL 12/12] xserver-xorg-lite: disable xmlto like full xserver-xorg does

[Saul Wold]

From: Martin Jansa <martin.jansa@gmail.com>

* xmlto-native is unusable (see YOCTO #2416
  xmlto/xsltproc stylesheets cannot be found even when they are installed in sysroot)

* fails like this:
| make[2]: Entering directory `/OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc'
| /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/xmlto   xhtml-nochunks Xserver-spec.xml
| /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/xmlto   xhtml-nochunks Xinput.xml
| xmlto: /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml does not validate (status 3)
| xmlto: Fix document syntax or use --skip-validation option
| /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:3: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
|                    "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
|                                                                             ^
| /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:40: parser error : Entity 'ldquo' not defined
| btaining a copy of this software and associated documentation files (the &ldquo;
|                                                                                ^
| /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:40: parser error : Entity 'rdquo' not defined
|  of this software and associated documentation files (the &ldquo;Software&rdquo;
|                                                                                ^
| /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:42: parser error : Entity 'ldquo' not defined
| btaining a copy of this software and associated documentation files (the &ldquo;
|                                                                                ^
| /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:42: parser error : Entity 'rdquo' not defined
|  of this software and associated documentation files (the &ldquo;Software&rdquo;
|                                                                                ^
| warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
| validity error : Could not load the external subset "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
| Document /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml does not validate
| xmlto: /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xserver-spec.xml does not validate (status 3)
| xmlto: Fix document syntax or use --skip-validation option
| make[2]: *** [Xinput.html] Error 13
| make[2]: *** Waiting for unfinished jobs....
| /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xserver-spec.xml:4: warning: failed to load external entity "/xserver/doc/xml/xserver.ent"
|  <!ENTITY % defs SYSTEM "/xserver/doc/xml/xserver.ent"> %defs;
|                                                               ^
| Entity: line 1:
|  %defs;
|        ^

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../xorg-xserver/xserver-xorg-1.11.2.inc           |    2 +-
 .../xorg-xserver/xserver-xorg-lite.inc             |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index 6a86af4..fc41568 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -7,5 +7,5 @@ SRC_URI += "file://crosscompile.patch \
 SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
 SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
 
-PR = "r2"
+PR = "r3"
 
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index 57615f5..02db5bf 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -4,4 +4,5 @@ EXTRA_OECONF += "\
                  --disable-dri \
                  --disable-glx \
                  --disable-dga \
+                 --without-xmlto \
 "
-- 
1.7.7.6

Re: [CONSOLIDATED PULL 00/12] Updated and Fixes

[Koen Kooi]

Op 17 mei 2012, om 18:51 heeft Saul Wold het volgende geschreven:

> Richard,
> 
> Pull in the backlog of changes from this week.  Bigest change
> that need looking at are Chris's.

Where's the kmod fix? Does udev 182 need to remain unbuildable for another week?

Re: [CONSOLIDATED PULL 00/12] Updated and Fixes

[Richard Purdie]

On Thu, 2012-05-17 at 19:51 +0300, Saul Wold wrote:
> Richard,
> 
> Pull in the backlog of changes from this week.  Bigest change
> that need looking at are Chris's.
> 
> Sau!
> 
> The following changes since commit 2cf6e7cf81c0b864b5d51be60094a6eb3e584383:
> 
>   fotowall: Add #include ui_wizard.h to ExportWizard.cpp (2012-05-16 07:33:15 +0100)
> 
> are available in the git repository at:
>   git://git.openembedded.org/openembedded-core-contrib sgw/stage
>   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
> 
> Alexandru DAMIAN (1):
>   xf86-video-vmware: update package to 12.0.2
> 
> Bogdan Marinescu (1):
>   gnutls: update to 2.12.19
> 
> Christopher Larson (3):
>   csl-versions: fix bb.process.CmdError reference
>   oe.types: give the regex type more sane semantics
>   kernel.bbclass: add deploy link to KERNEL_IMAGETYPE
> 
> Joshua Lock (2):
>   meta/classes/sstate.bbclass: ensure sstate files have group R/W
>   sanity.bbclass: check user can read and write to SSTATE_DIR
> 
> Laurentiu Palcu (1):
>   gnupg: Update to upstream version 2.0.19
> 
> Marko Lindqvist (1):
>   dpkg: update to upstream version 1.16.3
> 
> Martin Jansa (1):
>   xserver-xorg-lite: disable xmlto like full xserver-xorg does
> 
> Saul Wold (1):
>   xinetd: Update to 2.3.15
> 
> Xiaofeng Yan (1):
>   archiver.bbclass: Add two default set for avoiding error when missing
>     assignment

I've merged these apart from the dpkg upgrade which I'd like to double
check doesn't break the deb backend. I've seen conflicting emails about
this so would appreciate confirmation this upgrade works well.

Cheers,

Richard