[PATCH 00/21] remove and fixes for low version recipes

[PATCH 00/21] remove and fixes for low version recipes

[Robert Yang]

These patches remove several low native version since they don't work
any more or we don't need them. There are still the following native
versions, they work well, but I think we can remove: (need verify one by
one if remove)

coreutils-native_6.9
db-native_5.3.28
gdbm-native_1.8.3
elfutils-native_0.148
findutils-native_4.2.31
gnu-config-native_20120814
gperf-native_3.0.3
inputproto-native_2.3.1
libxcb-native_1.11
libxext-native_1.3.3
mtools-native_3.9.9
pkgconfig-native_0.28
qemu-native_2.2.0
readline-native_5.2
xcb-proto-native_1.11

There are also subversion-native_1.6.15 and texinfo-native_4.8, I think
that we need keep them since subversion-native_1.6.15 and 1.8.10's
checkout format are different as Martin said. And for
texinfo-native_4.8, the target texinfo_4.8 needs it.

I'd like to remov them in later patches if no objections.

BTW, do we need keep nativesdk's GPLv2 version if there is a GPLv3,
please? If no, I will remove the nativesdk ones, too, we have them
following low nativesdk versions:

nativesdk-db_5.3.28
nativesdk-gdbm_1.8.3
nativesdk-elfutils_0.148
nativesdk-findutils_4.2.31
nativesdk-gnu-config_20120814
nativesdk-inputproto_2.3.1
nativesdk-libxcb_1.11
nativesdk-libxext_1.3.3
nativesdk-mtools_3.9.9
nativesdk-pkgconfig_0.28
nativesdk-qemu_2.2.0
nativesdk-readline_5.2
nativesdk-xcb-proto_1.11

// Robert

The following changes since commit 818bcba063819b80d5a99827c5adb8ee157dbfe1:

  build-appliance-image: Update to master head revision (2015-02-02 14:57:40 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/low_version
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/low_version

Robert Yang (21):
  which 2.18: fix SRC_URI
  matchbox-wm 1.2: remove it
  matchbox-desktop: remove 0.9.1 and 2.0 version
  xf86-video-intel 2.21.15: remove it
  groff 1.18.1.4: fix HOMEPAGE and SRC_URI
  findutils 4.2.31: fix SRC_URI
  libidn 0.6.14: fixed installed-vs-shipped
  m4 1.4.9: fix unknown-configure-option
  patch 2.5.9: fix unknown-configure-option
  gzip 1.3.12: a few fixes
  grep 2.5.1a: fix unknown-configure-option
  tar 1.17: fix unknown-configure-option
  coreutils 6.9: fix unknown-configure-option
  rxvt-unicode: fix for 9.20 and 9.21
  subversion 1.6.15: fix unknown-configure-option
  meta: fix build with gettext 0.16.1
  elfutils 0.148: use BPN in SRC_URI
  coreutils 6.9: disable native
  gettext 0.6.1: disable native
  bison 2.3: disable native
  m4-native 1.4.9: remove it

 .../connman/connman-gnome_0.7.bb                   |    2 +-
 meta/recipes-core/coreutils/coreutils_6.9.bb       |   14 ++---
 meta/recipes-core/gettext/gettext_0.16.1.bb        |    4 +-
 meta/recipes-devtools/bison/bison_2.3.bb           |   15 +----
 meta/recipes-devtools/elfutils/elfutils_0.148.bb   |    2 +-
 meta/recipes-devtools/m4/m4-1.4.17.inc             |    2 +
 meta/recipes-devtools/m4/m4-native_1.4.9.bb        |   12 ----
 meta/recipes-devtools/m4/m4.inc                    |    1 -
 meta/recipes-devtools/patch/patch.inc              |    3 -
 .../subversion/subversion_1.6.15.bb                |    2 +-
 .../recipes-extended/findutils/findutils_4.2.31.bb |    7 ++-
 meta/recipes-extended/grep/grep_2.5.1a.bb          |    2 +-
 meta/recipes-extended/groff/groff_1.18.1.4.bb      |    4 +-
 meta/recipes-extended/gzip/gzip.inc                |    6 --
 meta/recipes-extended/gzip/gzip_1.3.12.bb          |   27 +--------
 meta/recipes-extended/gzip/gzip_1.6.bb             |    8 +++
 meta/recipes-extended/libidn/libidn_0.6.14.bb      |    2 +
 meta/recipes-extended/tar/tar.inc                  |    2 -
 meta/recipes-extended/tar/tar_1.28.bb              |    3 +
 meta/recipes-extended/which/which_2.18.bb          |    2 +-
 .../gtk-engines/gtk-engines_2.20.2.bb              |    2 +-
 .../matchbox-wm/matchbox-wm/configure_fix.patch    |   15 -----
 .../matchbox-wm/matchbox-wm/gconf-2.m4             |   39 -------------
 .../matchbox-wm/matchbox-wm_1.2.bb                 |   39 -------------
 meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb   |    2 +-
 ...Map-changes-of-DamageUnregister-API-in-1..patch |   29 ----------
 .../xf86-video-intel/disable-dri2-tests.patch      |   50 ----------------
 .../xorg-driver/xf86-video-intel_2.21.15.bb        |   32 ----------
 .../oprofile/oprofileui-server_git.bb              |    2 +-
 meta/recipes-kernel/oprofile/oprofileui_git.bb     |    2 +-
 meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb      |    2 +-
 .../files/dso_linking_change_build_fix.patch       |   28 ---------
 .../matchbox-desktop/matchbox-desktop_0.9.1.bb     |   27 ---------
 .../matchbox-desktop/matchbox-desktop_2.0.bb       |   15 -----
 meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb         |    2 +-
 meta/recipes-sato/puzzles/oh-puzzles_git.bb        |    2 +-
 meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc    |   58 +++++++++++++++++++
 .../recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb |   61 +-------------------
 .../recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb |   61 +-------------------
 meta/recipes-support/atk/at-spi2-core_2.14.1.bb    |    2 +-
 meta/recipes-support/libfm/libfm-extra_1.2.3.bb    |    2 +-
 meta/recipes-support/libfm/libfm_1.2.3.bb          |    2 +-
 meta/recipes-support/pinentry/pinentry_0.9.0.bb    |    2 +
 43 files changed, 107 insertions(+), 489 deletions(-)
 delete mode 100644 meta/recipes-devtools/m4/m4-native_1.4.9.bb
 delete mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch
 delete mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4
 delete mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
 delete mode 100644 meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
 delete mode 100644 meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb
 delete mode 100644 meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb
 create mode 100644 meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc

-- 
1.7.9.5

[PATCH 01/21] which 2.18: fix SRC_URI

[Robert Yang]

It is the GPLv2+ version, the old SRC_URI is down, use fedoraproject's
repo. Its homepage is also down, but I can't find a new one for it.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/which/which_2.18.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/which/which_2.18.bb b/meta/recipes-extended/which/which_2.18.bb
index fd68520..eb6cc99 100644
--- a/meta/recipes-extended/which/which_2.18.bb
+++ b/meta/recipes-extended/which/which_2.18.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 PR = "r2"
 
-SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \
+SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/which/which-2.18.tar.gz/42d51938e48b91f6e19fabf216f5c3e9/which-${PV}.tar.gz \
            file://fix_name_conflict_group_member.patch \
            file://automake-foreign.patch \
 "
-- 
1.7.9.5

[PATCH 02/21] matchbox-wm 1.2: remove it

[Robert Yang]

It doesn't work:
ERROR: matchbox-wm: Recipe file does not have license file information (LIC_FILES_CHKSUM)
ERROR: Licensing Error: LIC_FILES_CHKSUM does not match, please fix

And there is a matchbox-wm_git.bb, they have the same GPLv2+ license.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../matchbox-wm/matchbox-wm/configure_fix.patch    |   15 --------
 .../matchbox-wm/matchbox-wm/gconf-2.m4             |   39 --------------------
 .../matchbox-wm/matchbox-wm_1.2.bb                 |   39 --------------------
 3 files changed, 93 deletions(-)
 delete mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch
 delete mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4
 delete mode 100644 meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb

diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch b/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch
deleted file mode 100644
index 800bf3b..0000000
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: matchbox-window-manager/configure.ac
-===================================================================
---- matchbox-window-manager.orig/configure.ac	2007-11-14 12:02:28.000000000 +0000
-+++ matchbox-window-manager/configure.ac	2007-11-14 12:18:55.000000000 +0000
-@@ -283,7 +283,7 @@
-     yes)
- 
- 	case "$expat" in
--	  yes)
-+	  yes|"")
- 		EXPAT_LIBS="-lexpat"
- 		;;
- 	    *)
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4 b/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4
deleted file mode 100644
index aca7c7d..0000000
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4
+++ /dev/null
@@ -1,39 +0,0 @@
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl  (i.e. pass to gconftool-2
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl  you should install foo.schemas files
-dnl
-
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-  AC_ARG_WITH(gconf-source, 
-  [  --with-gconf-source=sourceaddress      Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
-
-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-  AC_ARG_WITH(gconf-schema-file-dir, 
-  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
-
-  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-
-  AC_ARG_ENABLE(schemas-install,
-     [  --disable-schemas-install	Disable the schemas installation],
-     [case ${enableval} in
-       yes|no) ;;
-       *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
-      esac])
-  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-])
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
deleted file mode 100644
index 8ee42c3..0000000
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Matchbox lightweight window manager"
-SECTION = "x11/wm"
-LICENSE = "GPLv2.0+"
-DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxcursor xdamage libxrender startup-notification expat"
-PR = "r5"
-
-SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \
-           file://configure_fix.patch \
-           file://kbdconfig \
-           file://gconf-2.m4"
-
-SRC_URI[md5sum] = "3e158dcf57823b55c926d95b245500fb"
-SRC_URI[sha256sum] = "81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff"
-
-S = "${WORKDIR}/matchbox-window-manager-${PV}"
-
-inherit autotools pkgconfig
-
-FILES_${PN} = "${bindir}/* \
-	       ${datadir}/matchbox \
-	       ${sysconfdir}/matchbox \
-	       ${datadir}/themes/blondie/matchbox \
-	       ${datadir}/themes/Default/matchbox \
-	       ${datadir}/themes/MBOpus/matchbox"
-
-EXTRA_OECONF = " --enable-startup-notification \
-                 --disable-xrm \
-                 --enable-expat \
-                 --with-expat-lib=${STAGING_LIBDIR} \
-                 --with-expat-includes=${STAGING_INCDIR}"
-
-
-do_configure_prepend () {
-        cp ${WORKDIR}/gconf-2.m4 ${S}/
-}
-
-do_install_prepend() {
-	install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig
-}
-- 
1.7.9.5

[PATCH 03/21] matchbox-desktop: remove 0.9.1 and 2.0 version

[Robert Yang]

For 0.9.1:
ERROR: matchbox-wm: Recipe file does not have license file information (LIC_FILES_CHKSUM)
ERROR: Licensing Error: LIC_FILES_CHKSUM does not match, please fix

For 2.0:
| /path/to/matchbox-desktop-2.0/configure: line 2488: syntax error near unexpected token `build_old_libs,'
| /path/to/matchbox-desktop-2.0/configure: line 2488: `    _LT_DECL(build_old_libs, enable_static, 0,'

And there is a matchbox-desktop_git.bb which is "GPLv2+ & LGPLv2+", so remove them.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../files/dso_linking_change_build_fix.patch       |   28 --------------------
 .../matchbox-desktop/matchbox-desktop_0.9.1.bb     |   27 -------------------
 .../matchbox-desktop/matchbox-desktop_2.0.bb       |   15 -----------
 3 files changed, 70 deletions(-)
 delete mode 100644 meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
 delete mode 100644 meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb
 delete mode 100644 meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb

diff --git a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
deleted file mode 100644
index 388f51f..0000000
--- a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-after gcc linking has changed, all the libraries must be explicitely specified to for linking. 
-This patch avoids this linking error:
-
-| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-desktop-2.0+svnr2096-r0/matchbox-desktop-2/src'^M
-| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types  -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o matchbox-desktop main.o taku-category-bar.o desktop.o ../libtaku/libtaku.a -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0   -ldbus-1 -lpthread -lrt   -lstartup-notification-1   ../libtaku/libinotify.a^M
-| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: F^A: invalid DSO for symbol `XFree' definition^M
-| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M
-| collect2: ld returned 1 exit status^M
-| make[2]: *** [matchbox-desktop] Error 1
-
-Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: 2011/01/11
-
-Upstream-Status: Accepted
-
-Index: matchbox-desktop-2/configure.ac
-===================================================================
---- matchbox-desktop-2.orig/configure.ac
-+++ matchbox-desktop-2/configure.ac
-@@ -14,7 +14,7 @@ if test x$inotify_support = xyes; then
-         AC_DEFINE(WITH_INOTIFY, [1], [If inotify is enabled])
- fi
- 
--PKG_CHECK_MODULES(GTK, gtk+-2.0)
-+PKG_CHECK_MODULES(GTK, [gtk+-2.0 x11])
- 
- AC_ARG_ENABLE(startup_notification,
-         AC_HELP_STRING([--disable-startup-notification], [disable startup notification support]),
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb
deleted file mode 100644
index 120f086..0000000
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_0.9.1.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "Matchbox Window Manager Desktop"
-LICENSE = "GPLv2.0+"
-DEPENDS = "libmatchbox startup-notification"
-SECTION = "x11/wm"
-
-SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "3335a30b1a1aacfb39f23b505254765c"
-SRC_URI[sha256sum] = "ecb025d3660d80a9850973111b4fdfffaa50b47cbf0c5467b508d28d65146793"
-
-EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
-
-inherit autotools pkgconfig
-
-FILES_${PN} = "${bindir}/* \
-	       ${datadir}/applications \
-	       ${libdir}/matchbox/desktop/*.so \
-	       ${datadir}/matchbox-desktop \
-	       ${datadir}/pixmaps \
-	       ${sysconfdir}/matchbox"
-
-FILES_${PN}-dev += "${libdir}/matchbox-desktop \
-		    ${includedir}/matchbox-desktop \
-                    ${libdir}/matchbox/desktop/*.*a \
-		    ${datadir}/matchbox/desktop/modules/*a"
-
-FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/"
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb
deleted file mode 100644
index c52e7f2..0000000
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "Matchbox Window Manager Desktop"
-LICENSE = "GPLv2.0+"
-DEPENDS = "gtk+ startup-notification"
-SECTION = "x11/wm"
-PR = "r2"
-
-SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/2.0/matchbox-desktop-${PV}.tar.bz2 \
-	file://dso_linking_change_build_fix.patch"
-
-SRC_URI[md5sum] = "b0a4a47130272e2adab4e9feb43a6c9c"
-SRC_URI[sha256sum] = "be33ff0bc8a9b1eee6af360a5118e470e69a6292ecc9e154ec6f349fce5c5f75"
-
-EXTRA_OECONF = "--enable-startup-notification"
-
-inherit autotools pkgconfig
-- 
1.7.9.5

[PATCH 04/21] xf86-video-intel 2.21.15: remove it

[Robert Yang]

It doesn't work:
| checking whether to include DRI1 support... no
| configure: error: DRI1 requested but prerequisites not found

And there is a xf86-video-intel_2.99.917.bb which is MIT-X.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...Map-changes-of-DamageUnregister-API-in-1..patch |   29 ------------
 .../xf86-video-intel/disable-dri2-tests.patch      |   50 --------------------
 .../xorg-driver/xf86-video-intel_2.21.15.bb        |   32 -------------
 3 files changed, 111 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch
deleted file mode 100644
index 3a42d13..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: Backport
-
-From 524a45da56e2a052ffafa3887891caa90ba39f76 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sat, 5 Oct 2013 18:42:24 +0100
-Subject: [PATCH] compat-api: Map changes of DamageUnregister API in 1.14.99.2
-
-Reported-by: Emmanuel Benisty <benisty.e@gmail.com>
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
- src/compat-api.h |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/compat-api.h b/src/compat-api.h
-index 8eb46ef..244a486 100644
---- a/src/compat-api.h
-+++ b/src/compat-api.h
-@@ -162,4 +162,8 @@ static inline void FreePixmap(PixmapPtr pixmap)
- 	if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h)
- #endif
- 
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
-+#define DamageUnregister(d, dd) DamageUnregister(dd)
-+#endif
-+
- #endif
--- 
-1.7.9.5
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch
deleted file mode 100644
index 9e93ca8..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From ec91cfe7e5efdd5e1b1fbb85eea8f07b50e24c4b Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Wed, 11 Sep 2013 21:12:37 +0100
-Subject: [PATCH] test: only build DRI2 tests if DRI2 is enabled
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
----
- test/Makefile.am |   10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index f51967b..18528a9 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -16,9 +16,14 @@ stress_TESTS = \
- 	render-copyarea-size \
- 	render-copy-alphaless \
- 	mixed-stress \
-+	$(NULL)
-+
-+if DRI2
-+stress_TESTS += \
- 	dri2-swap \
- 	dri2-race \
- 	$(NULL)
-+endif
- 
- check_PROGRAMS = $(stress_TESTS)
- 
-@@ -34,9 +39,14 @@ libtest_la_SOURCES = \
- 	test_image.c \
- 	test_log.c \
- 	test_render.c \
-+	$(NULL)
-+
-+if DRI2
-+libtest_la_SOURCES += \
- 	dri2.c \
- 	dri2.h \
- 	$(NULL)
-+endif
- 
- vsync.avi: mkvsync.sh
- 	./mkvsync.sh $@
--- 
-1.7.10.4
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
deleted file mode 100644
index cd8fd63..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-require xorg-driver-video.inc
-
-SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver"
-
-DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \
-chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \
-the driver supports hardware accelerated 3D via the Direct Rendering \
-Infrastructure (DRI)."
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
-
-DEPENDS += "virtual/libx11 drm libpciaccess pixman"
-
-SRC_URI += "file://disable-dri2-tests.patch \
-            file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \
-           "
-
-PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
-
-PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto"
-PACKAGECONFIG[sna] = "--enable-sna,--disable-sna"
-PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa"
-PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev"
-PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
-
-# --enable-kms-only option is required by ROOTLESS_X
-EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}'
-
-COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-
-SRC_URI[md5sum] = "8b646d257ace8197d6ab4e5ddeb8efb2"
-SRC_URI[sha256sum] = "7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc"
-- 
1.7.9.5

[PATCH 05/21] groff 1.18.1.4: fix HOMEPAGE and SRC_URI

[Robert Yang]

The upstream has moved tarball to "old" dir.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/groff/groff_1.18.1.4.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/groff/groff_1.18.1.4.bb b/meta/recipes-extended/groff/groff_1.18.1.4.bb
index 7fbce9b..bd786a3 100644
--- a/meta/recipes-extended/groff/groff_1.18.1.4.bb
+++ b/meta/recipes-extended/groff/groff_1.18.1.4.bb
@@ -2,13 +2,13 @@ SUMMARY = "GNU Troff software"
 DESCRIPTION = "The groff (GNU troff) software is a typesetting package which reads plain text mixed with \
 formatting commands and produces formatted output."
 SECTION = "console/utils"
-HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"
+HOMEPAGE = "http://www.gnu.org/software/groff/"
 LICENSE = "GPLv2"
 PR = "r1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e43fc16fccd8519fba405f0a0ff6e8a3"
 
-SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
+SRC_URI = "${GNU_MIRROR}/${BPN}/old/${BP}.tar.gz \
           file://groff-1.18.1.4-remove-mom.patch;striplevel=1 \
           file://man-local.patch \
           file://mdoc-local.patch \
-- 
1.7.9.5

[PATCH 06/21] findutils 4.2.31: fix SRC_URI

[Robert Yang]

The findutils_4.2.31.bb can't use the SRC_URI in findutils.inc (but
findutils_4.5.14.bb can use it), use the right SRC_URI to fix it.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../recipes-extended/findutils/findutils_4.2.31.bb |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/findutils/findutils_4.2.31.bb b/meta/recipes-extended/findutils/findutils_4.2.31.bb
index 72b657a..7dee018 100644
--- a/meta/recipes-extended/findutils/findutils_4.2.31.bb
+++ b/meta/recipes-extended/findutils/findutils_4.2.31.bb
@@ -4,9 +4,10 @@ PR = "r4"
 
 require findutils.inc
 
-SRC_URI += "file://gnulib-extension.patch \
-            file://findutils_fix_for_automake-1.12.patch \
-            file://findutils-fix-doc-build-error.patch \
+SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
+           file://gnulib-extension.patch \
+           file://findutils_fix_for_automake-1.12.patch \
+           file://findutils-fix-doc-build-error.patch \
            "
 
 SRC_URI[md5sum] = "a0e31a0f18a49709bf5a449867c8049a"
-- 
1.7.9.5

[PATCH 07/21] libidn 0.6.14: fixed installed-vs-shipped

[Robert Yang]

ERROR: QA Issue: libidn: Files/directories were installed but not shipped
  /usr/share/emacs
  /usr/share/emacs/site-lisp
  /usr/share/emacs/site-lisp/idna.el
  /usr/share/emacs/site-lisp/punycode.el [installed-vs-shipped]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/libidn/libidn_0.6.14.bb |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-extended/libidn/libidn_0.6.14.bb b/meta/recipes-extended/libidn/libidn_0.6.14.bb
index 4df1d08..ce7e7b7 100644
--- a/meta/recipes-extended/libidn/libidn_0.6.14.bb
+++ b/meta/recipes-extended/libidn/libidn_0.6.14.bb
@@ -31,3 +31,5 @@ do_install_append() {
 	rm -rf ${D}${libdir}/Libidn.dll
 	rm -rf ${D}${datadir}/emacs
 }
+
+FILES_${PN} += "${datadir}/emacs"
-- 
1.7.9.5

[PATCH 08/21] m4 1.4.9: fix unknown-configure-option

[Robert Yang]

Fixed:
WARNING: QA Issue: m4: configure was passed unrecognised options: --without-libsigsegv-prefix [unknown-configure-option]

The m4 1.4.9 doesn't support --without-libsigsegv-prefix, so move it from m4.inc
to m4-1.4.17.inc.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/m4/m4-1.4.17.inc |    2 ++
 meta/recipes-devtools/m4/m4.inc        |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/m4/m4-1.4.17.inc b/meta/recipes-devtools/m4/m4-1.4.17.inc
index 790678e..3133e99 100644
--- a/meta/recipes-devtools/m4/m4-1.4.17.inc
+++ b/meta/recipes-devtools/m4/m4-1.4.17.inc
@@ -1,5 +1,7 @@
 require m4.inc
 
+EXTRA_OECONF += "--without-libsigsegv-prefix"
+
 LICENSE = "GPLv3"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
diff --git a/meta/recipes-devtools/m4/m4.inc b/meta/recipes-devtools/m4/m4.inc
index e473e23..4a83929 100644
--- a/meta/recipes-devtools/m4/m4.inc
+++ b/meta/recipes-devtools/m4/m4.inc
@@ -5,7 +5,6 @@ GNU M4 also has built-in functions for including files, running shell commands,
 
 inherit autotools texinfo
 
-EXTRA_OECONF += "--without-libsigsegv-prefix"
 EXTRA_OEMAKE += "'infodir=${infodir}'"
 LDFLAGS_prepend_libc-uclibc = " -lrt "
 SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
-- 
1.7.9.5

[PATCH 09/21] patch 2.5.9: fix unknown-configure-option

[Robert Yang]

Fixed:
WARNING: QA Issue: patch: configure was passed unrecognised options: --disable-xattr [unknown-configure-option]

The patch 2.5.9 doesn't support --disable-xattr, there are already
PACKAGECONFIG and PACKAGECONFIG[attr] in patch_2.7.1.bb, so remove them from
patch.inc to fix the problem.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/patch/patch.inc |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta/recipes-devtools/patch/patch.inc b/meta/recipes-devtools/patch/patch.inc
index b49226a..332b97a 100644
--- a/meta/recipes-devtools/patch/patch.inc
+++ b/meta/recipes-devtools/patch/patch.inc
@@ -9,8 +9,5 @@ S = "${WORKDIR}/patch-${PV}"
 
 inherit autotools update-alternatives
 
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[attr] = "--enable-xattr,--disable-xattr,attr"
-
 ALTERNATIVE_${PN} = "patch"
 ALTERNATIVE_PRIORITY = "100"
-- 
1.7.9.5

[PATCH 10/21] gzip 1.3.12: a few fixes

[Robert Yang]

* Let gzip_1.3.12.bb and gzip_1.6.bb use gzip.inc to remove duplicated
  code.
* Fixed for gzip_1.3.12.bb:
  WARNING: QA Issue: gzip requires /bin/bash, but no providers in its RDEPENDS [file-rdeps]
* Remove native extend from gzip_1.3.12.bb, keep gzip_1.6.bb's.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/gzip/gzip.inc       |    6 ------
 meta/recipes-extended/gzip/gzip_1.3.12.bb |   27 +--------------------------
 meta/recipes-extended/gzip/gzip_1.6.bb    |    8 ++++++++
 3 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
index b90856e..94480ec 100644
--- a/meta/recipes-extended/gzip/gzip.inc
+++ b/meta/recipes-extended/gzip/gzip.inc
@@ -4,12 +4,6 @@ project. Mark Adler wrote the decompression part"
 HOMEPAGE = "http://www.gnu.org/software/gzip/"
 SECTION = "console/utils"
 # change to GPLv3+ in 2007/07. Previous GPLv2 version is 1.3.12
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e"
-
-SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz"
-SRC_URI_append_class-target = " file://wrong-path-fix.patch"
 
 inherit autotools texinfo
 
diff --git a/meta/recipes-extended/gzip/gzip_1.3.12.bb b/meta/recipes-extended/gzip/gzip_1.3.12.bb
index 45a33ff..e406282 100644
--- a/meta/recipes-extended/gzip/gzip_1.3.12.bb
+++ b/meta/recipes-extended/gzip/gzip_1.3.12.bb
@@ -1,8 +1,4 @@
-SUMMARY = "Standard GNU compressor"
-DESCRIPTION = "GNU Gzip is a popular data compression program originally written by Jean-loup Gailly for the GNU \
-project. Mark Adler wrote the decompression part"
-HOMEPAGE = "http://www.gnu.org/software/gzip"
-SECTION = "base"
+require gzip.inc
 
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
@@ -17,24 +13,3 @@ SRC_URI[md5sum] = "b5bac2d21840ae077e0217bc5e4845b1"
 SRC_URI[sha256sum] = "3f565be05f7f3d1aff117c030eb7c738300510b7d098cedea796ca8e4cd587af"
 
 PR = "r2"
-
-inherit autotools
-
-do_install_append () {
-	# move files into /bin (FHS)
-	install -d ${D}${base_bindir}
-	mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip
-	mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip
-	mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat
-	mv ${D}${bindir}/uncompress ${D}${base_bindir}/uncompress
-}
-
-inherit update-alternatives
-
-ALTERNATIVE_${PN} = "gzip gunzip zcat"
-ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip"
-ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip"
-ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat"
-ALTERNATIVE_PRIORITY = "100"
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/gzip/gzip_1.6.bb b/meta/recipes-extended/gzip/gzip_1.6.bb
index 9c728df..b347f0b 100644
--- a/meta/recipes-extended/gzip/gzip_1.6.bb
+++ b/meta/recipes-extended/gzip/gzip_1.6.bb
@@ -1,5 +1,13 @@
 require gzip.inc
 
+LICENSE = "GPLv3+"
+
+SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz"
+SRC_URI_append_class-target = " file://wrong-path-fix.patch"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e"
+
 PROVIDES_append_class-native = " gzip-replacement-native"
 NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
 
-- 
1.7.9.5

[PATCH 11/21] grep 2.5.1a: fix unknown-configure-option

[Robert Yang]

Fixed:
WARNING: QA Issue: grep: configure was passed unrecognised options: --disable-ncurses [unknown-configure-option]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/grep/grep_2.5.1a.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb b/meta/recipes-extended/grep/grep_2.5.1a.bb
index 1ce112e..178fc31 100644
--- a/meta/recipes-extended/grep/grep_2.5.1a.bb
+++ b/meta/recipes-extended/grep/grep_2.5.1a.bb
@@ -22,7 +22,7 @@ SRC_URI[sha256sum] = "38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92b
 
 inherit autotools gettext texinfo
 
-EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses"
+EXTRA_OECONF = "--disable-perl-regexp"
 
 CFLAGS += "-D PROTOTYPES"
 do_configure_prepend () {
-- 
1.7.9.5

[PATCH 12/21] tar 1.17: fix unknown-configure-option

[Robert Yang]

WARNING: QA Issue: tar: configure was passed unrecognised options: --without-posix-acls [unknown-configure-option]

tar 1.17 doesn't support --without-posix-acls, move it from tar.inc to
tar_1.28.bb to fix the problem.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/tar/tar.inc     |    2 --
 meta/recipes-extended/tar/tar_1.28.bb |    3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
index 51d4934..fb5db78 100644
--- a/meta/recipes-extended/tar/tar.inc
+++ b/meta/recipes-extended/tar/tar.inc
@@ -26,8 +26,6 @@ do_install_extra () {
 
 PACKAGES =+ "${PN}-rmt"
 
-PACKAGECONFIG[acl] = "--with-posix-acls, --without-posix-acls, acl,"
-
 FILES_${PN}-rmt = "${base_sbindir}/rmt*"
 
 inherit update-alternatives
diff --git a/meta/recipes-extended/tar/tar_1.28.bb b/meta/recipes-extended/tar/tar_1.28.bb
index a15b4b6..8816000 100644
--- a/meta/recipes-extended/tar/tar_1.28.bb
+++ b/meta/recipes-extended/tar/tar_1.28.bb
@@ -1,5 +1,8 @@
 require tar.inc
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[acl] = "--with-posix-acls, --without-posix-acls, acl,"
+
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-- 
1.7.9.5

[PATCH 13/21] coreutils 6.9: fix unknown-configure-option

[Robert Yang]

Fixed:
WARNING: QA Issue: coreutils: configure was passed unrecognised options: --disable-acl [unknown-configure-option]

It doesn't support --enable-acl or --disable-acl, conditionaly depend on
acl to fix the problem.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-core/coreutils/coreutils_6.9.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index debd2a1..faea984 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -41,7 +41,7 @@ PACKAGECONFIG_class-native ??= ""
 
 # with, without, depends, rdepends
 #
-PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
+PACKAGECONFIG[acl] = ",,acl,"
 
 
 # [ gets a special treatment and is not included in this
-- 
1.7.9.5

[PATCH 14/21] rxvt-unicode: fix for 9.20 and 9.21

[Robert Yang]

* Add a rxvt-unicode.inc for rxvt-unicode_9.20.bb and rxvt-unicode_9.21.bb
* Fix unknown-configure-option:
  WARNING: QA Issue: rxvt-unicode: configure was passed unrecognised options: --enable-menubar --enable-cursor-blink --enable-shared --disable-strings --enable-xgetdefault [unknown-configure-option]
* Fix build-deps: (add a PACKAGECONFIG)
  WARNING: QA Issue: rxvt-unicode rdepends on startup-notification, but it isn't a build dependency? [build-deps]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc    |   58 +++++++++++++++++++
 .../recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb |   61 +-------------------
 .../recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb |   61 +-------------------
 3 files changed, 62 insertions(+), 118 deletions(-)
 create mode 100644 meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc

diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
new file mode 100644
index 0000000..04a43c0
--- /dev/null
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
@@ -0,0 +1,58 @@
+SECTION = "x11/utils"
+SUMMARY = "rxvt terminal clone supporting unicode"
+DESCRIPTION = "rxvt-unicode is a clone of the well known \
+terminal emulator rxvt, modified to store text in Unicode \
+(either UCS-2 or UCS-4) and to use locale-correct input and \
+output. It also supports mixing multiple fonts at the \
+same time, including Xft fonts."
+DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf"
+
+SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
+	   file://xwc.patch \
+	   file://rxvt.desktop \
+	   file://rxvt.png"
+
+inherit autotools update-alternatives
+
+PROVIDES = "virtual/x-terminal-emulator"
+ALTERNATIVE_${PN} = "x-terminal-emulator"
+ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt"
+
+CFLAGS_append = " -fpermissive"
+
+EXTRA_OECONF = "--enable-xim \
+		--enable-utmp --enable-wtmp --enable-lastlog \
+		--with-term=rxvt --enable-keepscrolling \
+		--enable-xft --with-name=rxvt --enable-frills \
+		--enable-swapscreen --enable-transparency \
+		--with-codesets=eu --enable-pointer-blank \
+		--enable-text-blink --enable-rxvt-scroll \
+		--enable-combining --disable-perl \
+		--with-x=${STAGING_DIR_HOST}${prefix}"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification,"
+
+do_configure_prepend () {
+	if [ ! -e ${S}/acinclude.m4 ]; then
+		cp ${S}/aclocal.m4 ${S}/acinclude.m4
+	fi
+}
+
+do_compile_prepend () {
+	echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
+	echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
+	echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
+	echo '#define HAVE_XLOCALE 1' >> config.h
+}
+
+do_install_append () {
+	install -d ${D}/${datadir}
+	install -d ${D}/${datadir}/applications
+	install -d ${D}/${datadir}/pixmaps/
+
+	install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications
+}
+
+FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png"
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb
index 3a1ea66..3480ec7 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.20.bb
@@ -1,65 +1,8 @@
-SECTION = "x11/utils"
-SUMMARY = "rxvt terminal clone supporting unicode"
-DESCRIPTION = "rxvt-unicode is a clone of the well known \
-terminal emulator rxvt, modified to store text in Unicode \
-(either UCS-2 or UCS-4) and to use locale-correct input and \
-output. It also supports mixing multiple fonts at the \
-same time, including Xft fonts."
+require rxvt-unicode.inc
+
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://src/main.C;beginline=1;endline=31;md5=775485398a09fa7aee6f90464af88432"
 
-DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf"
-
-SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-	   file://xwc.patch \
-	   file://rxvt.desktop \
-	   file://rxvt.png"
-
 SRC_URI[md5sum] = "4a5b823f08d21036f94a6c51e94d025b"
 SRC_URI[sha256sum] = "e73e13fe64b59fd3c8e6e20c00f149d388741f141b8155e4700d3ed40aa94b4e"
-
-inherit autotools update-alternatives
-
-PROVIDES = "virtual/x-terminal-emulator"
-ALTERNATIVE_${PN} = "x-terminal-emulator"
-ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt"
-
-CFLAGS_append = " -fpermissive"
-
-EXTRA_OECONF = "--enable-menubar --enable-xim \
-		--enable-utmp --enable-wtmp --enable-lastlog \
-		--disable-strings --with-term=rxvt --enable-keepscrolling \
-		--enable-xft --with-name=rxvt --enable-frills \
-		--enable-swapscreen --enable-transparency \
-		--with-codesets=eu \
-		--enable-cursor-blink --enable-pointer-blank \
-		--enable-text-blink --enable-rxvt-scroll \
-		--enable-combining --enable-shared \
-		--enable-xgetdefault \
-                --disable-perl \
-		--with-x=${STAGING_DIR_HOST}${prefix}"
-
-do_configure_prepend () {
-	if [ ! -e ${S}/acinclude.m4 ]; then
-		cp ${S}/aclocal.m4 ${S}/acinclude.m4
-	fi
-}
-
-do_compile_prepend () {
-	echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
-	echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
-	echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
-	echo '#define HAVE_XLOCALE 1' >> config.h
-}
-
-do_install_append () {
-	install -d ${D}/${datadir}
-	install -d ${D}/${datadir}/applications
-	install -d ${D}/${datadir}/pixmaps/
-
-	install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications
-}
-
-FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png"
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb
index 239fbed..7049495 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.21.bb
@@ -1,65 +1,8 @@
-SECTION = "x11/utils"
-SUMMARY = "rxvt terminal clone supporting unicode"
-DESCRIPTION = "rxvt-unicode is a clone of the well known \
-terminal emulator rxvt, modified to store text in Unicode \
-(either UCS-2 or UCS-4) and to use locale-correct input and \
-output. It also supports mixing multiple fonts at the \
-same time, including Xft fonts."
+require rxvt-unicode.inc
+
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://src/main.C;beginline=1;endline=31;md5=7dac0395806570856e037f98aba8513b"
 
-DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf"
-
-SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-	   file://xwc.patch \
-	   file://rxvt.desktop \
-	   file://rxvt.png"
-
 SRC_URI[md5sum] = "a9a06c608258c5fd247c3725d8f44582"
 SRC_URI[sha256sum] = "75270ed72bc5895a64a1d7392bf45a622204192371c3965bd3dd978dc088956b"
-
-inherit autotools update-alternatives
-
-PROVIDES = "virtual/x-terminal-emulator"
-ALTERNATIVE_${PN} = "x-terminal-emulator"
-ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt"
-
-CFLAGS_append = " -fpermissive"
-
-EXTRA_OECONF = "--enable-menubar --enable-xim \
-		--enable-utmp --enable-wtmp --enable-lastlog \
-		--disable-strings --with-term=rxvt --enable-keepscrolling \
-		--enable-xft --with-name=rxvt --enable-frills \
-		--enable-swapscreen --enable-transparency \
-		--with-codesets=eu \
-		--enable-cursor-blink --enable-pointer-blank \
-		--enable-text-blink --enable-rxvt-scroll \
-		--enable-combining --enable-shared \
-		--enable-xgetdefault \
-                --disable-perl \
-		--with-x=${STAGING_DIR_HOST}${prefix}"
-
-do_configure_prepend () {
-	if [ ! -e ${S}/acinclude.m4 ]; then
-		cp ${S}/aclocal.m4 ${S}/acinclude.m4
-	fi
-}
-
-do_compile_prepend () {
-	echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
-	echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
-	echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
-	echo '#define HAVE_XLOCALE 1' >> config.h
-}
-
-do_install_append () {
-	install -d ${D}/${datadir}
-	install -d ${D}/${datadir}/applications
-	install -d ${D}/${datadir}/pixmaps/
-
-	install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications
-}
-
-FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png"
-- 
1.7.9.5

[PATCH 15/21] subversion 1.6.15: fix unknown-configure-option

[Robert Yang]

WARNING: QA Issue: subversion: configure was passed unrecognised options: --without-apache [unknown-configure-option]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../subversion/subversion_1.6.15.bb                |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
index b135bb7..28163e5 100644
--- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
@@ -30,7 +30,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b"
 PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl"
 
 EXTRA_OECONF = " \
-                --without-berkeley-db --without-apxs --without-apache \
+                --without-berkeley-db --without-apxs \
                 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
                 --with-apr-util=${STAGING_BINDIR_CROSS} \
                 ac_cv_path_RUBY=none"
-- 
1.7.9.5

[PATCH 16/21] meta: fix build with gettext 0.16.1

[Robert Yang]

The gettext 0.16.1 doesn't install any m4 files to sysroot, please see
the following commit:

  commit 9e10db5bdfe77c0ef2aff2f1cf89958b62c294a1
  Author: Christopher Larson <kergoth@gmail.com>
  Date:   Mon Mar 17 18:10:54 2014 +0000

      gettext-0.16.1: kill target m4 macros from sysroot

This is aim for using gettext-native's macros(gettext-native-0.19.4),
but when we set:
  PREFERRED_VERSION_gettext = "0.16.1"
And build the recipes like pcmanfm, we would get errors when
do_configure:

configure:5164: error: possibly undefined macro: AM_NLS

This is because autotools_copy_aclocals doesn't copy the native macros
for target unless they're direct dependencies.

Add gettext-native to DEPENDS will fix the problem.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../connman/connman-gnome_0.7.bb                   |    2 +-
 .../gtk-engines/gtk-engines_2.20.2.bb              |    2 +-
 meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb   |    2 +-
 .../oprofile/oprofileui-server_git.bb              |    2 +-
 meta/recipes-kernel/oprofile/oprofileui_git.bb     |    2 +-
 meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb      |    2 +-
 meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb         |    2 +-
 meta/recipes-sato/puzzles/oh-puzzles_git.bb        |    2 +-
 meta/recipes-support/atk/at-spi2-core_2.14.1.bb    |    2 +-
 meta/recipes-support/libfm/libfm-extra_1.2.3.bb    |    2 +-
 meta/recipes-support/libfm/libfm_1.2.3.bb          |    2 +-
 meta/recipes-support/pinentry/pinentry_0.9.0.bb    |    2 ++
 12 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
index f5575d2..b54d703 100644
--- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
                     file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \
                     file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"
 
-DEPENDS = "gtk+ dbus-glib intltool-native"
+DEPENDS = "gtk+ dbus-glib intltool-native gettext-native"
 
 # 0.7 tag
 SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143"
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
index 33b6afe..7ec64b9 100644
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
+++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 SECTION = "x11/base"
-DEPENDS = "intltool-native gtk+"
+DEPENDS = "intltool-native gtk+ gettext-native"
 
 PR = "r3"
 
diff --git a/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb b/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb
index 7a45241..0c23d19 100644
--- a/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb
+++ b/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb
@@ -7,7 +7,7 @@ windows.  Information may include window position, size, color depth, \
 and a number of other items."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=78976cd3115f6faf615accc4e094d90e"
-DEPENDS += "libxext libxmu"
+DEPENDS += "libxext libxmu gettext-native"
 
 PE = "0"
 
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
index eb3b78b..cc3477b 100644
--- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
+++ b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
@@ -9,7 +9,7 @@ SRC_URI = "git://git.yoctoproject.org/oprofileui \
            file://init \
            file://oprofileui-server.service "
 
-DEPENDS += "intltool-native"
+DEPENDS += "intltool-native gettext-native"
 
 EXTRA_OECONF += "--disable-client --enable-server"
 
diff --git a/meta/recipes-kernel/oprofile/oprofileui_git.bb b/meta/recipes-kernel/oprofile/oprofileui_git.bb
index bb69d54..7fbc03d 100644
--- a/meta/recipes-kernel/oprofile/oprofileui_git.bb
+++ b/meta/recipes-kernel/oprofile/oprofileui_git.bb
@@ -1,6 +1,6 @@
 require oprofileui.inc
 
-DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf"
+DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf gettext-native"
 
 SRCREV = "389e1875af4721d52c7e65cf9cfffb69b0ed6a59"
 PV = "0.0+git${SRCPV}"
diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
index 830c053..711fe1d 100644
--- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
+++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://src/leafpad.h;endline=20;md5=d3d6a89f5e61e8b13bdea537511ba1fa \
                     file://src/utils.c;endline=20;md5=0d2cc6584ba3202448bb274f62739571"
 
-DEPENDS = "gtk+ intltool-native"
+DEPENDS = "gtk+ intltool-native gettext-native"
 DEPENDS_append_poky = " libowl"
 SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
 	   file://leafpad.desktop"
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb
index 14f58ae..ad1acf7 100644
--- a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2"
 
 SECTION = "x11"
-DEPENDS = "gtk+ startup-notification libfm intltool-native"
+DEPENDS = "gtk+ startup-notification libfm intltool-native gettext-native"
 DEPENDS_append_poky = " libowl"
 
 
diff --git a/meta/recipes-sato/puzzles/oh-puzzles_git.bb b/meta/recipes-sato/puzzles/oh-puzzles_git.bb
index bd762e9..b99f5e6 100644
--- a/meta/recipes-sato/puzzles/oh-puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/oh-puzzles_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=f56ec6772dd1c7c367067bbea8ea1675 \
                     file://src/tree234.c;endline=28;md5=b4feb1976feebf8f1379093ed52f2945"
 
 SECTION = "x11"
-DEPENDS = "gtk+ gconf intltool-native librsvg"
+DEPENDS = "gtk+ gconf intltool-native librsvg gettext-native"
 DEPENDS_append_poky = " libowl"
 
 SRCREV = "92f1a20e4b72eed7a35b00984d9793b51dc2fb3b"
diff --git a/meta/recipes-support/atk/at-spi2-core_2.14.1.bb b/meta/recipes-support/atk/at-spi2-core_2.14.1.bb
index 8d01124..0a06475 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.14.1.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.14.1.bb
@@ -9,7 +9,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "a37993cc50d90465c9aeed95e2ac439a"
 SRC_URI[sha256sum] = "eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f46ce657"
 
-DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native"
+DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native"
 
 inherit autotools gtk-doc pkgconfig
 
diff --git a/meta/recipes-support/libfm/libfm-extra_1.2.3.bb b/meta/recipes-support/libfm/libfm-extra_1.2.3.bb
index 85bcc3c..aab6e6d 100644
--- a/meta/recipes-support/libfm/libfm-extra_1.2.3.bb
+++ b/meta/recipes-support/libfm/libfm-extra_1.2.3.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007"
 
 SECTION = "x11/libs"
-DEPENDS = "glib-2.0 intltool-native"
+DEPENDS = "glib-2.0 intltool-native gettext-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz"
 
diff --git a/meta/recipes-support/libfm/libfm_1.2.3.bb b/meta/recipes-support/libfm/libfm_1.2.3.bb
index 629502f..aa48fb9 100644
--- a/meta/recipes-support/libfm/libfm_1.2.3.bb
+++ b/meta/recipes-support/libfm/libfm_1.2.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 
 
 SECTION = "x11/libs"
-DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif libfm-extra"
+DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif libfm-extra gettext-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz"
 
diff --git a/meta/recipes-support/pinentry/pinentry_0.9.0.bb b/meta/recipes-support/pinentry/pinentry_0.9.0.bb
index 10b329b..6338597 100644
--- a/meta/recipes-support/pinentry/pinentry_0.9.0.bb
+++ b/meta/recipes-support/pinentry/pinentry_0.9.0.bb
@@ -12,6 +12,8 @@ PR = "r1"
 
 inherit autotools
 
+DEPENDS = "gettext-native"
+
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "40a05856cb3accf6679987b7899b0f5a"
-- 
1.7.9.5

[PATCH 17/21] elfutils 0.148: use BPN in SRC_URI

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/elfutils/elfutils_0.148.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/elfutils/elfutils_0.148.bb b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
index 5e75f12..16db6b2 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.148.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
@@ -8,7 +8,7 @@ DEPENDS = "libtool bzip2 zlib virtual/libintl"
 
 PR = "r11"
 
-SRC_URI = "https://fedorahosted.org/releases/e/l/${PN}/${BP}.tar.bz2"
+SRC_URI = "https://fedorahosted.org/releases/e/l/${BPN}/${BP}.tar.bz2"
 
 SRC_URI[md5sum] = "a0bed1130135f17ad27533b0034dba8d"
 SRC_URI[sha256sum] = "8aebfa4a745db21cf5429c9541fe482729b62efc7e53e9110151b4169fe887da"
-- 
1.7.9.5

[PATCH 18/21] coreutils 6.9: disable native

[Robert Yang]

ERROR: The recipe coreutils-native is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
   tmp/sysroots/x86_64-linux/bin/kill
 Matched in manifest-x86_64-util-linux-native.populate_sysroot

We have 8.23, so disable it rather than fix.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-core/coreutils/coreutils_6.9.bb |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index faea984..c6b3453 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -9,11 +9,10 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://src/ls.c;beginline=4;endline=16;md5=15ed60f67b1db5fedd5dbc37cf8a9543"
 PR = "r5"
-DEPENDS_class-native = "gettext-native"
 
 inherit autotools gettext texinfo
 
-SRC_URI_BASE = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \
+SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \
            file://gnulib_m4.patch \
            file://futimens.patch \
            file://coreutils-ls-x.patch \
@@ -25,19 +24,16 @@ SRC_URI_BASE = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \
            file://coreutils_fix_for_automake-1.12.patch \
            file://coreutils-build-with-acl.patch \
            file://coreutils-fix-texinfo.patch \
+           file://fix_for_manpage_building.patch \
            "
 
-SRC_URI = "${SRC_URI_BASE} file://fix_for_manpage_building.patch"
-SRC_URI_class-native = "${SRC_URI_BASE}"
-
 SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06"
 SRC_URI[sha256sum] = "89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0"
 
 
 # acl is not a default feature
 #
-PACKAGECONFIG_class-target ??= "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
-PACKAGECONFIG_class-native ??= ""
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
 
 # with, without, depends, rdepends
 #
@@ -102,5 +98,3 @@ python __anonymous() {
 	for prog in d.getVar('sbindir_progs', True).split():
 		d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir', True), prog))
 }
-
-BBCLASSEXTEND = "native"
-- 
1.7.9.5

[PATCH 19/21] gettext 0.6.1: disable native

[Robert Yang]

ERROR: The recipe gettext-native is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
   sysroots/x86_64-linux/usr/share/gettext/config.rpath
 Matched in manifest-x86_64-gettext-minimal-native.populate_sysroot
 sysroots/x86_64-linux/usr/share/gettext/po/remove-potcdate.sin
 Matched in manifest-x86_64-gettext-minimal-native.populate_sysroot
 sysroots/x86_64-linux/usr/share/gettext/po/Makefile.in.in
 Matched in manifest-x86_64-gettext-minimal-native.populate_sysroot
Please verify which recipe should provide the above files.

We have 0.19.4, so disable it rather than fix.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-core/gettext/gettext_0.16.1.bb |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta/recipes-core/gettext/gettext_0.16.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb
index 892194c..97acf7b 100644
--- a/meta/recipes-core/gettext/gettext_0.16.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.16.1.bb
@@ -7,9 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9ea3144f04c41cd2eada5d3f472e6ea5"
 
 PR = "r6"
 DEPENDS = "virtual/libiconv"
-DEPENDS_class-native = ""
 PROVIDES = "virtual/libintl virtual/gettext"
-PROVIDES_class-native = ""
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
            file://gettext-vpath.patch \
@@ -106,4 +104,4 @@ remove_sysroot_m4_macros () {
     rm -r "${SYSROOT_DESTDIR}${datadir}/aclocal"
 }
 
-BBCLASSEXTEND = "native nativesdk"
+BBCLASSEXTEND = "nativesdk"
-- 
1.7.9.5

[PATCH 20/21] bison 2.3: disable native

[Robert Yang]

The following packages will fail to build once we build bion-native 2.3:
libnl
iproute2
libxkbcommon
lttng-tools
gstreamer1.0
babeltrace

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/bison/bison_2.3.bb |   15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/meta/recipes-devtools/bison/bison_2.3.bb b/meta/recipes-devtools/bison/bison_2.3.bb
index 174916b..182e880 100644
--- a/meta/recipes-devtools/bison/bison_2.3.bb
+++ b/meta/recipes-devtools/bison/bison_2.3.bb
@@ -11,17 +11,12 @@ DEPENDS = "bison-native flex-native"
 
 PR = "r1"
 
-BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
+SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
          file://bison-2.3_m4.patch"
 
-SRC_URI = "${BASE_SRC_URI}"
-
 SRC_URI[md5sum] = "22327efdd5080e2b1acb6e560a04b43a"
 SRC_URI[sha256sum] = "52f78aa4761a74ceb7fdf770f3554dd84308c3b93c4255e3a5c17558ecda293e"
 
-DEPENDS_class-native = "gettext-native"
-SRC_URI_class-native = "${BASE_SRC_URI}"
-
 inherit autotools gettext texinfo
 acpaths = "-I ${S}/m4"
 
@@ -29,11 +24,3 @@ do_configure_prepend () {
 	rm -f ${S}/m4/*gl.m4
 	cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/runtime-po/
 }
-
-do_install_append_class-native() {
-	create_wrapper ${D}/${bindir}/bison \
-		M4=${STAGING_BINDIR_NATIVE}/m4 \
-		BISON_PKGDATADIR=${STAGING_DATADIR_NATIVE}/bison
-}
-#bison-native encodes the staging M4 path
-BBCLASSEXTEND = "native"
-- 
1.7.9.5

[PATCH 21/21] m4-native 1.4.9: remove it

[Robert Yang]

Its do_compile would be failed once our autoconf-naitve is built:
| /path/to/m4-native/1.4.9-r2/m4-1.4.9/missing: line 54: aclocal-1.10: command not found
| WARNING: `aclocal-1.10' is missing on your system.  You should only need it if
|          you modified `acinclude.m4' or `configure.ac'.  You might want
|          to install the `Automake' and `Perl' packages.  Grab them from

Also:
| /path/to/m4-native/1.4.9-r2/m4-1.4.9/missing: line 54: automake-1.10: command not found

We don't need keep a native GPLv2 recipe, so remove it.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/m4/m4-native_1.4.9.bb |   12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 meta/recipes-devtools/m4/m4-native_1.4.9.bb

diff --git a/meta/recipes-devtools/m4/m4-native_1.4.9.bb b/meta/recipes-devtools/m4/m4-native_1.4.9.bb
deleted file mode 100644
index 23a21d0..0000000
--- a/meta/recipes-devtools/m4/m4-native_1.4.9.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require m4-${PV}.inc
-
-INHIBIT_AUTOTOOLS_DEPS = "1"
-DEPENDS += "gnu-config-native"
-
-do_configure()  {
-	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub .
-	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess .
-	oe_runconf
-}
-
-inherit native
-- 
1.7.9.5

Re: [PATCH 07/21] libidn 0.6.14: fixed installed-vs-shipped

[Burton, Ross]

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

On 3 February 2015 at 01:12, Robert Yang <liezhi.yang@windriver.com> wrote:

>         rm -rf ${D}${datadir}/emacs
>  }
> +
> +FILES_${PN} += "${datadir}/emacs"
>

This was already fixed - see the rm a few lines above. :)

Ross

[-- Attachment #2: Type: text/html, Size: 652 bytes --]

Re: [PATCH 07/21] libidn 0.6.14: fixed installed-vs-shipped

[Robert Yang]

On 02/03/2015 10:59 PM, Burton, Ross wrote:
>
> On 3 February 2015 at 01:12, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> wrote:
>
>              rm -rf ${D}${datadir}/emacs
>       }
>     +
>     +FILES_${PN} += "${datadir}/emacs"
>
>
> This was already fixed - see the rm a few lines above. :)

Yes, it is fixed recently, please drop this patch.

// Robert

>
> Ross

Re: [PATCH 07/21] libidn 0.6.14: fixed installed-vs-shipped

[Robert Yang]

Hi Ross,

I removed this patch from the repo:

   git://git.openembedded.org/openembedded-core-contrib rbt/low_version

// Robert

On 02/04/2015 08:56 AM, Robert Yang wrote:
>
>
> On 02/03/2015 10:59 PM, Burton, Ross wrote:
>>
>> On 3 February 2015 at 01:12, Robert Yang <liezhi.yang@windriver.com
>> <mailto:liezhi.yang@windriver.com>> wrote:
>>
>>              rm -rf ${D}${datadir}/emacs
>>       }
>>     +
>>     +FILES_${PN} += "${datadir}/emacs"
>>
>>
>> This was already fixed - see the rm a few lines above. :)
>
> Yes, it is fixed recently, please drop this patch.
>
> // Robert
>
>>
>> Ross

Re: [PATCH 13/21] coreutils 6.9: fix unknown-configure-option

[Burton, Ross]

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

Hi Robert,

On 3 February 2015 at 01:12, Robert Yang <liezhi.yang@windriver.com> wrote:

> -PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
> +PACKAGECONFIG[acl] = ",,acl,"
>

Introducing non-deterministic behaviour doesn't seem like a good idea.
Presumably we can seed the autoconf checks instead of passing configure
arguments? (see e.g. libice's arc4 option).

Ross

[-- Attachment #2: Type: text/html, Size: 858 bytes --]

Re: [PATCH 13/21] coreutils 6.9: fix unknown-configure-option

[Robert Yang]

On 02/05/2015 11:13 PM, Burton, Ross wrote:
> Hi Robert,
>
> On 3 February 2015 at 01:12, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> wrote:
>
>     -PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
>     +PACKAGECONFIG[acl] = ",,acl,"
>
>
> Introducing non-deterministic behaviour doesn't seem like a good idea.
> Presumably we can seed the autoconf checks instead of passing configure
> arguments? (see e.g. libice's arc4 option).

Good idea, thanks, let's drop this patch atm, I will update it after fix
the libtool issue:-)

// Robert

>
> Ross