[CONSOLIDATED PULL 00/32] 1-June-2011 Request

[CONSOLIDATED PULL 00/32] 1-June-2011 Request

[Saul Wold]

Richard,

This contains a few patches from the community, along with a batch of updates
and bug fixes from me. 

This includes the patch I submitted for the beagleboard qt4-x11-free failure.

This has been built via world.

Thanks
	Sau!


The following changes since commit 26e5e5feb695864b11e47e24017e254c28f14494:

  Improve handling of 'all' architecture recipes and their interaction with sstate (2011-05-31 12:56:38 +0100)

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

Koen Kooi (1):
  dbus 1.4.1: disable sysv script properly when using systemd

Martin Jansa (1):
  create-pull-request: allow '+' in git PROTO_RE, ie for 'git+ssh://'

Phil Blundell (2):
  busybox: sync do_install() with oe master (mostly)
  binconfig: improve handling of empty prefixes

Saul Wold (27):
  less: update to 443
  sysstat: update to 10.0.0
  tzdata: update to 2011g
  libmad: add Upstream-Status
  mpeg2dev: add Upstream-Status
  newt: add Upstream-Status
  util-linux: update to 2.19.1
  glew: update to 1.6.0
  gettext: Update to 0.18.1.1
  gobject-introspection: Update to 0.10.8 Git
  dtc: Cleanup and update recipe
  libiconv: update to 1.13.1
  update-alternatives-dpkg update to 1.16.0.3
  chkconfig: update to 1.3.52
  mailx: update to 12.5
  mc: update to 4.7.5.2
  msmtp: update tof 1.4.24
  gthumb: update to 2.12.3
  alsa-tools: update to 1.0.24.1
  qmmp: update to 0.5.1
  rxvt-unicode: update to 9.11
  gnutls: update to 2.12.5
  distro tracking: updates
  bitbake.conf: Create static-dev pacakge for static libraries
  tcmode-default: disable ARMv7 Optimization for qt4-x11-free
  puzzles: Update to 9175
  clutter-1.6: Add patch to update gettext macro version

Xiaofeng Yan (1):
  sudo.inc: Add do_install_prepend () to sudo.inc

 meta/classes/binconfig.bbclass                     |    4 +-
 meta/conf/bitbake.conf                             |    7 +-
 .../conf/distro/include/distro_tracking_fields.inc |   99 ++++++++++++++------
 meta/conf/distro/include/tcmode-default.inc        |    1 +
 meta/recipes-core/busybox/busybox.inc              |   99 +++++++++++---------
 meta/recipes-core/busybox/busybox_1.18.4.bb        |    2 +-
 meta/recipes-core/dbus/dbus.inc                    |    4 +
 meta/recipes-core/dbus/dbus_1.4.1.bb               |    2 +-
 .../gettext/gettext-0.16.1/disable_java.patch      |    2 +
 .../gettext-0.16.1/fix_aclocal_version.patch       |    2 +
 .../gettext-0.16.1/fix_gnu_source_circular.patch   |    2 +
 .../gettext/gettext-0.16.1/fixchicken.patch        |    2 +
 .../gettext/gettext-0.16.1/getline.m4.patch        |    2 +
 .../gettext-autoconf-lib-link-no-L.patch           |    2 +
 .../gettext-error_print_progname.patch             |    2 +
 .../gettext/gettext-0.16.1/gettext-vpath.patch     |    2 +
 .../gettext-0.16.1/hardcode_macro_version.patch    |    2 +
 .../gettext/gettext-0.16.1/linklib_from_0.17.patch |    2 +
 .../gettext/gettext-0.17/wchar-uclibc.patch        |   96 -------------------
 .../autotools.patch                                |    2 +
 .../gettext-error_print_progname.patch             |    2 +
 .../{gettext-0.17 => gettext-0.18.1.1}/m4fix.patch |    2 +
 .../use_open_properly.patch                        |    2 +
 .../gettext/gettext-0.18.1.1/wchar-uclibc.patch    |   74 +++++++++++++++
 .../{gettext_0.17.bb => gettext_0.18.1.1.bb}       |   14 +--
 .../MCONFIG                                        |    0
 .../defines.h                                      |    0
 .../make_include                                   |    0
 .../remove-lscpu.patch                             |    0
 .../swapargs.h                                     |    0
 .../uclibc-compile.patch                           |    0
 .../util-linux-ng-2.16-mount_lock_path.patch       |    0
 .../util-linux-ng-replace-siginterrupt.patch       |    0
 meta/recipes-core/util-linux/util-linux.inc        |    6 +-
 .../{util-linux_2.17.2.bb => util-linux_2.19.1.bb} |   11 +-
 ...8.7.bb => update-alternatives-dpkg_1.16.0.3.bb} |    0
 .../{chkconfig_1.3.51.bb => chkconfig_1.3.52.bb}   |    4 +-
 .../less/{less_436.bb => less_443.bb}              |    6 +-
 .../mailx/{mailx_12.4.bb => mailx_12.5.bb}         |   13 ++-
 .../mc/{mc_4.7.5.1.bb => mc_4.7.5.2.bb}            |    4 +-
 .../msmtp/{msmtp_1.4.23.bb => msmtp_1.4.24.bb}     |    4 +-
 .../newt/files/remove_slang_include.patch          |    3 +
 meta/recipes-extended/sudo/sudo.inc                |   12 +++
 meta/recipes-extended/sysstat/sysstat_10.0.0.bb    |   10 ++
 meta/recipes-extended/sysstat/sysstat_9.1.5.bb     |   10 --
 .../tzdata/{tzdata_2010o.bb => tzdata_2011g.bb}    |    4 +-
 .../gnome/gobject-introspection/configure.patch    |    2 +
 .../gnome/gobject-introspection/pathfix.patch      |    2 +
 .../gnome/gobject-introspection_git.bb             |    4 +-
 .../gthumb/{gthumb_2.12.2.bb => gthumb_2.12.3.bb}  |    4 +-
 .../recipes-graphics/clutter/clutter-1.6_1.6.14.bb |    5 +-
 .../clutter/update_gettext_macro_version.patch     |   32 +++++++
 meta/recipes-graphics/glew/files/autotools.patch   |    3 +
 .../glew/{glew_1.5.7.bb => glew_1.6.0.bb}          |    4 +-
 meta/recipes-kernel/dtc/dtc-native.inc             |    3 -
 meta/recipes-kernel/dtc/dtc-native_git.bb          |    5 -
 meta/recipes-kernel/dtc/dtc.inc                    |    8 ++-
 meta/recipes-kernel/dtc/dtc/remove_space_opt.patch |    2 +
 meta/recipes-kernel/dtc/dtc_git.bb                 |   15 +++-
 meta/recipes-kernel/dtc/dtc_git.inc                |    8 --
 ...alsa-tools_1.0.20.bb => alsa-tools_1.0.24.1.bb} |    0
 .../libmad/libmad/add-pkgconfig.patch              |    2 +
 .../libmad/fix_for_mips_with_gcc-4.5.0.patch       |    2 +
 .../libmad/libmad/no-force-mem.patch               |    2 +
 .../mpeg2dec/mpeg2dec-0.4.1/altivec_h_needed.patch |    2 +
 .../qt-apps/{qmmp_0.5.0.bb => qmmp_0.5.1.bb}       |    5 +-
 .../puzzles/{puzzles_r9173.bb => puzzles_r9175.bb} |    0
 .../rxvt.desktop                                   |    0
 .../rxvt.png                                       |  Bin 2847 -> 2847 bytes
 .../xwc.patch                                      |    0
 .../{rxvt-unicode_9.10.bb => rxvt-unicode_9.11.bb} |    0
 .../gnutls/gnutls-2.10.4/configure-fix.patch       |   66 -------------
 .../gnutls/gnutls-2.12.5/configure-fix.patch       |   67 +++++++++++++
 .../gnutls-openssl.patch                           |    0
 .../gnutls-texinfo-euro.patch                      |    0
 meta/recipes-support/gnutls/gnutls.inc             |    6 +-
 meta/recipes-support/gnutls/gnutls_2.10.4.bb       |   10 --
 meta/recipes-support/gnutls/gnutls_2.12.5.bb       |    9 ++
 .../autoconf.patch                                 |    2 +
 .../shared_preloadable_libiconv_linux.patch        |    2 +
 .../{libiconv_1.11.1.bb => libiconv_1.13.1.bb}     |    0
 scripts/create-pull-request                        |    2 +-
 82 files changed, 462 insertions(+), 329 deletions(-)
 delete mode 100644 meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
 rename meta/recipes-core/gettext/{gettext-0.17 => gettext-0.18.1.1}/autotools.patch (98%)
 rename meta/recipes-core/gettext/{gettext-0.17 => gettext-0.18.1.1}/gettext-error_print_progname.patch (96%)
 rename meta/recipes-core/gettext/{gettext-0.17 => gettext-0.18.1.1}/m4fix.patch (98%)
 rename meta/recipes-core/gettext/{gettext-0.17 => gettext-0.18.1.1}/use_open_properly.patch (96%)
 create mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch
 rename meta/recipes-core/gettext/{gettext_0.17.bb => gettext_0.18.1.1.bb} (90%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/MCONFIG (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/defines.h (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/make_include (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/remove-lscpu.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/swapargs.h (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/uclibc-compile.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/util-linux-ng-2.16-mount_lock_path.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/util-linux-ng-replace-siginterrupt.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux_2.17.2.bb => util-linux_2.19.1.bb} (82%)
 rename meta/recipes-devtools/update-alternatives/{update-alternatives-dpkg_1.15.8.7.bb => update-alternatives-dpkg_1.16.0.3.bb} (100%)
 rename meta/recipes-extended/chkconfig/{chkconfig_1.3.51.bb => chkconfig_1.3.52.bb} (83%)
 rename meta/recipes-extended/less/{less_436.bb => less_443.bb} (80%)
 rename meta/recipes-extended/mailx/{mailx_12.4.bb => mailx_12.5.bb} (66%)
 rename meta/recipes-extended/mc/{mc_4.7.5.1.bb => mc_4.7.5.2.bb} (78%)
 rename meta/recipes-extended/msmtp/{msmtp_1.4.23.bb => msmtp_1.4.24.bb} (81%)
 create mode 100644 meta/recipes-extended/sysstat/sysstat_10.0.0.bb
 delete mode 100644 meta/recipes-extended/sysstat/sysstat_9.1.5.bb
 rename meta/recipes-extended/tzdata/{tzdata_2010o.bb => tzdata_2011g.bb} (98%)
 rename meta/recipes-gnome/gthumb/{gthumb_2.12.2.bb => gthumb_2.12.3.bb} (76%)
 create mode 100644 meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch
 rename meta/recipes-graphics/glew/{glew_1.5.7.bb => glew_1.6.0.bb} (80%)
 delete mode 100644 meta/recipes-kernel/dtc/dtc-native.inc
 delete mode 100644 meta/recipes-kernel/dtc/dtc-native_git.bb
 delete mode 100644 meta/recipes-kernel/dtc/dtc_git.inc
 rename meta/recipes-multimedia/alsa/{alsa-tools_1.0.20.bb => alsa-tools_1.0.24.1.bb} (100%)
 rename meta/recipes-qt/qt-apps/{qmmp_0.5.0.bb => qmmp_0.5.1.bb} (92%)
 rename meta/recipes-sato/puzzles/{puzzles_r9173.bb => puzzles_r9175.bb} (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.10 => rxvt-unicode-9.11}/rxvt.desktop (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.10 => rxvt-unicode-9.11}/rxvt.png (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.10 => rxvt-unicode-9.11}/xwc.patch (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode_9.10.bb => rxvt-unicode_9.11.bb} (100%)
 delete mode 100644 meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch
 create mode 100644 meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch
 rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.5}/gnutls-openssl.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.5}/gnutls-texinfo-euro.patch (100%)
 delete mode 100644 meta/recipes-support/gnutls/gnutls_2.10.4.bb
 create mode 100644 meta/recipes-support/gnutls/gnutls_2.12.5.bb
 rename meta/recipes-support/libiconv/{libiconv-1.11.1 => libiconv-1.13.1}/autoconf.patch (98%)
 rename meta/recipes-support/libiconv/{libiconv-1.11.1 => libiconv-1.13.1}/shared_preloadable_libiconv_linux.patch (98%)
 rename meta/recipes-support/libiconv/{libiconv_1.11.1.bb => libiconv_1.13.1.bb} (100%)

-- 
1.7.3.4

[CONSOLIDATED PULL 01/32] less: update to 443

[Saul Wold]

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

diff --git a/meta/recipes-extended/less/less_436.bb b/meta/recipes-extended/less/less_443.bb
similarity index 80%
rename from meta/recipes-extended/less/less_436.bb
rename to meta/recipes-extended/less/less_443.bb
index e6c8c71..0928ad4 100644
--- a/meta/recipes-extended/less/less_436.bb
+++ b/meta/recipes-extended/less/less_443.bb
@@ -9,14 +9,14 @@ SECTION = "console/utils"
 # less is a 2-clause BSD-like permissive license
 LICENSE = "GPLv3+ | less"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://LICENSE;md5=fd5ccf3de28f72a0254fa8768ec8180c"
+                    file://LICENSE;md5=1237c0f825bb36122b0b2b486ffbe6be"
 DEPENDS = "ncurses"
 PR = "r0"
 
 SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "817bf051953ad2dea825a1cdf460caa4"
-SRC_URI[sha256sum] = "57a16ff07431a9af45cf1cd5b374e1066d019304219f0d156e22bb8c4d6734d2"
+SRC_URI[md5sum] = "47db098fb3cdaf847b3c4be05ee954fc"
+SRC_URI[sha256sum] = "a4c3e8af81fd0944941ee7c74eecc7759422a227df52335e899e69de5eae30ca"
 
 
 inherit autotools update-alternatives
-- 
1.7.3.4

[CONSOLIDATED PULL 02/32] sysstat: update to 10.0.0

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/sysstat/sysstat_10.0.0.bb |   10 ++++++++++
 meta/recipes-extended/sysstat/sysstat_9.1.5.bb  |   10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 meta/recipes-extended/sysstat/sysstat_10.0.0.bb
 delete mode 100644 meta/recipes-extended/sysstat/sysstat_9.1.5.bb

diff --git a/meta/recipes-extended/sysstat/sysstat_10.0.0.bb b/meta/recipes-extended/sysstat/sysstat_10.0.0.bb
new file mode 100644
index 0000000..fd003d9
--- /dev/null
+++ b/meta/recipes-extended/sysstat/sysstat_10.0.0.bb
@@ -0,0 +1,10 @@
+require sysstat.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+
+PR = "r1"
+
+
+
+SRC_URI[md5sum] = "accc17cc1fa855be6b27def77dd92a0d"
+SRC_URI[sha256sum] = "12b2ddb1c30a6d69a84ced8243b0745b4ab7f1a3b0048b9e1c21ac052d89cd43"
diff --git a/meta/recipes-extended/sysstat/sysstat_9.1.5.bb b/meta/recipes-extended/sysstat/sysstat_9.1.5.bb
deleted file mode 100644
index 49ac988..0000000
--- a/meta/recipes-extended/sysstat/sysstat_9.1.5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require sysstat.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-
-PR = "r1"
-
-
-
-SRC_URI[md5sum] = "b680828159b5158094b9bf1ebad30e90"
-SRC_URI[sha256sum] = "2a567a35511ddb873169ad3345f4e6a6219d39750638bf804027342ef89cb3e0"
-- 
1.7.3.4

[CONSOLIDATED PULL 03/32] tzdata: update to 2011g

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../tzdata/{tzdata_2010o.bb => tzdata_2011g.bb}    |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/tzdata/{tzdata_2010o.bb => tzdata_2011g.bb} (98%)

diff --git a/meta/recipes-extended/tzdata/tzdata_2010o.bb b/meta/recipes-extended/tzdata/tzdata_2011g.bb
similarity index 98%
rename from meta/recipes-extended/tzdata/tzdata_2010o.bb
rename to meta/recipes-extended/tzdata/tzdata_2011g.bb
index d250e5c..ed343c0 100644
--- a/meta/recipes-extended/tzdata/tzdata_2010o.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2011g.bb
@@ -15,8 +15,8 @@ RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \
 
 SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
 
-SRC_URI[md5sum] = "5cae5c56fad81dc29f8fcd933a05768e"
-SRC_URI[sha256sum] = "cd0f3799688b3b870cd988505e47c2975b1808e73ec0677bc9db4b705b534c07"
+SRC_URI[md5sum] = "a068c27e7e426fdb12ab0c88506df20d"
+SRC_URI[sha256sum] = "01a2a189eeda63baacc5e68e6c13afffc7edce182102fffc53acbf35e8703d3c"
 
 S = "${WORKDIR}"
 
-- 
1.7.3.4

[CONSOLIDATED PULL 04/32] libmad: add Upstream-Status

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../libmad/libmad/add-pkgconfig.patch              |    2 ++
 .../libmad/fix_for_mips_with_gcc-4.5.0.patch       |    2 ++
 .../libmad/libmad/no-force-mem.patch               |    2 ++
 3 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-multimedia/libmad/libmad/add-pkgconfig.patch b/meta/recipes-multimedia/libmad/libmad/add-pkgconfig.patch
index 636b27a..b49dc8c 100644
--- a/meta/recipes-multimedia/libmad/libmad/add-pkgconfig.patch
+++ b/meta/recipes-multimedia/libmad/libmad/add-pkgconfig.patch
@@ -10,6 +10,8 @@ do not provide mad.pc (google: pkgconfig libmad).
 
 EMH
 
+Upstream-Status: Inappropriate [configuration]
+
 --h31gzZEtNLTqOjlF
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=&quot;libmad-0.15.1b-pkgconfig.patch&quot;
diff --git a/meta/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch b/meta/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch
index 785a8a2..01c7aa3 100644
--- a/meta/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch
+++ b/meta/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch
@@ -6,6 +6,8 @@ Found a solution here:
 
 http://us.generation-nt.com/answer/bug-568418-libmad0-dev-mpg321-compilation-errors-mips-mipsel-architectures-help-169033451.html
 
+Upstream-Status: Pending
+
 2010/07/29
 Nitin A Kamble <nitin.a.kamble@intel.com>
 
diff --git a/meta/recipes-multimedia/libmad/libmad/no-force-mem.patch b/meta/recipes-multimedia/libmad/libmad/no-force-mem.patch
index d4dab75..d5e6d20 100644
--- a/meta/recipes-multimedia/libmad/libmad/no-force-mem.patch
+++ b/meta/recipes-multimedia/libmad/libmad/no-force-mem.patch
@@ -2,6 +2,8 @@ This option no longer exists in gcc 3.4.1
 
 RP - 18/07/2008
 
+Upstream-Status: Inappropriate [configuration]
+
 Index: libmad-0.15.1b/configure.ac
 ===================================================================
 --- libmad-0.15.1b.orig/configure.ac	2008-07-18 15:45:30.000000000 +0100
-- 
1.7.3.4

[CONSOLIDATED PULL 05/32] mpeg2dev: add Upstream-Status

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../mpeg2dec/mpeg2dec-0.4.1/altivec_h_needed.patch |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec-0.4.1/altivec_h_needed.patch b/meta/recipes-multimedia/mpeg2dec/mpeg2dec-0.4.1/altivec_h_needed.patch
index ecb3a9d..7dc5643 100644
--- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec-0.4.1/altivec_h_needed.patch
+++ b/meta/recipes-multimedia/mpeg2dec/mpeg2dec-0.4.1/altivec_h_needed.patch
@@ -20,6 +20,8 @@ altivec.h is needed by "typedef vector int t;".
 Here we include another statement "int tmp = __CR6_EQ;", in
 which __CR6_EQ is defined in altivec.h.
 
+Upstream-Status: Pending
+
 Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
 
 diff -ruN mpeg2dec-0.4.1-orig/configure.in mpeg2dec-0.4.1/configure.in
-- 
1.7.3.4

[CONSOLIDATED PULL 06/32] newt: add Upstream-Status

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../newt/files/remove_slang_include.patch          |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-extended/newt/files/remove_slang_include.patch b/meta/recipes-extended/newt/files/remove_slang_include.patch
index dbdeef0..a2634ec 100644
--- a/meta/recipes-extended/newt/files/remove_slang_include.patch
+++ b/meta/recipes-extended/newt/files/remove_slang_include.patch
@@ -1,3 +1,6 @@
+
+Upstream-Status: Pending
+
 Index: git/Makefile.in
 ===================================================================
 --- git.orig/Makefile.in
-- 
1.7.3.4

[CONSOLIDATED PULL 07/32] util-linux: update to 2.19.1

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../MCONFIG                                        |    0
 .../defines.h                                      |    0
 .../make_include                                   |    0
 .../remove-lscpu.patch                             |    0
 .../swapargs.h                                     |    0
 .../uclibc-compile.patch                           |    0
 .../util-linux-ng-2.16-mount_lock_path.patch       |    0
 .../util-linux-ng-replace-siginterrupt.patch       |    0
 meta/recipes-core/util-linux/util-linux.inc        |    6 ++----
 .../{util-linux_2.17.2.bb => util-linux_2.19.1.bb} |   11 +++++------
 10 files changed, 7 insertions(+), 10 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/MCONFIG (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/defines.h (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/make_include (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/remove-lscpu.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/swapargs.h (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/uclibc-compile.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/util-linux-ng-2.16-mount_lock_path.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux-2.17.2 => util-linux-2.19.1}/util-linux-ng-replace-siginterrupt.patch (100%)
 rename meta/recipes-core/util-linux/{util-linux_2.17.2.bb => util-linux_2.19.1.bb} (82%)

diff --git a/meta/recipes-core/util-linux/util-linux-2.17.2/MCONFIG b/meta/recipes-core/util-linux/util-linux-2.19.1/MCONFIG
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.17.2/MCONFIG
rename to meta/recipes-core/util-linux/util-linux-2.19.1/MCONFIG
diff --git a/meta/recipes-core/util-linux/util-linux-2.17.2/defines.h b/meta/recipes-core/util-linux/util-linux-2.19.1/defines.h
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.17.2/defines.h
rename to meta/recipes-core/util-linux/util-linux-2.19.1/defines.h
diff --git a/meta/recipes-core/util-linux/util-linux-2.17.2/make_include b/meta/recipes-core/util-linux/util-linux-2.19.1/make_include
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.17.2/make_include
rename to meta/recipes-core/util-linux/util-linux-2.19.1/make_include
diff --git a/meta/recipes-core/util-linux/util-linux-2.17.2/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.17.2/remove-lscpu.patch
rename to meta/recipes-core/util-linux/util-linux-2.19.1/remove-lscpu.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.17.2/swapargs.h b/meta/recipes-core/util-linux/util-linux-2.19.1/swapargs.h
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.17.2/swapargs.h
rename to meta/recipes-core/util-linux/util-linux-2.19.1/swapargs.h
diff --git a/meta/recipes-core/util-linux/util-linux-2.17.2/uclibc-compile.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-compile.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.17.2/uclibc-compile.patch
rename to meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-compile.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.17.2/util-linux-ng-2.16-mount_lock_path.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-2.16-mount_lock_path.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.17.2/util-linux-ng-2.16-mount_lock_path.patch
rename to meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-2.16-mount_lock_path.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-replace-siginterrupt.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch
rename to meta/recipes-core/util-linux/util-linux-2.19.1/util-linux-ng-replace-siginterrupt.patch
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 489ec1a..71601dc 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -7,7 +7,7 @@ SECTION = "base"
 
 LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
 
-LIC_FILES_CHKSUM = "file://README.licensing;md5=1530e36fe1304d4535513de90a290df9 \
+LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f \
                     file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://licenses/COPYING.GPL;md5=8ca43cbc842c2336e835926c2166c28b \
                     file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
@@ -18,7 +18,7 @@ DEPENDS = "zlib ncurses"
 DEPENDS_virtclass-native_append = " lzo-native"
 
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-linux-ng-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
            file://MCONFIG \
            file://swapargs.h \
            file://defines.h \
@@ -31,8 +31,6 @@ PACKAGES =+ "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \
              util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
              util-linux-uuidgen util-linux-lscpu"
 
-S = "${WORKDIR}/util-linux-ng-${PV}"
-
 EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
  --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
   --disable-login-utils --enable-write --enable-arch --enable-mount --with-fsprobe=builtin --enable-libuuid --enable-libblkid --enable-fsck"
diff --git a/meta/recipes-core/util-linux/util-linux_2.17.2.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
similarity index 82%
rename from meta/recipes-core/util-linux/util-linux_2.17.2.bb
rename to meta/recipes-core/util-linux/util-linux_2.19.1.bb
index f6bdfd4..7fe7497 100644
--- a/meta/recipes-core/util-linux/util-linux_2.17.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
@@ -1,16 +1,15 @@
-MAJOR_VERSION = "2.17"
-PR = "r7"
+MAJOR_VERSION = "2.19"
+PR = "r0"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
 LICENSE_util-linux-lscpu = "GPLv3+"
 
-SRC_URI += "file://uclibc-compile.patch \
-	          file://util-linux-ng-replace-siginterrupt.patch \
+SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
                   file://util-linux-ng-2.16-mount_lock_path.patch"
 
-SRC_URI[md5sum] = "4635725a3eef1c57090bac8ea5e082e6"
-SRC_URI[sha256sum] = "c9ae801b6a5ab20b7749a278a8bf6830ef53adc5e8b7eb0ac1a9f410c774118f"
+SRC_URI[md5sum] = "3eab06f05163dfa65479c44e5231932c"
+SRC_URI[sha256sum] = "d3eac4afcc687b3ae1ffedcab2dc12df84c7ba7045cce31386d2b7040a011c7d"
 
 # Only lscpu part is gplv3; rest of the code is not, 
 # so take out the lscpu parts while running non-gplv3 build.
-- 
1.7.3.4

[CONSOLIDATED PULL 08/32] glew: update to 1.6.0

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-graphics/glew/files/autotools.patch   |    3 +++
 .../glew/{glew_1.5.7.bb => glew_1.6.0.bb}          |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/glew/{glew_1.5.7.bb => glew_1.6.0.bb} (80%)

diff --git a/meta/recipes-graphics/glew/files/autotools.patch b/meta/recipes-graphics/glew/files/autotools.patch
index 7fe1d6e..e499594 100644
--- a/meta/recipes-graphics/glew/files/autotools.patch
+++ b/meta/recipes-graphics/glew/files/autotools.patch
@@ -1,3 +1,6 @@
+
+Upstream-Status: Inappropriate [configuration]
+
 Index: glew/Makefile.am
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
diff --git a/meta/recipes-graphics/glew/glew_1.5.7.bb b/meta/recipes-graphics/glew/glew_1.6.0.bb
similarity index 80%
rename from meta/recipes-graphics/glew/glew_1.5.7.bb
rename to meta/recipes-graphics/glew/glew_1.6.0.bb
index e2e6b43..8824667 100644
--- a/meta/recipes-graphics/glew/glew_1.5.7.bb
+++ b/meta/recipes-graphics/glew/glew_1.6.0.bb
@@ -13,7 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
            file://autotools.patch \
           "
 
-SRC_URI[md5sum] = "f913ce9dbde4cd250b932731b3534ded"
-SRC_URI[sha256sum] = "86bd36a163640d6027ec6be5fdd8a6e3b90f02dcf55f95c3c2429ebb58be3107"
+SRC_URI[md5sum] = "7dfbb444b5a4e125bc5dba0aef403082"
+SRC_URI[sha256sum] = "bea2a7e9bb97a7a5054d4a65d16aaeedeaa091719359ad3fcd9bfdb0fe8eb7fa"
 
 inherit autotools lib_package
-- 
1.7.3.4

[CONSOLIDATED PULL 09/32] gettext: Update to 0.18.1.1

[Saul Wold]

Add Upstream Status tags to patches

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../gettext/gettext-0.16.1/disable_java.patch      |    2 +
 .../gettext-0.16.1/fix_aclocal_version.patch       |    2 +
 .../gettext-0.16.1/fix_gnu_source_circular.patch   |    2 +
 .../gettext/gettext-0.16.1/fixchicken.patch        |    2 +
 .../gettext/gettext-0.16.1/getline.m4.patch        |    2 +
 .../gettext-autoconf-lib-link-no-L.patch           |    2 +
 .../gettext-error_print_progname.patch             |    2 +
 .../gettext/gettext-0.16.1/gettext-vpath.patch     |    2 +
 .../gettext-0.16.1/hardcode_macro_version.patch    |    2 +
 .../gettext/gettext-0.16.1/linklib_from_0.17.patch |    2 +
 .../gettext/gettext-0.17/wchar-uclibc.patch        |   96 --------------------
 .../autotools.patch                                |    2 +
 .../gettext-error_print_progname.patch             |    2 +
 .../{gettext-0.17 => gettext-0.18.1.1}/m4fix.patch |    2 +
 .../use_open_properly.patch                        |    2 +
 .../gettext/gettext-0.18.1.1/wchar-uclibc.patch    |   74 +++++++++++++++
 .../{gettext_0.17.bb => gettext_0.18.1.1.bb}       |   14 +--
 17 files changed, 107 insertions(+), 105 deletions(-)
 delete mode 100644 meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
 rename meta/recipes-core/gettext/{gettext-0.17 => gettext-0.18.1.1}/autotools.patch (98%)
 rename meta/recipes-core/gettext/{gettext-0.17 => gettext-0.18.1.1}/gettext-error_print_progname.patch (96%)
 rename meta/recipes-core/gettext/{gettext-0.17 => gettext-0.18.1.1}/m4fix.patch (98%)
 rename meta/recipes-core/gettext/{gettext-0.17 => gettext-0.18.1.1}/use_open_properly.patch (96%)
 create mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch
 rename meta/recipes-core/gettext/{gettext_0.17.bb => gettext_0.18.1.1.bb} (90%)

diff --git a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
index cf7dc55..2f8478a 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
@@ -2,6 +2,8 @@
 # 
 # Commented by: Saul Wold <saul.wold@intel.com>
 
+Upstream-Status: Inappropriate [embedded]
+
 Index: gettext-0.16.1/gettext-tools/configure.ac
 ===================================================================
 --- gettext-0.16.1.orig/gettext-tools/configure.ac	2006-11-27 09:02:01.000000000 -0800
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
index 3796052..8fe7712 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
@@ -2,6 +2,8 @@ This patch updates the required version number from 2.61 to the
 current 2.65 version of aclocal, this will need to be updated 
 when we update aclocal
 
+Upstream-Status: Inappropriate [configuration]
+
 Signed-off-by Saul Wold <sgw@linux.intel.com>
 
 Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
index 8b42f1b..d1c0bbb 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
@@ -3,6 +3,8 @@ AC_USE_SYSTEM_EXTENSIONS.
 
 Thanks to Mark Hatle for the timely pointers and fixes.
 
+Upstream-Status: Inappropriate [configuration]
+
 Signed-off-by Saul Wold <sgw@linux.intel.com>
 
 diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/extensions.m4 gettext.patched/gettext-runtime/gnulib-m4/extensions.m4
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
index ef51056..d6bb7b0 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
@@ -2,6 +2,8 @@
 # 
 # Commented by: Saul Wold <saul.wold@intel.com>
 
+Upstream-Status: Inappropriate [embedded]
+
 Index: gettext-tools/m4/csharpcomp.m4
 ===================================================================
 RCS file: /cvs/gettext/gettext/gettext-tools/m4/csharpcomp.m4,v
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
index f71d0e1..34965fc 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
@@ -2,6 +2,8 @@
 # 
 # Commented by: Saul Wold <saul.wold@intel.com>
 
+Upstream-Status: Inappropriate [configuration]
+
 --- /gettext-tools/m4/orig-getline.m4	2003-07-18 18:11:37.000000000 +0300
 +++ /gettext-tools/m4/getline.m4	2007-02-03 13:33:41.000000000 +0200
 @@ -42,12 +42,23 @@
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
index e8bb2f6..82775d6 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
@@ -2,6 +2,8 @@
 # 
 # Commented by: Saul Wold <saul.wold@intel.com>
 
+Upstream-Status: Pending
+
 --- gettext-0.17/autoconf-lib-link/m4/lib-link.m4~	2009-04-17 15:12:30.000000000 -0700
 +++ gettext-0.17/autoconf-lib-link/m4/lib-link.m4	2009-04-17 15:37:39.000000000 -0700
 @@ -267,6 +267,9 @@
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
index 96a2196..abb7195 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
@@ -2,6 +2,8 @@
 # 
 # Commented by: Saul Wold <saul.wold@intel.com>
 
+Upstream-Status: Inappropriate [configuration]
+
 diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h
 --- gettext-0.14.6/gettext-tools/lib/error.h	2005-05-20 16:03:42.000000000 -0500
 +++ gettext-0.14.6-patched/gettext-tools/lib/error.h	2007-01-13 20:57:24.422168053 -0600
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
index 62420b7..67b0a5a 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
@@ -2,6 +2,8 @@
 # 
 # Commented by: Saul Wold <saul.wold@intel.com>
 
+Upstream-Status: Pending
+
 Index: gettext-0.16.1/gettext-runtime/intl/Makefile.in
 ===================================================================
 --- gettext-0.16.1.orig/gettext-runtime/intl/Makefile.in	2006-11-27 09:02:00.000000000 -0800
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
index ef57dc2..82ed04d 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
@@ -2,6 +2,8 @@ This patch hardcodes in version 0.17 for the GETTEXT_MACRO_VERSION,
 the version check is only part of 0.17 and will not affect any 0.16.1
 operations
 
+Upstream-Status: Inappropriate [configuration]
+
 Signed-off-by: Saul Wold <sgw@linux.intel.com>
 
 Index: gettext-0.16.1/gettext-runtime/m4/po.m4
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch b/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
index 2b805c9..3cbe867 100644
--- a/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
+++ b/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
@@ -2,6 +2,8 @@
 # 
 # Commented by: Saul Wold <saul.wold@intel.com>
 
+Upstream-Status: Inappropriate [configuration]
+
 Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4
 ===================================================================
 --- gettext-0.16.1.orig/autoconf-lib-link/m4/lib-link.m4	2006-11-27 09:01:58.000000000 -0800
diff --git a/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch b/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
deleted file mode 100644
index 7b3880b..0000000
--- a/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Index: gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h
-===================================================================
---- gettext-0.17.orig/gettext-runtime/gnulib-lib/wchar.in.h	2008-07-29 14:51:52.336394636 +0200
-+++ gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h	2008-07-29 14:52:25.546430195 +0200
-@@ -1,6 +1,6 @@
- /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
- 
--   Copyright (C) 2007 Free Software Foundation, Inc.
-+   Copyright (C) 2007-2008 Free Software Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -26,6 +26,14 @@
-  * the declaration of wcwidth().
-  */
- 
-+#ifdef __need_mbstate_t
-+/* Special invocation convention inside uClibc header files.  */
-+
-+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
-+
-+#else
-+/* Normal invocation convention.  */
-+
- #ifndef _GL_WCHAR_H
- 
- /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-@@ -80,3 +88,4 @@
- 
- #endif /* _GL_WCHAR_H */
- #endif /* _GL_WCHAR_H */
-+#endif
-Index: gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h
-===================================================================
---- gettext-0.17.orig/gettext-tools/gnulib-lib/wchar.in.h	2008-07-29 14:52:03.886393956 +0200
-+++ gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h	2008-07-29 14:52:50.876388000 +0200
-@@ -1,6 +1,6 @@
- /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
- 
--   Copyright (C) 2007 Free Software Foundation, Inc.
-+   Copyright (C) 2007-2008 Free Software Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -26,6 +26,14 @@
-  * the declaration of wcwidth().
-  */
- 
-+#ifdef __need_mbstate_t
-+/* Special invocation convention inside uClibc header files.  */
-+
-+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
-+
-+#else
-+/* Normal invocation convention.  */
-+
- #ifndef _GL_WCHAR_H
- 
- /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-@@ -80,3 +88,4 @@
- 
- #endif /* _GL_WCHAR_H */
- #endif /* _GL_WCHAR_H */
-+#endif
-Index: gettext-0.17/gettext-tools/libgettextpo/wchar.in.h
-===================================================================
---- gettext-0.17.orig/gettext-tools/libgettextpo/wchar.in.h	2008-07-29 14:51:58.826395009 +0200
-+++ gettext-0.17/gettext-tools/libgettextpo/wchar.in.h	2008-07-29 14:52:38.609723575 +0200
-@@ -1,6 +1,6 @@
- /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
- 
--   Copyright (C) 2007 Free Software Foundation, Inc.
-+   Copyright (C) 2007-2008 Free Software Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -26,6 +26,14 @@
-  * the declaration of wcwidth().
-  */
- 
-+#ifdef __need_mbstate_t
-+/* Special invocation convention inside uClibc header files.  */
-+
-+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
-+
-+#else
-+/* Normal invocation convention.  */
-+
- #ifndef _GL_WCHAR_H
- 
- /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-@@ -80,3 +88,4 @@
- 
- #endif /* _GL_WCHAR_H */
- #endif /* _GL_WCHAR_H */
-+#endif
diff --git a/meta/recipes-core/gettext/gettext-0.17/autotools.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch
similarity index 98%
rename from meta/recipes-core/gettext/gettext-0.17/autotools.patch
rename to meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch
index 9f16b18..e4545fd 100644
--- a/meta/recipes-core/gettext/gettext-0.17/autotools.patch
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: gettext-0.17/gettext-runtime/man/Makefile.am
 ===================================================================
 --- gettext-0.17.orig/gettext-runtime/man/Makefile.am	2007-10-07 21:37:36.000000000 +0200
diff --git a/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch
similarity index 96%
rename from meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch
rename to meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch
index 0f67cd0..4a1b2c6 100644
--- a/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Index: gettext-0.17/gettext-tools/libgettextpo/error.h
 ===================================================================
 --- gettext-0.17.orig/gettext-tools/libgettextpo/error.h	2008-07-27 21:16:25.561115527 +0200
diff --git a/meta/recipes-core/gettext/gettext-0.17/m4fix.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
similarity index 98%
rename from meta/recipes-core/gettext/gettext-0.17/m4fix.patch
rename to meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
index a02457f..34930d1 100644
--- a/meta/recipes-core/gettext/gettext-0.17/m4fix.patch
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
@@ -22,6 +22,8 @@ Ralf
         * m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or
         newer.
 
+Upstream-Status: Pending
+
 Index: gettext-0.17/gettext-tools/gnulib-m4/openmp.m4
 ===================================================================
 --- gettext-0.17.orig/gettext-tools/gnulib-m4/openmp.m4	2010-02-01 10:51:00.437788710 +0000
diff --git a/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch
similarity index 96%
rename from meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch
rename to meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch
index 111714b..a04a32d 100644
--- a/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Index: gettext-0.17/gettext-tools/src/write-catalog.c
 ===================================================================
 --- gettext-0.17.orig/gettext-tools/src/write-catalog.c	2008-10-16 15:18:16.000000000 +0200
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch
new file mode 100644
index 0000000..34e3f1a
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch
@@ -0,0 +1,74 @@
+Upstream-Status: Pending
+
+Index: gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h
+===================================================================
+--- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/wchar.in.h	2010-05-08 18:36:16.000000000 -0700
++++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h	2011-05-25 16:28:38.656220937 -0700
+@@ -48,6 +48,14 @@
+ #else
+ /* Normal invocation convention.  */
+ 
++#ifdef __need_mbstate_t
++/* Special invocation convention inside uClibc header files.  */
++
++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
++
++#else
++/* Normal invocation convention.  */
++
+ #ifndef _GL_WCHAR_H
+ 
+ #define _GL_ALREADY_INCLUDING_WCHAR_H
+@@ -426,3 +434,4 @@
+ #endif /* _GL_WCHAR_H */
+ #endif /* _GL_WCHAR_H */
+ #endif
++#endif
+Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h
+===================================================================
+--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/wchar.in.h	2010-05-24 02:42:48.000000000 -0700
++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h	2011-05-25 16:28:15.717360791 -0700
+@@ -48,6 +48,14 @@
+ #else
+ /* Normal invocation convention.  */
+ 
++#ifdef __need_mbstate_t
++/* Special invocation convention inside uClibc header files.  */
++
++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
++
++#else
++/* Normal invocation convention.  */
++
+ #ifndef _GL_WCHAR_H
+ 
+ #define _GL_ALREADY_INCLUDING_WCHAR_H
+@@ -426,3 +434,4 @@
+ #endif /* _GL_WCHAR_H */
+ #endif /* _GL_WCHAR_H */
+ #endif
++#endif
+Index: gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h
+===================================================================
+--- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/wchar.in.h	2010-05-08 18:38:04.000000000 -0700
++++ gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h	2011-05-25 16:28:26.998721087 -0700
+@@ -48,6 +48,14 @@
+ #else
+ /* Normal invocation convention.  */
+ 
++#ifdef __need_mbstate_t
++/* Special invocation convention inside uClibc header files.  */
++
++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
++
++#else
++/* Normal invocation convention.  */
++
+ #ifndef _GL_WCHAR_H
+ 
+ #define _GL_ALREADY_INCLUDING_WCHAR_H
+@@ -426,3 +434,4 @@
+ #endif /* _GL_WCHAR_H */
+ #endif /* _GL_WCHAR_H */
+ #endif
++#endif
diff --git a/meta/recipes-core/gettext/gettext_0.17.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
similarity index 90%
rename from meta/recipes-core/gettext/gettext_0.17.bb
rename to meta/recipes-core/gettext/gettext_0.18.1.1.bb
index ce5fc3e..fe1b266 100644
--- a/meta/recipes-core/gettext/gettext_0.17.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -5,24 +5,21 @@ SECTION = "libs"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r5"
+PR = "r0"
 DEPENDS = "gettext-native virtual/libiconv ncurses expat"
 DEPENDS_virtclass-native = ""
 PROVIDES = "virtual/libintl virtual/gettext"
 PROVIDES_virtclass-native = ""
 CONFLICTS_${PN} = "proxy-libintl"
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
-           file://autotools.patch;patch=1 \
-           file://wchar-uclibc.patch;patch=1 \
-           file://use_open_properly.patch;patch=1 \
-           file://m4fix.patch;patch=1 \
+           file://wchar-uclibc.patch \
           "
 
 SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
 SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1"
 
-SRC_URI[md5sum] = "58a2bc6d39c0ba57823034d55d65d606"
-SRC_URI[sha256sum] = "209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba"
+SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89"
+SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9"
 
 #PARALLEL_MAKE = ""
 
@@ -39,8 +36,7 @@ EXTRA_OECONF += "--without-lispdir \
                  --without-emacs \
                 "
 
-acpaths = '-I ${S}/autoconf-lib-link/m4/ \
-           -I ${S}/gettext-runtime/m4 \
+acpaths = '-I ${S}/gettext-runtime/m4 \
            -I ${S}/gettext-tools/m4'
 
 
-- 
1.7.3.4

[CONSOLIDATED PULL 10/32] gobject-introspection: Update to 0.10.8 Git

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../gnome/gobject-introspection/configure.patch    |    2 ++
 .../gnome/gobject-introspection/pathfix.patch      |    2 ++
 .../gnome/gobject-introspection_git.bb             |    4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-gnome/gnome/gobject-introspection/configure.patch b/meta/recipes-gnome/gnome/gobject-introspection/configure.patch
index c441799..5dcd9b0 100644
--- a/meta/recipes-gnome/gnome/gobject-introspection/configure.patch
+++ b/meta/recipes-gnome/gnome/gobject-introspection/configure.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: git/common.mk
 ===================================================================
 --- git.orig/common.mk	2009-08-19 11:11:26.000000000 +0100
diff --git a/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch b/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
index 472cb86..a96e4b1 100644
--- a/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
+++ b/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Index: git/giscanner/dumper.py
 ===================================================================
 --- git.orig/giscanner/dumper.py	2010-11-29 15:14:35.000000000 -0800
diff --git a/meta/recipes-gnome/gnome/gobject-introspection_git.bb b/meta/recipes-gnome/gnome/gobject-introspection_git.bb
index a47e808..d5723bf 100644
--- a/meta/recipes-gnome/gnome/gobject-introspection_git.bb
+++ b/meta/recipes-gnome/gnome/gobject-introspection_git.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \
 		    file://COPYING.lib;md5=3bf50002aefd002f49e7bb854063f7e7"
 
 SRCREV = "efa7266bcf78478ce62e8dd778a4f0417bfd4d15"
-PV = "0.0+git${SRCPV}"
-PR = "r3"
+PV = "0.10.8+git${SRCPV}"
+PR = "r4"
 
 S = "${WORKDIR}/git"
 
-- 
1.7.3.4

[CONSOLIDATED PULL 11/32] dtc: Cleanup and update recipe

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-kernel/dtc/dtc-native.inc             |    3 ---
 meta/recipes-kernel/dtc/dtc-native_git.bb          |    5 -----
 meta/recipes-kernel/dtc/dtc.inc                    |    8 +++++++-
 meta/recipes-kernel/dtc/dtc/remove_space_opt.patch |    2 ++
 meta/recipes-kernel/dtc/dtc_git.bb                 |   15 ++++++++++++---
 meta/recipes-kernel/dtc/dtc_git.inc                |    8 --------
 6 files changed, 21 insertions(+), 20 deletions(-)
 delete mode 100644 meta/recipes-kernel/dtc/dtc-native.inc
 delete mode 100644 meta/recipes-kernel/dtc/dtc-native_git.bb
 delete mode 100644 meta/recipes-kernel/dtc/dtc_git.inc

diff --git a/meta/recipes-kernel/dtc/dtc-native.inc b/meta/recipes-kernel/dtc/dtc-native.inc
deleted file mode 100644
index 1da7004..0000000
--- a/meta/recipes-kernel/dtc/dtc-native.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-require dtc.inc
-
-inherit native
diff --git a/meta/recipes-kernel/dtc/dtc-native_git.bb b/meta/recipes-kernel/dtc/dtc-native_git.bb
deleted file mode 100644
index fd5bde5..0000000
--- a/meta/recipes-kernel/dtc/dtc-native_git.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
-		    file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"
-
-require dtc-native.inc
-require dtc_git.inc
diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
index e068df3..cfed15a 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/meta/recipes-kernel/dtc/dtc.inc
@@ -2,7 +2,7 @@ SUMMARY = "Device Tree Compiler"
 DESCRIPTION = "The Device Tree Compiler is a tool used to manipulate the Open-Firmware-like device tree used by PowerPC kernels."
 SECTION = "bootloader"
 PRIORITY = "optional"
-LICENSE = "GPL"
+LICENSE = "GPL2 | BSD"
 DEPENDS = "flex-native bison-native"
 
 inherit autotools
@@ -11,3 +11,9 @@ do_install() {
 	install -m 0755 -d ${D}${bindir}
 	install -m 755 dtc ${D}${bindir}/dtc
 }
+SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \
+	file://fix_for_compilation_with_gcc_4.6.0.patch"
+
+INC_PR = "r0"
+
+S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch b/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch
index 805bf58..8c26dec 100644
--- a/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch
+++ b/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch
@@ -1,5 +1,7 @@
 Remove the -Os flag
 
+Upstream-Status: Inappropriate [configuration]
+
 Signed-off-by: Saul Wold <sgw@linux.intel.com>
 Index: git/Makefile
 ===================================================================
diff --git a/meta/recipes-kernel/dtc/dtc_git.bb b/meta/recipes-kernel/dtc/dtc_git.bb
index 1cca32c..e010488 100644
--- a/meta/recipes-kernel/dtc/dtc_git.bb
+++ b/meta/recipes-kernel/dtc/dtc_git.bb
@@ -1,7 +1,16 @@
 require dtc.inc
-require dtc_git.inc
-LICENSE="GPLv2|BSD"
+
 LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
 		    file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"
 
-SRC_URI += " file://remove_space_opt.patch"
+SRCREV = "73dca9ae0b9abe6924ba640164ecce9f8df69c5a"
+PV = "1.3.0+git${SRCPV}"
+PR = "${INC_PR}.0"
+
+S = "${WORKDIR}/git"
+
+SRC_URI_PATCH = " file://remove_space_opt.patch"
+SRC_URI_PATCH_virtclass-native = ""
+SRC_URI += "${SRC_URI_PATCH}"
+
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-kernel/dtc/dtc_git.inc b/meta/recipes-kernel/dtc/dtc_git.inc
deleted file mode 100644
index 2400cfe..0000000
--- a/meta/recipes-kernel/dtc/dtc_git.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \
-	file://fix_for_compilation_with_gcc_4.6.0.patch"
-
-SRCREV = "73dca9ae0b9abe6924ba640164ecce9f8df69c5a"
-PV = "1.2.0+git${SRCPV}"
-PR = "r3"
-
-S = "${WORKDIR}/git"
-- 
1.7.3.4

[CONSOLIDATED PULL 12/32] libiconv: update to 1.13.1

[Saul Wold]

Add Upstream-Status tags to patches

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../autoconf.patch                                 |    2 ++
 .../shared_preloadable_libiconv_linux.patch        |    2 ++
 .../{libiconv_1.11.1.bb => libiconv_1.13.1.bb}     |    0
 3 files changed, 4 insertions(+), 0 deletions(-)
 rename meta/recipes-support/libiconv/{libiconv-1.11.1 => libiconv-1.13.1}/autoconf.patch (98%)
 rename meta/recipes-support/libiconv/{libiconv-1.11.1 => libiconv-1.13.1}/shared_preloadable_libiconv_linux.patch (98%)
 rename meta/recipes-support/libiconv/{libiconv_1.11.1.bb => libiconv_1.13.1.bb} (100%)

diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch b/meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
similarity index 98%
rename from meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
rename to meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
index 2b24894..3cbf549 100644
--- a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
+++ b/meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
@@ -2,6 +2,8 @@ It adds the variables that are needed
 for autoconf 2.65 to reconfigure libiconv and defines the m4 macros 
 directory. Its imported from OE.
 
+Upstream-Status: Pending
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 Index: libiconv-1.11.1/configure.ac
diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch b/meta/recipes-support/libiconv/libiconv-1.13.1/shared_preloadable_libiconv_linux.patch
similarity index 98%
rename from meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
rename to meta/recipes-support/libiconv/libiconv-1.13.1/shared_preloadable_libiconv_linux.patch
index a913dad..fb07f73 100644
--- a/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
+++ b/meta/recipes-support/libiconv/libiconv-1.13.1/shared_preloadable_libiconv_linux.patch
@@ -4,6 +4,8 @@ Its more enforced by libtool 2.4. I have not checked it with older libtool
 libiconv 1.11.x is relatively old release and libtool 2.4 did not exist when it
 was released these kind of problem are more likely
 
+Upstream-Status: Pending
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 Index: libiconv-1.11.1/lib/Makefile.in
diff --git a/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/meta/recipes-support/libiconv/libiconv_1.13.1.bb
similarity index 100%
rename from meta/recipes-support/libiconv/libiconv_1.11.1.bb
rename to meta/recipes-support/libiconv/libiconv_1.13.1.bb
-- 
1.7.3.4

[CONSOLIDATED PULL 13/32] update-alternatives-dpkg update to 1.16.0.3

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 ...8.7.bb => update-alternatives-dpkg_1.16.0.3.bb} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-devtools/update-alternatives/{update-alternatives-dpkg_1.15.8.7.bb => update-alternatives-dpkg_1.16.0.3.bb} (100%)

diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.16.0.3.bb
similarity index 100%
rename from meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
rename to meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.16.0.3.bb
-- 
1.7.3.4

[CONSOLIDATED PULL 14/32] chkconfig: update to 1.3.52

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../{chkconfig_1.3.51.bb => chkconfig_1.3.52.bb}   |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/chkconfig/{chkconfig_1.3.51.bb => chkconfig_1.3.52.bb} (83%)

diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.51.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb
similarity index 83%
rename from meta/recipes-extended/chkconfig/chkconfig_1.3.51.bb
rename to meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb
index 3f810b6..7d5f069 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.51.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb
@@ -16,8 +16,8 @@ PR = "r0"
 
 SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${P}.tar.bz2"
 
-SRC_URI[md5sum] = "0a7e5b271084abf368919b51fd917750"
-SRC_URI[sha256sum] = "bfa83a8f69f5127ab772eee33a48f3c1839efac1a622ab484d2f688264d13929"
+SRC_URI[md5sum] = "a576808a6d66763606d750ec451bab6d"
+SRC_URI[sha256sum] = "aa36bf7fd3f7c6e3371eddd8a7846b83435c48f132cc5919d83a830504b797d6"
 
 inherit autotools gettext
 
-- 
1.7.3.4

[CONSOLIDATED PULL 15/32] mailx: update to 12.5

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../mailx/{mailx_12.4.bb => mailx_12.5.bb}         |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
 rename meta/recipes-extended/mailx/{mailx_12.4.bb => mailx_12.5.bb} (66%)

diff --git a/meta/recipes-extended/mailx/mailx_12.4.bb b/meta/recipes-extended/mailx/mailx_12.5.bb
similarity index 66%
rename from meta/recipes-extended/mailx/mailx_12.4.bb
rename to meta/recipes-extended/mailx/mailx_12.5.bb
index 7abce7a..171e892 100644
--- a/meta/recipes-extended/mailx/mailx_12.4.bb
+++ b/meta/recipes-extended/mailx/mailx_12.5.bb
@@ -12,14 +12,15 @@ LICENSE = "GPL"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4202a0a62910cf94f7af8a3436a2a2dd"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/h/heirloom-mailx/heirloom-mailx_${PV}.orig.tar.gz;name=archive \
-           ${DEBIAN_MIRROR}/main/h/heirloom-mailx/heirloom-mailx_${PV}-2.diff.gz;name=patch \
+           ${DEBIAN_MIRROR}/main/h/heirloom-mailx/heirloom-mailx_${PV}-1.diff.gz;name=patch \
           "
-SRC_URI[archive.md5sum] = "17b8ff86795a118b199e041b66b7d1aa"
-SRC_URI[archive.sha256sum] = "946d822cbff70df2ecf5b78c8347fdd01fdc5873f7a7cf55932b3e07030fa370"
-SRC_URI[patch.md5sum] = "3233d1a85fcb4dcde689132a1bba7fc9"
-SRC_URI[patch.sha256sum] = "b15fac77973b7d787469e51bbbeae7ddbe922b02a0c23208b9779ce837eba861"
 
-S = "${WORKDIR}/mailx-${PV}"
+SRC_URI[archive.md5sum] = "29a6033ef1412824d02eb9d9213cb1f2"
+SRC_URI[archive.sha256sum] = "015ba4209135867f37a0245d22235a392b8bbed956913286b887c2e2a9a421ad"
+SRC_URI[patch.md5sum] = "f466281336183be673bf136dd7096662"
+SRC_URI[patch.sha256sum] = "aaf2a4bbf145e5ca9cdeb0843091ec8cc01df6c9568c997207a5e97b4dc5ba43"
+
+S = "${WORKDIR}/heirloom-mailx-${PV}"
 
 inherit autotools
 
-- 
1.7.3.4

[CONSOLIDATED PULL 16/32] mc: update to 4.7.5.2

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../mc/{mc_4.7.5.1.bb => mc_4.7.5.2.bb}            |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/mc/{mc_4.7.5.1.bb => mc_4.7.5.2.bb} (78%)

diff --git a/meta/recipes-extended/mc/mc_4.7.5.1.bb b/meta/recipes-extended/mc/mc_4.7.5.2.bb
similarity index 78%
rename from meta/recipes-extended/mc/mc_4.7.5.1.bb
rename to meta/recipes-extended/mc/mc_4.7.5.2.bb
index 9e790df..c407b0b 100644
--- a/meta/recipes-extended/mc/mc_4.7.5.1.bb
+++ b/meta/recipes-extended/mc/mc_4.7.5.2.bb
@@ -10,8 +10,8 @@ PR = "r0"
 
 SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "2ffe4771e94569d497010eea298b13cd"
-SRC_URI[sha256sum] = "4d60a9fcd186b70f52d4e730ae3d43408a73e3f0647968e9f4af8005f13369e9"
+SRC_URI[md5sum] = "bdae966244496cd4f6d282d80c9cf3c6"
+SRC_URI[sha256sum] = "a68338862bb30017eb65ed569a58e80ab66ae8cef11c886440c9e9f4d1efc6ab"
 
 inherit autotools gettext
 
-- 
1.7.3.4

[CONSOLIDATED PULL 17/32] msmtp: update tof 1.4.24

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../msmtp/{msmtp_1.4.23.bb => msmtp_1.4.24.bb}     |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/msmtp/{msmtp_1.4.23.bb => msmtp_1.4.24.bb} (81%)

diff --git a/meta/recipes-extended/msmtp/msmtp_1.4.23.bb b/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
similarity index 81%
rename from meta/recipes-extended/msmtp/msmtp_1.4.23.bb
rename to meta/recipes-extended/msmtp/msmtp_1.4.24.bb
index d48881a..39a7eea 100644
--- a/meta/recipes-extended/msmtp/msmtp_1.4.23.bb
+++ b/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
@@ -15,8 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SRC_URI = "http://sourceforge.net/projects/msmtp/files/msmtp/${PV}/${BPN}-${PV}.tar.bz2 \
           "
 
-SRC_URI[md5sum] = "5fb7ae88186624cdb125d3efad3fdc16"
-SRC_URI[sha256sum] = "269cd30eeb867167c6a599e23399f4fc24196fcdef3bac5b120d806b3b421810"
+SRC_URI[md5sum] = "3ed704fbd3e7419cab5c65bb7928d9ba"
+SRC_URI[sha256sum] = "f19f3fcc67da448420b3adbd5add09f8fe110664dd64f3c2cd693ef0cb736887"
 
 inherit gettext autotools update-alternatives
 
-- 
1.7.3.4

[CONSOLIDATED PULL 18/32] gthumb: update to 2.12.3

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../gthumb/{gthumb_2.12.2.bb => gthumb_2.12.3.bb}  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/gthumb/{gthumb_2.12.2.bb => gthumb_2.12.3.bb} (76%)

diff --git a/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb b/meta/recipes-gnome/gthumb/gthumb_2.12.3.bb
similarity index 76%
rename from meta/recipes-gnome/gthumb/gthumb_2.12.2.bb
rename to meta/recipes-gnome/gthumb/gthumb_2.12.3.bb
index 258f2d5..115a805 100644
--- a/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb
+++ b/meta/recipes-gnome/gthumb/gthumb_2.12.3.bb
@@ -12,5 +12,5 @@ inherit gnome pkgconfig
 FILES_${PN} += "${datadir}/icons"
 FILES_${PN}-dbg += "${libdir}/gthumb/modules/.debug"
 
-SRC_URI[archive.md5sum] = "5f6cb5957a4dcf196cedc6bb836169dc"
-SRC_URI[archive.sha256sum] = "bce8111e4d699620ae0399963798ff25929df8c8546f4949e2a871b330277091"
+SRC_URI[archive.md5sum] = "bfa0957a1bafc5d049292cd5fad372ce"
+SRC_URI[archive.sha256sum] = "0060c05fd372c2af2048d294ab3f75c8fb02c576d3e2004e08b7d34f49da1e66"
-- 
1.7.3.4

[CONSOLIDATED PULL 19/32] alsa-tools: update to 1.0.24.1

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 ...alsa-tools_1.0.20.bb => alsa-tools_1.0.24.1.bb} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-multimedia/alsa/{alsa-tools_1.0.20.bb => alsa-tools_1.0.24.1.bb} (100%)

diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.20.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
similarity index 100%
rename from meta/recipes-multimedia/alsa/alsa-tools_1.0.20.bb
rename to meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
-- 
1.7.3.4

[CONSOLIDATED PULL 20/32] qmmp: update to 0.5.1

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../qt-apps/{qmmp_0.5.0.bb => qmmp_0.5.1.bb}       |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-qt/qt-apps/{qmmp_0.5.0.bb => qmmp_0.5.1.bb} (92%)

diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.0.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
similarity index 92%
rename from meta/recipes-qt/qt-apps/qmmp_0.5.0.bb
rename to meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
index 055bfd5..948c32a 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.5.0.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
@@ -11,8 +11,9 @@ RDEPENDS_${PN} += "taglib alsa-lib curl"
 
 SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "e4cce9e0b70230c02263ebcbe958e9c0"
-SRC_URI[sha256sum] = "0fc75012546744657c2cdcea7f30f1be371a9d812811b6901019faa9427f7ba9"
+SRC_URI[md5sum] = "7934c069256bf2fc4ab762ad2683db2f"
+SRC_URI[sha256sum] = "16ab0334f368a5ef14d631a1d43d7cae876ee06b7185643377b5e9cfd6143099"
+
 
 PARALLEL_MAKE = ""
 
-- 
1.7.3.4

[CONSOLIDATED PULL 21/32] rxvt-unicode: update to 9.11

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../rxvt.desktop                                   |    0
 .../rxvt.png                                       |  Bin 2847 -> 2847 bytes
 .../xwc.patch                                      |    0
 .../{rxvt-unicode_9.10.bb => rxvt-unicode_9.11.bb} |    0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.10 => rxvt-unicode-9.11}/rxvt.desktop (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.10 => rxvt-unicode-9.11}/rxvt.png (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode-9.10 => rxvt-unicode-9.11}/xwc.patch (100%)
 rename meta/recipes-sato/rxvt-unicode/{rxvt-unicode_9.10.bb => rxvt-unicode_9.11.bb} (100%)

diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.11/rxvt.desktop
similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/rxvt.desktop
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.11/rxvt.desktop
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/rxvt.png b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.11/rxvt.png
similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/rxvt.png
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.11/rxvt.png
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/xwc.patch b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.11/xwc.patch
similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/xwc.patch
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.11/xwc.patch
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.10.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.11.bb
similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.10.bb
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.11.bb
-- 
1.7.3.4

[CONSOLIDATED PULL 22/32] gnutls: update to 2.12.5

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../gnutls/gnutls-2.10.4/configure-fix.patch       |   66 -------------------
 .../gnutls/gnutls-2.12.5/configure-fix.patch       |   67 ++++++++++++++++++++
 .../gnutls-openssl.patch                           |    0
 .../gnutls-texinfo-euro.patch                      |    0
 meta/recipes-support/gnutls/gnutls.inc             |    6 +-
 meta/recipes-support/gnutls/gnutls_2.10.4.bb       |   10 ---
 meta/recipes-support/gnutls/gnutls_2.12.5.bb       |    9 +++
 7 files changed, 79 insertions(+), 79 deletions(-)
 delete mode 100644 meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch
 create mode 100644 meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch
 rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.5}/gnutls-openssl.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.5}/gnutls-texinfo-euro.patch (100%)
 delete mode 100644 meta/recipes-support/gnutls/gnutls_2.10.4.bb
 create mode 100644 meta/recipes-support/gnutls/gnutls_2.12.5.bb

diff --git a/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch
deleted file mode 100644
index 2ce3f55..0000000
--- a/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Upstream-Status: Inappropriate [distribution]
-
-rebased from original configure_madness.patch
-
-libtasn1 provides an .pc file in upstream,
-and a libgcrypt.pc is added in libgcrypt recipe,
-so use Requires.private for these two.
-
-against 2.8.6
-
-07/02/2010 - qhe
-
----
-diff --git a/lib/configure.ac b/lib/configure.ac
-index 80d3375..1a486f7 100644
---- a/lib/configure.ac
-+++ b/lib/configure.ac
-@@ -81,8 +81,8 @@ fi
- 
- lgl_INIT
- 
--LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
--LIBGNUTLS_CFLAGS="-I${includedir}"
-+LIBGNUTLS_LIBS="-lgnutls $LIBS"
-+LIBGNUTLS_CFLAGS=""
- AC_SUBST(LIBGNUTLS_LIBS)
- AC_SUBST(LIBGNUTLS_CFLAGS)
- 
-diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
-index 3b01c17..de31469 100644
---- a/lib/gnutls.pc.in
-+++ b/lib/gnutls.pc.in
-@@ -20,6 +20,6 @@ Name: GnuTLS
- Description: Transport Security Layer implementation for the GNU system
- URL: http://www.gnu.org/software/gnutls/
- Version: @VERSION@
-+Requires.private: libgcrypt, libtasn1
- Libs: -L${libdir} -lgnutls
--Libs.private: @LIBGNUTLS_LIBS@ @LTLIBTASN1@
- Cflags: -I${includedir}
-diff --git a/libextra/configure.ac b/libextra/configure.ac
-index c08e73f..3313886 100644
---- a/libextra/configure.ac
-+++ b/libextra/configure.ac
-@@ -40,8 +40,8 @@ LIBGNUTLS_EXTRA_HOOKS
- 
- xgl_INIT
- 
--LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
--LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
-+LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
-+LIBGNUTLS_EXTRA_CFLAGS=""
- AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
- AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
- 
-diff --git a/libextra/gnutls-extra.pc.in b/libextra/gnutls-extra.pc.in
-index 9e7b8f6..e228ec9 100644
---- a/libextra/gnutls-extra.pc.in
-+++ b/libextra/gnutls-extra.pc.in
-@@ -21,5 +21,5 @@ URL: http://www.gnu.org/software/gnutls/
- Requires: gnutls
- Version: @VERSION@
- Libs: -L${libdir} -lgnutls-extra
--Libs.private: @LIBGNUTLS_EXTRA_LIBS@
-+Libs.private: -llzo2
- Cflags: -I${includedir}
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch
new file mode 100644
index 0000000..e6f9785
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch
@@ -0,0 +1,67 @@
+Upstream-Status: Inappropriate [distribution]
+
+rebased from original configure_madness.patch
+
+libtasn1 provides an .pc file in upstream,
+and a libgcrypt.pc is added in libgcrypt recipe,
+so use Requires.private for these two.
+
+against 2.8.6
+
+07/02/2010 - qhe
+
+---
+Index: gnutls-2.12.5/lib/configure.ac
+===================================================================
+--- gnutls-2.12.5.orig/lib/configure.ac	2011-05-11 00:05:33.000000000 -0700
++++ gnutls-2.12.5/lib/configure.ac	2011-05-25 19:45:23.721180103 -0700
+@@ -96,8 +96,8 @@
+ dnl for pakchois
+ AC_LIB_HAVE_LINKFLAGS(dl,, [#include <dlfcn.h>], [dlclose (0);])
+ 
+-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
+-LIBGNUTLS_CFLAGS="-I${includedir}"
++LIBGNUTLS_LIBS="-lgnutls $LIBS"
++LIBGNUTLS_CFLAGS=""
+ AC_SUBST(LIBGNUTLS_LIBS)
+ AC_SUBST(LIBGNUTLS_CFLAGS)
+ 
+Index: gnutls-2.12.5/lib/gnutls.pc.in
+===================================================================
+--- gnutls-2.12.5.orig/lib/gnutls.pc.in	2011-04-23 08:00:07.000000000 -0700
++++ gnutls-2.12.5/lib/gnutls.pc.in	2011-05-25 19:50:11.926102288 -0700
+@@ -19,7 +19,6 @@
+ Description: Transport Security Layer implementation for the GNU system
+ URL: http://www.gnu.org/software/gnutls/
+ Version: @VERSION@
++Requires.private: libgcrypt, libtasn1
+ Libs: -L${libdir} -lgnutls
+-Libs.private: @LTLIBGCRYPT@ @NETTLE_LIBS@
+-@GNUTLS_REQUIRES_PRIVATE@
+ Cflags: -I${includedir}
+Index: gnutls-2.12.5/libextra/configure.ac
+===================================================================
+--- gnutls-2.12.5.orig/libextra/configure.ac	2011-05-11 00:05:31.000000000 -0700
++++ gnutls-2.12.5/libextra/configure.ac	2011-05-25 19:45:23.722186801 -0700
+@@ -41,8 +41,8 @@
+ 
+ xgl_INIT
+ 
+-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
+-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
++LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
++LIBGNUTLS_EXTRA_CFLAGS=""
+ AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
+ AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
+ 
+Index: gnutls-2.12.5/libextra/gnutls-extra.pc.in
+===================================================================
+--- gnutls-2.12.5.orig/libextra/gnutls-extra.pc.in	2011-04-07 17:30:45.000000000 -0700
++++ gnutls-2.12.5/libextra/gnutls-extra.pc.in	2011-05-25 19:45:23.722186801 -0700
+@@ -22,5 +22,5 @@
+ Requires: gnutls
+ Version: @VERSION@
+ Libs: -L${libdir} -lgnutls-extra
+-Libs.private: @LIBGNUTLS_EXTRA_LIBS@
++Libs.private: -llzo2
+ Cflags: -I${includedir}
diff --git a/meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch b/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch
diff --git a/meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch b/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index fd77af4..9f8d81b 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -21,9 +21,9 @@ inherit autotools binconfig pkgconfig gettext
 
 EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \
               --with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \
-              --with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \
-              --with-libz-prefix=${STAGING_DIR_HOST}${prefix} --with-lzo --disable-guile"
-
+              --with-libgcrypt --with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \
+              --with-lzo --disable-guile \
+              "
 do_configure_prepend() {
 	for dir in . lib libextra; do
 		rm ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4
diff --git a/meta/recipes-support/gnutls/gnutls_2.10.4.bb b/meta/recipes-support/gnutls/gnutls_2.10.4.bb
deleted file mode 100644
index cc2fa27..0000000
--- a/meta/recipes-support/gnutls/gnutls_2.10.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require gnutls.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://gnutls-openssl.patch \
-            file://gnutls-texinfo-euro.patch \
-            file://configure-fix.patch"
-
-SRC_URI[md5sum] = "4e1517084018a8b1fdc96daabea40528"
-SRC_URI[sha256sum] = "b8bfe36450fe671e99db5ff1e44e6b65fda8a79cacd9e77d550eff7da3745fc8"
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.5.bb b/meta/recipes-support/gnutls/gnutls_2.12.5.bb
new file mode 100644
index 0000000..b27a065
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls_2.12.5.bb
@@ -0,0 +1,9 @@
+require gnutls.inc
+
+PR = "r0"
+
+SRC_URI += "file://gnutls-openssl.patch \
+            file://configure-fix.patch"
+
+SRC_URI[md5sum] = "2d0bd5ae11534074fcd78da6ea384e64"
+SRC_URI[sha256sum] = "bf263880f327ac34a561d8e66b5a729cbe33eea56728bfed3406ff2898448b60"
-- 
1.7.3.4

[CONSOLIDATED PULL 23/32] distro tracking: updates

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |   99 ++++++++++++++------
 1 files changed, 72 insertions(+), 27 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index bcf7a1a..73e6782 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -428,16 +428,16 @@ RECIPE_LATEST_RELEASE_DATE_pn-libgcrypt = "12/2009"
 RECIPE_COMMENTS_pn-libgcrypt = ""
 
 RECIPE_STATUS_pn-gnutls = "yellow"   # need explict pre configure
-RECIPE_LAST_UPDATE_pn-gnutls = "Jun 23, 2010"
+RECIPE_LAST_UPDATE_pn-gnutls = "May 25, 2011"
 RECIPE_MAINTAINER_pn-gnutls = "Qing He <qing.he@intel.com>"
 RECIPE_DEPENDENCY_CHECK_pn-gnutls = "done"
-RECIPE_LATEST_VERSION_pn-gnutls = "2.8.6"
+RECIPE_LATEST_VERSION_pn-gnutls = "2.12.5"
 RECIPE_PATCH_pn-gnutls+gnutls-openssl = "unkown"
 RECIPE_PATCH_pn-gnutls+gnutls-texinfo-euro = "fix if @euro is missing in texinfo"
 RECIPE_PATCH_pn-gnutls+configure-fix = "fix Requires.private and Libs.private in autotools script"
 RECIPE_INTEL_SECTION_pn-gnutls = "base libs"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gnutls = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-gnutls = "03/2010"
+RECIPE_LATEST_RELEASE_DATE_pn-gnutls = "May 14, 2011"
 RECIPE_COMMENTS_pn-gnutls = "requires libtasn1, but has an internal copy"
 
 RECIPE_STATUS_pn-lzo = "green"
@@ -528,9 +528,10 @@ RECIPE_STATUS_pn-libevent = "green"
 RECIPE_LAST_UPDATE_pn-libevent = "Jul 7, 2010"
 RECIPE_MAINTAINER_pn-libevent = "Qing He <qing.he@intel.com>"
 RECIPE_NO_UPDATE_REASON_pn-libevent="libevent 2 is incompatible"
-RECIPE_LATEST_VERSION_pn-libevent = "1.4.14b"
+RECIPE_LATEST_VERSION_pn-libevent = "2.0.11"
 RECIPE_INTEL_SECTION_pn-libevent = "base libs"
-RECIPE_LATEST_RELEASE_DATE_pn-libevent = "06/2010"
+RECIPE_LATEST_RELEASE_DATE_pn-libevent = "Apr 11, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libevent = "May 24, 2011"
 
 RECIPE_STATUS_pn-libnfsidmap = "green"
 RECIPE_LAST_UPDATE_pn-libnfsidmap = "Jan 20, 2011"
@@ -739,6 +740,16 @@ RECIPE_COMMENTS_pn-opkg = ""
 RECIPE_LAST_UPDATE_pn-opkg = "Jul 21, 2010"
 RECIPE_MAINTAINER_pn-opkg = "Dongxiao Xu <dongxiao.xu@intel.com"
 
+RECIPE_STATUS_pn-opkg_nogpg = "green"
+RECIPE_DEPENDENCY_CHECK_pn-opkg_nogpg = "not done"
+RECIPE_LATEST_VERSION_pn-opkg_nogpg = "0.1.8"
+RECIPE_INTEL_SECTION_pn-opkg_nogpg = "base utils"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-opkg_nogpg = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-opkg_nogpg = "02/2010"
+RECIPE_COMMENTS_pn-opkg_nogpg = ""
+RECIPE_LAST_UPDATE_pn-opkg_nogpg = "Jul 21, 2010"
+RECIPE_MAINTAINER_pn-opkg_nogpg = "Dongxiao Xu <dongxiao.xu@intel.com"
+
 RECIPE_STATUS_pn-dpkg = "green"
 RECIPE_LATEST_VERSION_pn-dpkg = "1.15.8.7"
 RECIPE_INTEL_SECTION_pn-dpkg = "base utils"
@@ -1324,6 +1335,7 @@ RECIPE_INTEL_SECTION_pn-bzip2 = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-bzip2 = "12 months"
 RECIPE_LATEST_RELEASE_DATE_pn-bzip2 = "03/2008"
 RECIPE_COMMENTS_pn-bzip2 = "bzip2 license is 3-clause BSD plus an renaming clause"
+RECIPE_MANUAL_CHECK_DATE_pn-zip = "May 24, 2011"
 
 RECIPE_STATUS_pn-portmap = "yellow"
 RECIPE_LAST_UPDATE_pn-portmap = "Aug 27, 2007"
@@ -1423,6 +1435,7 @@ RECIPE_LATEST_VERSION_pn-sysfsutils = "2.1.0"
 RECIPE_INTEL_SECTION_pn-sysfsutils = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sysfsutils = "n/a"
 RECIPE_LATEST_RELEASE_DATE_pn-sysfsutils = "08/2006"
+RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = "May 24, 2011"
 RECIPE_COMMENTS_pn-sysfsutils = ""
 
 RECIPE_STATUS_pn-curl = "green"
@@ -1469,14 +1482,15 @@ RECIPE_LATEST_RELEASE_DATE_pn-pkgconfig = "05/2010"
 RECIPE_COMMENTS_pn-pkgconfig = "git as candidate, 0.23: 01/2008, 0.24: 05/2010, 0.25: 05/2010"
 
 RECIPE_STATUS_pn-less = "green"
-RECIPE_LAST_UPDATE_pn-less = "Jul 6, 2010"
+RECIPE_LAST_UPDATE_pn-less = "May 24, 2011"
 RECIPE_MAINTAINER_pn-less = "Qing He <qing.he@intel.com>"
 RECIPE_DEPENDENCY_CHECK_pn-less = "done"
-RECIPE_LATEST_VERSION_pn-less = "436"
+RECIPE_LATEST_VERSION_pn-less = "443"
 RECIPE_INTEL_SECTION_pn-less = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-less = "1 month"
-RECIPE_LATEST_RELEASE_DATE_pn-less = "07/2009"
+RECIPE_LATEST_RELEASE_DATE_pn-less = "Apr 10, 2011"
 RECIPE_COMMENTS_pn-less = "also licensed under less, which is a 2-clause BSD-like permissive license"
+RECIPE_MANUAL_CHECK_DATE_pn-less = "May 24, 2011"
 
 RECIPE_STATUS_pn-genext2fs = "green"
 RECIPE_LAST_UPDATE_pn-genext2fs = "Jul 12, 2010"
@@ -1616,6 +1630,7 @@ RECIPE_LATEST_VERSION_pn-unzip = "6.0"
 RECIPE_INTEL_SECTION_pn-unzip = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-unzip = "49 months"
 RECIPE_LATEST_RELEASE_DATE_pn-unzip = "04/2009"
+RECIPE_MANUAL_CHECK_DATE_pn-unzip = "May 24, 2011"
 RECIPE_COMMENTS_pn-unzip = "5.52 has a race condition vulnerability for Unix version"
 
 RECIPE_STATUS_pn-zip = "green"
@@ -1626,6 +1641,7 @@ RECIPE_LATEST_VERSION_pn-zip = "3.0"
 RECIPE_INTEL_SECTION_pn-zip = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-zip = "21 months"
 RECIPE_LATEST_RELEASE_DATE_pn-zip = "09/2009"
+RECIPE_MANUAL_CHECK_DATE_pn-zip = "May 24, 2011"
 RECIPE_COMMENTS_pn-zip = ""
 
 RECIPE_STATUS_pn-strace = "green"
@@ -1669,13 +1685,14 @@ RECIPE_LATEST_RELEASE_DATE_pn-udev = "06/2010"
 RECIPE_COMMENTS_pn-udev = "may need different versions for different kernels"
 
 RECIPE_STATUS_pn-tzdata = "green"
-RECIPE_LAST_UPDATE_pn-tzdata = "Nov 9, 2010"
+RECIPE_LAST_UPDATE_pn-tzdata = "May 24, 2010"
 RECIPE_MAINTAINER_pn-tzdata = "Qing He <qing.he@intel.com>"
 RECIPE_DEPENDENCY_CHECK_pn-tzdata = "not done"
-RECIPE_LATEST_VERSION_pn-tzdata = "2010o"
+RECIPE_LATEST_VERSION_pn-tzdata = "2011g"
 RECIPE_INTEL_SECTION_pn-tzdata = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-tzdata = "1 month"
 RECIPE_LATEST_RELEASE_DATE_pn-tzdata = "05/2010"
+RECIPE_MANUAL_CHECK_DATE_pn-tzdata = "May 24, 2011"
 RECIPE_COMMENTS_pn-tzdata = ""
 
 RECIPE_STATUS_pn-tinylogin = "yellow"    # replaced, place holder for tracking
@@ -1707,21 +1724,23 @@ RECIPE_INTEL_SECTION_pn-shared-mime-info = "base utils"
 RECIPE_LATEST_RELEASE_DATE_pn-shared-mime-info = "02/2010"
 
 RECIPE_STATUS_pn-util-linux = "green"
-RECIPE_LAST_UPDATE_pn-util-linux = "Jul 21, 2010"
+RECIPE_LAST_UPDATE_pn-util-linux = "May 24, 2011"
 RECIPE_MAINTAINER_pn-util-linux = "Qing He <qing.he@intel.com>"
-RECIPE_LATEST_VERSION_pn-util-linux = "2.18"
+RECIPE_LATEST_VERSION_pn-util-linux = "2.19.1"
 RECIPE_INTEL_SECTION_pn-util-linux = "base utils"
-RECIPE_LATEST_RELEASE_DATE_pn-util-linux = "06/2010"
+RECIPE_LATEST_RELEASE_DATE_pn-util-linux = "May 2, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-util-linux = "May 24, 2011"
 
 RECIPE_STATUS_pn-usbutils = "green"
-RECIPE_LAST_UPDATE_pn-usbutils = "Jul 30, 2010"
+RECIPE_LAST_UPDATE_pn-usbutils = "May 20, 2011"
 RECIPE_MAINTAINER_pn-usbutils = "Qing He <qing.he@intel.com>"
 RECIPE_DEPENDENCY_CHECK_pn-usbutils = "done"
-RECIPE_LATEST_VERSION_pn-usbutils = "0.86"
+RECIPE_LATEST_VERSION_pn-usbutils = "0.91"
 RECIPE_INTEL_SECTION_pn-usbutils = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-usbutils = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-usbutils = "08/2009"
+RECIPE_LATEST_RELEASE_DATE_pn-usbutils = "Oct 22, 2010"
 RECIPE_COMMENTS_pn-usbutils = ""
+RECIPE_MANUAL_CHECK_DATE_pn-usbutils = "May 24, 2011"
 
 RECIPE_STATUS_pn-pciutils = "yellow"    # custom build system, several hacks
 RECIPE_LAST_UPDATE_pn-pciutils = "Nov 10, 2010"
@@ -1757,9 +1776,10 @@ RECIPE_INTEL_SECTION_pn-zypper = "base utils"
 RECIPE_COMMENTS_pn-zypper = ""
 
 RECIPE_STATUS_pn-sysstat = "green"
-RECIPE_LAST_UPDATE_pn-sysstat = "Nov 17, 2010"
+RECIPE_LAST_UPDATE_pn-sysstat = "May 24, 2011"
 RECIPE_MAINTAINER_pn-sysstat = "Qing He <qing.he@intel.com>"
-RECIPE_LATEST_VERSION_pn-sysstat = "9.1.6"
+RECIPE_LATEST_VERSION_pn-sysstat = "10.0.0"
+RECIPE_MANUAL_CHECK_DATE_pn-sysstat = "May 24, 2011"
 
 RECIPE_STATUS_pn-sysklogd = "red"    # need upgrade
 RECIPE_LAST_UPDATE_pn-sysklogd = "Aug 27, 2010"
@@ -1838,6 +1858,7 @@ RECIPE_LATEST_VERSION_pn-zaurusd = "0.0+svnr426"
 DISTRO_PN_ALIAS_pn-zaurusd = "OpenedHand"
 RECIPE_LAST_UPDATE_pn-zaurusd = "Jan 20, 2011"
 RECIPE_MAINTAINER_pn-zaurusd = "Qing He <qing.he@intel.com>"
+RECIPE_MANUAL_CHECK_DATE_pn-zip = "May 24, 2011"
 
 RECIPE_STATUS_pn-yaffs2-utils = "red"
 RECIPE_LATEST_VERSION_pn-yaffs2-utils = ""
@@ -5485,6 +5506,9 @@ RECIPE_STATUS_pn-table = "red"
 DISTRO_PN_ALIAS_pn-table = "Intel"
 RECIPE_STATUS_pn-eds-tools = "red"
 DISTRO_PN_ALIAS_pn-eds-tools = "OpenedHand"
+RECIPE_LATEST_VERSION_pn-eds-tools = "bzr"
+RECIPE_MANUAL_CHECK_DATE_pn-eds-tools = "May 24, 2011"
+
 RECIPE_STATUS_pn-abiword-embedded = "red"
 DISTRO_PN_ALIAS_pn-abiword-embedded = "Fedora=abiword Ubuntu=abiword"
 RECIPE_STATUS_pn-libsync = "red"
@@ -5520,18 +5544,23 @@ RECIPE_LATEST_RELEASE_DATE_pn-lighttpd = "08/2010"
 RECIPE_COMMENTS_pn-lighttpd = ""
 
 RECIPE_LATEST_VERSION_pn-adt-installer = "1.0"
-RECIPE_MANUAL_CHECK_DATE_pn-adt-installer = "Jan 17, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-adt-installer = "May 24, 2011"
 DISTRO_PN_ALIAS_pn-adt-installer = "Intel"
-RECIPE_LATEST_VERSION_pn-glew = "1.5.7"
-RECIPE_MANUAL_CHECK_DATE_pn-glew = "Feb 28, 2011"
-RECIPE_LATEST_VERSION_pn-mpeg2dec = "0.4.1"
-RECIPE_MANUAL_CHECK_DATE_pn-mpeg2dec = "Jan 17, 2011"
+RECIPE_MAINTAINER_pn-adt-install = "Jessica Zhang <jessica.zhang@intel.com>"
+
+RECIPE_LATEST_VERSION_pn-glew = "1.6.0"
+RECIPE_MANUAL_CHECK_DATE_pn-glew = "May 24, 2011"
+RECIPE_LATEST_VERSION_pn-mpeg2dec = "0.5.1"
+RECIPE_NO_UPDATE_REASON_pn-libtheora = "Why are we currently at 0.4.1?"
+RECIPE_MANUAL_CHECK_DATE_pn-mpeg2dec = "May 24, 2011"
 RECIPE_LATEST_VERSION_pn-lame = "3.98.4"
 RECIPE_LATEST_VERSION_pn-libmad = "0.15.1b"
-RECIPE_MANUAL_CHECK_DATE_pn-libmad = "Apr 6, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libmad = "May 24, 2011"
 RECIPE_LATEST_VERSION_pn-libxml-perl = "0.08"
 RECIPE_LATEST_VERSION_pn-lsb = "1.4"
-RECIPE_MANUAL_CHECK_DATE_pn-lsb = "Jan 17, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-lsb = "May 24, 2011"
+RECIPE_NO_UPDATE_REASON_pn-lsb = "1.4 is fixed version of LSB Test"
+
 RECIPE_LATEST_VERSION_pn-lsbsetup = "0.9"
 RECIPE_MANUAL_CHECK_DATE_pn-lsbsetup = "Jan 17, 2011"
 RECIPE_LATEST_VERSION_pn-libxml-simple-perl = "2.18"
@@ -5673,12 +5702,15 @@ RECIPE_MANUAL_CHECK_DATE_pn-slang = "Apr 6, 2011"
 RECIPE_STATUS_pn-libnewt = "green"
 RECIPE_LATEST_VERSION_pn-libnewt = "2.2.3"
 RECIPE_LAST_UPDATE_pn-libnewt = "Feb 25, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-libnewt = "Apr 6, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libnewt = "May 24, 2011"
+RECIPE_NO_UPDATE_REASON_pn-libnewt = "fedora hosted version is at 0.52.12"
 
 RECIPE_STATUS_pn-createrepo = "green"
-RECIPE_LATEST_VERSION_pn-createrepo = "2.2.3"
+RECIPE_LATEST_VERSION_pn-createrepo = "0.9.9"
 RECIPE_MAINTAINER_pn-createrepo = "Qing He <qing.he@intel.com>"
 RECIPE_LAST_UPDATE_pn-createrepo = "Apr 6, 2011"
+RECIPE_NO_UPDATE_REASON_pn-createrepo = "Versions after 0.9.* use YUM, so we hold at 0.4.11"
+
 
 RECIPE_STATUS_pn-cdrtools = "green"
 RECIPE_DEPENDENCY_CHECK_pn-cdrtools = "not done"
@@ -5690,3 +5722,16 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-cdrtools = "6 years 2 months"
 RECIPE_COMMENTS_pn-cdrtools = "This is the last GPL licensed version of cdrtools"
 RECIPE_LAST_UPDATE_pn-cdrtools = "Apr 25, 2011"
 RECIPE_MAINTAINER_pn-cdrtools = "Scott Garman <scott.a.garman@intel.com>"
+
+RECIPE_STATUS_pn-rxvt-unicode = "green"
+RECIPE_DEPENDENCY_CHECK_pn-rxvt-unicode = "not done"
+RECIPE_LATEST_VERSION_pn-rxvt-unicode = "9.11"
+RECIPE_NO_UPDATE_REASON_pn-rxvt-unicode = ""
+RECIPE_NO_OF_PATCHES_pn-rxvt-unicode = "1"
+RECIPE_LATEST_RELEASE_DATE_pn-rxvt-unicode = "May 02, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-rxvt-unicode = ""
+RECIPE_COMMENTS_pn-rxvt-unicode = ""
+RECIPE_LAST_UPDATE_pn-rxvt-unicode = "May 25, 2011"
+RECIPE_MAINTAINER_pn-rxvt-unicode = "Saul Wold <sgw@linux.intel.com>"
+
+
-- 
1.7.3.4

[CONSOLIDATED PULL 24/32] bitbake.conf: Create static-dev pacakge for static libraries

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/conf/bitbake.conf |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index de94316..4722eb0 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -248,13 +248,18 @@ FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
 SECTION_${PN}-doc = "doc"
 
 FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
-                ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
+                ${libdir}/*.o ${libdir}/pkgconfig \
                 ${datadir}/pkgconfig ${datadir}/aclocal \
                 ${base_libdir}/*.a ${base_libdir}/*.o"
 SECTION_${PN}-dev = "devel"
 ALLOW_EMPTY_${PN}-dev = "1"
 RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})"
 
+FILES_${PN}-static-dev = "${libdir}/*.a ${base_libdir}/*.a"
+SECTION_${PN}-static-dev = "devel"
+ALLOW_EMPTY_${PN}-static-dev = "1"
+RDEPENDS_${PN}-static-dev = "${PN} (= ${EXTENDPV})"
+
 DOTDEBUG-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
             ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \
             ${libdir}/matchbox-panel/.debug /usr/src/debug"
-- 
1.7.3.4

[CONSOLIDATED PULL 25/32] sudo.inc: Add do_install_prepend () to sudo.inc

[Saul Wold]

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

Fix bug [YOCTO #1092]
Own a directory "/var/lib" before do_install() because if there isn't this directory during installing, \
then script "mkinstalldirs" from "sudo package" will create directory "/var/lib/sudo" by recursion with mode "0700" \
which will cause bug [YOCTO #1092]. So I add do_install_prepend() to create a "/var/lib" which can be accessed \
by common user before installing files.

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 meta/recipes-extended/sudo/sudo.inc |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 6a04a9c..fd68057 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -23,6 +23,18 @@ do_configure_prepend () {
 	fi
 }
 
+# The script "mkinstalldirs" from package "sudo" will create directory 
+# "/var/lib/sudo" by recursion with mode "0700" during installing files.
+# That is to say, "var", "var/lib" and "var/lib/sudo" will possess access authority 
+# with mode "0700". It cause that directory "var" and "var/lib" 
+# can't be accessed by common user. Creating directory "/var/lib" before 
+# installing files can resolve this problem.
+
+do_install_prepend (){
+	mkdir -p ${D}/${localstatedir}/lib
+}
+ 
+
 pkg_postinst_${PN} () {
 	if [ "x$D" != "x" ]; then
 		exit 1
-- 
1.7.3.4

[CONSOLIDATED PULL 26/32] busybox: sync do_install() with oe master (mostly)

[Saul Wold]

From: Phil Blundell <pb@pbcl.net>

This is basically a backport of the current state of the art from the
openembedded master repo.  In particular this fixes an installation
error on micro:

| + cp -dPr /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/bin /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/sbin /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/busybox/
| cp: will not create hard link `/home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/busybox/image/bin' to directory `/home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/busybox/bin'
| cp: cannot copy a directory, `/home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image', into itself, `/home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/busybox/image'
| ERROR: Function 'do_install' failed (see /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/temp/log.do_install.3808 for further information)

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-core/busybox/busybox.inc       |   99 +++++++++++++++------------
 meta/recipes-core/busybox/busybox_1.18.4.bb |    2 +-
 2 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 341c5c4..86fbdae 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -46,75 +46,84 @@ do_compile() {
 }
 
 do_install () {
-	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	oe_runmake busybox.links
+	if [ "${prefix}" != "/usr" ]; then
+		sed "s:^/usr/:${prefix}/:" busybox.links > busybox.links.new
+		mv busybox.links.new busybox.links
+	fi
+	if [ "${base_sbindir}" != "/sbin" ]; then
+		sed "s:^/sbin/:${base_sbindir}/:" busybox.links > busybox.links.new
+		mv busybox.links.new busybox.links
+	fi
+
 	install -d ${D}${sysconfdir}/init.d
-	oe_runmake "PREFIX=${D}" install
-	cp -pPR ${S}/_install/* ${D}/
-
-	# Move everything to /busybox (not supposed to end up in any package)
-	install -d ${D}/busybox
-	ls ${D} -R
-
-	cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
-	# Move the busybox binary back to /bin
-	install -d ${D}${base_bindir}
-	mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
-	# Move back the sh symlink
-	test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
-
-	install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN}
-	install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${PN}
-	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
-		# Move crond back to /usr/sbin/crond
-		install -d ${D}${sbindir}
-		mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
 
+	if ! grep -q "CONFIG_FEATURE_INDIVIDUAL=y" ${WORKDIR}/defconfig; then
+		# Install /bin/busybox, and the /bin/sh link so the postinst script
+		# can run. Let update-alternatives handle the rest.
+		install -d ${D}${base_bindir}
+		if grep -q "CONFIG_FEATURE_SUID=y" ${WORKDIR}/defconfig; then
+			install -m 4755 ${S}/busybox ${D}${base_bindir}
+		else
+			install -m 0755 ${S}/busybox ${D}${base_bindir}
+		fi
+		ln -sf busybox ${D}${base_bindir}/sh
+	else
+		install -d ${D}${base_bindir} ${D}${base_sbindir}
+		install -d ${D}${libdir} ${D}${bindir} ${D}${sbindir}
+		cat busybox.links | while read FILE; do
+			NAME=`basename "$FILE"`
+			install -m 0755 "0_lib/$NAME" "${D}$FILE.${PN}"
+		done
+		# add suid bit where needed
+		for i in `grep -E "APPLET.*_BB_SUID_((MAYBE|REQUIRE))" include/applets.h | grep -v _BB_SUID_DROP | cut -f 3 -d '(' | cut -f 1 -d ','`; do
+			find ${D} -name $i.${PN} -exec chmod a+s {} \;
+		done
+		install -m 0755 0_lib/libbusybox.so.${PV} ${D}${libdir}/libbusybox.so.${PV}
+		ln -sf sh.${PN} ${D}${base_bindir}/sh
+		ln -sf ln.${PN} ${D}${base_bindir}/ln
+		ln -sf test.${PN} ${D}${bindir}/test
+		if [ -f ${D}/linuxrc.${PN} ]; then
+			mv ${D}/linuxrc.${PN} ${D}/linuxrc
+		fi
+	fi
+
+	if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then
+		install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN}
+		install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${PN}
+	fi
+	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
 		install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
-		# Move httpd back to /usr/sbin/httpd
-		install -d ${D}${sbindir}
-		mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
-
 		install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
 		install -d ${D}/srv/www
 	fi
 	if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then
-		# Move udhcpd back to /usr/sbin/udhcpd
-		install -d ${D}${sbindir}
-		mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
-
 		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
-		# Move hwclock back to /sbin/hwclock
-		install -d ${D}${base_sbindir}
-		mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
-
+		install -d ${D}${sysconfdir}/default
 		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then
-		# Move dhcpc back to /usr/sbin/udhcpc
-		install -d ${D}${base_sbindir}
-		mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
-
 		install -d ${D}${sysconfdir}/udhcpc.d
 		install -d ${D}${datadir}/udhcpc
-		install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
+                install -m 0755 ${WORKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default
 		install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
 		install -m 0755 ${WORKDIR}/busybox-udhcpc ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_MDEV=y" ${WORKDIR}/defconfig; then
-		install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
-		if grep "CONFIG_FEATURE_MDEV_CONF=y" ${WORKDIR}/defconfig; then
-			install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf
-		fi
+	if grep "CONFIG_INETD=y" ${WORKDIR}/defconfig; then
+		install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${PN}
+		install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
+	fi
+        if grep "CONFIG_MDEV=y" ${WORKDIR}/defconfig; then
+               install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
+               if grep "CONFIG_FEATURE_MDEV_CONF=y" ${WORKDIR}/defconfig; then
+                       install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf
+               fi
 	fi
-
 	install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
-
-	# remove the temp dir to suppress warning, we are done with it
-	rm -rf ${D}/busybox
 }
 
 pkg_postinst_${PN} () {
diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb
index cf37650..a5080d5 100644
--- a/meta/recipes-core/busybox/busybox_1.18.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.4.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \
-- 
1.7.3.4

[CONSOLIDATED PULL 27/32] create-pull-request: allow '+' in git PROTO_RE, ie for 'git+ssh://'

[Saul Wold]

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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 scripts/create-pull-request |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index 19b640f..d52098e 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -102,7 +102,7 @@ while getopts "b:chi:m:o:p:r:s:u:" OPT; do
 		case "$REMOTE_URL" in
 		*@*)
 			USER_RE="[A-Za-z0-9_.@][A-Za-z0-9_.@-]*\$\?"
-			PROTO_RE="[a-z][a-z]*://"
+			PROTO_RE="[a-z][a-z+]*://"
 			GIT_RE="\(^\($PROTO_RE\)\?$USER_RE@\)\([^:/]*\)[:/]\(.*\)"
 			REMOTE_URL=${REMOTE_URL%.git}
 			REMOTE_REPO=$(echo $REMOTE_URL | sed "s#$GIT_RE#\4#")
-- 
1.7.3.4

[CONSOLIDATED PULL 28/32] binconfig: improve handling of empty prefixes

[Saul Wold]

From: Phil Blundell <pb@pbcl.net>

This is a backport of 952e5e2b7a5c1deefc939594d40b81a71fb16a54 from oe master.

Without this the script mangling goes very wrong if ${prefix}="".  There
isn't really any way to fix this in the completely general case, but
this patch does work with the two cases I tested (freetype and
gpg-error) which were unusable previously.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/classes/binconfig.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 8e22d2d..3deb541 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -6,8 +6,8 @@ def get_binconfig_mangle(d):
 		s += " -e 's:=%s${libdir}:=\\1OELIBDIR:;'" % optional_quote
 		s += " -e 's:=%s${includedir}:=\\1OEINCDIR:;'" % optional_quote
 		s += " -e 's:=%s${datadir}:=\\1OEDATADIR:'" % optional_quote
-		s += " -e 's:=%s${prefix}:=\\1OEPREFIX:'" % optional_quote
-		s += " -e 's:=%s${exec_prefix}:=\\1OEEXECPREFIX:'" % optional_quote
+		s += " -e 's:=%s${prefix}/:=\\1OEPREFIX/:'" % optional_quote
+		s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote
 		s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
 		s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
 		s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
-- 
1.7.3.4

[CONSOLIDATED PULL 29/32] dbus 1.4.1: disable sysv script properly when using systemd

[Saul Wold]

From: Koen Kooi <koen@dominion.thruhere.net>

OE-core uses 'dbus-1' as initscript name, which no other distribution(-buildsys) does, so we have to take special measures.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-core/dbus/dbus.inc      |    4 ++++
 meta/recipes-core/dbus/dbus_1.4.1.bb |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 22514e9..fb2f6d4 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -89,6 +89,10 @@ do_install() {
 
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+
+	# disable dbus-1 sysv script on systemd installs
+	# nearly all distros call the initscript plain 'dbus', but OE-core is different
+	ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service
 }
 
 do_install_virtclass-native() {
diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb
index f65ef35..252d160 100644
--- a/meta/recipes-core/dbus/dbus_1.4.1.bb
+++ b/meta/recipes-core/dbus/dbus_1.4.1.bb
@@ -1,6 +1,6 @@
 include dbus.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
 SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"
-- 
1.7.3.4

[CONSOLIDATED PULL 30/32] tcmode-default: disable ARMv7 Optimization for qt4-x11-free

[Saul Wold]

[YOCTO #1030]

This diables the ARMv7 optimizations that cause the compiler to fail with the following error

| ../../include/QtCore/../../src/corelib/arch/qatomic_arm.h: In function 'void qt_removeObject(QObject*)':
| ../../include/QtCore/../../src/corelib/arch/qatomic_arm.h:361:35: error: output number 1 not directly addressable

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/conf/distro/include/tcmode-default.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 6eb34ef..6393ffd 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -29,6 +29,7 @@ PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08"
 # Temporary workaround for gcc 4.6.0 ICE with beagleboard
 # gcc bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47719
 TARGET_CC_ARCH_arm_pn-mesa-xlib := "${@'${TARGET_CC_ARCH}'.replace('armv7-a','armv5')}"
+TARGET_CC_ARCH_arm_pn-qt4-x11-free := "${@'${TARGET_CC_ARCH}'.replace('armv7-a','armv5')}"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
-- 
1.7.3.4

[CONSOLIDATED PULL 31/32] puzzles: Update to 9175

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../puzzles/{puzzles_r9173.bb => puzzles_r9175.bb} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-sato/puzzles/{puzzles_r9173.bb => puzzles_r9175.bb} (100%)

diff --git a/meta/recipes-sato/puzzles/puzzles_r9173.bb b/meta/recipes-sato/puzzles/puzzles_r9175.bb
similarity index 100%
rename from meta/recipes-sato/puzzles/puzzles_r9173.bb
rename to meta/recipes-sato/puzzles/puzzles_r9175.bb
-- 
1.7.3.4

[CONSOLIDATED PULL 32/32] clutter-1.6: Add patch to update gettext macro version

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../recipes-graphics/clutter/clutter-1.6_1.6.14.bb |    5 ++-
 .../clutter/update_gettext_macro_version.patch     |   32 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch

diff --git a/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb b/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb
index 938a30c..555133f 100644
--- a/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb
@@ -1,6 +1,6 @@
 require recipes-graphics/clutter/clutter.inc
 
-PR = "r1"
+PR = "r2"
 
 # Internal json-glib was removed in Clutter 1.5.2
 STDDEPENDS += "json-glib"
@@ -9,7 +9,8 @@ PACKAGES =+ "${PN}-examples"
 FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
 
 SRC_URI = "http://source.clutter-project.org/sources/clutter/1.6/clutter-${PV}.tar.bz2 \
-           file://enable_tests-1.4.patch"
+           file://enable_tests-1.4.patch \
+           file://update_gettext_macro_version.patch"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 S = "${WORKDIR}/clutter-${PV}"
diff --git a/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch b/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch
new file mode 100644
index 0000000..6671098
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch
@@ -0,0 +1,32 @@
+Upstream-Status: Pending
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: clutter-1.6.14/build/autotools/po.m4
+===================================================================
+--- clutter-1.6.14.orig/build/autotools/po.m4	2011-05-31 22:39:55.000000000 -0700
++++ clutter-1.6.14/build/autotools/po.m4	2011-05-31 22:40:36.898833113 -0700
+@@ -29,7 +29,7 @@
+ 
+   dnl Release version of the gettext macros. This is used to ensure that
+   dnl the gettext macros and po/Makefile.in.in are in sync.
+-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
++  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+ 
+   dnl Perform the following tests also if --disable-nls has been given,
+   dnl because they are needed for "make dist" to work.
+Index: clutter-1.6.14/po/Makefile.in.in
+===================================================================
+--- clutter-1.6.14.orig/po/Makefile.in.in	2011-05-31 22:40:05.000000000 -0700
++++ clutter-1.6.14/po/Makefile.in.in	2011-05-31 22:40:21.030833109 -0700
+@@ -8,8 +8,8 @@
+ # Please note that the actual code of GNU gettext is covered by the GNU
+ # General Public License and is *not* in the public domain.
+ #
+-# Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++# Origin: gettext-0.18
++GETTEXT_MACRO_VERSION = 0.18
+ 
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
-- 
1.7.3.4

Re: [CONSOLIDATED PULL 12/32] libiconv: update to 1.13.1

[Khem Raj]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 05/31/2011 11:21 PM, Saul Wold wrote:
> Add Upstream-Status tags to patches
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  .../autoconf.patch                                 |    2 ++
>  .../shared_preloadable_libiconv_linux.patch        |    2 ++
>  .../{libiconv_1.11.1.bb => libiconv_1.13.1.bb}     |    0
>  3 files changed, 4 insertions(+), 0 deletions(-)
>  rename meta/recipes-support/libiconv/{libiconv-1.11.1 => libiconv-1.13.1}/autoconf.patch (98%)
>  rename meta/recipes-support/libiconv/{libiconv-1.11.1 => libiconv-1.13.1}/shared_preloadable_libiconv_linux.patch (98%)
>  rename meta/recipes-support/libiconv/{libiconv_1.11.1.bb => libiconv_1.13.1.bb} (100%)
> 
> diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch b/meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
> similarity index 98%
> rename from meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
> rename to meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
> index 2b24894..3cbf549 100644
> --- a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
> +++ b/meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
> @@ -2,6 +2,8 @@ It adds the variables that are needed
>  for autoconf 2.65 to reconfigure libiconv and defines the m4 macros 
>  directory. Its imported from OE.
>  
> +Upstream-Status: Pending
> +
>  Signed-off-by: Khem Raj <raj.khem@gmail.com>
>  
>  Index: libiconv-1.11.1/configure.ac
> diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch b/meta/recipes-support/libiconv/libiconv-1.13.1/shared_preloadable_libiconv_linux.patch
> similarity index 98%
> rename from meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
> rename to meta/recipes-support/libiconv/libiconv-1.13.1/shared_preloadable_libiconv_linux.patch
> index a913dad..fb07f73 100644
> --- a/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
> +++ b/meta/recipes-support/libiconv/libiconv-1.13.1/shared_preloadable_libiconv_linux.patch
> @@ -4,6 +4,8 @@ Its more enforced by libtool 2.4. I have not checked it with older libtool
>  libiconv 1.11.x is relatively old release and libtool 2.4 did not exist when it
>  was released these kind of problem are more likely
>  
> +Upstream-Status: Pending
> +
>  Signed-off-by: Khem Raj <raj.khem@gmail.com>
>  
>  Index: libiconv-1.11.1/lib/Makefile.in
> diff --git a/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/meta/recipes-support/libiconv/libiconv_1.13.1.bb
> similarity index 100%
> rename from meta/recipes-support/libiconv/libiconv_1.11.1.bb
> rename to meta/recipes-support/libiconv/libiconv_1.13.1.bb

FWIW 1.11.1 was last GPLv2 release. So I think you can add 1.13.1 but do
not replace 1.11.1 with it.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk3l3BcACgkQuwUzVZGdMxS/0QCaAkbu4wuI/ZJ72mK7zlD3lP8F
vlMAniBrJK4jCDvDlqgQtXzUwFVQju/R
=ZlZ3
-----END PGP SIGNATURE-----

Re: [CONSOLIDATED PULL 09/32] gettext: Update to 0.18.1.1

[Khem Raj]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 05/31/2011 11:21 PM, Saul Wold wrote:
> Add Upstream Status tags to patches
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  .../gettext/gettext-0.16.1/disable_java.patch      |    2 +
>  .../gettext-0.16.1/fix_aclocal_version.patch       |    2 +
>  .../gettext-0.16.1/fix_gnu_source_circular.patch   |    2 +
>  .../gettext/gettext-0.16.1/fixchicken.patch        |    2 +
>  .../gettext/gettext-0.16.1/getline.m4.patch        |    2 +
>  .../gettext-autoconf-lib-link-no-L.patch           |    2 +
>  .../gettext-error_print_progname.patch             |    2 +
>  .../gettext/gettext-0.16.1/gettext-vpath.patch     |    2 +
>  .../gettext-0.16.1/hardcode_macro_version.patch    |    2 +
>  .../gettext/gettext-0.16.1/linklib_from_0.17.patch |    2 +
>  .../gettext/gettext-0.17/wchar-uclibc.patch        |   96 --------------------
>  .../autotools.patch                                |    2 +
>  .../gettext-error_print_progname.patch             |    2 +
>  .../{gettext-0.17 => gettext-0.18.1.1}/m4fix.patch |    2 +
>  .../use_open_properly.patch                        |    2 +
>  .../gettext/gettext-0.18.1.1/wchar-uclibc.patch    |   74 +++++++++++++++
>  .../{gettext_0.17.bb => gettext_0.18.1.1.bb}       |   14 +--
>  17 files changed, 107 insertions(+), 105 deletions(-)
>  delete mode 100644 meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
>  rename meta/recipes-core/gettext/{gettext-0.17 => gettext-0.18.1.1}/autotools.patch (98%)
>  rename meta/recipes-core/gettext/{gettext-0.17 => gettext-0.18.1.1}/gettext-error_print_progname.patch (96%)
>  rename meta/recipes-core/gettext/{gettext-0.17 => gettext-0.18.1.1}/m4fix.patch (98%)
>  rename meta/recipes-core/gettext/{gettext-0.17 => gettext-0.18.1.1}/use_open_properly.patch (96%)
>  create mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch
>  rename meta/recipes-core/gettext/{gettext_0.17.bb => gettext_0.18.1.1.bb} (90%)
> 
> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
> index cf7dc55..2f8478a 100644
> --- a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
> +++ b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
> @@ -2,6 +2,8 @@
>  # 
>  # Commented by: Saul Wold <saul.wold@intel.com>
>  
> +Upstream-Status: Inappropriate [embedded]
> +
>  Index: gettext-0.16.1/gettext-tools/configure.ac
>  ===================================================================
>  --- gettext-0.16.1.orig/gettext-tools/configure.ac	2006-11-27 09:02:01.000000000 -0800
> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
> index 3796052..8fe7712 100644
> --- a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
> +++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
> @@ -2,6 +2,8 @@ This patch updates the required version number from 2.61 to the
>  current 2.65 version of aclocal, this will need to be updated 
>  when we update aclocal
>  
> +Upstream-Status: Inappropriate [configuration]
> +
>  Signed-off-by Saul Wold <sgw@linux.intel.com>
>  
>  Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4
> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
> index 8b42f1b..d1c0bbb 100644
> --- a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
> +++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
> @@ -3,6 +3,8 @@ AC_USE_SYSTEM_EXTENSIONS.
>  
>  Thanks to Mark Hatle for the timely pointers and fixes.
>  
> +Upstream-Status: Inappropriate [configuration]
> +
>  Signed-off-by Saul Wold <sgw@linux.intel.com>
>  
>  diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/extensions.m4 gettext.patched/gettext-runtime/gnulib-m4/extensions.m4
> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
> index ef51056..d6bb7b0 100644
> --- a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
> +++ b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
> @@ -2,6 +2,8 @@
>  # 
>  # Commented by: Saul Wold <saul.wold@intel.com>
>  
> +Upstream-Status: Inappropriate [embedded]
> +
>  Index: gettext-tools/m4/csharpcomp.m4
>  ===================================================================
>  RCS file: /cvs/gettext/gettext/gettext-tools/m4/csharpcomp.m4,v
> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
> index f71d0e1..34965fc 100644
> --- a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
> +++ b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
> @@ -2,6 +2,8 @@
>  # 
>  # Commented by: Saul Wold <saul.wold@intel.com>
>  
> +Upstream-Status: Inappropriate [configuration]
> +
>  --- /gettext-tools/m4/orig-getline.m4	2003-07-18 18:11:37.000000000 +0300
>  +++ /gettext-tools/m4/getline.m4	2007-02-03 13:33:41.000000000 +0200
>  @@ -42,12 +42,23 @@
> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
> index e8bb2f6..82775d6 100644
> --- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
> +++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
> @@ -2,6 +2,8 @@
>  # 
>  # Commented by: Saul Wold <saul.wold@intel.com>
>  
> +Upstream-Status: Pending
> +
>  --- gettext-0.17/autoconf-lib-link/m4/lib-link.m4~	2009-04-17 15:12:30.000000000 -0700
>  +++ gettext-0.17/autoconf-lib-link/m4/lib-link.m4	2009-04-17 15:37:39.000000000 -0700
>  @@ -267,6 +267,9 @@
> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
> index 96a2196..abb7195 100644
> --- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
> +++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
> @@ -2,6 +2,8 @@
>  # 
>  # Commented by: Saul Wold <saul.wold@intel.com>
>  
> +Upstream-Status: Inappropriate [configuration]
> +
>  diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h
>  --- gettext-0.14.6/gettext-tools/lib/error.h	2005-05-20 16:03:42.000000000 -0500
>  +++ gettext-0.14.6-patched/gettext-tools/lib/error.h	2007-01-13 20:57:24.422168053 -0600
> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
> index 62420b7..67b0a5a 100644
> --- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
> +++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
> @@ -2,6 +2,8 @@
>  # 
>  # Commented by: Saul Wold <saul.wold@intel.com>
>  
> +Upstream-Status: Pending
> +
>  Index: gettext-0.16.1/gettext-runtime/intl/Makefile.in
>  ===================================================================
>  --- gettext-0.16.1.orig/gettext-runtime/intl/Makefile.in	2006-11-27 09:02:00.000000000 -0800
> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
> index ef57dc2..82ed04d 100644
> --- a/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
> +++ b/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
> @@ -2,6 +2,8 @@ This patch hardcodes in version 0.17 for the GETTEXT_MACRO_VERSION,
>  the version check is only part of 0.17 and will not affect any 0.16.1
>  operations
>  
> +Upstream-Status: Inappropriate [configuration]
> +
>  Signed-off-by: Saul Wold <sgw@linux.intel.com>
>  
>  Index: gettext-0.16.1/gettext-runtime/m4/po.m4
> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch b/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
> index 2b805c9..3cbe867 100644
> --- a/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
> +++ b/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
> @@ -2,6 +2,8 @@
>  # 
>  # Commented by: Saul Wold <saul.wold@intel.com>
>  
> +Upstream-Status: Inappropriate [configuration]
> +
>  Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4
>  ===================================================================
>  --- gettext-0.16.1.orig/autoconf-lib-link/m4/lib-link.m4	2006-11-27 09:01:58.000000000 -0800
> diff --git a/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch b/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
> deleted file mode 100644
> index 7b3880b..0000000
> --- a/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
> +++ /dev/null
> @@ -1,96 +0,0 @@
> -Index: gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h
> -===================================================================
> ---- gettext-0.17.orig/gettext-runtime/gnulib-lib/wchar.in.h	2008-07-29 14:51:52.336394636 +0200
> -+++ gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h	2008-07-29 14:52:25.546430195 +0200
> -@@ -1,6 +1,6 @@
> - /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
> - 
> --   Copyright (C) 2007 Free Software Foundation, Inc.
> -+   Copyright (C) 2007-2008 Free Software Foundation, Inc.
> - 
> -    This program is free software; you can redistribute it and/or modify
> -    it under the terms of the GNU General Public License as published by
> -@@ -26,6 +26,14 @@
> -  * the declaration of wcwidth().
> -  */
> - 
> -+#ifdef __need_mbstate_t
> -+/* Special invocation convention inside uClibc header files.  */
> -+
> -+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
> -+
> -+#else
> -+/* Normal invocation convention.  */
> -+
> - #ifndef _GL_WCHAR_H
> - 
> - /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
> -@@ -80,3 +88,4 @@
> - 
> - #endif /* _GL_WCHAR_H */
> - #endif /* _GL_WCHAR_H */
> -+#endif
> -Index: gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h
> -===================================================================
> ---- gettext-0.17.orig/gettext-tools/gnulib-lib/wchar.in.h	2008-07-29 14:52:03.886393956 +0200
> -+++ gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h	2008-07-29 14:52:50.876388000 +0200
> -@@ -1,6 +1,6 @@
> - /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
> - 
> --   Copyright (C) 2007 Free Software Foundation, Inc.
> -+   Copyright (C) 2007-2008 Free Software Foundation, Inc.
> - 
> -    This program is free software; you can redistribute it and/or modify
> -    it under the terms of the GNU General Public License as published by
> -@@ -26,6 +26,14 @@
> -  * the declaration of wcwidth().
> -  */
> - 
> -+#ifdef __need_mbstate_t
> -+/* Special invocation convention inside uClibc header files.  */
> -+
> -+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
> -+
> -+#else
> -+/* Normal invocation convention.  */
> -+
> - #ifndef _GL_WCHAR_H
> - 
> - /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
> -@@ -80,3 +88,4 @@
> - 
> - #endif /* _GL_WCHAR_H */
> - #endif /* _GL_WCHAR_H */
> -+#endif
> -Index: gettext-0.17/gettext-tools/libgettextpo/wchar.in.h
> -===================================================================
> ---- gettext-0.17.orig/gettext-tools/libgettextpo/wchar.in.h	2008-07-29 14:51:58.826395009 +0200
> -+++ gettext-0.17/gettext-tools/libgettextpo/wchar.in.h	2008-07-29 14:52:38.609723575 +0200
> -@@ -1,6 +1,6 @@
> - /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
> - 
> --   Copyright (C) 2007 Free Software Foundation, Inc.
> -+   Copyright (C) 2007-2008 Free Software Foundation, Inc.
> - 
> -    This program is free software; you can redistribute it and/or modify
> -    it under the terms of the GNU General Public License as published by
> -@@ -26,6 +26,14 @@
> -  * the declaration of wcwidth().
> -  */
> - 
> -+#ifdef __need_mbstate_t
> -+/* Special invocation convention inside uClibc header files.  */
> -+
> -+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
> -+
> -+#else
> -+/* Normal invocation convention.  */
> -+
> - #ifndef _GL_WCHAR_H
> - 
> - /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
> -@@ -80,3 +88,4 @@
> - 
> - #endif /* _GL_WCHAR_H */
> - #endif /* _GL_WCHAR_H */
> -+#endif
> diff --git a/meta/recipes-core/gettext/gettext-0.17/autotools.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch
> similarity index 98%
> rename from meta/recipes-core/gettext/gettext-0.17/autotools.patch
> rename to meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch
> index 9f16b18..e4545fd 100644
> --- a/meta/recipes-core/gettext/gettext-0.17/autotools.patch
> +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch
> @@ -1,3 +1,5 @@
> +Upstream-Status: Inappropriate [configuration]
> +
>  Index: gettext-0.17/gettext-runtime/man/Makefile.am
>  ===================================================================
>  --- gettext-0.17.orig/gettext-runtime/man/Makefile.am	2007-10-07 21:37:36.000000000 +0200
> diff --git a/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch
> similarity index 96%
> rename from meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch
> rename to meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch
> index 0f67cd0..4a1b2c6 100644
> --- a/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch
> +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch
> @@ -1,3 +1,5 @@
> +Upstream-Status: Pending
> +
>  Index: gettext-0.17/gettext-tools/libgettextpo/error.h
>  ===================================================================
>  --- gettext-0.17.orig/gettext-tools/libgettextpo/error.h	2008-07-27 21:16:25.561115527 +0200
> diff --git a/meta/recipes-core/gettext/gettext-0.17/m4fix.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
> similarity index 98%
> rename from meta/recipes-core/gettext/gettext-0.17/m4fix.patch
> rename to meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
> index a02457f..34930d1 100644
> --- a/meta/recipes-core/gettext/gettext-0.17/m4fix.patch
> +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
> @@ -22,6 +22,8 @@ Ralf
>          * m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or
>          newer.
>  
> +Upstream-Status: Pending
> +
>  Index: gettext-0.17/gettext-tools/gnulib-m4/openmp.m4
>  ===================================================================
>  --- gettext-0.17.orig/gettext-tools/gnulib-m4/openmp.m4	2010-02-01 10:51:00.437788710 +0000
> diff --git a/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch
> similarity index 96%
> rename from meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch
> rename to meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch
> index 111714b..a04a32d 100644
> --- a/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch
> +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch
> @@ -1,3 +1,5 @@
> +Upstream-Status: Pending
> +
>  Index: gettext-0.17/gettext-tools/src/write-catalog.c
>  ===================================================================
>  --- gettext-0.17.orig/gettext-tools/src/write-catalog.c	2008-10-16 15:18:16.000000000 +0200
> diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch
> new file mode 100644
> index 0000000..34e3f1a
> --- /dev/null
> +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch
> @@ -0,0 +1,74 @@
> +Upstream-Status: Pending
> +
> +Index: gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h
> +===================================================================
> +--- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/wchar.in.h	2010-05-08 18:36:16.000000000 -0700
> ++++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h	2011-05-25 16:28:38.656220937 -0700
> +@@ -48,6 +48,14 @@
> + #else
> + /* Normal invocation convention.  */
> + 
> ++#ifdef __need_mbstate_t
> ++/* Special invocation convention inside uClibc header files.  */
> ++
> ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
> ++
> ++#else
> ++/* Normal invocation convention.  */
> ++
> + #ifndef _GL_WCHAR_H
> + 
> + #define _GL_ALREADY_INCLUDING_WCHAR_H
> +@@ -426,3 +434,4 @@
> + #endif /* _GL_WCHAR_H */
> + #endif /* _GL_WCHAR_H */
> + #endif
> ++#endif
> +Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h
> +===================================================================
> +--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/wchar.in.h	2010-05-24 02:42:48.000000000 -0700
> ++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h	2011-05-25 16:28:15.717360791 -0700
> +@@ -48,6 +48,14 @@
> + #else
> + /* Normal invocation convention.  */
> + 
> ++#ifdef __need_mbstate_t
> ++/* Special invocation convention inside uClibc header files.  */
> ++
> ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
> ++
> ++#else
> ++/* Normal invocation convention.  */
> ++
> + #ifndef _GL_WCHAR_H
> + 
> + #define _GL_ALREADY_INCLUDING_WCHAR_H
> +@@ -426,3 +434,4 @@
> + #endif /* _GL_WCHAR_H */
> + #endif /* _GL_WCHAR_H */
> + #endif
> ++#endif
> +Index: gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h
> +===================================================================
> +--- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/wchar.in.h	2010-05-08 18:38:04.000000000 -0700
> ++++ gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h	2011-05-25 16:28:26.998721087 -0700
> +@@ -48,6 +48,14 @@
> + #else
> + /* Normal invocation convention.  */
> + 
> ++#ifdef __need_mbstate_t
> ++/* Special invocation convention inside uClibc header files.  */
> ++
> ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
> ++
> ++#else
> ++/* Normal invocation convention.  */
> ++
> + #ifndef _GL_WCHAR_H
> + 
> + #define _GL_ALREADY_INCLUDING_WCHAR_H
> +@@ -426,3 +434,4 @@
> + #endif /* _GL_WCHAR_H */
> + #endif /* _GL_WCHAR_H */
> + #endif
> ++#endif
> diff --git a/meta/recipes-core/gettext/gettext_0.17.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
> similarity index 90%
> rename from meta/recipes-core/gettext/gettext_0.17.bb
> rename to meta/recipes-core/gettext/gettext_0.18.1.1.bb
> index ce5fc3e..fe1b266 100644
> --- a/meta/recipes-core/gettext/gettext_0.17.bb
> +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
> @@ -5,24 +5,21 @@ SECTION = "libs"
>  LICENSE = "GPLv3"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>  
> -PR = "r5"
> +PR = "r0"
>  DEPENDS = "gettext-native virtual/libiconv ncurses expat"
>  DEPENDS_virtclass-native = ""
>  PROVIDES = "virtual/libintl virtual/gettext"
>  PROVIDES_virtclass-native = ""
>  CONFLICTS_${PN} = "proxy-libintl"
>  SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
> -           file://autotools.patch;patch=1 \
> -           file://wchar-uclibc.patch;patch=1 \
> -           file://use_open_properly.patch;patch=1 \
> -           file://m4fix.patch;patch=1 \
> +           file://wchar-uclibc.patch \
>            "
>  
>  SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
>  SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1"
>  
> -SRC_URI[md5sum] = "58a2bc6d39c0ba57823034d55d65d606"
> -SRC_URI[sha256sum] = "209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba"
> +SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89"
> +SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9"
>  
>  #PARALLEL_MAKE = ""
>  
> @@ -39,8 +36,7 @@ EXTRA_OECONF += "--without-lispdir \
>                   --without-emacs \
>                  "
>  
> -acpaths = '-I ${S}/autoconf-lib-link/m4/ \
> -           -I ${S}/gettext-runtime/m4 \
> +acpaths = '-I ${S}/gettext-runtime/m4 \
>             -I ${S}/gettext-tools/m4'
>  
>  


I assume you did a complete build from scratch for testing gettext
upgrade that is using no sstate.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk3l3QgACgkQuwUzVZGdMxRpEQCfRyTZL6AwQfU7OL4Ee6Nbpt4C
gvgAnjOjf/0T7XBPOmyD5i8OCqm0x5Nd
=PO6E
-----END PGP SIGNATURE-----

Re: [CONSOLIDATED PULL 09/32] gettext: Update to 0.18.1.1

[Saul Wold]

On 05/31/2011 11:32 PM, Khem Raj wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 05/31/2011 11:21 PM, Saul Wold wrote:
>> Add Upstream Status tags to patches
>>
>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>> ---
>>   .../gettext/gettext-0.16.1/disable_java.patch      |    2 +
>>   .../gettext-0.16.1/fix_aclocal_version.patch       |    2 +
>>   .../gettext-0.16.1/fix_gnu_source_circular.patch   |    2 +
>>   .../gettext/gettext-0.16.1/fixchicken.patch        |    2 +
>>   .../gettext/gettext-0.16.1/getline.m4.patch        |    2 +
>>   .../gettext-autoconf-lib-link-no-L.patch           |    2 +
>>   .../gettext-error_print_progname.patch             |    2 +
>>   .../gettext/gettext-0.16.1/gettext-vpath.patch     |    2 +
>>   .../gettext-0.16.1/hardcode_macro_version.patch    |    2 +
>>   .../gettext/gettext-0.16.1/linklib_from_0.17.patch |    2 +
>>   .../gettext/gettext-0.17/wchar-uclibc.patch        |   96 --------------------
>>   .../autotools.patch                                |    2 +
>>   .../gettext-error_print_progname.patch             |    2 +
>>   .../{gettext-0.17 =>  gettext-0.18.1.1}/m4fix.patch |    2 +
>>   .../use_open_properly.patch                        |    2 +
>>   .../gettext/gettext-0.18.1.1/wchar-uclibc.patch    |   74 +++++++++++++++
>>   .../{gettext_0.17.bb =>  gettext_0.18.1.1.bb}       |   14 +--
>>   17 files changed, 107 insertions(+), 105 deletions(-)
>>   delete mode 100644 meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
>>   rename meta/recipes-core/gettext/{gettext-0.17 =>  gettext-0.18.1.1}/autotools.patch (98%)
>>   rename meta/recipes-core/gettext/{gettext-0.17 =>  gettext-0.18.1.1}/gettext-error_print_progname.patch (96%)
>>   rename meta/recipes-core/gettext/{gettext-0.17 =>  gettext-0.18.1.1}/m4fix.patch (98%)
>>   rename meta/recipes-core/gettext/{gettext-0.17 =>  gettext-0.18.1.1}/use_open_properly.patch (96%)
>>   create mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch
>>   rename meta/recipes-core/gettext/{gettext_0.17.bb =>  gettext_0.18.1.1.bb} (90%)
>>
>> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
>> index cf7dc55..2f8478a 100644
>> --- a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
>> +++ b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
>> @@ -2,6 +2,8 @@
>>   #
>>   # Commented by: Saul Wold<saul.wold@intel.com>
>>
>> +Upstream-Status: Inappropriate [embedded]
>> +
>>   Index: gettext-0.16.1/gettext-tools/configure.ac
>>   ===================================================================
>>   --- gettext-0.16.1.orig/gettext-tools/configure.ac	2006-11-27 09:02:01.000000000 -0800
>> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
>> index 3796052..8fe7712 100644
>> --- a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
>> +++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
>> @@ -2,6 +2,8 @@ This patch updates the required version number from 2.61 to the
>>   current 2.65 version of aclocal, this will need to be updated
>>   when we update aclocal
>>
>> +Upstream-Status: Inappropriate [configuration]
>> +
>>   Signed-off-by Saul Wold<sgw@linux.intel.com>
>>
>>   Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4
>> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
>> index 8b42f1b..d1c0bbb 100644
>> --- a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
>> +++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
>> @@ -3,6 +3,8 @@ AC_USE_SYSTEM_EXTENSIONS.
>>
>>   Thanks to Mark Hatle for the timely pointers and fixes.
>>
>> +Upstream-Status: Inappropriate [configuration]
>> +
>>   Signed-off-by Saul Wold<sgw@linux.intel.com>
>>
>>   diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/extensions.m4 gettext.patched/gettext-runtime/gnulib-m4/extensions.m4
>> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
>> index ef51056..d6bb7b0 100644
>> --- a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
>> +++ b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch
>> @@ -2,6 +2,8 @@
>>   #
>>   # Commented by: Saul Wold<saul.wold@intel.com>
>>
>> +Upstream-Status: Inappropriate [embedded]
>> +
>>   Index: gettext-tools/m4/csharpcomp.m4
>>   ===================================================================
>>   RCS file: /cvs/gettext/gettext/gettext-tools/m4/csharpcomp.m4,v
>> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
>> index f71d0e1..34965fc 100644
>> --- a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
>> +++ b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch
>> @@ -2,6 +2,8 @@
>>   #
>>   # Commented by: Saul Wold<saul.wold@intel.com>
>>
>> +Upstream-Status: Inappropriate [configuration]
>> +
>>   --- /gettext-tools/m4/orig-getline.m4	2003-07-18 18:11:37.000000000 +0300
>>   +++ /gettext-tools/m4/getline.m4	2007-02-03 13:33:41.000000000 +0200
>>   @@ -42,12 +42,23 @@
>> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
>> index e8bb2f6..82775d6 100644
>> --- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
>> +++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
>> @@ -2,6 +2,8 @@
>>   #
>>   # Commented by: Saul Wold<saul.wold@intel.com>
>>
>> +Upstream-Status: Pending
>> +
>>   --- gettext-0.17/autoconf-lib-link/m4/lib-link.m4~	2009-04-17 15:12:30.000000000 -0700
>>   +++ gettext-0.17/autoconf-lib-link/m4/lib-link.m4	2009-04-17 15:37:39.000000000 -0700
>>   @@ -267,6 +267,9 @@
>> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
>> index 96a2196..abb7195 100644
>> --- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
>> +++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch
>> @@ -2,6 +2,8 @@
>>   #
>>   # Commented by: Saul Wold<saul.wold@intel.com>
>>
>> +Upstream-Status: Inappropriate [configuration]
>> +
>>   diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h
>>   --- gettext-0.14.6/gettext-tools/lib/error.h	2005-05-20 16:03:42.000000000 -0500
>>   +++ gettext-0.14.6-patched/gettext-tools/lib/error.h	2007-01-13 20:57:24.422168053 -0600
>> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
>> index 62420b7..67b0a5a 100644
>> --- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
>> +++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
>> @@ -2,6 +2,8 @@
>>   #
>>   # Commented by: Saul Wold<saul.wold@intel.com>
>>
>> +Upstream-Status: Pending
>> +
>>   Index: gettext-0.16.1/gettext-runtime/intl/Makefile.in
>>   ===================================================================
>>   --- gettext-0.16.1.orig/gettext-runtime/intl/Makefile.in	2006-11-27 09:02:00.000000000 -0800
>> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
>> index ef57dc2..82ed04d 100644
>> --- a/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
>> +++ b/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
>> @@ -2,6 +2,8 @@ This patch hardcodes in version 0.17 for the GETTEXT_MACRO_VERSION,
>>   the version check is only part of 0.17 and will not affect any 0.16.1
>>   operations
>>
>> +Upstream-Status: Inappropriate [configuration]
>> +
>>   Signed-off-by: Saul Wold<sgw@linux.intel.com>
>>
>>   Index: gettext-0.16.1/gettext-runtime/m4/po.m4
>> diff --git a/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch b/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
>> index 2b805c9..3cbe867 100644
>> --- a/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
>> +++ b/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
>> @@ -2,6 +2,8 @@
>>   #
>>   # Commented by: Saul Wold<saul.wold@intel.com>
>>
>> +Upstream-Status: Inappropriate [configuration]
>> +
>>   Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4
>>   ===================================================================
>>   --- gettext-0.16.1.orig/autoconf-lib-link/m4/lib-link.m4	2006-11-27 09:01:58.000000000 -0800
>> diff --git a/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch b/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
>> deleted file mode 100644
>> index 7b3880b..0000000
>> --- a/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
>> +++ /dev/null
>> @@ -1,96 +0,0 @@
>> -Index: gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h
>> -===================================================================
>> ---- gettext-0.17.orig/gettext-runtime/gnulib-lib/wchar.in.h	2008-07-29 14:51:52.336394636 +0200
>> -+++ gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h	2008-07-29 14:52:25.546430195 +0200
>> -@@ -1,6 +1,6 @@
>> - /* A substitute for ISO C99<wchar.h>, for platforms that have issues.
>> -
>> --   Copyright (C) 2007 Free Software Foundation, Inc.
>> -+   Copyright (C) 2007-2008 Free Software Foundation, Inc.
>> -
>> -    This program is free software; you can redistribute it and/or modify
>> -    it under the terms of the GNU General Public License as published by
>> -@@ -26,6 +26,14 @@
>> -  * the declaration of wcwidth().
>> -  */
>> -
>> -+#ifdef __need_mbstate_t
>> -+/* Special invocation convention inside uClibc header files.  */
>> -+
>> -+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
>> -+
>> -+#else
>> -+/* Normal invocation convention.  */
>> -+
>> - #ifndef _GL_WCHAR_H
>> -
>> - /* Tru64 with Desktop Toolkit C has a bug:<stdio.h>  must be included before
>> -@@ -80,3 +88,4 @@
>> -
>> - #endif /* _GL_WCHAR_H */
>> - #endif /* _GL_WCHAR_H */
>> -+#endif
>> -Index: gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h
>> -===================================================================
>> ---- gettext-0.17.orig/gettext-tools/gnulib-lib/wchar.in.h	2008-07-29 14:52:03.886393956 +0200
>> -+++ gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h	2008-07-29 14:52:50.876388000 +0200
>> -@@ -1,6 +1,6 @@
>> - /* A substitute for ISO C99<wchar.h>, for platforms that have issues.
>> -
>> --   Copyright (C) 2007 Free Software Foundation, Inc.
>> -+   Copyright (C) 2007-2008 Free Software Foundation, Inc.
>> -
>> -    This program is free software; you can redistribute it and/or modify
>> -    it under the terms of the GNU General Public License as published by
>> -@@ -26,6 +26,14 @@
>> -  * the declaration of wcwidth().
>> -  */
>> -
>> -+#ifdef __need_mbstate_t
>> -+/* Special invocation convention inside uClibc header files.  */
>> -+
>> -+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
>> -+
>> -+#else
>> -+/* Normal invocation convention.  */
>> -+
>> - #ifndef _GL_WCHAR_H
>> -
>> - /* Tru64 with Desktop Toolkit C has a bug:<stdio.h>  must be included before
>> -@@ -80,3 +88,4 @@
>> -
>> - #endif /* _GL_WCHAR_H */
>> - #endif /* _GL_WCHAR_H */
>> -+#endif
>> -Index: gettext-0.17/gettext-tools/libgettextpo/wchar.in.h
>> -===================================================================
>> ---- gettext-0.17.orig/gettext-tools/libgettextpo/wchar.in.h	2008-07-29 14:51:58.826395009 +0200
>> -+++ gettext-0.17/gettext-tools/libgettextpo/wchar.in.h	2008-07-29 14:52:38.609723575 +0200
>> -@@ -1,6 +1,6 @@
>> - /* A substitute for ISO C99<wchar.h>, for platforms that have issues.
>> -
>> --   Copyright (C) 2007 Free Software Foundation, Inc.
>> -+   Copyright (C) 2007-2008 Free Software Foundation, Inc.
>> -
>> -    This program is free software; you can redistribute it and/or modify
>> -    it under the terms of the GNU General Public License as published by
>> -@@ -26,6 +26,14 @@
>> -  * the declaration of wcwidth().
>> -  */
>> -
>> -+#ifdef __need_mbstate_t
>> -+/* Special invocation convention inside uClibc header files.  */
>> -+
>> -+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
>> -+
>> -+#else
>> -+/* Normal invocation convention.  */
>> -+
>> - #ifndef _GL_WCHAR_H
>> -
>> - /* Tru64 with Desktop Toolkit C has a bug:<stdio.h>  must be included before
>> -@@ -80,3 +88,4 @@
>> -
>> - #endif /* _GL_WCHAR_H */
>> - #endif /* _GL_WCHAR_H */
>> -+#endif
>> diff --git a/meta/recipes-core/gettext/gettext-0.17/autotools.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch
>> similarity index 98%
>> rename from meta/recipes-core/gettext/gettext-0.17/autotools.patch
>> rename to meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch
>> index 9f16b18..e4545fd 100644
>> --- a/meta/recipes-core/gettext/gettext-0.17/autotools.patch
>> +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch
>> @@ -1,3 +1,5 @@
>> +Upstream-Status: Inappropriate [configuration]
>> +
>>   Index: gettext-0.17/gettext-runtime/man/Makefile.am
>>   ===================================================================
>>   --- gettext-0.17.orig/gettext-runtime/man/Makefile.am	2007-10-07 21:37:36.000000000 +0200
>> diff --git a/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch
>> similarity index 96%
>> rename from meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch
>> rename to meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch
>> index 0f67cd0..4a1b2c6 100644
>> --- a/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch
>> +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch
>> @@ -1,3 +1,5 @@
>> +Upstream-Status: Pending
>> +
>>   Index: gettext-0.17/gettext-tools/libgettextpo/error.h
>>   ===================================================================
>>   --- gettext-0.17.orig/gettext-tools/libgettextpo/error.h	2008-07-27 21:16:25.561115527 +0200
>> diff --git a/meta/recipes-core/gettext/gettext-0.17/m4fix.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
>> similarity index 98%
>> rename from meta/recipes-core/gettext/gettext-0.17/m4fix.patch
>> rename to meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
>> index a02457f..34930d1 100644
>> --- a/meta/recipes-core/gettext/gettext-0.17/m4fix.patch
>> +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
>> @@ -22,6 +22,8 @@ Ralf
>>           * m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or
>>           newer.
>>
>> +Upstream-Status: Pending
>> +
>>   Index: gettext-0.17/gettext-tools/gnulib-m4/openmp.m4
>>   ===================================================================
>>   --- gettext-0.17.orig/gettext-tools/gnulib-m4/openmp.m4	2010-02-01 10:51:00.437788710 +0000
>> diff --git a/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch
>> similarity index 96%
>> rename from meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch
>> rename to meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch
>> index 111714b..a04a32d 100644
>> --- a/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch
>> +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch
>> @@ -1,3 +1,5 @@
>> +Upstream-Status: Pending
>> +
>>   Index: gettext-0.17/gettext-tools/src/write-catalog.c
>>   ===================================================================
>>   --- gettext-0.17.orig/gettext-tools/src/write-catalog.c	2008-10-16 15:18:16.000000000 +0200
>> diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch
>> new file mode 100644
>> index 0000000..34e3f1a
>> --- /dev/null
>> +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch
>> @@ -0,0 +1,74 @@
>> +Upstream-Status: Pending
>> +
>> +Index: gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h
>> +===================================================================
>> +--- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/wchar.in.h	2010-05-08 18:36:16.000000000 -0700
>> ++++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h	2011-05-25 16:28:38.656220937 -0700
>> +@@ -48,6 +48,14 @@
>> + #else
>> + /* Normal invocation convention.  */
>> +
>> ++#ifdef __need_mbstate_t
>> ++/* Special invocation convention inside uClibc header files.  */
>> ++
>> ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
>> ++
>> ++#else
>> ++/* Normal invocation convention.  */
>> ++
>> + #ifndef _GL_WCHAR_H
>> +
>> + #define _GL_ALREADY_INCLUDING_WCHAR_H
>> +@@ -426,3 +434,4 @@
>> + #endif /* _GL_WCHAR_H */
>> + #endif /* _GL_WCHAR_H */
>> + #endif
>> ++#endif
>> +Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h
>> +===================================================================
>> +--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/wchar.in.h	2010-05-24 02:42:48.000000000 -0700
>> ++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h	2011-05-25 16:28:15.717360791 -0700
>> +@@ -48,6 +48,14 @@
>> + #else
>> + /* Normal invocation convention.  */
>> +
>> ++#ifdef __need_mbstate_t
>> ++/* Special invocation convention inside uClibc header files.  */
>> ++
>> ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
>> ++
>> ++#else
>> ++/* Normal invocation convention.  */
>> ++
>> + #ifndef _GL_WCHAR_H
>> +
>> + #define _GL_ALREADY_INCLUDING_WCHAR_H
>> +@@ -426,3 +434,4 @@
>> + #endif /* _GL_WCHAR_H */
>> + #endif /* _GL_WCHAR_H */
>> + #endif
>> ++#endif
>> +Index: gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h
>> +===================================================================
>> +--- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/wchar.in.h	2010-05-08 18:38:04.000000000 -0700
>> ++++ gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h	2011-05-25 16:28:26.998721087 -0700
>> +@@ -48,6 +48,14 @@
>> + #else
>> + /* Normal invocation convention.  */
>> +
>> ++#ifdef __need_mbstate_t
>> ++/* Special invocation convention inside uClibc header files.  */
>> ++
>> ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
>> ++
>> ++#else
>> ++/* Normal invocation convention.  */
>> ++
>> + #ifndef _GL_WCHAR_H
>> +
>> + #define _GL_ALREADY_INCLUDING_WCHAR_H
>> +@@ -426,3 +434,4 @@
>> + #endif /* _GL_WCHAR_H */
>> + #endif /* _GL_WCHAR_H */
>> + #endif
>> ++#endif
>> diff --git a/meta/recipes-core/gettext/gettext_0.17.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
>> similarity index 90%
>> rename from meta/recipes-core/gettext/gettext_0.17.bb
>> rename to meta/recipes-core/gettext/gettext_0.18.1.1.bb
>> index ce5fc3e..fe1b266 100644
>> --- a/meta/recipes-core/gettext/gettext_0.17.bb
>> +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
>> @@ -5,24 +5,21 @@ SECTION = "libs"
>>   LICENSE = "GPLv3"
>>   LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>>
>> -PR = "r5"
>> +PR = "r0"
>>   DEPENDS = "gettext-native virtual/libiconv ncurses expat"
>>   DEPENDS_virtclass-native = ""
>>   PROVIDES = "virtual/libintl virtual/gettext"
>>   PROVIDES_virtclass-native = ""
>>   CONFLICTS_${PN} = "proxy-libintl"
>>   SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
>> -           file://autotools.patch;patch=1 \
>> -           file://wchar-uclibc.patch;patch=1 \
>> -           file://use_open_properly.patch;patch=1 \
>> -           file://m4fix.patch;patch=1 \
>> +           file://wchar-uclibc.patch \
>>             "
>>
>>   SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
>>   SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1"
>>
>> -SRC_URI[md5sum] = "58a2bc6d39c0ba57823034d55d65d606"
>> -SRC_URI[sha256sum] = "209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba"
>> +SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89"
>> +SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9"
>>
>>   #PARALLEL_MAKE = ""
>>
>> @@ -39,8 +36,7 @@ EXTRA_OECONF += "--without-lispdir \
>>                    --without-emacs \
>>                   "
>>
>> -acpaths = '-I ${S}/autoconf-lib-link/m4/ \
>> -           -I ${S}/gettext-runtime/m4 \
>> +acpaths = '-I ${S}/gettext-runtime/m4 \
>>              -I ${S}/gettext-tools/m4'
>>
>>
>
>
> I assume you did a complete build from scratch for testing gettext
> upgrade that is using no sstate.

Clean no sstate.

Sau!

> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.11 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iEYEARECAAYFAk3l3QgACgkQuwUzVZGdMxRpEQCfRyTZL6AwQfU7OL4Ee6Nbpt4C
> gvgAnjOjf/0T7XBPOmyD5i8OCqm0x5Nd
> =PO6E
> -----END PGP SIGNATURE-----
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [CONSOLIDATED PULL 12/32] libiconv: update to 1.13.1

[Saul Wold]

On 05/31/2011 11:28 PM, Khem Raj wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 05/31/2011 11:21 PM, Saul Wold wrote:
>> Add Upstream-Status tags to patches
>>
>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>> ---
>>   .../autoconf.patch                                 |    2 ++
>>   .../shared_preloadable_libiconv_linux.patch        |    2 ++
>>   .../{libiconv_1.11.1.bb =>  libiconv_1.13.1.bb}     |    0
>>   3 files changed, 4 insertions(+), 0 deletions(-)
>>   rename meta/recipes-support/libiconv/{libiconv-1.11.1 =>  libiconv-1.13.1}/autoconf.patch (98%)
>>   rename meta/recipes-support/libiconv/{libiconv-1.11.1 =>  libiconv-1.13.1}/shared_preloadable_libiconv_linux.patch (98%)
>>   rename meta/recipes-support/libiconv/{libiconv_1.11.1.bb =>  libiconv_1.13.1.bb} (100%)
>>
Richard,

Please drop this patch from the series, there more wrong with it, I got 
caught with a "virtual/libiconv", I thought it built, but it did not.

Sorry about this one.
	
Sau!

>> diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch b/meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
>> similarity index 98%
>> rename from meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
>> rename to meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
>> index 2b24894..3cbf549 100644
>> --- a/meta/recipes-support/libiconv/libiconv-1.11.1/autoconf.patch
>> +++ b/meta/recipes-support/libiconv/libiconv-1.13.1/autoconf.patch
>> @@ -2,6 +2,8 @@ It adds the variables that are needed
>>   for autoconf 2.65 to reconfigure libiconv and defines the m4 macros
>>   directory. Its imported from OE.
>>
>> +Upstream-Status: Pending
>> +
>>   Signed-off-by: Khem Raj<raj.khem@gmail.com>
>>
>>   Index: libiconv-1.11.1/configure.ac
>> diff --git a/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch b/meta/recipes-support/libiconv/libiconv-1.13.1/shared_preloadable_libiconv_linux.patch
>> similarity index 98%
>> rename from meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
>> rename to meta/recipes-support/libiconv/libiconv-1.13.1/shared_preloadable_libiconv_linux.patch
>> index a913dad..fb07f73 100644
>> --- a/meta/recipes-support/libiconv/libiconv-1.11.1/shared_preloadable_libiconv_linux.patch
>> +++ b/meta/recipes-support/libiconv/libiconv-1.13.1/shared_preloadable_libiconv_linux.patch
>> @@ -4,6 +4,8 @@ Its more enforced by libtool 2.4. I have not checked it with older libtool
>>   libiconv 1.11.x is relatively old release and libtool 2.4 did not exist when it
>>   was released these kind of problem are more likely
>>
>> +Upstream-Status: Pending
>> +
>>   Signed-off-by: Khem Raj<raj.khem@gmail.com>
>>
>>   Index: libiconv-1.11.1/lib/Makefile.in
>> diff --git a/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/meta/recipes-support/libiconv/libiconv_1.13.1.bb
>> similarity index 100%
>> rename from meta/recipes-support/libiconv/libiconv_1.11.1.bb
>> rename to meta/recipes-support/libiconv/libiconv_1.13.1.bb
>
> FWIW 1.11.1 was last GPLv2 release. So I think you can add 1.13.1 but do
> not replace 1.11.1 with it.
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.11 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iEYEARECAAYFAk3l3BcACgkQuwUzVZGdMxS/0QCaAkbu4wuI/ZJ72mK7zlD3lP8F
> vlMAniBrJK4jCDvDlqgQtXzUwFVQju/R
> =ZlZ3
> -----END PGP SIGNATURE-----
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [CONSOLIDATED PULL 24/32] bitbake.conf: Create static-dev pacakge for static libraries

[Richard Purdie]

On Tue, 2011-05-31 at 23:21 -0700, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/conf/bitbake.conf |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index de94316..4722eb0 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -248,13 +248,18 @@ FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
>  SECTION_${PN}-doc = "doc"
>  
>  FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
> -                ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
> +                ${libdir}/*.o ${libdir}/pkgconfig \
>                  ${datadir}/pkgconfig ${datadir}/aclocal \
>                  ${base_libdir}/*.a ${base_libdir}/*.o"
>  SECTION_${PN}-dev = "devel"
>  ALLOW_EMPTY_${PN}-dev = "1"
>  RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})"
>  
> +FILES_${PN}-static-dev = "${libdir}/*.a ${base_libdir}/*.a"
> +SECTION_${PN}-static-dev = "devel"
> +ALLOW_EMPTY_${PN}-static-dev = "1"

No need for the ALLOW_EMPTY here. The dependencies of -dev packages are
important but it makes no sense for static dv packages.

I've also a slight preference for "staticdev" just to make these clearly
different from -dev packages.

Cheers,

Richard

> +RDEPENDS_${PN}-static-dev = "${PN} (= ${EXTENDPV})"
> +
>  DOTDEBUG-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
>              ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \
>              ${libdir}/matchbox-panel/.debug /usr/src/debug"

Re: [CONSOLIDATED PULL 00/32] 1-June-2011 Request

[Richard Purdie]

On Tue, 2011-05-31 at 23:21 -0700, Saul Wold wrote:
> This contains a few patches from the community, along with a batch of updates
> and bug fixes from me. 
> 
> This includes the patch I submitted for the beagleboard qt4-x11-free failure.
> 
> This has been built via world.
> 
> The following changes since commit 26e5e5feb695864b11e47e24017e254c28f14494:
> 
>   Improve handling of 'all' architecture recipes and their interaction with sstate (2011-05-31 12:56:38 +0100)
> 
> are available in the git repository at:
>   git://git.openembedded.org/openembedded-core-contrib sgw/stage
>   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

I merged this apart from:


> Saul Wold (27):
>   libiconv: update to 1.13.1

Due to feedback from Khem.

>   update-alternatives-dpkg update to 1.16.0.3
>   chkconfig: update to 1.3.52
>   mailx: update to 12.5
>   mc: update to 4.7.5.2
>   msmtp: update tof 1.4.24
>   gthumb: update to 2.12.3
>   alsa-tools: update to 1.0.24.1
>   qmmp: update to 0.5.1
>   rxvt-unicode: update to 9.11
>   gnutls: update to 2.12.5
>   distro tracking: updates
>   bitbake.conf: Create static-dev pacakge for static libraries

Due to feedback from me.

>   tcmode-default: disable ARMv7 Optimization for qt4-x11-free

Again, I'm not sure this is the right approach and it sounds like there
is a patch around for this issue for gcc.

Cheers,

Richard

Re: [CONSOLIDATED PULL 24/32] bitbake.conf: Create static-dev pacakge for static libraries

[Phil Blundell]

On Wed, 2011-06-01 at 18:29 +0100, Richard Purdie wrote:
> I've also a slight preference for "staticdev" just to make these clearly
> different from -dev packages.

Agreed.  I think even "-static" might be better still.

p.

Re: [CONSOLIDATED PULL 24/32] bitbake.conf: Create static-dev pacakge for static libraries

[Koen Kooi]

Op 1 jun 2011, om 20:19 heeft Phil Blundell het volgende geschreven:

> On Wed, 2011-06-01 at 18:29 +0100, Richard Purdie wrote:
>> I've also a slight preference for "staticdev" just to make these clearly
>> different from -dev packages.
> 
> Agreed.  I think even "-static" might be better still.

That's what we did in OE and it caused some troubles in the busybox-static and mplayer-static cases. But that were the only ones I encountered.

regards,

Koen 

Re: [CONSOLIDATED PULL 22/32] gnutls: update to 2.12.5

[Otavio Salvador]

Hello,

After updating it, gnutls started failing to compile due missing
dlopen and like.

Cheers,

On Wed, Jun 1, 2011 at 06:21, Saul Wold <sgw@linux.intel.com> wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  .../gnutls/gnutls-2.10.4/configure-fix.patch       |   66 -------------------
>  .../gnutls/gnutls-2.12.5/configure-fix.patch       |   67 ++++++++++++++++++++
>  .../gnutls-openssl.patch                           |    0
>  .../gnutls-texinfo-euro.patch                      |    0
>  meta/recipes-support/gnutls/gnutls.inc             |    6 +-
>  meta/recipes-support/gnutls/gnutls_2.10.4.bb       |   10 ---
>  meta/recipes-support/gnutls/gnutls_2.12.5.bb       |    9 +++
>  7 files changed, 79 insertions(+), 79 deletions(-)
>  delete mode 100644 meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch
>  create mode 100644 meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch
>  rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.5}/gnutls-openssl.patch (100%)
>  rename meta/recipes-support/gnutls/{gnutls-2.10.4 => gnutls-2.12.5}/gnutls-texinfo-euro.patch (100%)
>  delete mode 100644 meta/recipes-support/gnutls/gnutls_2.10.4.bb
>  create mode 100644 meta/recipes-support/gnutls/gnutls_2.12.5.bb
>
> diff --git a/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch
> deleted file mode 100644
> index 2ce3f55..0000000
> --- a/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -Upstream-Status: Inappropriate [distribution]
> -
> -rebased from original configure_madness.patch
> -
> -libtasn1 provides an .pc file in upstream,
> -and a libgcrypt.pc is added in libgcrypt recipe,
> -so use Requires.private for these two.
> -
> -against 2.8.6
> -
> -07/02/2010 - qhe
> -
> ----
> -diff --git a/lib/configure.ac b/lib/configure.ac
> -index 80d3375..1a486f7 100644
> ---- a/lib/configure.ac
> -+++ b/lib/configure.ac
> -@@ -81,8 +81,8 @@ fi
> -
> - lgl_INIT
> -
> --LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
> --LIBGNUTLS_CFLAGS="-I${includedir}"
> -+LIBGNUTLS_LIBS="-lgnutls $LIBS"
> -+LIBGNUTLS_CFLAGS=""
> - AC_SUBST(LIBGNUTLS_LIBS)
> - AC_SUBST(LIBGNUTLS_CFLAGS)
> -
> -diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
> -index 3b01c17..de31469 100644
> ---- a/lib/gnutls.pc.in
> -+++ b/lib/gnutls.pc.in
> -@@ -20,6 +20,6 @@ Name: GnuTLS
> - Description: Transport Security Layer implementation for the GNU system
> - URL: http://www.gnu.org/software/gnutls/
> - Version: @VERSION@
> -+Requires.private: libgcrypt, libtasn1
> - Libs: -L${libdir} -lgnutls
> --Libs.private: @LIBGNUTLS_LIBS@ @LTLIBTASN1@
> - Cflags: -I${includedir}
> -diff --git a/libextra/configure.ac b/libextra/configure.ac
> -index c08e73f..3313886 100644
> ---- a/libextra/configure.ac
> -+++ b/libextra/configure.ac
> -@@ -40,8 +40,8 @@ LIBGNUTLS_EXTRA_HOOKS
> -
> - xgl_INIT
> -
> --LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
> --LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
> -+LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
> -+LIBGNUTLS_EXTRA_CFLAGS=""
> - AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
> - AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
> -
> -diff --git a/libextra/gnutls-extra.pc.in b/libextra/gnutls-extra.pc.in
> -index 9e7b8f6..e228ec9 100644
> ---- a/libextra/gnutls-extra.pc.in
> -+++ b/libextra/gnutls-extra.pc.in
> -@@ -21,5 +21,5 @@ URL: http://www.gnu.org/software/gnutls/
> - Requires: gnutls
> - Version: @VERSION@
> - Libs: -L${libdir} -lgnutls-extra
> --Libs.private: @LIBGNUTLS_EXTRA_LIBS@
> -+Libs.private: -llzo2
> - Cflags: -I${includedir}
> diff --git a/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch
> new file mode 100644
> index 0000000..e6f9785
> --- /dev/null
> +++ b/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch
> @@ -0,0 +1,67 @@
> +Upstream-Status: Inappropriate [distribution]
> +
> +rebased from original configure_madness.patch
> +
> +libtasn1 provides an .pc file in upstream,
> +and a libgcrypt.pc is added in libgcrypt recipe,
> +so use Requires.private for these two.
> +
> +against 2.8.6
> +
> +07/02/2010 - qhe
> +
> +---
> +Index: gnutls-2.12.5/lib/configure.ac
> +===================================================================
> +--- gnutls-2.12.5.orig/lib/configure.ac        2011-05-11 00:05:33.000000000 -0700
> ++++ gnutls-2.12.5/lib/configure.ac     2011-05-25 19:45:23.721180103 -0700
> +@@ -96,8 +96,8 @@
> + dnl for pakchois
> + AC_LIB_HAVE_LINKFLAGS(dl,, [#include <dlfcn.h>], [dlclose (0);])
> +
> +-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
> +-LIBGNUTLS_CFLAGS="-I${includedir}"
> ++LIBGNUTLS_LIBS="-lgnutls $LIBS"
> ++LIBGNUTLS_CFLAGS=""
> + AC_SUBST(LIBGNUTLS_LIBS)
> + AC_SUBST(LIBGNUTLS_CFLAGS)
> +
> +Index: gnutls-2.12.5/lib/gnutls.pc.in
> +===================================================================
> +--- gnutls-2.12.5.orig/lib/gnutls.pc.in        2011-04-23 08:00:07.000000000 -0700
> ++++ gnutls-2.12.5/lib/gnutls.pc.in     2011-05-25 19:50:11.926102288 -0700
> +@@ -19,7 +19,6 @@
> + Description: Transport Security Layer implementation for the GNU system
> + URL: http://www.gnu.org/software/gnutls/
> + Version: @VERSION@
> ++Requires.private: libgcrypt, libtasn1
> + Libs: -L${libdir} -lgnutls
> +-Libs.private: @LTLIBGCRYPT@ @NETTLE_LIBS@
> +-@GNUTLS_REQUIRES_PRIVATE@
> + Cflags: -I${includedir}
> +Index: gnutls-2.12.5/libextra/configure.ac
> +===================================================================
> +--- gnutls-2.12.5.orig/libextra/configure.ac   2011-05-11 00:05:31.000000000 -0700
> ++++ gnutls-2.12.5/libextra/configure.ac        2011-05-25 19:45:23.722186801 -0700
> +@@ -41,8 +41,8 @@
> +
> + xgl_INIT
> +
> +-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
> +-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
> ++LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
> ++LIBGNUTLS_EXTRA_CFLAGS=""
> + AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
> + AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
> +
> +Index: gnutls-2.12.5/libextra/gnutls-extra.pc.in
> +===================================================================
> +--- gnutls-2.12.5.orig/libextra/gnutls-extra.pc.in     2011-04-07 17:30:45.000000000 -0700
> ++++ gnutls-2.12.5/libextra/gnutls-extra.pc.in  2011-05-25 19:45:23.722186801 -0700
> +@@ -22,5 +22,5 @@
> + Requires: gnutls
> + Version: @VERSION@
> + Libs: -L${libdir} -lgnutls-extra
> +-Libs.private: @LIBGNUTLS_EXTRA_LIBS@
> ++Libs.private: -llzo2
> + Cflags: -I${includedir}
> diff --git a/meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch b/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch
> similarity index 100%
> rename from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch
> rename to meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch
> diff --git a/meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch b/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch
> similarity index 100%
> rename from meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch
> rename to meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch
> diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
> index fd77af4..9f8d81b 100644
> --- a/meta/recipes-support/gnutls/gnutls.inc
> +++ b/meta/recipes-support/gnutls/gnutls.inc
> @@ -21,9 +21,9 @@ inherit autotools binconfig pkgconfig gettext
>
>  EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \
>               --with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \
> -              --with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \
> -              --with-libz-prefix=${STAGING_DIR_HOST}${prefix} --with-lzo --disable-guile"
> -
> +              --with-libgcrypt --with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \
> +              --with-lzo --disable-guile \
> +              "
>  do_configure_prepend() {
>        for dir in . lib libextra; do
>                rm ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4
> diff --git a/meta/recipes-support/gnutls/gnutls_2.10.4.bb b/meta/recipes-support/gnutls/gnutls_2.10.4.bb
> deleted file mode 100644
> index cc2fa27..0000000
> --- a/meta/recipes-support/gnutls/gnutls_2.10.4.bb
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -require gnutls.inc
> -
> -PR = "${INC_PR}.0"
> -
> -SRC_URI += "file://gnutls-openssl.patch \
> -            file://gnutls-texinfo-euro.patch \
> -            file://configure-fix.patch"
> -
> -SRC_URI[md5sum] = "4e1517084018a8b1fdc96daabea40528"
> -SRC_URI[sha256sum] = "b8bfe36450fe671e99db5ff1e44e6b65fda8a79cacd9e77d550eff7da3745fc8"
> diff --git a/meta/recipes-support/gnutls/gnutls_2.12.5.bb b/meta/recipes-support/gnutls/gnutls_2.12.5.bb
> new file mode 100644
> index 0000000..b27a065
> --- /dev/null
> +++ b/meta/recipes-support/gnutls/gnutls_2.12.5.bb
> @@ -0,0 +1,9 @@
> +require gnutls.inc
> +
> +PR = "r0"
> +
> +SRC_URI += "file://gnutls-openssl.patch \
> +            file://configure-fix.patch"
> +
> +SRC_URI[md5sum] = "2d0bd5ae11534074fcd78da6ea384e64"
> +SRC_URI[sha256sum] = "bf263880f327ac34a561d8e66b5a729cbe33eea56728bfed3406ff2898448b60"
> --
> 1.7.3.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>



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

Re: [CONSOLIDATED PULL 24/32] bitbake.conf: Create static-dev pacakge for static libraries

[Saul Wold]

On 06/01/2011 11:27 AM, Koen Kooi wrote:
>
> Op 1 jun 2011, om 20:19 heeft Phil Blundell het volgende geschreven:
>
>> On Wed, 2011-06-01 at 18:29 +0100, Richard Purdie wrote:
>>> I've also a slight preference for "staticdev" just to make these clearly
>>> different from -dev packages.
>>
>> Agreed.  I think even "-static" might be better still.
>
> That's what we did in OE and it caused some troubles in the busybox-static and mplayer-static cases. But that were the only ones I encountered.
>
What about -staticlibs since that what they the packages actaully contain?

Sau!
> regards,
>
> Koen
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>