[PATCH 00/17] Various warning fixes

[PATCH 00/17] Various warning fixes

[Richard Purdie]

The following changes since commit f47ada62a3da879006e7cb27479dc9b72c56e923:

  cmake.bbclass: add ${base_libdir} to CMAKE_LIBRARY_PATH (2012-03-12 17:46:16 +0000)

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

and fix various warning messages.

Richard Purdie (17):
  leafpad: Package currently unpackaged files.
  xf86-input-vmmouse: Package unpackaged files
  sato-screenshot: Remove unneeded .la file
  librsvg: Fix unpackaged directory warnings
  matchbox-session: Clarify LICENSE as GPLv2
  wireless-tools: Clarify LICENSE field to avoid warnings
  gtk-doc: Clarify license as GPLv2
  gnome-doc-utils: Clarify license as GPLv2 and LGPLv2.1
  boost: Correct license name BSL-1 -> BSL-1.0
  shadow: Correct license Artistic -> Artistic-1.0
  perl: Clarify LICENSE with versions. Yes, its really GPLv1
  license.bbclass: Add mapping for LGPLv2.0, pango uses it
  qemu-config: Clarify license as GPLv2
  bluez4: Ensure the plugins directory is packaged to avoid warnings
  rpm: Add rpmdeps-oecore to appropriate package
  python-pycairo: Fix incorrect versions in license field
  xserver-xorg: Remove unneeded empty directory, fixing QA warning

 meta/classes/license.bbclass                       |    1 +
 meta/recipes-bsp/qemu-config/qemu-config.bb        |    4 ++--
 meta/recipes-connectivity/bluez/bluez4_4.98.bb     |    2 +-
 .../wireless-tools/wireless-tools_29.bb            |    4 ++--
 meta/recipes-devtools/perl/perl_5.14.2.bb          |    4 ++--
 .../python/python-pycairo_1.10.0.bb                |    4 ++--
 meta/recipes-devtools/rpm/rpm_5.4.0.bb             |    3 ++-
 .../shadow/shadow-native_4.1.4.3.bb                |    4 ++--
 .../shadow/shadow-sysroot_4.1.4.3.bb               |    4 ++--
 meta/recipes-extended/shadow/shadow_4.1.4.3.bb     |    4 ++--
 meta/recipes-gnome/gnome/gnome-doc-utils.inc       |    2 +-
 meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |    2 +-
 meta/recipes-gnome/gtk-doc/gtk-doc.bb              |    2 +-
 meta/recipes-gnome/librsvg/librsvg_2.32.1.bb       |    7 ++++++-
 .../matchbox-session/matchbox-session_0.1.bb       |    4 +++-
 .../xorg-driver/xf86-input-vmmouse_12.7.0.bb       |   10 +++++++++-
 .../xorg-xserver/xserver-xorg-common.inc           |    4 ++++
 meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb      |    6 ++++--
 .../sato-screenshot/sato-screenshot_git.bb         |    6 +++++-
 meta/recipes-support/boost/boost.inc               |    4 ++--
 20 files changed, 54 insertions(+), 27 deletions(-)

-- 
1.7.5.4

[PATCH 01/17] leafpad: Package currently unpackaged files.

[Richard Purdie]

This resolves the QA warning:

WARNING: For recipe leafpad, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/share/icons
WARNING:   /usr/share/icons/hicolor
WARNING:   /usr/share/icons/hicolor/16x16
WARNING:   /usr/share/icons/hicolor/22x22
WARNING:   /usr/share/icons/hicolor/scalable
WARNING:   /usr/share/icons/hicolor/32x32
WARNING:   /usr/share/icons/hicolor/24x24
WARNING:   /usr/share/icons/hicolor/16x16/apps
WARNING:   /usr/share/icons/hicolor/16x16/apps/leafpad.png
WARNING:   /usr/share/icons/hicolor/22x22/apps
WARNING:   /usr/share/icons/hicolor/22x22/apps/leafpad.png
WARNING:   /usr/share/icons/hicolor/scalable/apps
WARNING:   /usr/share/icons/hicolor/scalable/apps/leafpad.svg
WARNING:   /usr/share/icons/hicolor/32x32/apps
WARNING:   /usr/share/icons/hicolor/32x32/apps/leafpad.png
WARNING:   /usr/share/icons/hicolor/24x24/apps
WARNING:   /usr/share/icons/hicolor/24x24/apps/leafpad.png

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
index 68402c5..3d1bc43 100644
--- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
+++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "Simple GTK+ Text Editor"
 HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
-BUGTRACKER = ""
 
 LICENSE = "GPLv2 & GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
@@ -14,7 +13,7 @@ SRC_URI = "http://savannah.nongnu.org/download/${BPN}/${BPN}-${PV}.tar.gz \
 
 SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
 SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
-PR = "r1"
+PR = "r2"
 
 SRC_URI_append_poky += " file://owl-menu.patch;apply=yes "
 
@@ -29,3 +28,6 @@ do_install_append () {
 }
 
 FILES_${PN} += "${datadir}/applications/leafpad.desktop"
+
+PACKAGES += "leafpad-stock-icons"
+FILES_leafpad-stock-icons = "${datadir}/icons/hicolor/"
-- 
1.7.5.4

Re: [PATCH 01/17] leafpad: Package currently unpackaged files.

[Koen Kooi]

Op 13 mrt. 2012, om 01:22 heeft Richard Purdie het volgende geschreven:

> This resolves the QA warning:
> 
> WARNING: For recipe leafpad, the following files/directories were installed but not shipped in any package:
> WARNING:   /usr/share/icons
> WARNING:   /usr/share/icons/hicolor
> WARNING:   /usr/share/icons/hicolor/16x16
> WARNING:   /usr/share/icons/hicolor/22x22
> WARNING:   /usr/share/icons/hicolor/scalable
> WARNING:   /usr/share/icons/hicolor/32x32
> WARNING:   /usr/share/icons/hicolor/24x24
> WARNING:   /usr/share/icons/hicolor/16x16/apps
> WARNING:   /usr/share/icons/hicolor/16x16/apps/leafpad.png
> WARNING:   /usr/share/icons/hicolor/22x22/apps
> WARNING:   /usr/share/icons/hicolor/22x22/apps/leafpad.png
> WARNING:   /usr/share/icons/hicolor/scalable/apps
> WARNING:   /usr/share/icons/hicolor/scalable/apps/leafpad.svg
> WARNING:   /usr/share/icons/hicolor/32x32/apps
> WARNING:   /usr/share/icons/hicolor/32x32/apps/leafpad.png
> WARNING:   /usr/share/icons/hicolor/24x24/apps
> WARNING:   /usr/share/icons/hicolor/24x24/apps/leafpad.png
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb |    6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> index 68402c5..3d1bc43 100644
> --- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> +++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> @@ -1,6 +1,5 @@
> DESCRIPTION = "Simple GTK+ Text Editor"
> HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
> -BUGTRACKER = ""
> 
> LICENSE = "GPLv2 & GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> @@ -14,7 +13,7 @@ SRC_URI = "http://savannah.nongnu.org/download/${BPN}/${BPN}-${PV}.tar.gz \
> 
> SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
> SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
> -PR = "r1"
> +PR = "r2"
> 
> SRC_URI_append_poky += " file://owl-menu.patch;apply=yes "
> 
> @@ -29,3 +28,6 @@ do_install_append () {
> }
> 
> FILES_${PN} += "${datadir}/applications/leafpad.desktop"
> +
> +PACKAGES += "leafpad-stock-icons"
> +FILES_leafpad-stock-icons = "${datadir}/icons/hicolor/"

I strongly suspect that that .desktop will reference leafpad.png as the icon, but I haven't actually verified that. This recipe should probably inherit gtk-icon-cache.

regards,

Koen

Re: [PATCH 01/17] leafpad: Package currently unpackaged files.

[Richard Purdie]

On Tue, 2012-03-13 at 09:07 +0100, Koen Kooi wrote:
> Op 13 mrt. 2012, om 01:22 heeft Richard Purdie het volgende geschreven:
> 
> > This resolves the QA warning:
> > 
> > WARNING: For recipe leafpad, the following files/directories were installed but not shipped in any package:
> > WARNING:   /usr/share/icons
> > WARNING:   /usr/share/icons/hicolor
> > WARNING:   /usr/share/icons/hicolor/16x16
> > WARNING:   /usr/share/icons/hicolor/22x22
> > WARNING:   /usr/share/icons/hicolor/scalable
> > WARNING:   /usr/share/icons/hicolor/32x32
> > WARNING:   /usr/share/icons/hicolor/24x24
> > WARNING:   /usr/share/icons/hicolor/16x16/apps
> > WARNING:   /usr/share/icons/hicolor/16x16/apps/leafpad.png
> > WARNING:   /usr/share/icons/hicolor/22x22/apps
> > WARNING:   /usr/share/icons/hicolor/22x22/apps/leafpad.png
> > WARNING:   /usr/share/icons/hicolor/scalable/apps
> > WARNING:   /usr/share/icons/hicolor/scalable/apps/leafpad.svg
> > WARNING:   /usr/share/icons/hicolor/32x32/apps
> > WARNING:   /usr/share/icons/hicolor/32x32/apps/leafpad.png
> > WARNING:   /usr/share/icons/hicolor/24x24/apps
> > WARNING:   /usr/share/icons/hicolor/24x24/apps/leafpad.png
> > 
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb |    6 ++++--
> > 1 files changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > index 68402c5..3d1bc43 100644
> > --- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > +++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > @@ -1,6 +1,5 @@
> > DESCRIPTION = "Simple GTK+ Text Editor"
> > HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
> > -BUGTRACKER = ""
> > 
> > LICENSE = "GPLv2 & GPLv2+"
> > LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> > @@ -14,7 +13,7 @@ SRC_URI = "http://savannah.nongnu.org/download/${BPN}/${BPN}-${PV}.tar.gz \
> > 
> > SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
> > SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
> > -PR = "r1"
> > +PR = "r2"
> > 
> > SRC_URI_append_poky += " file://owl-menu.patch;apply=yes "
> > 
> > @@ -29,3 +28,6 @@ do_install_append () {
> > }
> > 
> > FILES_${PN} += "${datadir}/applications/leafpad.desktop"
> > +
> > +PACKAGES += "leafpad-stock-icons"
> > +FILES_leafpad-stock-icons = "${datadir}/icons/hicolor/"
> 
> I strongly suspect that that .desktop will reference leafpad.png as
> the icon, but I haven't actually verified that.

I can confirm it does not (it references accessories-text-editor).

>  This recipe should probably inherit gtk-icon-cache.

Probably although given the above it becomes less of an issue.

Cheers,

Richard

Re: [PATCH 01/17] leafpad: Package currently unpackaged files.

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3418 bytes --]

On Tue, Mar 13, 2012 at 09:52:14AM +0000, Richard Purdie wrote:
> On Tue, 2012-03-13 at 09:07 +0100, Koen Kooi wrote:
> > Op 13 mrt. 2012, om 01:22 heeft Richard Purdie het volgende geschreven:
> > 
> > > This resolves the QA warning:
> > > 
> > > WARNING: For recipe leafpad, the following files/directories were installed but not shipped in any package:
> > > WARNING:   /usr/share/icons
> > > WARNING:   /usr/share/icons/hicolor
> > > WARNING:   /usr/share/icons/hicolor/16x16
> > > WARNING:   /usr/share/icons/hicolor/22x22
> > > WARNING:   /usr/share/icons/hicolor/scalable
> > > WARNING:   /usr/share/icons/hicolor/32x32
> > > WARNING:   /usr/share/icons/hicolor/24x24
> > > WARNING:   /usr/share/icons/hicolor/16x16/apps
> > > WARNING:   /usr/share/icons/hicolor/16x16/apps/leafpad.png
> > > WARNING:   /usr/share/icons/hicolor/22x22/apps
> > > WARNING:   /usr/share/icons/hicolor/22x22/apps/leafpad.png
> > > WARNING:   /usr/share/icons/hicolor/scalable/apps
> > > WARNING:   /usr/share/icons/hicolor/scalable/apps/leafpad.svg
> > > WARNING:   /usr/share/icons/hicolor/32x32/apps
> > > WARNING:   /usr/share/icons/hicolor/32x32/apps/leafpad.png
> > > WARNING:   /usr/share/icons/hicolor/24x24/apps
> > > WARNING:   /usr/share/icons/hicolor/24x24/apps/leafpad.png
> > > 
> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > ---
> > > meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb |    6 ++++--
> > > 1 files changed, 4 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > > index 68402c5..3d1bc43 100644
> > > --- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > > +++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > > @@ -1,6 +1,5 @@
> > > DESCRIPTION = "Simple GTK+ Text Editor"
> > > HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
> > > -BUGTRACKER = ""
> > > 
> > > LICENSE = "GPLv2 & GPLv2+"
> > > LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> > > @@ -14,7 +13,7 @@ SRC_URI = "http://savannah.nongnu.org/download/${BPN}/${BPN}-${PV}.tar.gz \
> > > 
> > > SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
> > > SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
> > > -PR = "r1"
> > > +PR = "r2"
> > > 
> > > SRC_URI_append_poky += " file://owl-menu.patch;apply=yes "

^^ this should be probably dropped too (at least apply=yes) or applied for everybody

> > > 
> > > @@ -29,3 +28,6 @@ do_install_append () {
> > > }
> > > 
> > > FILES_${PN} += "${datadir}/applications/leafpad.desktop"
> > > +
> > > +PACKAGES += "leafpad-stock-icons"
> > > +FILES_leafpad-stock-icons = "${datadir}/icons/hicolor/"
> > 
> > I strongly suspect that that .desktop will reference leafpad.png as
> > the icon, but I haven't actually verified that.
> 
> I can confirm it does not (it references accessories-text-editor).
> 
> >  This recipe should probably inherit gtk-icon-cache.
> 
> Probably although given the above it becomes less of an issue.
> 
> Cheers,
> 
> Richard
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 01/17] leafpad: Package currently unpackaged files.

[Richard Purdie]

On Tue, 2012-03-13 at 10:54 +0100, Martin Jansa wrote:
> On Tue, Mar 13, 2012 at 09:52:14AM +0000, Richard Purdie wrote:
> > On Tue, 2012-03-13 at 09:07 +0100, Koen Kooi wrote:
> > > Op 13 mrt. 2012, om 01:22 heeft Richard Purdie het volgende geschreven:
> > > > meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb |    6 ++++--
> > > > 1 files changed, 4 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > > > index 68402c5..3d1bc43 100644
> > > > --- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > > > +++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
> > > > @@ -1,6 +1,5 @@
> > > > DESCRIPTION = "Simple GTK+ Text Editor"
> > > > HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
> > > > -BUGTRACKER = ""
> > > > 
> > > > LICENSE = "GPLv2 & GPLv2+"
> > > > LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> > > > @@ -14,7 +13,7 @@ SRC_URI = "http://savannah.nongnu.org/download/${BPN}/${BPN}-${PV}.tar.gz \
> > > > 
> > > > SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
> > > > SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
> > > > -PR = "r1"
> > > > +PR = "r2"
> > > > 
> > > > SRC_URI_append_poky += " file://owl-menu.patch;apply=yes "
> 
> ^^ this should be probably dropped too (at least apply=yes) or applied for everybody

I agree we need to resolve those. Applying them unequivocally would be a
bad idea though and we talked about a sato override. That is something
for a different patch and I wish there were more hours in the day...

Cheers,

Richard

[PATCH 02/17] xf86-input-vmmouse: Package unpackaged files

[Richard Purdie]

This addresses the QA warnings:

WARNING: For recipe xf86-input-vmmouse, the following files/directories were installed but not shipped in any package:
WARNING:   /lib
WARNING:   /lib/udev
WARNING:   /lib/udev/rules.d
WARNING:   /lib/udev/rules.d/69-xorg-vmmouse.rules
WARNING:   /usr/share/X11
WARNING:   /usr/share/hal
WARNING:   /usr/share/X11/xorg.conf.d
WARNING:   /usr/share/X11/xorg.conf.d/50-vmmouse.conf
WARNING:   /usr/share/hal/fdi
WARNING:   /usr/share/hal/fdi/policy
WARNING:   /usr/share/hal/fdi/policy/20thirdparty
WARNING:   /usr/share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
WARNING:   /usr/lib/hal
WARNING:   /usr/lib/hal/hal-probe-vmmouse

The hal files are simply deleted, we don't care about hal.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../xorg-driver/xf86-input-vmmouse_12.7.0.bb       |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb
index 42e2b14..652169f 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.7.0.bb
@@ -1,7 +1,7 @@
 require xorg-driver-input.inc
 
 DESCRIPTION = "X.Org X server -- VMWare mouse input driver"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 RDEPENDS_${PN} += "xf86-input-mouse"
 
@@ -11,3 +11,11 @@ SRC_URI[md5sum] = "dc77181330f983c7d0ec1ea1592c2ca7"
 SRC_URI[sha256sum] = "00e5d527a0d97e6b2a6e8c519e1339427e66fa0a43af026858655c7c62bd9e35"
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+
+do_install_append () {
+	# We don't care about hal
+	rm -rf ${D}${datadir}/hal/
+	rm -rf ${D}${libdir}/hal/
+}
+
+FILES_${PN} += "${base_libdir}/udev/ ${datadir}/X11/xorg.conf.d"
-- 
1.7.5.4

[PATCH 03/17] sato-screenshot: Remove unneeded .la file

[Richard Purdie]

This resolves the QA warning:

WARNING: For recipe sato-screenshot, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/lib/matchbox-panel/libscreenshot.la

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../sato-screenshot/sato-screenshot_git.bb         |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
index 8a113b3..ff92142 100644
--- a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
+++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 DEPENDS = "matchbox-panel-2"
 SRCREV = "c792e4edc758bab21e0b01814979eacf0b1af945"
 PV = "0.1+git${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git \
            file://fix_ldadd_order.patch"
@@ -21,3 +21,7 @@ inherit autotools pkgconfig
 
 FILES_${PN} += "${libdir}/matchbox-panel/*.so"
 FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"
+
+do_install_append () {
+	rm ${D}${libdir}/matchbox-panel/*.la
+}
-- 
1.7.5.4

[PATCH 04/17] librsvg: Fix unpackaged directory warnings

[Richard Purdie]

This patch fixes the QA warnings:

WARNING: For recipe librsvg, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/lib/gtk-3.0
WARNING:   /usr/lib/gtk-3.0/engines

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-gnome/librsvg/librsvg_2.32.1.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index faefecd..74286fd 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 SECTION = "x11/utils"
 DEPENDS = "gtk+ libcroco cairo libxml2 popt"
 
-PR = "r2"
+PR = "r3"
 
 inherit autotools pkgconfig gnome
 
@@ -25,6 +25,11 @@ do_configure_prepend () {
 	echo "CLEANFILES=" > gtk-doc.make
 }
 
+do_install_append () {
+	rmdir ${D}${libdir}/gtk-3.0/engines/
+	rmdir ${D}${libdir}/gtk-3.0/
+}
+
 PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
 FILES_${PN} = "${libdir}/*.so.*"
 FILES_${PN}-staticdev += "${libdir}/gdk-pixbuf-2.0/*.a ${libdir}/gdk-pixbuf-2.0/*/*/*.a \
-- 
1.7.5.4

[PATCH 05/17] matchbox-session: Clarify LICENSE as GPLv2

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../matchbox-session/matchbox-session_0.1.bb       |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
index df9f2ab..dc10031 100644
--- a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
+++ b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Custom MB session files for poky"
 HOMEPAGE = "http://www.matchbox-project.org/"
 BUGTRACKER = "http://bugzilla.openedhand.com/"
 
-LICENSE = "GPL"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://matchbox-session;endline=20;md5=180f1c169a15d059a56c30094f6fb5ea"
 
 SECTION = "x11"
@@ -11,6 +11,8 @@ RCONFLICTS = "matchbox-common"
 SRC_URI = "file://matchbox-session"
 S = "${WORKDIR}"
 
+PR = "r1"
+
 inherit update-alternatives
 
 ALTERNATIVE_NAME = "x-session-manager"
-- 
1.7.5.4

[PATCH 06/17] wireless-tools: Clarify LICENSE field to avoid warnings

[Richard Purdie]

The source is unclear which version of the license applies. Since BSD is listed,
we have plenty of choice so lets pick some versions. Most people would pick
BSD out of the three anyway.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../wireless-tools/wireless-tools_29.bb            |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
index c6235d6..209f29a 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
 HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
-LICENSE = "GPLv2 & (LGPL | MPL | BSD)"
+LICENSE = "GPLv2 & (LGPLv2.1 | MPL-1.1 | BSD)"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 			file://iwconfig.c;beginline=1;endline=12;md5=cf710eb1795c376eb10ea4ff04649caf \
 			file://iwevent.c;beginline=59;endline=72;md5=d66a10026d4394f0a5b1c5587bce4537 \
 			file://sample_enc.c;beginline=1;endline=4;md5=838372be07874260b566bae2f6ed33b6"
 SECTION = "base"
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \
 	   file://remove.ldconfig.call.patch \
-- 
1.7.5.4

[PATCH 07/17] gtk-doc: Clarify license as GPLv2

[Richard Purdie]

The .m4 file has no details but the upstream project is clearly GPLv2
so update the LICENSE file to match.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-gnome/gtk-doc/gtk-doc.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc.bb b/meta/recipes-gnome/gtk-doc/gtk-doc.bb
index 765304e..3147d4a 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc.bb
@@ -4,7 +4,7 @@ It is used for generating the documentation for GTK+, GLib \
 and GNOME."
 SECTION = "x11/base"
 SRC_URI = "file://gtk-doc.m4"
-LICENSE = "LGPL"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://../gtk-doc.m4;endline=10;md5=868a952d8bb2d825d724854cfaf8f14e"
 
 PR = "r4"
-- 
1.7.5.4

[PATCH 08/17] gnome-doc-utils: Clarify license as GPLv2 and LGPLv2.1

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-gnome/gnome/gnome-doc-utils.inc       |    2 +-
 meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
index 0047a1d..08333db 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
@@ -1,4 +1,4 @@
-LICENSE = "GPL & LGPL"
+LICENSE = "GPLv2 & LGPLv2.1"
 DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native glib-2.0"
 DEPENDS_virtclass-native = "libxml2-native libxslt-native intltool-native glib-2.0-native"
 
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
index 1681db7..e93f584 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
@@ -1,7 +1,7 @@
 require gnome-doc-utils.inc
 LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
 		    file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
-PR = "r7"
+PR = "r8"
 
 SRC_URI += "file://xsltproc_nonet.patch \
 	    file://use-usr-bin-env-for-python-in-xml2po.patch \
-- 
1.7.5.4

[PATCH 09/17] boost: Correct license name BSL-1 -> BSL-1.0

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-support/boost/boost.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index c15a04c..d70a7e2 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -8,7 +8,7 @@ HOMEPAGE = "http://www.boost.org/"
 SECTION = "libs"
 DEPENDS = "boost-native zlib"
 DEPENDS_virtclass-native = ""
-LICENSE = "BSL-1 & MIT & Python-2.0"
+LICENSE = "BSL-1.0 & MIT & Python-2.0"
 
 ARM_INSTRUCTION_SET = "arm"
 
@@ -16,7 +16,7 @@ BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}"
 BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}"
 BOOST_P = "boost_${BOOST_VER}"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2"
 
-- 
1.7.5.4

[PATCH 10/17] shadow: Correct license Artistic -> Artistic-1.0

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../shadow/shadow-native_4.1.4.3.bb                |    4 ++--
 .../shadow/shadow-sysroot_4.1.4.3.bb               |    4 ++--
 meta/recipes-extended/shadow/shadow_4.1.4.3.bb     |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
index 1f6ef1b..42ecc6a 100644
--- a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
@@ -3,11 +3,11 @@ DESCRIPTION = "Tools to change and administer password and group data"
 HOMEPAGE = "http://pkg-shadow.alioth.debian.org"
 BUGTRACKER = "https://alioth.debian.org/tracker/?group_id=30580"
 SECTION = "base utils"
-LICENSE = "BSD | Artistic"
+LICENSE = "BSD | Artistic-1.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
                     file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
            file://shadow.automake-1.11.patch \
diff --git a/meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb
index 1fb6c56..d379c1f 100644
--- a/meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb
@@ -3,12 +3,12 @@ DESCRIPTION = "Shadow utils requirements for useradd.bbclass"
 HOMEPAGE = "http://pkg-shadow.alioth.debian.org"
 BUGTRACKER = "https://alioth.debian.org/tracker/?group_id=30580"
 SECTION = "base utils"
-LICENSE = "BSD | Artistic"
+LICENSE = "BSD | Artistic-1.0"
 LIC_FILES_CHKSUM = "file://login.defs_shadow-sysroot;md5=25e2f2de4dfc8f966ac5cdfce45cd7d5"
 
 DEPENDS = "base-passwd"
 
-PR = "r2"
+PR = "r3"
 
 # The sole purpose of this recipe is to provide the /etc/login.defs
 # file for the target sysroot - needed so the shadow-native utilities
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index a69eb7c..f892eb9 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -3,13 +3,13 @@ DESCRIPTION = "Tools to change and administer password and group data"
 HOMEPAGE = "http://pkg-shadow.alioth.debian.org"
 BUGTRACKER = "https://alioth.debian.org/tracker/?group_id=30580"
 SECTION = "base utils"
-LICENSE = "BSD | Artistic"
+LICENSE = "BSD | Artistic-1.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
                     file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe"
 
 DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
            file://login_defs_pam.sed \
-- 
1.7.5.4

[PATCH 11/17] perl: Clarify LICENSE with versions. Yes, its really GPLv1

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/perl/perl_5.14.2.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index a0c34a3..92ca9b8 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "Perl is a popular scripting language."
 HOMEPAGE = "http://www.perl.org/"
 SECTION = "devel"
-LICENSE = "Artistic|GPL"
+LICENSE = "Artistic-1.0 | GPL-1.0"
 LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
 		    file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db grep-native"
 DEPENDS += "gdbm zlib"
-PR = "r3"
+PR = "r4"
 
 # 5.10.1 has Module::Build built-in
 PROVIDES += "libmodule-build-perl"
-- 
1.7.5.4

[PATCH 12/17] license.bbclass: Add mapping for LGPLv2.0, pango uses it

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/license.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 3de704f..3126318 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -33,6 +33,7 @@ SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0"
 
 #LGPL variations
 SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0"
+SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0"
 SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1"
 SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1"
 SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0"
-- 
1.7.5.4

[PATCH 13/17] qemu-config: Clarify license as GPLv2

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-bsp/qemu-config/qemu-config.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index 62f4700..56ee465 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "Adds scripts to use distcc on the host system under qemu"
 
-LICENSE = "GPL"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
 
 COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)"
 
-PR = "r23"
+PR = "r24"
 
 SRC_URI = "file://distcc.sh \
            file://anjuta-remote-run \
-- 
1.7.5.4

[PATCH 14/17] bluez4: Ensure the plugins directory is packaged to avoid warnings

[Richard Purdie]

This makes sense in this case even if its empty since this package is the
correct owner for it.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-connectivity/bluez/bluez4_4.98.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/bluez/bluez4_4.98.bb b/meta/recipes-connectivity/bluez/bluez4_4.98.bb
index 9a4c682..5df3241 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.98.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.98.bb
@@ -22,7 +22,7 @@ RDEPENDS_${PN}-dev = "bluez-hcidump"
 PACKAGES =+ "libasound-module-bluez"
 
 FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${base_libdir}/systemd/"
+FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${base_libdir}/systemd/"
 FILES_${PN}-dev += "\
   ${libdir}/bluetooth/plugins/*.la \
   ${libdir}/alsa-lib/*.la \
-- 
1.7.5.4

[PATCH 15/17] rpm: Add rpmdeps-oecore to appropriate package

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/rpm/rpm_5.4.0.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index eeca823..2441380 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
 extrarpmdeps = "python perl"
 extrarpmdeps_virtclass-native = "file-native"
-PR = "r33"
+PR = "r34"
 
 # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
 # in order to extract the distribution SRPM into a format we can extract...
@@ -261,6 +261,7 @@ FILES_${PN}-build = "${prefix}/src/rpm \
 		${libdir}/rpm/bin/rpmcache \
 		${libdir}/rpm/bin/rpmcmp \
 		${libdir}/rpm/bin/rpmdeps \
+		${libdir}/rpm/bin/rpmdeps-oecore \
 		${libdir}/rpm/bin/rpmdigest \
 		${libdir}/rpm/bin/abi-compliance-checker.pl \
 		${libdir}/rpm/bin/api-sanity-autotest.pl \
-- 
1.7.5.4

[PATCH 16/17] python-pycairo: Fix incorrect versions in license field

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../python/python-pycairo_1.10.0.bb                |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb b/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
index 7d1b6c1..dc009b3 100644
--- a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
+++ b/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
@@ -2,14 +2,14 @@ DESCRIPTION = "Python Bindings for the Cairo canvas library"
 HOMEPAGE = "http://cairographics.org/pycairo"
 BUGTRACKER = "http://bugs.freedesktop.org"
 SECTION = "python-devel"
-LICENSE = "LGPLv1.1 & MPL-1"
+LICENSE = "LGPLv2.1 & MPL-1.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \
                     file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \
                     file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325"
 
 # cairo >= 1.8.8
 DEPENDS = "cairo"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://cairographics.org/releases/py2cairo-${PV}.tar.bz2"
 
-- 
1.7.5.4

[PATCH 17/17] xserver-xorg: Remove unneeded empty directory, fixing QA warning

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../xorg-xserver/xserver-xorg-common.inc           |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 300704a..98f3d14 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -120,3 +120,7 @@ PACKAGECONFIG ??= "udev"
 PACKAGECONFIG[hal] = "--enable-config-hal,--disable-config-hal,,hal"
 PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
 
+do_install_append () {
+	# Its assumed base-files creates this for us
+	rmdir ${D}${localstatedir}/log/
+}
-- 
1.7.5.4