[PATCH 00/27] [Dizzy-next] pull request

[PATCH 00/27] [Dizzy-next] pull request

[Armin Kuster]

Please consider these changes for Dizzy-next

The following changes since commit 510b7a9d8d5dda07120df5866507742a626478c1:

  krb5: fix CVE-2014-5351 (2014-12-01 14:24:53 +0100)

are available in the git repository at:

  https://github.com/akuster/meta-openembedded.git akuster/dizzy-next
  https://github.com//tree/akuster/dizzy-next

Andreas Müller (1):
  glibmm: add perl to RDEPENDS_{PN}-dev

Awais Belal (1):
  enca: fix broken automake

Belal, Awais (2):
  mplayer2: use autotools-brokensep (B = S)
  mplayer2: cleanup empty directories

Chong.Lu@windriver.com (2):
  samba: add winbind.service to winbind package
  samba: fix error messages when startup samba service

Chris Morgan (1):
  dfu-util: Point to gitorious.org repository as gnumonks.org is down

Gary S. Robertson (2):
  libhugetlbfs: Make cross-devel recognize all ix86 arches
  libhugetlbfs: Fix page size & text offset for arm arches

Jackie Huang (5):
  postfix.inc: Remove references to buildmachine paths in target
    makedefs.out
  rrdtool: inherit cpan-base to help build perl modules
  rrdtool: add missing dependency on groff-native
  hostapd: several fixes for init script
  rfkill: fix the SRC_URI

Javier Viguera (1):
  xserver-common: disable TCP connections

Kai Kang (1):
  polarssl: add dependency openssl

Kang Kai (2):
  libnet-ssleay-perl: avoid host contamination
  meta-gnome: fix typo of directory name

Liu Jian (1):
  lvm2: add lvm.con to CONFFILES

Martin Jansa (3):
  iotop: Drop python-distutils from RDEPENDS
  PNBLACKLIST: use weak assignments
  xf86-video-glamo: fix build with xserver 1.16

Peter Bigot (3):
  imagemagick: update URI to allow fetching current and previous
    releases
  obexd: conflict with bluez5
  obex-data-server: conflict with bluez5

Robert Yang (1):
  libcanberra: fix installed-vs-shipped warning

Wenzong Fan (1):
  sethdlc: fix host contamination

 .../recipes-filesystems/ifuse/ifuse_1.1.2.bb       |  2 +-
 .../gnome-mplayer/gnome-mplayer_1.0.5.bb           |  2 +-
 meta-gnome/recipes-connectivity/obex/obexd_0.48.bb |  2 +
 .../glade/glade3_%.bbappend                        |  0
 meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb          |  2 +-
 .../gnome-menus/gnome-menus3_3.10.1.bb             |  2 +-
 .../gnome-panel/gnome-panel3_3.0.2.bb              |  2 +-
 .../recipes-gnome/gweather/libgweather3_3.0.2.bb   |  2 +-
 meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb   |  2 +-
 .../recipes-mediacentre/xbmc/xbmc_git.bb           |  2 +-
 .../coriander/coriander_2.0.2.bb                   |  2 +-
 .../dleyna/renderer-service-upnp_0.3.0.bb          |  2 +-
 .../polarssl/polarssl_1.3.8.bb                     |  1 +
 .../files/sethdlc-fix-host-contamination.patch     | 42 ++++++++++++++++
 .../recipes-connectivity/sethdlc/sethdlc.bb        |  3 +-
 .../recipes-daemons/postfix/postfix.inc            |  5 ++
 .../lksctp-tools/lksctp-tools_1.0.16.bb            |  2 +-
 .../0001-Makefile-Recognize-all-ix86-arches.patch  | 32 ++++++++++++
 ...rch64-fix-page-size-not-properly-computed.patch | 32 ------------
 ...s-arm-arches-fix-page-size-and-text-offse.patch | 57 ++++++++++++++++++++++
 .../libhugetlbfs/libhugetlbfs_git.bb               |  3 +-
 .../recipes-connectivity/hostapd/hostapd-2.2/init  | 27 ++++++++--
 .../libimobiledevice/libimobiledevice_1.1.4.bb     |  2 +-
 .../obex/obex-data-server_0.4.6.bb                 |  1 +
 meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb  |  2 +-
 meta-oe/recipes-connectivity/samba/samba-basic.inc |  1 +
 meta-oe/recipes-connectivity/samba/samba.inc       |  8 ++-
 meta-oe/recipes-connectivity/soft66/soft66_git.bb  |  2 +-
 .../zeroc-ice/zeroc-ice_3.5.1.bb                   |  2 +-
 meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb     |  2 +
 meta-oe/recipes-extended/iotop/iotop_0.4.4.bb      |  2 +-
 meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb  | 20 ++++----
 .../recipes-extended/subsurface/subsurface_git.bb  |  2 +-
 meta-oe/recipes-extended/zsh/zsh.inc               |  2 +-
 .../recipes-graphics/clutter/clutter-box2d_git.bb  |  2 +-
 meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb        |  2 +-
 .../xorg-driver/xf86-input-mtev_git.bb             |  2 +-
 ...-glamo.h-use-const-for-jbt6k74_state_path.patch | 29 +++++++++++
 .../xorg-driver/xf86-video-glamo_git.bb            |  1 +
 ...15-xserver-common-disable-TCP-connections.patch | 24 +++++++++
 .../xserver-common/xserver-common_1.34.bb          |  1 +
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |  5 +-
 meta-oe/recipes-navigation/omgps/omgps_svn.bb      |  2 +-
 meta-oe/recipes-qt/qconnman/qconnman-e_git.bb      |  2 +-
 meta-oe/recipes-qt/qconnman/qconnman_git.bb        |  2 +-
 meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb  |  2 +-
 meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb |  2 +-
 meta-oe/recipes-support/dfu-util/dfu-util_0.7.bb   |  9 ++--
 meta-oe/recipes-support/emacs/emacs_23.4.bb        |  2 +-
 .../enca/enca/libenca-003-iconv.patch              | 28 +++++++++++
 meta-oe/recipes-support/enca/enca_1.9.bb           |  3 +-
 .../imagemagick/imagemagick_6.8.9.bb               |  2 +-
 .../libcanberra/libcanberra_0.29.bb                |  2 +-
 meta-oe/recipes-support/lvm2/lvm2.inc              |  2 +
 .../recipes-support/maliit/maliit-framework_git.bb |  2 +-
 .../recipes-support/maliit/maliit-plugins_git.bb   |  2 +-
 .../recipes-support/openmotif/openmotif_2.3.3.bb   |  2 +-
 .../vala-terminal/vala-terminal_git.bb             |  2 +-
 .../recipes-perl/libnet/libnet-ssleay-perl_1.65.bb |  8 ++-
 meta-webserver/recipes-php/modphp/modphp5.inc      |  2 +-
 meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb  |  2 +-
 61 files changed, 325 insertions(+), 91 deletions(-)
 rename meta-gnome/{recipe-devtools => recipes-devtools}/glade/glade3_%.bbappend (100%)
 create mode 100644 meta-networking/recipes-connectivity/sethdlc/files/sethdlc-fix-host-contamination.patch
 create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Makefile-Recognize-all-ix86-arches.patch
 delete mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-aarch64-fix-page-size-not-properly-computed.patch
 create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-ld.hugetlbfs-arm-arches-fix-page-size-and-text-offse.patch
 create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
 create mode 100644 meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch
 create mode 100644 meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch

-- 
1.9.1

[PATCH 01/27] imagemagick: update URI to allow fetching current and previous releases

[Armin Kuster]

From: Peter Bigot <pab@pabigot.com>

The only version available at the original URI is patch 9.  All releases
are available at the /releases sub-path.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb
index 454db64..7cb8f01 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d84c6ddd4028aa53d028b4c50f9361e"
 DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib virtual/fftw freetype"
 
 PATCHSET = "8"
-SRC_URI = "http://www.imagemagick.org/download/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \
+SRC_URI = "http://www.imagemagick.org/download/releases/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \
 "
 SRC_URI[md5sum] = "7e96f55156d72ce59c76ec93362ec72a"
 SRC_URI[sha256sum] = "51e0eb0b56e2f16be11c29086a97d474ffd07fe4eb5a9858d8a9c8e9c054c99a"
-- 
1.9.1

[PATCH 02/27] polarssl: add dependency openssl

[Armin Kuster]

From: Kai Kang <kai.kang@windriver.com>

polarssl compiles with openssl to build unit test cases. If openssl
doesn't exist, native libssl.so will be used. Then causes error:

| .../bitbake_build/tmp/sysroots/x86_64-linux/usr/lib/libssl.so: error adding symbols: File in wrong format

Add dependency openssl for polarssl to fix it.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-connectivity/polarssl/polarssl_1.3.8.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-networking/recipes-connectivity/polarssl/polarssl_1.3.8.bb b/meta-networking/recipes-connectivity/polarssl/polarssl_1.3.8.bb
index 8ca1b1c..7a496b7 100644
--- a/meta-networking/recipes-connectivity/polarssl/polarssl_1.3.8.bb
+++ b/meta-networking/recipes-connectivity/polarssl/polarssl_1.3.8.bb
@@ -28,6 +28,7 @@ SRC_URI = "https://polarssl.org/download/polarssl-${PV}-gpl.tgz"
 SRC_URI[md5sum] = "d1a2b4f21727e888f143414d2e3144e6"
 SRC_URI[sha256sum] = "318171db41335cacbb5b0047c94f1faf91442ab70a223b5223436703c9406ff1"
 
+DEPENDS = "openssl"
 RDEPENDS_${PN} += "libcrypto"
 EXTRA_OECMAKE = "-DUSE_SHARED_POLARSSL_LIBRARY=on"
 
-- 
1.9.1

[PATCH 03/27] postfix.inc: Remove references to buildmachine paths in target makedefs.out

[Armin Kuster]

From: Jackie Huang <jackie.huang@windriver.com>

Fixed the buildpaths QA issue:
ERROR: QA Issue: File
/work/core2-64-wrs-linux/postfix/2.11.1-r0/packages-split/postfix/etc/postfix/makedefs.out
in package contained reference to tmpdir [buildpaths]

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-networking/recipes-daemons/postfix/postfix.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc
index c58787e..63de2a0 100644
--- a/meta-networking/recipes-daemons/postfix/postfix.inc
+++ b/meta-networking/recipes-daemons/postfix/postfix.inc
@@ -201,6 +201,11 @@ do_install_append_class-native() {
 	ln -sf ../sbin/sendmail.postfix ${D}${bindir}/mailq
 }
 
+do_install_append_class-target() {
+	# Remove references to buildmachine paths in target makedefs.out
+	sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' ${D}/etc/postfix/makedefs.out
+}
+
 NATIVE_INSTALL_WORKS = "1"
 
 ALTERNATIVE_${PN} = "sendmail"
-- 
1.9.1

[PATCH 04/27] samba: add winbind.service to winbind package

[Armin Kuster]

From: "Chong.Lu@windriver.com" <Chong.Lu@windriver.com>

This solves the following warning:

lib32-samba-3.6.24: lib32-samba: Files/directories were installed but not shipped
  /lib/systemd/system/winbind.service [installed-vs-shipped]

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-connectivity/samba/samba-basic.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-connectivity/samba/samba-basic.inc b/meta-oe/recipes-connectivity/samba/samba-basic.inc
index d0fa8e6..e9f891f 100644
--- a/meta-oe/recipes-connectivity/samba/samba-basic.inc
+++ b/meta-oe/recipes-connectivity/samba/samba-basic.inc
@@ -40,6 +40,7 @@ FILES_winbind = "${sbindir}/winbindd \
                  ${bindir}/wbinfo \
                  ${bindir}/ntlm_auth \
                  ${sysconfdir}/init.d/winbind \
+                 ${systemd_unitdir}/system/winbind.service \
 "
 FILES_libwinbind = "${libdir}/idmap/*.so \
                     ${libdir}/pdb \
-- 
1.9.1

[PATCH 05/27] samba: fix error messages when startup samba service

[Armin Kuster]

From: "Chong.Lu@windriver.com" <Chong.Lu@windriver.com>

This solves the following error messages when startup samba:

  Unable to open new log file '/var/log/samba/log.smbd': No such file or directory

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-connectivity/samba/samba.inc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index 4392821..68e1b1f 100644
--- a/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-oe/recipes-connectivity/samba/samba.inc
@@ -35,7 +35,7 @@ EXTRA_OECONF='--disable-cups \
               --with-privatedir=${sysconfdir}/samba/private \
               --with-lockdir=${localstatedir}/lock \
               --with-piddir=${localstatedir}/run \
-              --with-logfilebase=${localstatedir}/log \
+              --with-logfilebase=${localstatedir}/log/samba \
               --libdir=${libdir} \
               --with-mandir=${mandir} \
               --with-swatdir=${datadir}/swat \
@@ -123,6 +123,12 @@ do_install_append() {
     sed -e 's,@BASE_BINDIR@,${base_bindir},g' \
         -e 's,@SBINDIR@,${sbindir},g' \
         -i ${D}${systemd_unitdir}/system/*.service
+
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+	install -d ${D}${sysconfdir}/tmpfiles.d
+	echo "d ${localstatedir}/log/samba 0755 root root -" \
+            > ${D}${sysconfdir}/tmpfiles.d/99-${BPN}.conf
+    fi
 }
 
 DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-systemctl-native', '', d)}"
-- 
1.9.1

[PATCH 06/27] dfu-util: Point to gitorious.org repository as gnumonks.org is down

[Armin Kuster]

From: Chris Morgan <chmorgan@gmail.com>

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Chris Morgan <chmorgan@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-support/dfu-util/dfu-util_0.7.bb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-support/dfu-util/dfu-util_0.7.bb b/meta-oe/recipes-support/dfu-util/dfu-util_0.7.bb
index aa2b84d..7f06f8f 100644
--- a/meta-oe/recipes-support/dfu-util/dfu-util_0.7.bb
+++ b/meta-oe/recipes-support/dfu-util/dfu-util_0.7.bb
@@ -4,13 +4,16 @@ AUTHOR = "Harald Welte <laforge@openmoko.org>"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-SRC_URI = "http://${BPN}.gnumonks.org/releases/${BP}.tar.gz \
+S = "${WORKDIR}/git"
+
+SRC_URI = "git://gitorious.org/dfu-util/dfu-util.git \
     file://0001-configure.ac-Don-t-check-for-usbpath.patch \
 "
+SRCREV="a0a3668e0571a9b007f7d62b01e7dcfd7754ce50"
 
 inherit autotools pkgconfig
 
 DEPENDS = "libusb1"
 
-SRC_URI[md5sum] = "56844020177d4db4c1ea2e926fe9d588"
-SRC_URI[sha256sum] = "f52a2a5489fbf9f3204a6ada05e0b47ee322e19d81c712e0c58a332d80ec3eab"
+SRC_URI[md5sum] = "1de724551604bce1962960b7a301cc08"
+SRC_URI[sha256sum] = "5d253f924fd29bc13054b664bba9aa86b865299971195969478253c1775b7e56"
-- 
1.9.1

[PATCH 07/27] rrdtool: inherit cpan-base to help build perl modules

[Armin Kuster]

From: Jackie Huang <jackie.huang@windriver.com>

It's incorrect to use -I for nativeperl to specify @INC/#include
directory to target build perl, which cause error like:
| temp/do_configure/run.do_configure.20749: line 112: 20256 Illegal instruction (core dumped)
| perl -I/path/to/tmp/sysroots/intel-haswell-64/usr/lib64/perl/$perl_version Makefile.PL

Inherit cpan-base and set related env vars to fix this and
avoid using sed to hack Makefile when build perl modules.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb
index 449a923..b901f2e 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb
@@ -17,7 +17,7 @@ SRC_URI = "\
 
 S = "${WORKDIR}/git"
 
-inherit autotools-brokensep gettext pythonnative perlnative python-dir
+inherit autotools-brokensep gettext pythonnative perlnative python-dir cpan-base
 
 EXTRA_AUTORECONF = "-I m4"
 
@@ -56,6 +56,12 @@ export HOST_SYS
 export STAGING_LIBDIR
 export STAGING_INCDIR
 
+# Env var which tells perl if it should use host (no) or target (yes) settings
+export PERLCONFIGTARGET = "${@is_target(d)}"
+export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}/CORE"
+export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}"
+export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}"
+
 do_configure() {
 	#fix the pkglib problem with newer automake
 	#perl
@@ -71,9 +77,6 @@ do_configure() {
 
 	autotools_do_configure
 
-	perl_version=`perl -v 2>/dev/null | \
-	    sed -n 's/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p'`
-
 	#modify python sitepkg
 	#remove the dependency of perl-shared:Makefile
 	#or perl-shared/Makefile will be regenerated
@@ -86,13 +89,10 @@ do_configure() {
 	#redo the perl bindings
 	(
 	cd ${S}/bindings/perl-shared;
-	perl -I${STAGING_LIBDIR}/perl/$perl_version Makefile.PL INSTALLDIRS="vendor"
-	    INSTALLPRIVLIB="abc";
-	sed -i -e "s| ${libdir}/perl/| ${STAGING_LIBDIR}/perl/|g" Makefile;
+	perl Makefile.PL INSTALLDIRS="vendor" INSTALLPRIVLIB="abc";
 
 	cd ../../bindings/perl-piped;
-	perl -I${STAGING_LIBDIR}/perl/$perl_version Makefile.PL INSTALLDIRS="vendor";
-	sed -i -e "s| ${libdir}/perl/| ${STAGING_LIBDIR}/perl/|g" Makefile;
+	perl Makefile.PL INSTALLDIRS="vendor";
 	)
 
 	#change the interpreter in file
-- 
1.9.1

[PATCH 08/27] rrdtool: add missing dependency on groff-native

[Armin Kuster]

From: Jackie Huang <jackie.huang@windriver.com>

rrdtool needs groff-native to format the documentation.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb
index b901f2e..6bc5e98 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://oss.oetiker.ch/rrdtool/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0"
 
-DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2"
+DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2 groff-native"
 
 SRCREV = "1850e00a17e25e93c39e608f4e2da50f29c5c712"
 PV = "1.4.8"
-- 
1.9.1

[PATCH 09/27] glibmm: add perl to RDEPENDS_{PN}-dev

[Armin Kuster]

From: Andreas Müller <schnitzeltony@googlemail.com>

QA Issue: glibmm-dev requires /usr/bin/perl, but no providers in its RDEPENDS [file-rdeps]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb
index e68eb50..71daf9d 100644
--- a/meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb
+++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb
@@ -27,3 +27,5 @@ do_install_append() {
 
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/"
+
+RDEPENDS_${PN}-dev = "perl"
-- 
1.9.1

[PATCH 10/27] hostapd: several fixes for init script

[Armin Kuster]

From: Jackie Huang <jackie.huang@windriver.com>

* restart: The stop may delay a few seconds according to different wireless
  devices, on debian/ubuntu, the init script directly sleep 8 seconds
  to wait the stop complete, here we add a delay function (sleep in a loop)
  to ensure the stop is completed before start.
* add status command.
* add --oknodo for stop so it will not break restart if there is no
  running process.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../recipes-connectivity/hostapd/hostapd-2.2/init  | 27 +++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd-2.2/init b/meta-oe/recipes-connectivity/hostapd/hostapd-2.2/init
index 79f74b6..8ba4e07 100644
--- a/meta-oe/recipes-connectivity/hostapd/hostapd-2.2/init
+++ b/meta-oe/recipes-connectivity/hostapd/hostapd-2.2/init
@@ -8,6 +8,23 @@ test -f $DAEMON || exit 0
 
 set -e
 
+# source function library
+. /etc/init.d/functions
+
+delay_stop() {
+	count=0
+	while [ $count -lt 9 ] ; do
+	        if pidof $DAEMON >/dev/null; then
+	                sleep 1
+	        else
+	                return 0
+	        fi
+		count=`expr $count + 1`
+	done
+	echo "Failed to stop $DESC."
+	return 1
+}
+
 case "$1" in
     start)
 	echo -n "Starting $DESC: "
@@ -16,20 +33,24 @@ case "$1" in
 	;;
     stop)
 	echo -n "Stopping $DESC: "
-	start-stop-daemon -K -x $DAEMON
+	start-stop-daemon -K --oknodo -x $DAEMON
 	echo "$NAME."
 	;;
     restart)
 	$0 stop
-	$0 start
+	delay_stop && $0 start
 	;;
     reload)
 	echo -n "Reloading $DESC: "
 	killall -HUP $(basename ${DAEMON})
 	echo "$NAME."
 	;;
+    status)
+	status $DAEMON
+	exit $?
+	;;
     *)
-	echo "Usage: $0 {start|stop|restart|reload}"
+	echo "Usage: $0 {start|stop|restart|reload|status}"
 	exit 1
 	;;
 esac
-- 
1.9.1

[PATCH 11/27] lvm2: add lvm.con to CONFFILES

[Armin Kuster]

From: Liu Jian <jian.liu@windriver.com>

* Files will be over written when updating using rpm.

* If there is no %config micro before the file in the spec file,
  this file will be over-written after updating this package
  using rpm. This will make our settings lost.

Signed-off-by: Jian Liu <jian.liu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-support/lvm2/lvm2.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 1bbb158..42f6e3a 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -48,3 +48,5 @@ FILES_${PN} += "${libdir}/device-mapper/*.so ${base_libdir}/udev"
 FILES_${PN}-dbg += "${libdir}/device-mapper/.debug"
 
 RDEPENDS_${PN} = "bash"
+
+CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf"
-- 
1.9.1

[PATCH 12/27] iotop: Drop python-distutils from RDEPENDS

[Armin Kuster]

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

* nothing in iotop is using that for normal function

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-extended/iotop/iotop_0.4.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb b/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
index 111b072..d629245 100644
--- a/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
+++ b/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
@@ -20,6 +20,6 @@ do_install_append() {
     rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py  || true
 }
 
-RDEPENDS_${PN} = "python-distutils python-curses python-textutils \
+RDEPENDS_${PN} = "python-curses python-textutils \
                   python-codecs python-ctypes python-pprint \
                   python-shell"
-- 
1.9.1

[PATCH 13/27] sethdlc: fix host contamination

[Armin Kuster]

From: Wenzong Fan <wenzong.fan@windriver.com>

* Clean INCLUDES to fix the host contamination errors:

  In file included from /usr/src/linux/include/linux/posix_types.h:47:0,
  from /usr/src/linux/include/linux/types.h:17,
  from /usr/src/linux/include/linux/if.h:22,
  from sethdlc.c:23:
  /usr/src/linux/include/asm-generic/posix_types.h:91:3: \
    error: conflicting types for '__kernel_fsid_t'
  } __kernel_fsid_t;
  ^
  .../tmp/sysroots/qemumips/usr/include/asm/posix_types.h:26:3: \
    note: previous declaration of '__kernel_fsid_t' was here
  } __kernel_fsid_t;
  ^

* Correct LIC_FILES_CHKSUM to checkout license infos from sethdl.c
  instead of Makefile.

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../files/sethdlc-fix-host-contamination.patch     | 42 ++++++++++++++++++++++
 .../recipes-connectivity/sethdlc/sethdlc.bb        |  3 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-connectivity/sethdlc/files/sethdlc-fix-host-contamination.patch

diff --git a/meta-networking/recipes-connectivity/sethdlc/files/sethdlc-fix-host-contamination.patch b/meta-networking/recipes-connectivity/sethdlc/files/sethdlc-fix-host-contamination.patch
new file mode 100644
index 0000000..f25a02c
--- /dev/null
+++ b/meta-networking/recipes-connectivity/sethdlc/files/sethdlc-fix-host-contamination.patch
@@ -0,0 +1,42 @@
+From 9a9137c3df5309ac359737d6ebd67fb4ff5f3cf2 Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <wenzong.fan@windriver.com>
+Date: Mon, 24 Nov 2014 22:05:18 -0500
+Subject: [PATCH] sethdlc: fix host contamination
+
+Clean INCLUDES to fix the host contamination errors:
+
+  In file included from /usr/src/linux/include/linux/posix_types.h:47:0,
+  from /usr/src/linux/include/linux/types.h:17,
+  from /usr/src/linux/include/linux/if.h:22,
+  from sethdlc.c:23:
+  /usr/src/linux/include/asm-generic/posix_types.h:91:3: \
+    error: conflicting types for '__kernel_fsid_t'
+  } __kernel_fsid_t;
+  ^
+  .../tmp/sysroots/qemumips/usr/include/asm/posix_types.h:26:3: \
+    note: previous declaration of '__kernel_fsid_t' was here
+  } __kernel_fsid_t;
+  ^
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 0492f2b..97dec22 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+ CC = gcc
+ CFLAGS = -O2 -Wall -W -Wno-long-long -pipe
+-INCLUDES = -I/usr/src/linux/include -I/usr/src/linux-2.6/include
++INCLUDES =
+ 
+ all:		sethdlc
+ 
+-- 
+1.7.9.5
+
diff --git a/meta-networking/recipes-connectivity/sethdlc/sethdlc.bb b/meta-networking/recipes-connectivity/sethdlc/sethdlc.bb
index cf74827..5e8d9d9 100644
--- a/meta-networking/recipes-connectivity/sethdlc/sethdlc.bb
+++ b/meta-networking/recipes-connectivity/sethdlc/sethdlc.bb
@@ -1,10 +1,11 @@
 DESCRIPTION = "set Linux HDLC packet radio modem driver port information"
 HOMEPAGE = "https://www.kernel.org/pub/linux/utils/net/hdlc"
 LICENSE = "GPLv2 & GPLv2+ "
-LIC_FILES_CHKSUM = "file://Makefile;md5=19aada31930b2be84bf7138420d77263"
+LIC_FILES_CHKSUM = "file://sethdlc.c;endline=10;md5=90f936879e9f8b755a138aeb348782eb"
 
 
 SRC_URI = "https://www.kernel.org/pub/linux/utils/net/hdlc/${BPN}-1.18.tar.gz \
+           file://sethdlc-fix-host-contamination.patch \
 "
 SRC_URI[md5sum] = "9016878156a5eadb06c0bae71cc5c9ab"
 SRC_URI[sha256sum] = "21b1e2e1cb0e288b0ec8fcfd9fed449914e0f8e6fc273706bd5b3d4f6ab6b04e"
-- 
1.9.1

[PATCH 14/27] xserver-common: disable TCP connections

[Armin Kuster]

From: Javier Viguera <javier.viguera@digi.com>

For security reasons disable TCP connections to the xserver.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...15-xserver-common-disable-TCP-connections.patch | 24 ++++++++++++++++++++++
 .../xserver-common/xserver-common_1.34.bb          |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch

diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch
new file mode 100644
index 0000000..06df261
--- /dev/null
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch
@@ -0,0 +1,24 @@
+From: Javier Viguera <javier.viguera@digi.com>
+Date: Wed, 26 Nov 2014 09:24:44 +0100
+Subject: [PATCH] xserver-common: disable TCP connections
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Javier Viguera <javier.viguera@digi.com>
+---
+ X11/xserver-common | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/X11/xserver-common b/X11/xserver-common
+index 017e5aee1ab0..4dc48c412741 100644
+--- a/X11/xserver-common
++++ b/X11/xserver-common
+@@ -44,7 +44,7 @@ SCREEN_SIZE=`fallback_screen_arg`
+ export USER=root
+ export XSERVER_DEFAULT_ORIENTATION=normal
+ 
+-ARGS="-br -pn $INPUT_EXTRA_ARGS"
++ARGS="-br -pn -nolisten tcp $INPUT_EXTRA_ARGS"
+ DPI="100"
+ MOUSE=""
+ KDRIVEARGS=""
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
index 12fff9a..f5b1984 100644
--- a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
+++ b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
@@ -24,6 +24,7 @@ SRC_URI_append = " \
     file://0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch \
     file://0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch \
     file://0014-Xserver-Start-Xsession-like-x11-common-does.patch \
+    file://0015-xserver-common-disable-TCP-connections.patch \
 "
 
 do_install_append() {
-- 
1.9.1

[PATCH 15/27] libcanberra: fix installed-vs-shipped warning

[Armin Kuster]

From: Robert Yang <liezhi.yang@windriver.com>

When build libcanberra for powerpc64 bsp, it shows warning:

WARNING: QA Issue: libcanberra: Files/directories were installed but not shipped
  /lib
  /lib/systemd
  /lib/systemd/system
  /lib/systemd/system/canberra-system-shutdown.service
  /lib/systemd/system/canberra-system-shutdown-reboot.service
  /lib/systemd/system/canberra-system-bootup.service [installed-vs-shipped]

Update FILES_${PN}-systemd to fix it.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
index cb171ac..0f00b20 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.29.bb
@@ -59,4 +59,4 @@ FILES_${PN}-gtk3 = "${libdir}/${BPN}-gtk3.so.* \
 FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/ \
                      ${datadir}/gdm/ ${datadir}/gnome/"
 
-FILES_${PN}-systemd = "${base_libdir}/systemd/system/*.service"
+FILES_${PN}-systemd = "${systemd_unitdir}/system/*.service"
-- 
1.9.1

[PATCH 16/27] libnet-ssleay-perl: avoid host contamination

[Armin Kuster]

From: Kang Kai <kai.kang@windriver.com>

Check the configure log, libnet-ssleay-perl uses host's openssl:

*** Found OpenSSL-1.0.1 installed in /usr

Export OPENSSL_PREFIX to find the native openssl to use.

Replace library pathes '/lib', '/usr/lib' and header path with correct
staging pathes at same time.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.65.bb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.65.bb b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.65.bb
index 63594b9..f6c4b8b 100644
--- a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.65.bb
+++ b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.65.bb
@@ -28,12 +28,16 @@ S = "${WORKDIR}/Net-SSLeay-${PV}"
 
 inherit cpan ptest
 
-EXTRA_CPANFLAGS = "LIBS='-L=${libdir} -L=${base_libdir}' \
-                   INC=-I=${includedir} \
+EXTRA_CPANFLAGS = "LIBS='-L=${STAGING_LIBDIR} -L=${STAGING_BASELIBDIR}' \
+                   INC=-I=${STAGING_INCDIR} \
                    'EXTRALIBS=-lssl -lcrypto -lz' \
                    'LDLOADLIBS=-lssl -lcrypto -lz' \
                   "
 
+do_configure_prepend() {
+    export OPENSSL_PREFIX=${STAGING_DIR_NATIVE}${prefix_native}
+}
+
 do_install_ptest() {
     cp -r ${B}/t ${D}${PTEST_PATH}
 }
-- 
1.9.1

[PATCH 17/27] meta-gnome: fix typo of directory name

[Armin Kuster]

From: Kang Kai <kai.kang@windriver.com>

Fix typo of directory name 'recipe-devtools' in meta-gnome. It should
recipes-devtools.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-gnome/{recipe-devtools => recipes-devtools}/glade/glade3_%.bbappend | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta-gnome/{recipe-devtools => recipes-devtools}/glade/glade3_%.bbappend (100%)

diff --git a/meta-gnome/recipe-devtools/glade/glade3_%.bbappend b/meta-gnome/recipes-devtools/glade/glade3_%.bbappend
similarity index 100%
rename from meta-gnome/recipe-devtools/glade/glade3_%.bbappend
rename to meta-gnome/recipes-devtools/glade/glade3_%.bbappend
-- 
1.9.1

[PATCH 18/27] libhugetlbfs: Make cross-devel recognize all ix86 arches

[Armin Kuster]

From: "Gary S. Robertson" <gary.robertson@linaro.org>

In a non-native cross-development scenario, the Makefile
only recognized i386 or x86_64 PC architectures.
Extended this to also recognize i486, i586, and i686

Upstream Status: Accepted but not yet applied by libhugetlbfs project

Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../0001-Makefile-Recognize-all-ix86-arches.patch  | 32 ++++++++++++++++++++++
 .../libhugetlbfs/libhugetlbfs_git.bb               |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Makefile-Recognize-all-ix86-arches.patch

diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Makefile-Recognize-all-ix86-arches.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Makefile-Recognize-all-ix86-arches.patch
new file mode 100644
index 0000000..2718275
--- /dev/null
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Makefile-Recognize-all-ix86-arches.patch
@@ -0,0 +1,32 @@
+From a0166583ba5f7b6a6d2de434f633126fb12c9d29 Mon Sep 17 00:00:00 2001
+From: "Gary S. Robertson" <gary.robertson@linaro.org>
+Date: Wed, 24 Sep 2014 15:27:31 -0500
+Subject: [PATCH] Makefile: Recognize all ix86 arches
+
+In a non-native build scenario, the makefile
+only recognized i386 or x86_64 arches.  Added support
+to recognize i486, i586, i686.
+
+Upstream Status: Accepted by libhugetlbfs project
+
+Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 91502e1..0bfaee8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -71,7 +71,7 @@ ELF64 = aarch64elf
+ TMPLIB64 = lib64
+ CUSTOM_LDSCRIPTS = no
+ else
+-ifeq ($(ARCH),i386)
++ifneq (,$(filter i386 i486 i586 i686,$(ARCH)))
+ CC32 = $(CC)
+ ELF32 = elf_i386
+ TMPLIB32 = lib
+-- 
+1.7.9.5
+
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
index c2262ea..c906217 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
@@ -19,6 +19,7 @@ SRC_URI = "git://git.code.sf.net/p/libhugetlbfs/code \
     file://0001-aarch64-fix-page-size-not-properly-computed.patch \
     file://0001-replace-lib-lib64-hardcoded-values-by-LIBDIR32-LIBDI.patch \
     file://0001-Extend-arm32-support-to-include-BE-variants.patch \
+    file://0001-Makefile-Recognize-all-ix86-arches.patch \
 "
 
 S = "${WORKDIR}/git"
-- 
1.9.1

[PATCH 19/27] libhugetlbfs: Fix page size & text offset for arm arches

[Armin Kuster]

From: "Gary S. Robertson" <gary.robertson@linaro.org>

Fixed computation of page size and text segment offset for various arm
architectures - including both LE and BE variants of armv7 as well as
aarch64

Upstream Status: Accepted at libhugetlbfs project

Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...rch64-fix-page-size-not-properly-computed.patch | 32 ------------
 ...s-arm-arches-fix-page-size-and-text-offse.patch | 57 ++++++++++++++++++++++
 .../libhugetlbfs/libhugetlbfs_git.bb               |  2 +-
 3 files changed, 58 insertions(+), 33 deletions(-)
 delete mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-aarch64-fix-page-size-not-properly-computed.patch
 create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-ld.hugetlbfs-arm-arches-fix-page-size-and-text-offse.patch

diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-aarch64-fix-page-size-not-properly-computed.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-aarch64-fix-page-size-not-properly-computed.patch
deleted file mode 100644
index da60ba0..0000000
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-aarch64-fix-page-size-not-properly-computed.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Subject: [PATCH] aarch64: fix page size not properly computed
-
-There's 2 issues fixed:
-* typo on MB variable (MB -> $MB)
-* some linker variants are missing (linux and big endian)
-  - aarch64elfb
-  - aarch64linux
-  - aarch64linuxb
-
-Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-
-Upstream-Status: Submitted
----
- ld.hugetlbfs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ld.hugetlbfs b/ld.hugetlbfs
-index df446dd..6553547 100755
---- a/ld.hugetlbfs
-+++ b/ld.hugetlbfs
-@@ -87,7 +87,7 @@ elf32ppclinux|elf64ppc)	HPAGE_SIZE=$((16*$MB)) SLICE_SIZE=$((256*$MB)) ;;
- elf64lppc)		HPAGE_SIZE=$((16*$MB)) SLICE_SIZE=$((256*$MB)) ;;
- elf_i386|elf_x86_64)	HPAGE_SIZE=$((4*$MB)) SLICE_SIZE=$HPAGE_SIZE ;;
- elf_s390|elf64_s390)	HPAGE_SIZE=$((1*$MB)) SLICE_SIZE=$HPAGE_SIZE ;;
--armelf_linux_eabi|aarch64elf)	HPAGE_SIZE=$((2*MB)) SLICE_SIZE=$HPAGE_SIZE ;;
-+armelf_linux_eabi|aarch64elf*|aarch64linux*)	HPAGE_SIZE=$((2*$MB)) SLICE_SIZE=$HPAGE_SIZE ;;
- esac
- 
- if [ "$HTLB_ALIGN" == "slice" ]; then
--- 
-1.9.2
-
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-ld.hugetlbfs-arm-arches-fix-page-size-and-text-offse.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-ld.hugetlbfs-arm-arches-fix-page-size-and-text-offse.patch
new file mode 100644
index 0000000..4e5b7bb
--- /dev/null
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-ld.hugetlbfs-arm-arches-fix-page-size-and-text-offse.patch
@@ -0,0 +1,57 @@
+From 1ab6f7f9b34fc745451140fc21db6763dffc5785 Mon Sep 17 00:00:00 2001
+From: "Gary S. Robertson" <gary.robertson@linaro.org>
+Date: Thu, 25 Sep 2014 14:57:06 -0500
+Subject: [PATCH] ld.hugetlbfs: arm arches - fix page size and text offset
+ setup
+
+There's 3 issues fixed:
+* typo on MB variable (MB -> $MB)
+* some linker variants are missing (linux and big endian)
+  - armelfb_linux_eabi
+  - aarch64elfb
+  - aarch64linux
+  - aarch64linuxb
+* text segment offset was not specified for armv7 BE
+
+NOTE: This patch replaces and makes obsolete the following previously
+      submitted patch:
+
+      aarch64: fix page size not properly computed
+      by: Fathi Boudra <fathi.boudra@linaro.org>
+
+Upstream Status: Accepted at libhugetlbfs project
+
+Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
+---
+ ld.hugetlbfs |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ld.hugetlbfs b/ld.hugetlbfs
+index df446dd..4417442 100755
+--- a/ld.hugetlbfs
++++ b/ld.hugetlbfs
+@@ -87,7 +87,7 @@ elf32ppclinux|elf64ppc)	HPAGE_SIZE=$((16*$MB)) SLICE_SIZE=$((256*$MB)) ;;
+ elf64lppc)		HPAGE_SIZE=$((16*$MB)) SLICE_SIZE=$((256*$MB)) ;;
+ elf_i386|elf_x86_64)	HPAGE_SIZE=$((4*$MB)) SLICE_SIZE=$HPAGE_SIZE ;;
+ elf_s390|elf64_s390)	HPAGE_SIZE=$((1*$MB)) SLICE_SIZE=$HPAGE_SIZE ;;
+-armelf_linux_eabi|aarch64elf)	HPAGE_SIZE=$((2*MB)) SLICE_SIZE=$HPAGE_SIZE ;;
++armelf*_linux_eabi|aarch64elf*|aarch64linux*)	HPAGE_SIZE=$((2*$MB)) SLICE_SIZE=$HPAGE_SIZE ;;
+ esac
+ 
+ if [ "$HTLB_ALIGN" == "slice" ]; then
+@@ -96,9 +96,9 @@ if [ "$HTLB_ALIGN" == "slice" ]; then
+ 
+ 	# targeting the ARM platform one needs to explicitly set the text segment offset
+ 	# otherwise it will be NULL.
+-	if [ "$EMU" == "armelf_linux_eabi" ]; then
+-		HTLBOPTS="$HTLBOPTS -Ttext-segment=$SLICE_SIZE"
+-	fi
++	case "$EMU" in
++	armelf*_linux_eabi)	HTLBOPTS="$HTLBOPTS -Ttext-segment=$SLICE_SIZE" ;;
++	esac
+ fi
+ 
+ ${LD} "${args[@]}" ${HTLBOPTS}
+-- 
+1.7.9.5
+
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
index c906217..4ce6a19 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://git.code.sf.net/p/libhugetlbfs/code \
     file://tests-Makefile-install-static-4G-edge-testcases.patch \
     file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \
     file://0001-aarch64-fix-cross-compilation.patch \
-    file://0001-aarch64-fix-page-size-not-properly-computed.patch \
+    file://0001-ld.hugetlbfs-arm-arches-fix-page-size-and-text-offse.patch \
     file://0001-replace-lib-lib64-hardcoded-values-by-LIBDIR32-LIBDI.patch \
     file://0001-Extend-arm32-support-to-include-BE-variants.patch \
     file://0001-Makefile-Recognize-all-ix86-arches.patch \
-- 
1.9.1

[PATCH 20/27] obexd: conflict with bluez5

[Armin Kuster]

From: Peter Bigot <pab@pabigot.com>

obexd was integrated into bluez5 and is no longer a separate package.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-gnome/recipes-connectivity/obex/obexd_0.48.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
index 26869fe..f28f77b 100644
--- a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
+++ b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
@@ -1,5 +1,7 @@
 SUMMARY = "OBEX Server and Client"
+# obexd was integrated into bluez5
 DEPENDS = "glib-2.0 dbus bluez4 libical"
+RCONFLICTS_${PN} = "bluez5"
 
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
-- 
1.9.1

[PATCH 21/27] obex-data-server: conflict with bluez5

[Armin Kuster]

From: Peter Bigot <pab@pabigot.com>

Although this package builds with bluez5, it was removed from Fedora 20
[1] and is not used in bluez5-based GNOME [2], suggesting the bluez5
obexd is to be used instead.

[1] http://pkgs.fedoraproject.org/cgit/obex-data-server.git/log/?h=f20
[2] http://www.hadess.net/2013/11/bluetooth-file-sharing-obexpush-in.html

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
index 4a2b2b1..afe6106 100644
--- a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
+++ b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
@@ -3,6 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "gtk+ bluez4 dbus-glib imagemagick openobex"
+RCONFLICTS_${PN} = "bluez5"
 
 SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz"
 SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d"
-- 
1.9.1

[PATCH 22/27] enca: fix broken automake

[Armin Kuster]

From: Awais Belal <awais.belal@gmail.com>

The added patch fixes the usage of AM_ICONV macro and
comes straight from the Buildroot source tree.

Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../enca/enca/libenca-003-iconv.patch              | 28 ++++++++++++++++++++++
 meta-oe/recipes-support/enca/enca_1.9.bb           |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch

diff --git a/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch b/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch
new file mode 100644
index 0000000..dbf0fb8
--- /dev/null
+++ b/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch
@@ -0,0 +1,28 @@
+From 7e144495093187143a3d1589f74c2eac37e4d790 Mon Sep 17 00:00:00 2001
+From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
+Date: Sun, 4 May 2014 15:49:28 +0200
+Subject: [PATCH] libiconv.m4: Fix AM_ICONV macro usage
+
+This patch come straight from the Buildroot source tree.
+
+Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
+Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
+---
+ m4/libiconv.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/libiconv.m4 b/m4/libiconv.m4
+index fc8c6f8..3a59549 100644
+--- a/m4/libiconv.m4
++++ b/m4/libiconv.m4
+@@ -17,7 +17,7 @@ AC_REQUIRE([AC_C_CONST])dnl
+ dnl
+ 
+ dnl Use standard iconv test
+-AM_ICONV
++m4_pattern_allow([AM_ICONV])
+ CONVERTOR_LIBS="$CONVERTOR_LIBS $LIBICONV"
+ 
+ dnl Compile iconvcap.c and run it to determine what encodings iconv actually
+-- 
+1.9.3
diff --git a/meta-oe/recipes-support/enca/enca_1.9.bb b/meta-oe/recipes-support/enca/enca_1.9.bb
index efea5a3..184b27e 100644
--- a/meta-oe/recipes-support/enca/enca_1.9.bb
+++ b/meta-oe/recipes-support/enca/enca_1.9.bb
@@ -11,7 +11,8 @@ SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}
     file://configure-hack.patch \
     file://dont-run-tests.patch \
     file://configure-remove-dumbness.patch \
-    file://makefile-remove-tools.patch "
+    file://makefile-remove-tools.patch \
+    file://libenca-003-iconv.patch "
 
 SRC_URI[md5sum] = "b3581e28d68d452286fb0bfe58bed3b3"
 SRC_URI[sha256sum] = "02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d"
-- 
1.9.1

[PATCH 23/27] rfkill: fix the SRC_URI

[Armin Kuster]

From: Jackie Huang <jackie.huang@windriver.com>

It has been changed to:
http://www.kernel.org/pub/software/network/rfkill/

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb b/meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb
index a9f523c..3b2943c 100644
--- a/meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb
+++ b/meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb
@@ -5,7 +5,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c6036d0eb7edbfced28c4160e5d3fa94"
 PR = "r1"
 
-SRC_URI = "http://wireless.kernel.org/download/${BPN}/${BP}.tar.bz2 \
+SRC_URI = "http://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.bz2 \
            file://0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch \
            file://dont.call.git.rev-parse.on.parent.dir.patch"
 
-- 
1.9.1

[PATCH 24/27] PNBLACKLIST: use weak assignments

[Armin Kuster]

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

* this makes it easier to unblacklist it from local.conf which
  is parsed before the recipes

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.2.bb               | 2 +-
 meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb            | 2 +-
 meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb                               | 2 +-
 meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb             | 2 +-
 meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb              | 2 +-
 meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb                 | 2 +-
 meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb                        | 2 +-
 meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb                    | 2 +-
 meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb         | 2 +-
 .../recipes-multimedia/dleyna/renderer-service-upnp_0.3.0.bb            | 2 +-
 meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb     | 2 +-
 meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb | 2 +-
 meta-oe/recipes-connectivity/soft66/soft66_git.bb                       | 2 +-
 meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb               | 2 +-
 meta-oe/recipes-extended/subsurface/subsurface_git.bb                   | 2 +-
 meta-oe/recipes-extended/zsh/zsh.inc                                    | 2 +-
 meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb                   | 2 +-
 meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb                             | 2 +-
 meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb             | 2 +-
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb                      | 2 +-
 meta-oe/recipes-navigation/omgps/omgps_svn.bb                           | 2 +-
 meta-oe/recipes-qt/qconnman/qconnman-e_git.bb                           | 2 +-
 meta-oe/recipes-qt/qconnman/qconnman_git.bb                             | 2 +-
 meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb                       | 2 +-
 meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb                      | 2 +-
 meta-oe/recipes-support/emacs/emacs_23.4.bb                             | 2 +-
 meta-oe/recipes-support/maliit/maliit-framework_git.bb                  | 2 +-
 meta-oe/recipes-support/maliit/maliit-plugins_git.bb                    | 2 +-
 meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb                    | 2 +-
 meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb              | 2 +-
 meta-webserver/recipes-php/modphp/modphp5.inc                           | 2 +-
 meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb                       | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.2.bb b/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.2.bb
index 9a26642..42f4c87 100644
--- a/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.2.bb
+++ b/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.2.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7"
 HOMEPAGE ="http://www.libimobiledevice.org/"
 
-PNBLACKLIST[ifuse] = "depends on blacklisted libimobiledevice"
+PNBLACKLIST[ifuse] ?= "depends on blacklisted libimobiledevice"
 DEPENDS = "fuse libimobiledevice"
 
 SRC_URI = " \
diff --git a/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb b/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb
index c5ac6e2..ef460f1 100644
--- a/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb
+++ b/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb
@@ -5,7 +5,7 @@ SECTION = "multimedia"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
-PNBLACKLIST[gnome-mplayer] = "rdepends on blacklisted mplayer"
+PNBLACKLIST[gnome-mplayer] ?= "rdepends on blacklisted mplayer"
 PR = "r2"
 
 DEPENDS = "gmtk gtk+ alsa-lib libnotify glib-2.0 dbus-glib virtual/libx11 libxscrnsaver"
diff --git a/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
index 1a70ac0..e9a837b 100644
--- a/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
+++ b/meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 
 DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt"
 
-PNBLACKLIST[gcr] = "CONFLICT: 4 files conflict with gnome-keyring"
+PNBLACKLIST[gcr] ?= "CONFLICT: 4 files conflict with gnome-keyring"
 # e.g. sysroots/qemux86-64/usr/share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
 #      sysroots/qemux86-64/usr/share/GConf/gsettings/org.gnome.crypto.pgp.convert
 
diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
index 38ea5e5..611499a 100644
--- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2 & LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
-PNBLACKLIST[gnome-menus3] = "CONFLICT: 24 files are conflicting with gnome-menus"
+PNBLACKLIST[gnome-menus3] ?= "CONFLICT: 24 files are conflicting with gnome-menus"
 # e.g. sysroots/qemux86-64/usr/share/desktop-directories/X-GNOME-Other.directory
 
 DEPENDS = "python libxml2 gconf popt gtk+3"
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
index f89f3da..972a4d4 100644
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2 & LGPLv2 & GFDLv1.1"
 BPN = "gnome-panel"
 PR = "r1"
 
-PNBLACKLIST[gnome-panel3] = "CONFLICT: depends on libgweather3 which conflicts with libgweather"
+PNBLACKLIST[gnome-panel3] ?= "CONFLICT: depends on libgweather3 which conflicts with libgweather"
 
 # conflicts with gnome-panel, because they provide the same package
 # http://patches.openembedded.org/patch/43105/
diff --git a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb
index 69cdd8f..6e1997f 100644
--- a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb
+++ b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SECTION = "x11/gnome/libs"
 DEPENDS = "libxml2 gconf libsoup-2.4 gtk+3"
 
-PNBLACKLIST[libgweather3] = "CONFLICT: 876 files are conflicting with libgweather"
+PNBLACKLIST[libgweather3] ?= "CONFLICT: 876 files are conflicting with libgweather"
 # e.g. sysroots/qemux86-64/usr/share/libgweather/locations.dtd
 #      sysroots/qemux86-64/usr/share/libgweather/Locations.zh_TW.xml
 
diff --git a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb
index 3ea179e..4e01c5c 100644
--- a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
 PR = "r2"
 
-PNBLACKLIST[zenity] = "BROKEN: doesn't build with B!=S"
+PNBLACKLIST[zenity] ?= "BROKEN: doesn't build with B!=S"
 
 DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils"
 
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
index 4b65152..17db7b5 100644
--- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
+++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
@@ -10,7 +10,7 @@ DEPENDS = "libusb1 libcec libplist expat yajl gperf-native libxmu fribidi mpeg2d
 SRCREV = "82388d55dae79cbb2e486e307e23202e76a43efa"
 
 # multiple issues
-PNBLACKLIST[xbmc] = "/usr/include/c++/ctime:70:11: error: '::gmtime' has not been declared"
+PNBLACKLIST[xbmc] ?= "/usr/include/c++/ctime:70:11: error: '::gmtime' has not been declared"
 
 PV = "11.0+gitr${SRCPV}"
 PR = "r14"
diff --git a/meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb b/meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb
index 81e218f..a9f52ca 100755
--- a/meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb
+++ b/meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS = "gtk+ libgnomeui libraw1394 libdc1394 libxv tiff"
 
-PNBLACKLIST[coriander] = "BROKEN: fails to use SDL probably because libsdl-config was removed, error: unknown type name 'SDL_Overlay'"
+PNBLACKLIST[coriander] ?= "BROKEN: fails to use SDL probably because libsdl-config was removed, error: unknown type name 'SDL_Overlay'"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/coriander-2/${PV}/${BP}.tar.gz \
            file://cross-compile.patch \
diff --git a/meta-multimedia/recipes-multimedia/dleyna/renderer-service-upnp_0.3.0.bb b/meta-multimedia/recipes-multimedia/dleyna/renderer-service-upnp_0.3.0.bb
index f82eae0..68d59fa 100644
--- a/meta-multimedia/recipes-multimedia/dleyna/renderer-service-upnp_0.3.0.bb
+++ b/meta-multimedia/recipes-multimedia/dleyna/renderer-service-upnp_0.3.0.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
                     file://src/renderer-service-upnp.c;beginline=1;endline=21;md5=c25c3082684eb4ca87474b7528c6dc15"
 
-PNBLACKLIST[renderer-service-upnp] = "BROKEN: doesn't build with B!=S (trying to install rendererconsole.py from ${B} instead of ${S})"
+PNBLACKLIST[renderer-service-upnp] ?= "BROKEN: doesn't build with B!=S (trying to install rendererconsole.py from ${B} instead of ${S})"
 
 DEPENDS = "dbus glib-2.0 gssdp gupnp gupnp-av gupnp-dlna libsoup-2.4"
 
diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb
index e2551e1..ded6d08 100644
--- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb
+++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae
 #| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld: error: symbol sctp_connectx has undefined version
 #| collect2: error: ld returned 1 exit status
 #| make[4]: *** [libsctp.la] Error 1
-PNBLACKLIST[lksctp-tools] = "BROKEN: fails to link against sctp_connectx symbol"
+PNBLACKLIST[lksctp-tools] ?= "BROKEN: fails to link against sctp_connectx symbol"
 
 S = "${WORKDIR}/${BP}"
 
diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb
index 9f2cc49..5256ce0 100644
--- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb
+++ b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "\
 #| configure:17888: checking for native large file support
 #| configure:17891: error: in `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/libimobiledevice/1.1.4-r0/libimobiledevice-1.1.4':
 #| configure:17893: error: cannot run test program while cross compiling
-PNBLACKLIST[libimobiledevice] = "cannot run test program while cross compiling"
+PNBLACKLIST[libimobiledevice] ?= "cannot run test program while cross compiling"
 
 HOMEPAGE ="http://www.libimobiledevice.org/"
 
diff --git a/meta-oe/recipes-connectivity/soft66/soft66_git.bb b/meta-oe/recipes-connectivity/soft66/soft66_git.bb
index 050bf98..33ca2b5 100644
--- a/meta-oe/recipes-connectivity/soft66/soft66_git.bb
+++ b/meta-oe/recipes-connectivity/soft66/soft66_git.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv3 LGPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
                     file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 "
 
-PNBLACKLIST[soft66] = "BROKEN: depends on broken libftdi"
+PNBLACKLIST[soft66] ?= "BROKEN: depends on broken libftdi"
 
 DEPENDS = "libftdi"
 
diff --git a/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb b/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb
index e39aa18..2b6f56e 100644
--- a/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb
+++ b/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb
@@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b7049
 #| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/db_cxx.h:273:14: note: virtual int Db::set_bt_compare(int (*)(Db*, const Dbt*, const Dbt*, size_t*)) <near match>
 #| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/db_cxx.h:273:14: note:   no known conversion for argument 1 from 'int (*)(DB*, const DBT*, const DBT*) {aka int (*)(__db*, const __db_dbt*, const __db_dbt*)}' to 'int (*)(Db*, const Dbt*, const Dbt*, size_t*) {aka int (*)(Db*, const Dbt*, const Dbt*, long unsigned int*)}'
 #| make[3]: *** [MapDb.o] Error 1
-PNBLACKLIST[zeroc-ice] = "BROKEN: not compatible with default db version"
+PNBLACKLIST[zeroc-ice] ?= "BROKEN: not compatible with default db version"
 
 S = "${WORKDIR}/Ice-${PV}"
 
diff --git a/meta-oe/recipes-extended/subsurface/subsurface_git.bb b/meta-oe/recipes-extended/subsurface/subsurface_git.bb
index 1edb19e..22b9d2f 100644
--- a/meta-oe/recipes-extended/subsurface/subsurface_git.bb
+++ b/meta-oe/recipes-extended/subsurface/subsurface_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "libdivecomputer gtk+ libxml2 glib-2.0 gconf"
 
-PNBLACKLIST[subsurface] = "Needs to be upgraded for compatibility with new libdivecomputer"
+PNBLACKLIST[subsurface] ?= "Needs to be upgraded for compatibility with new libdivecomputer"
 
 inherit gtk-icon-cache cmake
 
diff --git a/meta-oe/recipes-extended/zsh/zsh.inc b/meta-oe/recipes-extended/zsh/zsh.inc
index 86a546e..6dc40bf 100644
--- a/meta-oe/recipes-extended/zsh/zsh.inc
+++ b/meta-oe/recipes-extended/zsh/zsh.inc
@@ -8,7 +8,7 @@ SECTION = "base/shell"
 LICENSE = "zsh"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=b7bc853894664be455a922db9805288e"
 
-PNBLACKLIST[zsh] = "BROKEN: doesn't build with B!=S (gnu-configize executed in ${B})"
+PNBLACKLIST[zsh] ?= "BROKEN: doesn't build with B!=S (gnu-configize executed in ${B})"
 
 DEPENDS = "ncurses bison-native"
 
diff --git a/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb b/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb
index b19110a..194d104 100644
--- a/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb
+++ b/meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://box2d/License.txt;md5=e5d39ad91f7dc4692dcdb1d85139ec6
 # 0.12.1+gitAUTOINC+de5452e56b-r1/git/clutter-box2d/clutter-box2d.h:226:47:
 #  fatal error: clutter-box2d/clutter-box2d-child.h: No such file or directory
 # |  #include <clutter-box2d/clutter-box2d-child.h>
-PNBLACKLIST[clutter-box2d] = "BROKEN: doesn't build with B!=S"
+PNBLACKLIST[clutter-box2d] ?= "BROKEN: doesn't build with B!=S"
 
 SRCREV = "de5452e56b537a11fd7f9453d048ff4b4793b5a2"
 PV = "0.12.1+git${SRCPV}"
diff --git a/meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb b/meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb
index 1d4e331..90ac702 100644
--- a/meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb
+++ b/meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://www.autistici.org/dezperado/fim/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fa01bff138cc98a62b8840a157951c88"
 
-PNBLACKLIST[fim] = "BROKEN: doesn't build with B!=S (flex: can't open lex.lex)"
+PNBLACKLIST[fim] ?= "BROKEN: doesn't build with B!=S (flex: can't open lex.lex)"
 
 # flex with provide /usr/include/FlexLexer.h
 DEPENDS = "flex-native bison-native flex"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb
index a1943be..547ec86 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543"
 
 DEPENDS += "pixman"
 
-PNBLACKLIST[xf86-input-mtev] = "BROKEN: doesn't build with B!=S (Makefile without ${S} in sed call)"
+PNBLACKLIST[xf86-input-mtev] ?= "BROKEN: doesn't build with B!=S (Makefile without ${S} in sed call)"
 
 SRC_URI = "git://gitorious.org/xorg/xf86-input-mtev.git file://fix-it.patch"
 SRCREV = "1eb469166ffc095c5801475f057f911f97a6e641"
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
index 65fab1f..aa6c011 100644
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
@@ -13,7 +13,7 @@ RCONFLICTS_${PN} = "mplayer"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
 
-PNBLACKLIST[mplayer2] = "Requires newer libav which has negative D_P"
+PNBLACKLIST[mplayer2] ?= "Requires newer libav which has negative D_P"
 
 SRC_URI = "git://repo.or.cz/mplayer.git \
     file://0001-configure-don-t-disable-ASS-support-when-explicitly-.patch \
diff --git a/meta-oe/recipes-navigation/omgps/omgps_svn.bb b/meta-oe/recipes-navigation/omgps/omgps_svn.bb
index 2304b36..aabdd43 100644
--- a/meta-oe/recipes-navigation/omgps/omgps_svn.bb
+++ b/meta-oe/recipes-navigation/omgps/omgps_svn.bb
@@ -9,7 +9,7 @@ PV = "0.1+svnr${SRCPV}"
 PR = "r2"
 S = "${WORKDIR}/${PN}"
 
-PNBLACKLIST[omgps] = "BROKEN: sound.c:61:35: error: 'saveptr' may be used uninitialized in this function [-Werror=maybe-uninitialized]"
+PNBLACKLIST[omgps] ?= "BROKEN: sound.c:61:35: error: 'saveptr' may be used uninitialized in this function [-Werror=maybe-uninitialized]"
 
 do_configure_prepend() {
     sed -i "s#PY_VERSION = 2.6#PY_VERSION = ${PYTHON_BASEVERSION}#g" ${S}/Makefile.am
diff --git a/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
index baf8027..e307a72 100644
--- a/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
+++ b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
@@ -4,7 +4,7 @@ RCONFLICTS_${PN} = "qconnman"
 
 inherit qt4e
 
-PNBLACKLIST[qconnman-e] = "BROKEN: doesn't work with B!=S, ls: cannot access *.pro: No such file or directory"
+PNBLACKLIST[qconnman-e] ?= "BROKEN: doesn't work with B!=S, ls: cannot access *.pro: No such file or directory"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=/usr"
 EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
diff --git a/meta-oe/recipes-qt/qconnman/qconnman_git.bb b/meta-oe/recipes-qt/qconnman/qconnman_git.bb
index e2bd2ed..2f8cca2 100644
--- a/meta-oe/recipes-qt/qconnman/qconnman_git.bb
+++ b/meta-oe/recipes-qt/qconnman/qconnman_git.bb
@@ -4,7 +4,7 @@ RCONFLICTS_${PN} = "qconnman-e"
 
 inherit qt4x11
 
-PNBLACKLIST[qconnman] = "BROKEN: doesn't work with B!=S, ls: cannot access *.pro: No such file or directory"
+PNBLACKLIST[qconnman] ?= "BROKEN: doesn't work with B!=S, ls: cannot access *.pro: No such file or directory"
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=/usr"
 EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
diff --git a/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb b/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb
index 214ca58..1b010a5 100644
--- a/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb
+++ b/meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4 \
 
 PR = "r2"
 
-PNBLACKLIST[sylpheed] = "BROKEN: Doesn't work with B!=S"
+PNBLACKLIST[sylpheed] ?= "BROKEN: Doesn't work with B!=S"
 
 SRC_URI = "http://sylpheed.sraoss.jp/sylpheed/v2.7/sylpheed-${PV}.tar.bz2 \
     file://glib-2.32.patch \
diff --git a/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb b/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb
index 4cd3f77..18979d5 100644
--- a/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb
+++ b/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://garr.dl.sourceforge.net/project/apcupsd/apcupsd%20-%20Stable/3
 SRC_URI[md5sum] = "5928822d855c5cf7ac29655e3e0b8c23"
 SRC_URI[sha256sum] = "0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032"
 
-PNBLACKLIST[apcupsd] = "BROKEN: doesn't build with B!=S"
+PNBLACKLIST[apcupsd] ?= "BROKEN: doesn't build with B!=S"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-support/emacs/emacs_23.4.bb b/meta-oe/recipes-support/emacs/emacs_23.4.bb
index 3db5da6..a324828 100644
--- a/meta-oe/recipes-support/emacs/emacs_23.4.bb
+++ b/meta-oe/recipes-support/emacs/emacs_23.4.bb
@@ -2,7 +2,7 @@ require emacs.inc
 
 PR = "r4"
 
-PNBLACKLIST[emacs] = "qemu: uncaught target signal 11 (Segmentation fault) - core dumped"
+PNBLACKLIST[emacs] ?= "qemu: uncaught target signal 11 (Segmentation fault) - core dumped"
 
 SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
            file://use-qemu.patch \
diff --git a/meta-oe/recipes-support/maliit/maliit-framework_git.bb b/meta-oe/recipes-support/maliit/maliit-framework_git.bb
index f387ce2..3eb7f30 100644
--- a/meta-oe/recipes-support/maliit/maliit-framework_git.bb
+++ b/meta-oe/recipes-support/maliit/maliit-framework_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=5c917f6ce94ceb8d8d5e16e2fca5b9ad"
 
 inherit autotools qt4x11 gtk-immodules-cache
 
-PNBLACKLIST[maliit-framework] = "BROKEN: Wasn't updated to work with B!=S, maybe incorrectly inherits autotools"
+PNBLACKLIST[maliit-framework] ?= "BROKEN: Wasn't updated to work with B!=S, maybe incorrectly inherits autotools"
 
 DEPENDS = "libxcomposite dbus gtk+3 gtk+"
 
diff --git a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
index 0fa8ac2..3c040d8 100644
--- a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
+++ b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f29b21caa8e460097bfad9c026a33621"
 
 inherit autotools qt4x11
 
-PNBLACKLIST[maliit-plugins] = "BROKEN: depends on broken maliit-framework"
+PNBLACKLIST[maliit-plugins] ?= "BROKEN: depends on broken maliit-framework"
 
 DEPENDS = "maliit-framework"
 
diff --git a/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb b/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb
index ac4d188..2baeda0 100644
--- a/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb
+++ b/meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=14f692c82491db3d52419929d2f3b343"
 
 PR = "r3"
 
-PNBLACKLIST[openmotif] = "BROKEN: doesn't build with B!=S"
+PNBLACKLIST[openmotif] ?= "BROKEN: doesn't build with B!=S"
 
 SRC_URI = "http://motif.ics.com/sites/default/files/openmotif-2.3.3.tar.gz \
            file://configure.patch;patch=1"
diff --git a/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb b/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb
index 78af9b6..07ff318 100644
--- a/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb
+++ b/meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb
@@ -8,7 +8,7 @@ PV = "1.3+gitr${SRCPV}"
 PE = "1"
 PR = "r1"
 
-PNBLACKLIST[vala-terminal] = "BROKEN: Doesn't work with B!=S, touch: cannot touch `src/.stamp': No such file or directory"
+PNBLACKLIST[vala-terminal] ?= "BROKEN: Doesn't work with B!=S, touch: cannot touch `src/.stamp': No such file or directory"
 
 inherit autotools perlnative vala
 
diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc
index dcafa4f..f60c7bb 100644
--- a/meta-webserver/recipes-php/modphp/modphp5.inc
+++ b/meta-webserver/recipes-php/modphp/modphp5.inc
@@ -20,7 +20,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108"
 
 inherit autotools pkgconfig
 
-PNBLACKLIST[modphp] = "CONFLICT: 466 header files conflict with php"
+PNBLACKLIST[modphp] ?= "CONFLICT: 466 header files conflict with php"
 # e.g. sysroots/qemux86-64/usr/include/php/main/win95nt.h
 
 CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2"
diff --git a/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb b/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb
index 750b288..66aff5e 100644
--- a/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb
+++ b/meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=34df3a274aa12b795417c65634c07f16"
 
 DEPENDS = "modphp"
 
-PNBLACKLIST[xdebug] = "CONFLICT: depends on blocked modphp"
+PNBLACKLIST[xdebug] ?= "CONFLICT: depends on blocked modphp"
 
 SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz"
 
-- 
1.9.1

[PATCH 25/27] mplayer2: use autotools-brokensep (B = S)

[Armin Kuster]

From: "Belal, Awais" <Awais_Belal@mentor.com>

The mplayer2 package does not support out of tree builds
and the do_configure step also tries to find the configure
script in the same build directory while the script lies in
the src directory.
This patch updates the builddir to point to the srcdir in
order to cope with the above issues.

Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
index aa6c011..446562c 100644
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
@@ -36,7 +36,7 @@ CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \
                     /usr/etc/mplayer/codecs.conf \
 "
 
-inherit autotools pkgconfig
+inherit autotools-brokensep pkgconfig
 
 EXTRA_OECONF = " \
     --prefix=/usr \
-- 
1.9.1

[PATCH 26/27] mplayer2: cleanup empty directories

[Armin Kuster]

From: "Belal, Awais" <Awais_Belal@mentor.com>

The mplayer "make install" phase leaves an empty
/usr/lib directory seemingly regardless of the setting
of libdir.  Remove it to avoid a packaging warning.

Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
index 446562c..7c04ff1 100644
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
@@ -141,4 +141,5 @@ do_install() {
     install ${S}/etc/input.conf ${D}/usr/etc/mplayer/
     install ${S}/etc/example.conf ${D}/usr/etc/mplayer/
     install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/
+    [ -e ${D}/usr/lib ] && rmdir ${D}/usr/lib
 }
-- 
1.9.1

[PATCH 27/27] xf86-video-glamo: fix build with xserver 1.16

[Armin Kuster]

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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...-glamo.h-use-const-for-jbt6k74_state_path.patch | 29 ++++++++++++++++++++++
 .../xorg-driver/xf86-video-glamo_git.bb            |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch

diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
new file mode 100644
index 0000000..a820371
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
@@ -0,0 +1,29 @@
+From 180a00634f351a09ceabc5695d8e1acc3e585501 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Fri, 12 Dec 2014 12:00:10 +0100
+Subject: [PATCH] glamo.h: use const for jbt6k74_state_path
+
+* fix build issue with xserver 1.16:
+  glamo-driver.c:501:32: error: assignment discards 'const' qualifier from pointer target type [-Werror]
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/glamo.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/glamo.h b/src/glamo.h
+index 5fd5c04..5e072be 100644
+--- a/src/glamo.h
++++ b/src/glamo.h
+@@ -148,7 +148,7 @@ typedef struct {
+ #endif
+ 
+ #ifdef JBT6K74_SET_STATE
+-    char *jbt6k74_state_path;
++    const char *jbt6k74_state_path;
+     char saved_jbt6k74_state[14];
+ #endif
+ 
+-- 
+2.1.3
+
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
index 38c12f3..78c6564 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
@@ -14,6 +14,7 @@ SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;branch=master \
            file://0001-fix-build-with-KMS-disabled.patch \
            file://0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch \
            file://0001-glamo-driver-remove-references-to-mibstore.patch \   
+           file://0004-glamo.h-use-const-for-jbt6k74_state_path.patch \
 "
 
 S = "${WORKDIR}/git"
-- 
1.9.1

Re: [PATCH 27/27] xf86-video-glamo: fix build with xserver 1.16

[Martin Jansa]

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

On Sat, Dec 27, 2014 at 09:22:14AM -0800, Armin Kuster wrote:
> From: Martin Jansa <Martin.Jansa@gmail.com>

This shoudn't be needed in dizzy which has old enough xserver.

> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> Signed-off-by: Armin Kuster <akuster808@gmail.com>
> ---
>  ...-glamo.h-use-const-for-jbt6k74_state_path.patch | 29 ++++++++++++++++++++++
>  .../xorg-driver/xf86-video-glamo_git.bb            |  1 +
>  2 files changed, 30 insertions(+)
>  create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
> 
> diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
> new file mode 100644
> index 0000000..a820371
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
> @@ -0,0 +1,29 @@
> +From 180a00634f351a09ceabc5695d8e1acc3e585501 Mon Sep 17 00:00:00 2001
> +From: Martin Jansa <Martin.Jansa@gmail.com>
> +Date: Fri, 12 Dec 2014 12:00:10 +0100
> +Subject: [PATCH] glamo.h: use const for jbt6k74_state_path
> +
> +* fix build issue with xserver 1.16:
> +  glamo-driver.c:501:32: error: assignment discards 'const' qualifier from pointer target type [-Werror]
> +
> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> +---
> + src/glamo.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/glamo.h b/src/glamo.h
> +index 5fd5c04..5e072be 100644
> +--- a/src/glamo.h
> ++++ b/src/glamo.h
> +@@ -148,7 +148,7 @@ typedef struct {
> + #endif
> + 
> + #ifdef JBT6K74_SET_STATE
> +-    char *jbt6k74_state_path;
> ++    const char *jbt6k74_state_path;
> +     char saved_jbt6k74_state[14];
> + #endif
> + 
> +-- 
> +2.1.3
> +
> diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
> index 38c12f3..78c6564 100644
> --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
> +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
> @@ -14,6 +14,7 @@ SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;branch=master \
>             file://0001-fix-build-with-KMS-disabled.patch \
>             file://0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch \
>             file://0001-glamo-driver-remove-references-to-mibstore.patch \   
> +           file://0004-glamo.h-use-const-for-jbt6k74_state_path.patch \
>  "
>  
>  S = "${WORKDIR}/git"
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

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

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

Re: [PATCH 11/27] lvm2: add lvm.con to CONFFILES

[Otavio Salvador]

There is a typo in the short log. *conf*.

On Sat, Dec 27, 2014 at 3:21 PM, Armin Kuster <akuster808@gmail.com> wrote:
> From: Liu Jian <jian.liu@windriver.com>
>
> * Files will be over written when updating using rpm.
>
> * If there is no %config micro before the file in the spec file,
>   this file will be over-written after updating this package
>   using rpm. This will make our settings lost.
>
> Signed-off-by: Jian Liu <jian.liu@windriver.com>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> Signed-off-by: Armin Kuster <akuster808@gmail.com>
> ---
>  meta-oe/recipes-support/lvm2/lvm2.inc | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
> index 1bbb158..42f6e3a 100644
> --- a/meta-oe/recipes-support/lvm2/lvm2.inc
> +++ b/meta-oe/recipes-support/lvm2/lvm2.inc
> @@ -48,3 +48,5 @@ FILES_${PN} += "${libdir}/device-mapper/*.so ${base_libdir}/udev"
>  FILES_${PN}-dbg += "${libdir}/device-mapper/.debug"
>
>  RDEPENDS_${PN} = "bash"
> +
> +CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf"
> --
> 1.9.1
>



-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 00/27] [Dizzy-next] pull request

[Otavio Salvador]

Hello Armin,

On Sat, Dec 27, 2014 at 3:21 PM, Armin Kuster <akuster808@gmail.com> wrote:
> Please consider these changes for Dizzy-next
>
> The following changes since commit 510b7a9d8d5dda07120df5866507742a626478c1:
>
>   krb5: fix CVE-2014-5351 (2014-12-01 14:24:53 +0100)
>
> are available in the git repository at:
>
>   https://github.com/akuster/meta-openembedded.git akuster/dizzy-next
>   https://github.com//tree/akuster/dizzy-next
>
> Andreas Müller (1):
>   glibmm: add perl to RDEPENDS_{PN}-dev
>
> Awais Belal (1):
>   enca: fix broken automake
>
> Belal, Awais (2):
>   mplayer2: use autotools-brokensep (B = S)
>   mplayer2: cleanup empty directories
>
> Chong.Lu@windriver.com (2):
>   samba: add winbind.service to winbind package
>   samba: fix error messages when startup samba service
>
> Chris Morgan (1):
>   dfu-util: Point to gitorious.org repository as gnumonks.org is down
>
> Gary S. Robertson (2):
>   libhugetlbfs: Make cross-devel recognize all ix86 arches
>   libhugetlbfs: Fix page size & text offset for arm arches
>
> Jackie Huang (5):
>   postfix.inc: Remove references to buildmachine paths in target
>     makedefs.out
>   rrdtool: inherit cpan-base to help build perl modules
>   rrdtool: add missing dependency on groff-native
>   hostapd: several fixes for init script
>   rfkill: fix the SRC_URI
>
> Javier Viguera (1):
>   xserver-common: disable TCP connections
>
> Kai Kang (1):
>   polarssl: add dependency openssl
>
> Kang Kai (2):
>   libnet-ssleay-perl: avoid host contamination
>   meta-gnome: fix typo of directory name
>
> Liu Jian (1):
>   lvm2: add lvm.con to CONFFILES

Typo!

>
> Martin Jansa (3):
>   iotop: Drop python-distutils from RDEPENDS
>   PNBLACKLIST: use weak assignments
>   xf86-video-glamo: fix build with xserver 1.16

The fix for 1.16, as said by Martin, are not needed. So I'd prefer to
not backport it for now (and we can consider it if we have a conflict
due the lack of it in future).

> Peter Bigot (3):
>   imagemagick: update URI to allow fetching current and previous
>     releases
>   obexd: conflict with bluez5
>   obex-data-server: conflict with bluez5
>
> Robert Yang (1):
>   libcanberra: fix installed-vs-shipped warning
>
> Wenzong Fan (1):
>   sethdlc: fix host contamination

Apart from those two comments I am fine with all the others. :)

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 00/27] [Dizzy-next] pull request

[Philip Balister]

What about Saul's resolvconf fixes?

Philip

On 12/27/2014 12:21 PM, Armin Kuster wrote:
> Please consider these changes for Dizzy-next
> 
> The following changes since commit 510b7a9d8d5dda07120df5866507742a626478c1:
> 
>   krb5: fix CVE-2014-5351 (2014-12-01 14:24:53 +0100)
> 
> are available in the git repository at:
> 
>   https://github.com/akuster/meta-openembedded.git akuster/dizzy-next
>   https://github.com//tree/akuster/dizzy-next
> 
> Andreas Müller (1):
>   glibmm: add perl to RDEPENDS_{PN}-dev
> 
> Awais Belal (1):
>   enca: fix broken automake
> 
> Belal, Awais (2):
>   mplayer2: use autotools-brokensep (B = S)
>   mplayer2: cleanup empty directories
> 
> Chong.Lu@windriver.com (2):
>   samba: add winbind.service to winbind package
>   samba: fix error messages when startup samba service
> 
> Chris Morgan (1):
>   dfu-util: Point to gitorious.org repository as gnumonks.org is down
> 
> Gary S. Robertson (2):
>   libhugetlbfs: Make cross-devel recognize all ix86 arches
>   libhugetlbfs: Fix page size & text offset for arm arches
> 
> Jackie Huang (5):
>   postfix.inc: Remove references to buildmachine paths in target
>     makedefs.out
>   rrdtool: inherit cpan-base to help build perl modules
>   rrdtool: add missing dependency on groff-native
>   hostapd: several fixes for init script
>   rfkill: fix the SRC_URI
> 
> Javier Viguera (1):
>   xserver-common: disable TCP connections
> 
> Kai Kang (1):
>   polarssl: add dependency openssl
> 
> Kang Kai (2):
>   libnet-ssleay-perl: avoid host contamination
>   meta-gnome: fix typo of directory name
> 
> Liu Jian (1):
>   lvm2: add lvm.con to CONFFILES
> 
> Martin Jansa (3):
>   iotop: Drop python-distutils from RDEPENDS
>   PNBLACKLIST: use weak assignments
>   xf86-video-glamo: fix build with xserver 1.16
> 
> Peter Bigot (3):
>   imagemagick: update URI to allow fetching current and previous
>     releases
>   obexd: conflict with bluez5
>   obex-data-server: conflict with bluez5
> 
> Robert Yang (1):
>   libcanberra: fix installed-vs-shipped warning
> 
> Wenzong Fan (1):
>   sethdlc: fix host contamination
> 
>  .../recipes-filesystems/ifuse/ifuse_1.1.2.bb       |  2 +-
>  .../gnome-mplayer/gnome-mplayer_1.0.5.bb           |  2 +-
>  meta-gnome/recipes-connectivity/obex/obexd_0.48.bb |  2 +
>  .../glade/glade3_%.bbappend                        |  0
>  meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb          |  2 +-
>  .../gnome-menus/gnome-menus3_3.10.1.bb             |  2 +-
>  .../gnome-panel/gnome-panel3_3.0.2.bb              |  2 +-
>  .../recipes-gnome/gweather/libgweather3_3.0.2.bb   |  2 +-
>  meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb   |  2 +-
>  .../recipes-mediacentre/xbmc/xbmc_git.bb           |  2 +-
>  .../coriander/coriander_2.0.2.bb                   |  2 +-
>  .../dleyna/renderer-service-upnp_0.3.0.bb          |  2 +-
>  .../polarssl/polarssl_1.3.8.bb                     |  1 +
>  .../files/sethdlc-fix-host-contamination.patch     | 42 ++++++++++++++++
>  .../recipes-connectivity/sethdlc/sethdlc.bb        |  3 +-
>  .../recipes-daemons/postfix/postfix.inc            |  5 ++
>  .../lksctp-tools/lksctp-tools_1.0.16.bb            |  2 +-
>  .../0001-Makefile-Recognize-all-ix86-arches.patch  | 32 ++++++++++++
>  ...rch64-fix-page-size-not-properly-computed.patch | 32 ------------
>  ...s-arm-arches-fix-page-size-and-text-offse.patch | 57 ++++++++++++++++++++++
>  .../libhugetlbfs/libhugetlbfs_git.bb               |  3 +-
>  .../recipes-connectivity/hostapd/hostapd-2.2/init  | 27 ++++++++--
>  .../libimobiledevice/libimobiledevice_1.1.4.bb     |  2 +-
>  .../obex/obex-data-server_0.4.6.bb                 |  1 +
>  meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb  |  2 +-
>  meta-oe/recipes-connectivity/samba/samba-basic.inc |  1 +
>  meta-oe/recipes-connectivity/samba/samba.inc       |  8 ++-
>  meta-oe/recipes-connectivity/soft66/soft66_git.bb  |  2 +-
>  .../zeroc-ice/zeroc-ice_3.5.1.bb                   |  2 +-
>  meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb     |  2 +
>  meta-oe/recipes-extended/iotop/iotop_0.4.4.bb      |  2 +-
>  meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb  | 20 ++++----
>  .../recipes-extended/subsurface/subsurface_git.bb  |  2 +-
>  meta-oe/recipes-extended/zsh/zsh.inc               |  2 +-
>  .../recipes-graphics/clutter/clutter-box2d_git.bb  |  2 +-
>  meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb        |  2 +-
>  .../xorg-driver/xf86-input-mtev_git.bb             |  2 +-
>  ...-glamo.h-use-const-for-jbt6k74_state_path.patch | 29 +++++++++++
>  .../xorg-driver/xf86-video-glamo_git.bb            |  1 +
>  ...15-xserver-common-disable-TCP-connections.patch | 24 +++++++++
>  .../xserver-common/xserver-common_1.34.bb          |  1 +
>  meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |  5 +-
>  meta-oe/recipes-navigation/omgps/omgps_svn.bb      |  2 +-
>  meta-oe/recipes-qt/qconnman/qconnman-e_git.bb      |  2 +-
>  meta-oe/recipes-qt/qconnman/qconnman_git.bb        |  2 +-
>  meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb  |  2 +-
>  meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb |  2 +-
>  meta-oe/recipes-support/dfu-util/dfu-util_0.7.bb   |  9 ++--
>  meta-oe/recipes-support/emacs/emacs_23.4.bb        |  2 +-
>  .../enca/enca/libenca-003-iconv.patch              | 28 +++++++++++
>  meta-oe/recipes-support/enca/enca_1.9.bb           |  3 +-
>  .../imagemagick/imagemagick_6.8.9.bb               |  2 +-
>  .../libcanberra/libcanberra_0.29.bb                |  2 +-
>  meta-oe/recipes-support/lvm2/lvm2.inc              |  2 +
>  .../recipes-support/maliit/maliit-framework_git.bb |  2 +-
>  .../recipes-support/maliit/maliit-plugins_git.bb   |  2 +-
>  .../recipes-support/openmotif/openmotif_2.3.3.bb   |  2 +-
>  .../vala-terminal/vala-terminal_git.bb             |  2 +-
>  .../recipes-perl/libnet/libnet-ssleay-perl_1.65.bb |  8 ++-
>  meta-webserver/recipes-php/modphp/modphp5.inc      |  2 +-
>  meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb  |  2 +-
>  61 files changed, 325 insertions(+), 91 deletions(-)
>  rename meta-gnome/{recipe-devtools => recipes-devtools}/glade/glade3_%.bbappend (100%)
>  create mode 100644 meta-networking/recipes-connectivity/sethdlc/files/sethdlc-fix-host-contamination.patch
>  create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Makefile-Recognize-all-ix86-arches.patch
>  delete mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-aarch64-fix-page-size-not-properly-computed.patch
>  create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-ld.hugetlbfs-arm-arches-fix-page-size-and-text-offse.patch
>  create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
>  create mode 100644 meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch
>  create mode 100644 meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch
> 

Re: [PATCH 00/27] [Dizzy-next] pull request

[akuster808]

On 12/27/2014 11:33 AM, Philip Balister wrote:
> What about Saul's resolvconf fixes?

do you mean the one in openembedded-core?

- armin
>
> Philip
>
> On 12/27/2014 12:21 PM, Armin Kuster wrote:
>> Please consider these changes for Dizzy-next
>>
>> The following changes since commit 510b7a9d8d5dda07120df5866507742a626478c1:
>>
>>    krb5: fix CVE-2014-5351 (2014-12-01 14:24:53 +0100)
>>
>> are available in the git repository at:
>>
>>    https://github.com/akuster/meta-openembedded.git akuster/dizzy-next
>>    https://github.com//tree/akuster/dizzy-next
>>
>> Andreas Müller (1):
>>    glibmm: add perl to RDEPENDS_{PN}-dev
>>
>> Awais Belal (1):
>>    enca: fix broken automake
>>
>> Belal, Awais (2):
>>    mplayer2: use autotools-brokensep (B = S)
>>    mplayer2: cleanup empty directories
>>
>> Chong.Lu@windriver.com (2):
>>    samba: add winbind.service to winbind package
>>    samba: fix error messages when startup samba service
>>
>> Chris Morgan (1):
>>    dfu-util: Point to gitorious.org repository as gnumonks.org is down
>>
>> Gary S. Robertson (2):
>>    libhugetlbfs: Make cross-devel recognize all ix86 arches
>>    libhugetlbfs: Fix page size & text offset for arm arches
>>
>> Jackie Huang (5):
>>    postfix.inc: Remove references to buildmachine paths in target
>>      makedefs.out
>>    rrdtool: inherit cpan-base to help build perl modules
>>    rrdtool: add missing dependency on groff-native
>>    hostapd: several fixes for init script
>>    rfkill: fix the SRC_URI
>>
>> Javier Viguera (1):
>>    xserver-common: disable TCP connections
>>
>> Kai Kang (1):
>>    polarssl: add dependency openssl
>>
>> Kang Kai (2):
>>    libnet-ssleay-perl: avoid host contamination
>>    meta-gnome: fix typo of directory name
>>
>> Liu Jian (1):
>>    lvm2: add lvm.con to CONFFILES
>>
>> Martin Jansa (3):
>>    iotop: Drop python-distutils from RDEPENDS
>>    PNBLACKLIST: use weak assignments
>>    xf86-video-glamo: fix build with xserver 1.16
>>
>> Peter Bigot (3):
>>    imagemagick: update URI to allow fetching current and previous
>>      releases
>>    obexd: conflict with bluez5
>>    obex-data-server: conflict with bluez5
>>
>> Robert Yang (1):
>>    libcanberra: fix installed-vs-shipped warning
>>
>> Wenzong Fan (1):
>>    sethdlc: fix host contamination
>>
>>   .../recipes-filesystems/ifuse/ifuse_1.1.2.bb       |  2 +-
>>   .../gnome-mplayer/gnome-mplayer_1.0.5.bb           |  2 +-
>>   meta-gnome/recipes-connectivity/obex/obexd_0.48.bb |  2 +
>>   .../glade/glade3_%.bbappend                        |  0
>>   meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb          |  2 +-
>>   .../gnome-menus/gnome-menus3_3.10.1.bb             |  2 +-
>>   .../gnome-panel/gnome-panel3_3.0.2.bb              |  2 +-
>>   .../recipes-gnome/gweather/libgweather3_3.0.2.bb   |  2 +-
>>   meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb   |  2 +-
>>   .../recipes-mediacentre/xbmc/xbmc_git.bb           |  2 +-
>>   .../coriander/coriander_2.0.2.bb                   |  2 +-
>>   .../dleyna/renderer-service-upnp_0.3.0.bb          |  2 +-
>>   .../polarssl/polarssl_1.3.8.bb                     |  1 +
>>   .../files/sethdlc-fix-host-contamination.patch     | 42 ++++++++++++++++
>>   .../recipes-connectivity/sethdlc/sethdlc.bb        |  3 +-
>>   .../recipes-daemons/postfix/postfix.inc            |  5 ++
>>   .../lksctp-tools/lksctp-tools_1.0.16.bb            |  2 +-
>>   .../0001-Makefile-Recognize-all-ix86-arches.patch  | 32 ++++++++++++
>>   ...rch64-fix-page-size-not-properly-computed.patch | 32 ------------
>>   ...s-arm-arches-fix-page-size-and-text-offse.patch | 57 ++++++++++++++++++++++
>>   .../libhugetlbfs/libhugetlbfs_git.bb               |  3 +-
>>   .../recipes-connectivity/hostapd/hostapd-2.2/init  | 27 ++++++++--
>>   .../libimobiledevice/libimobiledevice_1.1.4.bb     |  2 +-
>>   .../obex/obex-data-server_0.4.6.bb                 |  1 +
>>   meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb  |  2 +-
>>   meta-oe/recipes-connectivity/samba/samba-basic.inc |  1 +
>>   meta-oe/recipes-connectivity/samba/samba.inc       |  8 ++-
>>   meta-oe/recipes-connectivity/soft66/soft66_git.bb  |  2 +-
>>   .../zeroc-ice/zeroc-ice_3.5.1.bb                   |  2 +-
>>   meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb     |  2 +
>>   meta-oe/recipes-extended/iotop/iotop_0.4.4.bb      |  2 +-
>>   meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb  | 20 ++++----
>>   .../recipes-extended/subsurface/subsurface_git.bb  |  2 +-
>>   meta-oe/recipes-extended/zsh/zsh.inc               |  2 +-
>>   .../recipes-graphics/clutter/clutter-box2d_git.bb  |  2 +-
>>   meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb        |  2 +-
>>   .../xorg-driver/xf86-input-mtev_git.bb             |  2 +-
>>   ...-glamo.h-use-const-for-jbt6k74_state_path.patch | 29 +++++++++++
>>   .../xorg-driver/xf86-video-glamo_git.bb            |  1 +
>>   ...15-xserver-common-disable-TCP-connections.patch | 24 +++++++++
>>   .../xserver-common/xserver-common_1.34.bb          |  1 +
>>   meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |  5 +-
>>   meta-oe/recipes-navigation/omgps/omgps_svn.bb      |  2 +-
>>   meta-oe/recipes-qt/qconnman/qconnman-e_git.bb      |  2 +-
>>   meta-oe/recipes-qt/qconnman/qconnman_git.bb        |  2 +-
>>   meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb  |  2 +-
>>   meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb |  2 +-
>>   meta-oe/recipes-support/dfu-util/dfu-util_0.7.bb   |  9 ++--
>>   meta-oe/recipes-support/emacs/emacs_23.4.bb        |  2 +-
>>   .../enca/enca/libenca-003-iconv.patch              | 28 +++++++++++
>>   meta-oe/recipes-support/enca/enca_1.9.bb           |  3 +-
>>   .../imagemagick/imagemagick_6.8.9.bb               |  2 +-
>>   .../libcanberra/libcanberra_0.29.bb                |  2 +-
>>   meta-oe/recipes-support/lvm2/lvm2.inc              |  2 +
>>   .../recipes-support/maliit/maliit-framework_git.bb |  2 +-
>>   .../recipes-support/maliit/maliit-plugins_git.bb   |  2 +-
>>   .../recipes-support/openmotif/openmotif_2.3.3.bb   |  2 +-
>>   .../vala-terminal/vala-terminal_git.bb             |  2 +-
>>   .../recipes-perl/libnet/libnet-ssleay-perl_1.65.bb |  8 ++-
>>   meta-webserver/recipes-php/modphp/modphp5.inc      |  2 +-
>>   meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb  |  2 +-
>>   61 files changed, 325 insertions(+), 91 deletions(-)
>>   rename meta-gnome/{recipe-devtools => recipes-devtools}/glade/glade3_%.bbappend (100%)
>>   create mode 100644 meta-networking/recipes-connectivity/sethdlc/files/sethdlc-fix-host-contamination.patch
>>   create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Makefile-Recognize-all-ix86-arches.patch
>>   delete mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-aarch64-fix-page-size-not-properly-computed.patch
>>   create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-ld.hugetlbfs-arm-arches-fix-page-size-and-text-offse.patch
>>   create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
>>   create mode 100644 meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch
>>   create mode 100644 meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch
>>

Re: [PATCH 27/27] xf86-video-glamo: fix build with xserver 1.16

[akuster808]

On 12/27/2014 09:45 AM, Martin Jansa wrote:
> On Sat, Dec 27, 2014 at 09:22:14AM -0800, Armin Kuster wrote:
>> From: Martin Jansa <Martin.Jansa@gmail.com>
>
> This shoudn't be needed in dizzy which has old enough xserver.

Thanks I will drop it.

- armin
>
>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> Signed-off-by: Armin Kuster <akuster808@gmail.com>
>> ---
>>   ...-glamo.h-use-const-for-jbt6k74_state_path.patch | 29 ++++++++++++++++++++++
>>   .../xorg-driver/xf86-video-glamo_git.bb            |  1 +
>>   2 files changed, 30 insertions(+)
>>   create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
>>
>> diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
>> new file mode 100644
>> index 0000000..a820371
>> --- /dev/null
>> +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
>> @@ -0,0 +1,29 @@
>> +From 180a00634f351a09ceabc5695d8e1acc3e585501 Mon Sep 17 00:00:00 2001
>> +From: Martin Jansa <Martin.Jansa@gmail.com>
>> +Date: Fri, 12 Dec 2014 12:00:10 +0100
>> +Subject: [PATCH] glamo.h: use const for jbt6k74_state_path
>> +
>> +* fix build issue with xserver 1.16:
>> +  glamo-driver.c:501:32: error: assignment discards 'const' qualifier from pointer target type [-Werror]
>> +
>> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> +---
>> + src/glamo.h | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/src/glamo.h b/src/glamo.h
>> +index 5fd5c04..5e072be 100644
>> +--- a/src/glamo.h
>> ++++ b/src/glamo.h
>> +@@ -148,7 +148,7 @@ typedef struct {
>> + #endif
>> +
>> + #ifdef JBT6K74_SET_STATE
>> +-    char *jbt6k74_state_path;
>> ++    const char *jbt6k74_state_path;
>> +     char saved_jbt6k74_state[14];
>> + #endif
>> +
>> +--
>> +2.1.3
>> +
>> diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
>> index 38c12f3..78c6564 100644
>> --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
>> +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
>> @@ -14,6 +14,7 @@ SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;branch=master \
>>              file://0001-fix-build-with-KMS-disabled.patch \
>>              file://0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch \
>>              file://0001-glamo-driver-remove-references-to-mibstore.patch \
>> +           file://0004-glamo.h-use-const-for-jbt6k74_state_path.patch \
>>   "
>>
>>   S = "${WORKDIR}/git"
>> --
>> 1.9.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
>

Re: [PATCH 11/27] lvm2: add lvm.con to CONFFILES

[akuster808]

Hmm, I got it that way from Master.

do we really fix that ?

- armin

On 12/27/2014 11:27 AM, Otavio Salvador wrote:
> There is a typo in the short log. *conf*.
>
> On Sat, Dec 27, 2014 at 3:21 PM, Armin Kuster <akuster808@gmail.com> wrote:
>> From: Liu Jian <jian.liu@windriver.com>
>>
>> * Files will be over written when updating using rpm.
>>
>> * If there is no %config micro before the file in the spec file,
>>    this file will be over-written after updating this package
>>    using rpm. This will make our settings lost.
>>
>> Signed-off-by: Jian Liu <jian.liu@windriver.com>
>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> Signed-off-by: Armin Kuster <akuster808@gmail.com>
>> ---
>>   meta-oe/recipes-support/lvm2/lvm2.inc | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
>> index 1bbb158..42f6e3a 100644
>> --- a/meta-oe/recipes-support/lvm2/lvm2.inc
>> +++ b/meta-oe/recipes-support/lvm2/lvm2.inc
>> @@ -48,3 +48,5 @@ FILES_${PN} += "${libdir}/device-mapper/*.so ${base_libdir}/udev"
>>   FILES_${PN}-dbg += "${libdir}/device-mapper/.debug"
>>
>>   RDEPENDS_${PN} = "bash"
>> +
>> +CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf"
>> --
>> 1.9.1
>>
>
>
>

Re: [PATCH 11/27] lvm2: add lvm.con to CONFFILES

[Otavio Salvador]

Ok, you got me. Go ahead and merge it as is.

On Sat, Dec 27, 2014 at 5:57 PM, akuster808 <akuster808@gmail.com> wrote:
> Hmm, I got it that way from Master.
>
> do we really fix that ?
>
> - armin
>
>
> On 12/27/2014 11:27 AM, Otavio Salvador wrote:
>>
>> There is a typo in the short log. *conf*.
>>
>> On Sat, Dec 27, 2014 at 3:21 PM, Armin Kuster <akuster808@gmail.com>
>> wrote:
>>>
>>> From: Liu Jian <jian.liu@windriver.com>
>>>
>>> * Files will be over written when updating using rpm.
>>>
>>> * If there is no %config micro before the file in the spec file,
>>>    this file will be over-written after updating this package
>>>    using rpm. This will make our settings lost.
>>>
>>> Signed-off-by: Jian Liu <jian.liu@windriver.com>
>>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>>> Signed-off-by: Armin Kuster <akuster808@gmail.com>
>>> ---
>>>   meta-oe/recipes-support/lvm2/lvm2.inc | 2 ++
>>>   1 file changed, 2 insertions(+)
>>>
>>> diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc
>>> b/meta-oe/recipes-support/lvm2/lvm2.inc
>>> index 1bbb158..42f6e3a 100644
>>> --- a/meta-oe/recipes-support/lvm2/lvm2.inc
>>> +++ b/meta-oe/recipes-support/lvm2/lvm2.inc
>>> @@ -48,3 +48,5 @@ FILES_${PN} += "${libdir}/device-mapper/*.so
>>> ${base_libdir}/udev"
>>>   FILES_${PN}-dbg += "${libdir}/device-mapper/.debug"
>>>
>>>   RDEPENDS_${PN} = "bash"
>>> +
>>> +CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf"
>>> --
>>> 1.9.1
>>>
>>
>>
>>
>



-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 00/27] [Dizzy-next] pull request

[Philip Balister]

On 12/27/2014 02:48 PM, akuster808 wrote:
> 
> 
> On 12/27/2014 11:33 AM, Philip Balister wrote:
>> What about Saul's resolvconf fixes?
> 
> do you mean the one in openembedded-core?

Right, my brain is not in gear yet.

Thanks,

Philip

> 
> - armin
>>
>> Philip
>>
>> On 12/27/2014 12:21 PM, Armin Kuster wrote:
>>> Please consider these changes for Dizzy-next
>>>
>>> The following changes since commit
>>> 510b7a9d8d5dda07120df5866507742a626478c1:
>>>
>>>    krb5: fix CVE-2014-5351 (2014-12-01 14:24:53 +0100)
>>>
>>> are available in the git repository at:
>>>
>>>    https://github.com/akuster/meta-openembedded.git akuster/dizzy-next
>>>    https://github.com//tree/akuster/dizzy-next
>>>
>>> Andreas Müller (1):
>>>    glibmm: add perl to RDEPENDS_{PN}-dev
>>>
>>> Awais Belal (1):
>>>    enca: fix broken automake
>>>
>>> Belal, Awais (2):
>>>    mplayer2: use autotools-brokensep (B = S)
>>>    mplayer2: cleanup empty directories
>>>
>>> Chong.Lu@windriver.com (2):
>>>    samba: add winbind.service to winbind package
>>>    samba: fix error messages when startup samba service
>>>
>>> Chris Morgan (1):
>>>    dfu-util: Point to gitorious.org repository as gnumonks.org is down
>>>
>>> Gary S. Robertson (2):
>>>    libhugetlbfs: Make cross-devel recognize all ix86 arches
>>>    libhugetlbfs: Fix page size & text offset for arm arches
>>>
>>> Jackie Huang (5):
>>>    postfix.inc: Remove references to buildmachine paths in target
>>>      makedefs.out
>>>    rrdtool: inherit cpan-base to help build perl modules
>>>    rrdtool: add missing dependency on groff-native
>>>    hostapd: several fixes for init script
>>>    rfkill: fix the SRC_URI
>>>
>>> Javier Viguera (1):
>>>    xserver-common: disable TCP connections
>>>
>>> Kai Kang (1):
>>>    polarssl: add dependency openssl
>>>
>>> Kang Kai (2):
>>>    libnet-ssleay-perl: avoid host contamination
>>>    meta-gnome: fix typo of directory name
>>>
>>> Liu Jian (1):
>>>    lvm2: add lvm.con to CONFFILES
>>>
>>> Martin Jansa (3):
>>>    iotop: Drop python-distutils from RDEPENDS
>>>    PNBLACKLIST: use weak assignments
>>>    xf86-video-glamo: fix build with xserver 1.16
>>>
>>> Peter Bigot (3):
>>>    imagemagick: update URI to allow fetching current and previous
>>>      releases
>>>    obexd: conflict with bluez5
>>>    obex-data-server: conflict with bluez5
>>>
>>> Robert Yang (1):
>>>    libcanberra: fix installed-vs-shipped warning
>>>
>>> Wenzong Fan (1):
>>>    sethdlc: fix host contamination
>>>
>>>   .../recipes-filesystems/ifuse/ifuse_1.1.2.bb       |  2 +-
>>>   .../gnome-mplayer/gnome-mplayer_1.0.5.bb           |  2 +-
>>>   meta-gnome/recipes-connectivity/obex/obexd_0.48.bb |  2 +
>>>   .../glade/glade3_%.bbappend                        |  0
>>>   meta-gnome/recipes-gnome/gcr/gcr_3.8.2.bb          |  2 +-
>>>   .../gnome-menus/gnome-menus3_3.10.1.bb             |  2 +-
>>>   .../gnome-panel/gnome-panel3_3.0.2.bb              |  2 +-
>>>   .../recipes-gnome/gweather/libgweather3_3.0.2.bb   |  2 +-
>>>   meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb   |  2 +-
>>>   .../recipes-mediacentre/xbmc/xbmc_git.bb           |  2 +-
>>>   .../coriander/coriander_2.0.2.bb                   |  2 +-
>>>   .../dleyna/renderer-service-upnp_0.3.0.bb          |  2 +-
>>>   .../polarssl/polarssl_1.3.8.bb                     |  1 +
>>>   .../files/sethdlc-fix-host-contamination.patch     | 42
>>> ++++++++++++++++
>>>   .../recipes-connectivity/sethdlc/sethdlc.bb        |  3 +-
>>>   .../recipes-daemons/postfix/postfix.inc            |  5 ++
>>>   .../lksctp-tools/lksctp-tools_1.0.16.bb            |  2 +-
>>>   .../0001-Makefile-Recognize-all-ix86-arches.patch  | 32 ++++++++++++
>>>   ...rch64-fix-page-size-not-properly-computed.patch | 32 ------------
>>>   ...s-arm-arches-fix-page-size-and-text-offse.patch | 57
>>> ++++++++++++++++++++++
>>>   .../libhugetlbfs/libhugetlbfs_git.bb               |  3 +-
>>>   .../recipes-connectivity/hostapd/hostapd-2.2/init  | 27 ++++++++--
>>>   .../libimobiledevice/libimobiledevice_1.1.4.bb     |  2 +-
>>>   .../obex/obex-data-server_0.4.6.bb                 |  1 +
>>>   meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb  |  2 +-
>>>   meta-oe/recipes-connectivity/samba/samba-basic.inc |  1 +
>>>   meta-oe/recipes-connectivity/samba/samba.inc       |  8 ++-
>>>   meta-oe/recipes-connectivity/soft66/soft66_git.bb  |  2 +-
>>>   .../zeroc-ice/zeroc-ice_3.5.1.bb                   |  2 +-
>>>   meta-oe/recipes-core/glib-2.0/glibmm_2.36.2.bb     |  2 +
>>>   meta-oe/recipes-extended/iotop/iotop_0.4.4.bb      |  2 +-
>>>   meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb  | 20 ++++----
>>>   .../recipes-extended/subsurface/subsurface_git.bb  |  2 +-
>>>   meta-oe/recipes-extended/zsh/zsh.inc               |  2 +-
>>>   .../recipes-graphics/clutter/clutter-box2d_git.bb  |  2 +-
>>>   meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb        |  2 +-
>>>   .../xorg-driver/xf86-input-mtev_git.bb             |  2 +-
>>>   ...-glamo.h-use-const-for-jbt6k74_state_path.patch | 29 +++++++++++
>>>   .../xorg-driver/xf86-video-glamo_git.bb            |  1 +
>>>   ...15-xserver-common-disable-TCP-connections.patch | 24 +++++++++
>>>   .../xserver-common/xserver-common_1.34.bb          |  1 +
>>>   meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |  5 +-
>>>   meta-oe/recipes-navigation/omgps/omgps_svn.bb      |  2 +-
>>>   meta-oe/recipes-qt/qconnman/qconnman-e_git.bb      |  2 +-
>>>   meta-oe/recipes-qt/qconnman/qconnman_git.bb        |  2 +-
>>>   meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb  |  2 +-
>>>   meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb |  2 +-
>>>   meta-oe/recipes-support/dfu-util/dfu-util_0.7.bb   |  9 ++--
>>>   meta-oe/recipes-support/emacs/emacs_23.4.bb        |  2 +-
>>>   .../enca/enca/libenca-003-iconv.patch              | 28 +++++++++++
>>>   meta-oe/recipes-support/enca/enca_1.9.bb           |  3 +-
>>>   .../imagemagick/imagemagick_6.8.9.bb               |  2 +-
>>>   .../libcanberra/libcanberra_0.29.bb                |  2 +-
>>>   meta-oe/recipes-support/lvm2/lvm2.inc              |  2 +
>>>   .../recipes-support/maliit/maliit-framework_git.bb |  2 +-
>>>   .../recipes-support/maliit/maliit-plugins_git.bb   |  2 +-
>>>   .../recipes-support/openmotif/openmotif_2.3.3.bb   |  2 +-
>>>   .../vala-terminal/vala-terminal_git.bb             |  2 +-
>>>   .../recipes-perl/libnet/libnet-ssleay-perl_1.65.bb |  8 ++-
>>>   meta-webserver/recipes-php/modphp/modphp5.inc      |  2 +-
>>>   meta-webserver/recipes-php/xdebug/xdebug_2.2.5.bb  |  2 +-
>>>   61 files changed, 325 insertions(+), 91 deletions(-)
>>>   rename meta-gnome/{recipe-devtools =>
>>> recipes-devtools}/glade/glade3_%.bbappend (100%)
>>>   create mode 100644
>>> meta-networking/recipes-connectivity/sethdlc/files/sethdlc-fix-host-contamination.patch
>>>
>>>   create mode 100644
>>> meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Makefile-Recognize-all-ix86-arches.patch
>>>
>>>   delete mode 100644
>>> meta-oe/recipes-benchmark/libhugetlbfs/files/0001-aarch64-fix-page-size-not-properly-computed.patch
>>>
>>>   create mode 100644
>>> meta-oe/recipes-benchmark/libhugetlbfs/files/0001-ld.hugetlbfs-arm-arches-fix-page-size-and-text-offse.patch
>>>
>>>   create mode 100644
>>> meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch
>>>
>>>   create mode 100644
>>> meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch
>>>
>>>   create mode 100644
>>> meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch
>>>