[CONSOLIDATED REQUEST 01/64] rxvt-unicode: remove setting of LD_LIBRARY_PATH

[CONSOLIDATED REQUEST 01/64] rxvt-unicode: remove setting of LD_LIBRARY_PATH

[Saul Wold]

This is no longer needed as we do not run tic at install time

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb
index 2415ba5..1f144e6 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb
@@ -28,10 +28,6 @@ ALTERNATIVE_PATH = "${bindir}/rxvt"
 
 CFLAGS_append = " -fpermissive"
 
-# This is necessary so that the "tic" command executed during the install can
-# link with the correct libary in staging.
-export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
-
 EXTRA_OECONF = "--enable-menubar --enable-xim \
 		--enable-utmp --enable-wtmp --enable-lastlog \
 		--disable-strings --with-term=rxvt --enable-keepscrolling \
-- 
1.7.7.6

[CONSOLIDATED REQUEST 02/64] rxvt-unicode: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb
index 1f144e6..69ef25d 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 
 DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
 	   file://xwc.patch \
@@ -23,8 +23,8 @@ SRC_URI[sha256sum] = "ec1aa2932da844979ed8140bd92223defb12042aa5e877e05ac31139ca
 inherit autotools update-alternatives
 
 PROVIDES = "virtual/x-terminal-emulator"
-ALTERNATIVE_NAME = "x-terminal-emulator"
-ALTERNATIVE_PATH = "${bindir}/rxvt"
+ALTERNATIVE_${PN} = "x-terminal-emulator"
+ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt"
 
 CFLAGS_append = " -fpermissive"
 
-- 
1.7.7.6

[CONSOLIDATED REQUEST 03/64] openssh: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-connectivity/openssh/openssh_6.0p1.bb |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
index 8757f82..31202d4 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
@@ -101,10 +101,6 @@ CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config"
 CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config"
 
 ALTERNATIVE_PRIORITY = "90"
-
 ALTERNATIVE_${PN}-scp = "scp"
-ALTERNATIVE_LINK_NAME[scp] = "${bindir}/scp"
-
 ALTERNATIVE_${PN}-ssh = "ssh"
-ALTERNATIVE_LINK_NAME[ssh] = "${bindir}/ssh"
 
-- 
1.7.7.6

[CONSOLIDATED REQUEST 04/64] mini-x-session: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../mini-x-session/mini-x-session_0.1.bb           |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
index bc9368a..6f7efb2 100644
--- a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
+++ b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Mini X session files for poky"
 HOMEPAGE = "http://www.yoctoproject.org"
 BUGTRACKER = "http://bugzilla.pokylinux.org"
 
-PR = "r2"
+PR = "r3"
 
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://mini-x-session;endline=5;md5=b6430bffbcf05f9760e72938826b7487"
@@ -15,9 +15,8 @@ S = "${WORKDIR}"
 
 inherit update-alternatives
 
-ALTERNATIVE_NAME = "x-session-manager"
-ALTERNATIVE_LINK = "${bindir}/x-session-manager"
-ALTERNATIVE_PATH = "${bindir}/mini-x-session"
+ALTERNATIVE_${PN} = "x-session-manager"
+ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/mini-x-session"
 ALTERNATIVE_PRIORITY = "50"
 
 do_install() {
-- 
1.7.7.6

[CONSOLIDATED REQUEST 05/64] console-tools: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../console-tools/console-tools_0.3.2.bb           |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index 6027d4a..1446368 100644
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9"
 SUMMARY = "Allows you to set-up and manipulate the Linux console."
 DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files."
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
            file://codepage.patch \
@@ -35,6 +35,10 @@ inherit autotools gettext update-alternatives
 ALTERNATIVE_PRIORITY = "100"
 
 bindir_progs = "chvt deallocvt fgconsole openvt"
-ALTERNATIVE_LINKS = "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}"
+ALTERNATIVE_${PN} = "${bindir_progs}"
+#python __anonymous() {
+#	for prog in d.getVar('bindir_progs', True).split():
+#		d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog))
+#}
 
 RDEPENDS_${PN} = "bash"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 06/64] kbd: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/kbd/kbd_1.15.2.bb |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_1.15.2.bb
index 99a6a50..79ea468 100644
--- a/meta/recipes-core/kbd/kbd_1.15.2.bb
+++ b/meta/recipes-core/kbd/kbd_1.15.2.bb
@@ -10,7 +10,7 @@ RREPLACES_${PN} = "console-tools"
 RPROVIDES_${PN} = "console-tools"
 RCONFLICTS_${PN} = "console-tools"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI="${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2"
 SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5"
@@ -25,7 +25,6 @@ FILES_${PN}-unimaps = "${datadir}/unimaps"
 
 inherit update-alternatives
 
-ALTERNATIVE_PRIORITY = "100"
 
-bindir_progs = "chvt deallocvt fgconsole openvt"
-ALTERNATIVE_LINKS = "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}"
+ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt"
+ALTERNATIVE_PRIORITY = "100"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 07/64] tinylogin: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/tinylogin/tinylogin_1.4.bb |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-core/tinylogin/tinylogin_1.4.bb b/meta/recipes-core/tinylogin/tinylogin_1.4.bb
index 195f0c7..aaed92a 100644
--- a/meta/recipes-core/tinylogin/tinylogin_1.4.bb
+++ b/meta/recipes-core/tinylogin/tinylogin_1.4.bb
@@ -7,7 +7,7 @@ and groups on an embedded system."
 HOMEPAGE = "http://tinylogin.busybox.net/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM="file://LICENSE;md5=f1060fa3a366f098b5b1d8c2077ba269"
-PR = "r8"
+PR = "r9"
 
 inherit update-alternatives
 
@@ -38,11 +38,6 @@ do_install () {
 	done
 }
 
-do_install_append () {
-        mv ${D}${base_sbindir}/getty ${D}${base_sbindir}/getty.${BPN}
-}
-
-ALTERNATIVE_NAME = "getty"
-ALTERNATIVE_LINK = "${base_sbindir}/getty"
-ALTERNATIVE_PATH = "${base_sbindir}/getty.${BPN}"
+ALTERNATIVE_${PN} = "getty"
+ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty"
 ALTERNATIVE_PRIORITY = "80"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 08/64] patch: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/patch/patch.inc      |    7 +------
 meta/recipes-devtools/patch/patch_2.5.9.bb |    2 +-
 meta/recipes-devtools/patch/patch_2.6.1.bb |    2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-devtools/patch/patch.inc b/meta/recipes-devtools/patch/patch.inc
index 21c06c6..332b97a 100644
--- a/meta/recipes-devtools/patch/patch.inc
+++ b/meta/recipes-devtools/patch/patch.inc
@@ -9,10 +9,5 @@ S = "${WORKDIR}/patch-${PV}"
 
 inherit autotools update-alternatives
 
-do_install_append () {
-        mv ${D}${bindir}/patch ${D}${bindir}/patch.${BPN}
-}
-
-ALTERNATIVE_NAME = "patch"
-ALTERNATIVE_PATH = "patch.${BPN}"
+ALTERNATIVE_${PN} = "patch"
 ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-devtools/patch/patch_2.5.9.bb b/meta/recipes-devtools/patch/patch_2.5.9.bb
index 4d27cbd..c29b240 100644
--- a/meta/recipes-devtools/patch/patch_2.5.9.bb
+++ b/meta/recipes-devtools/patch/patch_2.5.9.bb
@@ -5,7 +5,7 @@ SRC_URI += " file://debian.patch \
 	   file://install.patch \
            file://unified-reject-files.diff \
            file://global-reject-file.diff "
-PR = "r2"
+PR = "r3"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 SRC_URI[md5sum] = "dacfb618082f8d3a2194601193cf8716"
diff --git a/meta/recipes-devtools/patch/patch_2.6.1.bb b/meta/recipes-devtools/patch/patch_2.6.1.bb
index fce3656..5055747 100644
--- a/meta/recipes-devtools/patch/patch_2.6.1.bb
+++ b/meta/recipes-devtools/patch/patch_2.6.1.bb
@@ -1,7 +1,7 @@
 require patch.inc
 LICENSE = "GPLv3"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += " file://global-reject-file.diff "
 
-- 
1.7.7.6

[CONSOLIDATED REQUEST 09/64] ubootchart: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/ubootchart/ubootchart_svn.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/ubootchart/ubootchart_svn.bb b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
index 843024c..8cdedf9 100644
--- a/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
+++ b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
@@ -17,9 +17,9 @@ S = "${WORKDIR}/trunk"
 
 inherit update-alternatives
 
-ALTERNATIVE_NAME = "init"
-ALTERNATIVE_LINK = "${base_sbindir}/init"
-ALTERNATIVE_PATH = "${base_sbindir}/ubootchartd"
+ALTERNATIVE_${PN} = "init"
+ALTERNATIVE_TARGET[init] = "${base_sbindir}/ubootchartd"
+ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init"
 ALTERNATIVE_PRIORITY = "70"
 
 do_compile() {
-- 
1.7.7.6

[CONSOLIDATED REQUEST 10/64] bc: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/bc/bc_1.06.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/bc/bc_1.06.bb b/meta/recipes-extended/bc/bc_1.06.bb
index 283e2d8..fe9c3f4 100644
--- a/meta/recipes-extended/bc/bc_1.06.bb
+++ b/meta/recipes-extended/bc/bc_1.06.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 SECTION = "base"
 DEPENDS = "flex"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz"
 
@@ -20,5 +20,5 @@ SRC_URI[sha256sum] = "4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea7
 
 inherit autotools update-alternatives
 
-ALTERNATIVE_LINKS = "${bindir}/dc"
+ALTERNATIVE_${PN} = "dc"
 ALTERNATIVE_PRIORITY = "100"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 11/64] diffutils: refactor to add a common diffutils.inc

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/diffutils/diffutils.inc      |   22 ++++++++++++++++++
 meta/recipes-extended/diffutils/diffutils_2.8.1.bb |   24 +++----------------
 meta/recipes-extended/diffutils/diffutils_3.2.bb   |   22 ++---------------
 3 files changed, 29 insertions(+), 39 deletions(-)
 create mode 100644 meta/recipes-extended/diffutils/diffutils.inc

diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-extended/diffutils/diffutils.inc
new file mode 100644
index 0000000..3964db0
--- /dev/null
+++ b/meta/recipes-extended/diffutils/diffutils.inc
@@ -0,0 +1,22 @@
+SUMMARY = "Diffutils contains tools used for finding differences between files."
+DESCRIPTION = "Diffutils contains the GNU diff, diff3, \
+sdiff, and cmp utilities. These programs are usually \
+used for creating patch files."
+SECTION = "base"
+
+INC_PR = "r6"
+
+SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz"
+
+inherit autotools update-alternatives gettext
+
+# diffutils assumes non-glibc compilation with uclibc and
+# this causes it to generate its own implementations of
+# standard functionality.  regex.c actually breaks compilation
+# because it uses __mempcpy, there are other things (TBD:
+# see diffutils.mk in buildroot)
+EXTRA_OECONF_libc-uclibc = "--without-included-regex"
+
+ALTERNATIVE_LINKS = "${bindir}/diff ${bindir}/cmp"
+ALTERNATIVE_PRIORITY = "100"
+
diff --git a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
index 09eb71e..a31363a 100644
--- a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
+++ b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
@@ -1,28 +1,12 @@
-SUMMARY = "Diffutils contains tools used for finding differences between files."
-DESCRIPTION = "Diffutils contains the GNU diff, diff3, \
-sdiff, and cmp utilities. These programs are usually \
-used for creating patch files."
-SECTION = "base"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-PR = "r5"
+require diffutils.inc
 
-SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz \
-           file://diffutils_fix_for_automake-1.12.patch \
-           "
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://diffutils_fix_for_automake-1.12.patch"
 
 SRC_URI[md5sum] = "71f9c5ae19b60608f6c7f162da86a428"
 SRC_URI[sha256sum] = "c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a"
 
-inherit autotools update-alternatives gettext
-
-# diffutils assumes non-glibc compilation with uclibc and
-# this causes it to generate its own implementations of
-# standard functionality.  regex.c actually breaks compilation
-# because it uses __mempcpy, there are other things (TBD:
-# see diffutils.mk in buildroot)
-EXTRA_OECONF_libc-uclibc = "--without-included-regex"
-
-ALTERNATIVE_LINKS = "${bindir}/diff ${bindir}/cmp"
-ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.2.bb
index c46863d..74c371d 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.2.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.2.bb
@@ -1,27 +1,11 @@
-DESCRIPTION = "Diffutils contains the GNU diff, diff3, \
-sdiff, and cmp utilities. These programs are usually \
-used for creating patch files."
-SECTION = "base"
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r1"
+require diffutils.inc
 
-SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz \
-           file://remove-gets.patch \
-          "
+PR = "${INC_PR}.0"
 
-inherit autotools update-alternatives gettext
-
-# diffutils assumes non-glibc compilation with uclibc and
-# this causes it to generate its own implementations of
-# standard functionality.  regex.c actually breaks compilation
-# because it uses __mempcpy, there are other things (TBD:
-# see diffutils.mk in buildroot)
-EXTRA_OECONF_libc-uclibc = "--without-included-regex"
-
-ALTERNATIVE_LINKS = "${bindir}/diff ${bindir}/cmp"
-ALTERNATIVE_PRIORITY = "100"
+SRC_URI += "file://remove-gets.patch"
 
 SRC_URI[md5sum] = "22e4deef5d8949a727b159d6bc65c1cc"
 SRC_URI[sha256sum] = "2aaaebef615be7dc365306a14caa5d273a4fc174f9f10abca8b60e082c054ed3"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 12/64] diffutils: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/diffutils/diffutils.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-extended/diffutils/diffutils.inc
index 3964db0..c90a3c9 100644
--- a/meta/recipes-extended/diffutils/diffutils.inc
+++ b/meta/recipes-extended/diffutils/diffutils.inc
@@ -4,7 +4,7 @@ sdiff, and cmp utilities. These programs are usually \
 used for creating patch files."
 SECTION = "base"
 
-INC_PR = "r6"
+INC_PR = "r7"
 
 SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz"
 
@@ -17,6 +17,6 @@ inherit autotools update-alternatives gettext
 # see diffutils.mk in buildroot)
 EXTRA_OECONF_libc-uclibc = "--without-included-regex"
 
-ALTERNATIVE_LINKS = "${bindir}/diff ${bindir}/cmp"
+ALTERNATIVE_${PN} = "diff cmp"
 ALTERNATIVE_PRIORITY = "100"
 
-- 
1.7.7.6

[CONSOLIDATED REQUEST 13/64] findutils: refactor common code to findutils.inc

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/findutils/findutils.inc      |    5 +--
 .../recipes-extended/findutils/findutils_4.2.31.bb |   29 +++-----------------
 meta/recipes-extended/findutils/findutils_4.4.2.bb |    6 +++-
 3 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc
index 64909a1..1fa9b97 100644
--- a/meta/recipes-extended/findutils/findutils.inc
+++ b/meta/recipes-extended/findutils/findutils.inc
@@ -6,9 +6,6 @@ HOMEPAGE = "http://www.gnu.org/software/findutils/"
 BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils"
 SECTION = "console/utils"
 
-# GPLv2+ (<< 4.2.32), GPLv3+ (>= 4.2.32)
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
 
 SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz"
 
@@ -23,3 +20,5 @@ ALTERNATIVE_PRIORITY = "100"
 # because it uses __mempcpy, there are other things (TBD:
 # see diffutils.mk in buildroot)
 EXTRA_OECONF_libc-uclibc = "--without-included-regex"
+
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/findutils/findutils_4.2.31.bb b/meta/recipes-extended/findutils/findutils_4.2.31.bb
index 37da0ce..38cdc21 100644
--- a/meta/recipes-extended/findutils/findutils_4.2.31.bb
+++ b/meta/recipes-extended/findutils/findutils_4.2.31.bb
@@ -1,33 +1,12 @@
-SUMMARY = "find, locate, and xargs binaries."
-DESCRIPTION = "The GNU Find Utilities are the basic directory searching utilities of the GNU operating system. \
-These programs are typically used in conjunction with other programs to provide modular and powerful directory \
-search and file locating capabilities to other commands."
-HOMEPAGE = "http://www.gnu.org/software/findutils/"
-BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils"
-SECTION = "console/utils"
-
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 PR = "r3"
 
-SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz \
-           file://gnulib-extension.patch \
-           file://findutils_fix_for_automake-1.12.patch \
+require findutils.inc
+
+SRC_URI += "file://gnulib-extension.patch \
+            file://findutils_fix_for_automake-1.12.patch \
            "
 
 SRC_URI[md5sum] = "a0e31a0f18a49709bf5a449867c8049a"
 SRC_URI[sha256sum] = "e0d34b8faca0b3cca0703f6c6b498afbe72f0ba16c35980c10ec9ef7724d6204"
-
-inherit autotools gettext update-alternatives
-
-ALTERNATIVE_LINKS = "${bindir}/find ${bindir}/xargs"
-ALTERNATIVE_PRIORITY = "100"
-
-# diffutils assumes non-glibc compilation with uclibc and
-# this causes it to generate its own implementations of
-# standard functionality.  regex.c actually breaks compilation
-# because it uses __mempcpy, there are other things (TBD:
-# see diffutils.mk in buildroot)
-EXTRA_OECONF_libc-uclibc = "--without-included-regex"
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/findutils/findutils_4.4.2.bb b/meta/recipes-extended/findutils/findutils_4.4.2.bb
index 34e53d2..3f49300 100644
--- a/meta/recipes-extended/findutils/findutils_4.4.2.bb
+++ b/meta/recipes-extended/findutils/findutils_4.4.2.bb
@@ -1,5 +1,9 @@
 require findutils.inc
 
+# GPLv2+ (<< 4.2.32), GPLv3+ (>= 4.2.32)
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
+ 
 PR = "r6"
 
 SRC_URI += "file://01-27017.patch \
@@ -18,5 +22,3 @@ DEPENDS = "bison-native"
 CACHED_CONFIGUREVARS += "${@base_contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}"
 
 EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
-
-BBCLASSEXTEND = "native"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 14/64] findutils: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/findutils/findutils.inc      |    2 +-
 .../recipes-extended/findutils/findutils_4.2.31.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc
index 1fa9b97..9306786 100644
--- a/meta/recipes-extended/findutils/findutils.inc
+++ b/meta/recipes-extended/findutils/findutils.inc
@@ -11,7 +11,7 @@ SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz"
 
 inherit autotools gettext update-alternatives
 
-ALTERNATIVE_LINKS = "${bindir}/find ${bindir}/xargs"
+ALTERNATIVE_${PN} = "find xargs"
 ALTERNATIVE_PRIORITY = "100"
 
 # diffutils assumes non-glibc compilation with uclibc and
diff --git a/meta/recipes-extended/findutils/findutils_4.2.31.bb b/meta/recipes-extended/findutils/findutils_4.2.31.bb
index 38cdc21..00c3f77 100644
--- a/meta/recipes-extended/findutils/findutils_4.2.31.bb
+++ b/meta/recipes-extended/findutils/findutils_4.2.31.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-PR = "r3"
+PR = "r4"
 
 require findutils.inc
 
-- 
1.7.7.6

[CONSOLIDATED REQUEST 15/64] powertop: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-kernel/powertop/powertop_1.13.bb |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-kernel/powertop/powertop_1.13.bb b/meta/recipes-kernel/powertop/powertop_1.13.bb
index b4f45dd..db54ed0 100644
--- a/meta/recipes-kernel/powertop/powertop_1.13.bb
+++ b/meta/recipes-kernel/powertop/powertop_1.13.bb
@@ -11,7 +11,7 @@ DEPENDS = "virtual/libintl ncurses"
 # powertop 1.13 needs lspci
 RDEPENDS_${PN} = "pciutils"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz \
            file://stub_out_the_ncurses_calls_in_dump_mode.patch \
@@ -25,12 +25,6 @@ EXTRA_OEMAKE = "VERSION=\"${PV}\" EXTRA_LIBS=${EXTRA_LIBS}"
 
 EXTRA_LIBS_libc-uclibc = "-lintl"
 
-inherit update-alternatives
-ALTERNATIVE_NAME = "powertop"
-ALTERNATIVE_PATH = "${bindir}/powertop"
-ALTERNATIVE_LINK = "${base_bindir}/powertop"
-ALTERNATIVE_PRIORITY = "100"
-
 do_configure() {
 	# We do not build ncurses with wide char support
 	sed -i -e 's:lncursesw:lncurses ${EXTRA_LIBS}:g' ${S}/Makefile
@@ -40,3 +34,8 @@ do_install() {
 	oe_runmake install DESTDIR=${D}
 }
 
+inherit update-alternatives
+ALTERNATIVE_${PN} = "powertop"
+ALTERNATIVE_TARGET[powertop] = "${bindir}/powertop"
+ALTERNATIVE_LINK_NAME[powertop] = "${base_bindir}/powertop"
+ALTERNATIVE_PRIORITY = "100"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 16/64] mutter: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-graphics/mutter/mutter.inc       |    5 ++---
 meta/recipes-graphics/mutter/mutter_2.29.1.bb |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc
index 4b73d97..27cf413 100644
--- a/meta/recipes-graphics/mutter/mutter.inc
+++ b/meta/recipes-graphics/mutter/mutter.inc
@@ -5,9 +5,8 @@ DEPENDS = "startup-notification gtk+ gconf clutter-1.8 gdk-pixbuf-native intltoo
 # gobject-introspection
 inherit gnome update-alternatives
 
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/mutter"
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/mutter"
 ALTERNATIVE_PRIORITY = "11"
 
 EXTRA_OECONF += "--disable-verbose	\
diff --git a/meta/recipes-graphics/mutter/mutter_2.29.1.bb b/meta/recipes-graphics/mutter/mutter_2.29.1.bb
index 5d031f6..aefd2c7 100644
--- a/meta/recipes-graphics/mutter/mutter_2.29.1.bb
+++ b/meta/recipes-graphics/mutter/mutter_2.29.1.bb
@@ -1,6 +1,6 @@
 require mutter.inc
 
-PR = "r0"
+PR = "r1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-- 
1.7.7.6

[CONSOLIDATED REQUEST 17/64] matchbox-wm-2: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../matchbox-wm-2/matchbox-wm-2_git.bb             |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
index 8b162be..7369339 100644
--- a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
+++ b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libxext libxrender startup-notification expat gconf pa
 
 SRCREV = "01fa5465743c9ee43d040350f4405d35293e4869"
 PV = "0.1+git${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager-2;protocol=git \
 	file://fix_makefile.patch \
@@ -20,9 +20,8 @@ inherit autotools pkgconfig update-alternatives
 # Change this to x-session-manager->matchbox-session and put in
 # matchbox-session, then change this to x-window-manager to
 # matchbox-window-manager-2.
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-window-manager"
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/matchbox-window-manager"
 ALTERNATIVE_PRIORITY = "10"
 
 PACKAGES =+ "libmatchbox2"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 18/64] matchbox-session: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../matchbox-session/matchbox-session_0.1.bb       |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
index 3faa16c..f4be279 100644
--- a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
+++ b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
@@ -11,13 +11,12 @@ RCONFLICTS_${PN} = "matchbox-common"
 SRC_URI = "file://matchbox-session"
 S = "${WORKDIR}"
 
-PR = "r2"
+PR = "r3"
 
 inherit update-alternatives
 
-ALTERNATIVE_NAME = "x-session-manager"
-ALTERNATIVE_LINK = "${bindir}/x-session-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_${PN} = "x-session-manager"
+ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/matchbox-session"
 ALTERNATIVE_PRIORITY = "10"
 
 do_install() {
-- 
1.7.7.6

[CONSOLIDATED REQUEST 19/64] metacity: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-gnome/gnome/metacity_2.30.3.bb |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-gnome/gnome/metacity_2.30.3.bb b/meta/recipes-gnome/gnome/metacity_2.30.3.bb
index 6db19c4..3524f0e 100644
--- a/meta/recipes-gnome/gnome/metacity_2.30.3.bb
+++ b/meta/recipes-gnome/gnome/metacity_2.30.3.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90"
 
 DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-native libcanberra gnome-doc-utils"
-PR = "r4"
+PR = "r5"
 
 inherit gnome update-alternatives
 
@@ -13,9 +13,8 @@ SRC_URI += "file://crosscompile.patch"
 SRC_URI[archive.md5sum] = "553784f376d96b902e19ff437cd5b339"
 SRC_URI[archive.sha256sum] = "08f887018fa5e447cf184d03bae3fe2c05fdb7583bed6768e3b4d66392fc18dd"
 
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/metacity"
+ALTERNATIVE_${PN} = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/metacity"
 ALTERNATIVE_PRIORITY = "10"
 
 EXTRA_OECONF += "--disable-verbose \
-- 
1.7.7.6

[CONSOLIDATED REQUEST 20/64] pigz: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/pigz/pigz.inc      |    4 +++-
 meta/recipes-extended/pigz/pigz_2.2.4.bb |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/pigz/pigz.inc b/meta/recipes-extended/pigz/pigz.inc
index e1cbc8b..be37e8a 100644
--- a/meta/recipes-extended/pigz/pigz.inc
+++ b/meta/recipes-extended/pigz/pigz.inc
@@ -27,6 +27,8 @@ do_install () {
 	fi
 }
 
-ALTERNATIVE_LINKS = "${base_bindir}/gzip ${base_bindir}/gunzip"
+ALTERNARIVE_${PN} = "gzip gunzip"
+ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip"
+ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip"
 ALTERNATIVE_PRIORITY = "80"
 
diff --git a/meta/recipes-extended/pigz/pigz_2.2.4.bb b/meta/recipes-extended/pigz/pigz_2.2.4.bb
index e76c49c..1cb9d08 100644
--- a/meta/recipes-extended/pigz/pigz_2.2.4.bb
+++ b/meta/recipes-extended/pigz/pigz_2.2.4.bb
@@ -1,6 +1,6 @@
 require pigz.inc
 
-PR = "r2"
+PR = "r3"
 
 NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
 
-- 
1.7.7.6

[CONSOLIDATED REQUEST 21/64] msmtp: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/msmtp/msmtp_1.4.24.bb |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-extended/msmtp/msmtp_1.4.24.bb b/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
index 2d2ee52..08566ca 100644
--- a/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
+++ b/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 
 LICENSE = "GPLv3"
 DEPENDS = "zlib gnutls"
-PR = "r2"
+PR = "r3"
 
 
 #COPYING or Licence
@@ -21,7 +21,7 @@ inherit gettext autotools update-alternatives
 
 EXTRA_OECONF += "--without-gnome-keyring"
 
-ALTERNATIVE_NAME = "sendmail"
-ALTERNATIVE_PATH = "${bindir}/msmtp"
-ALTERNATIVE_LINK = "${sbindir}/sendmail"
+ALTERNATIVE_${PN} = "sendmail"
+ALTERNATIVE_TARGET[sendmail] = "${bindir}/msmtp"
+ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail"
 ALTERNATIVE_PRIORITY = "100"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 22/64] mktemp: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/mktemp/mktemp_1.7.bb |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb b/meta/recipes-extended/mktemp/mktemp_1.7.bb
index b3a3d51..170a183 100644
--- a/meta/recipes-extended/mktemp/mktemp_1.7.bb
+++ b/meta/recipes-extended/mktemp/mktemp_1.7.bb
@@ -5,7 +5,7 @@ SECTION = "console/utils"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=430680f6322a1eb87199b5e01a82c0d4"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${BPN}-${PV}.tar.gz \
         file://disable-strip.patch \
@@ -20,12 +20,11 @@ inherit autotools update-alternatives
 EXTRA_OECONF = "--with-libc"
 
 do_install_append () {
-	mkdir ${D}${base_bindir}
-	mv ${D}${bindir}/mktemp ${D}${base_bindir}/mktemp.${BPN}
+	install -d ${D}${base_bindir}
+	mv ${D}${bindir}/mktemp ${D}${base_bindir}/mktemp
 	rmdir ${D}${bindir}
 }
 
-ALTERNATIVE_NAME = "mktemp"
-ALTERNATIVE_LINK = "${base_bindir}/mktemp"
-ALTERNATIVE_PATH = "${base_bindir}/mktemp.${BPN}"
+ALTERNATIVE_${PN} = "mktemp"
+ALTERNATIVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp"
 ALTERNATIVE_PRIORITY = "100"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 23/64] which: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/which/which_2.18.bb |    8 ++------
 meta/recipes-extended/which/which_2.20.bb |   10 ++--------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/meta/recipes-extended/which/which_2.18.bb b/meta/recipes-extended/which/which_2.18.bb
index d54e776..27a567c 100644
--- a/meta/recipes-extended/which/which_2.18.bb
+++ b/meta/recipes-extended/which/which_2.18.bb
@@ -9,7 +9,7 @@ BUGTRACKER = "n/a"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \
            file://fix_name_conflict_group_member.patch"
@@ -26,11 +26,7 @@ do_configure_prepend() {
 	NEW="-I ${STAGING_DIR_NATIVE}/${datadir}/cwautomacros/m4"
 	sed -i "s#${OLD}#${NEW}#g" `grep -rl ${OLD} ${S}`
 }
-do_install_append() {
-	mv ${D}/${bindir}/which ${D}/${bindir}/which.${BPN}
-}
 
-ALTERNATIVE_NAME = "which"
-ALTERNATIVE_PATH = "which.${BPN}"
+ALTERNATIVE_${PN} = "which"
 ALTERNATIVE_PRIORITY = "100"
 
diff --git a/meta/recipes-extended/which/which_2.20.bb b/meta/recipes-extended/which/which_2.20.bb
index 9b43943..312688f 100644
--- a/meta/recipes-extended/which/which_2.20.bb
+++ b/meta/recipes-extended/which/which_2.20.bb
@@ -8,7 +8,7 @@ DEPENDS     = "cwautomacros-native"
 
 inherit autotools update-alternatives
 
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF = "--disable-iberty"
 
@@ -22,11 +22,5 @@ do_configure_prepend() {
 	sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}/usr/share/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am
 }
 
-do_install() {
-	autotools_do_install
-	mv ${D}${bindir}/which ${D}${bindir}/which.${BPN}
-}
-
-ALTERNATIVE_NAME = "which"
-ALTERNATIVE_PATH = "which.${BPN}"
+ALTERNATIVE_${PN} = "which"
 ALTERNATIVE_PRIORITY = "100"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 24/64] less: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/less/less_444.bb |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-extended/less/less_444.bb b/meta/recipes-extended/less/less_444.bb
index 146b4fd..1ce9d92 100644
--- a/meta/recipes-extended/less/less_444.bb
+++ b/meta/recipes-extended/less/less_444.bb
@@ -23,7 +23,7 @@ LICENSE = "GPLv3+ | BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://LICENSE;md5=1237c0f825bb36122b0b2b486ffbe6be"
 DEPENDS = "ncurses"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz"
 
@@ -34,9 +34,7 @@ inherit autotools update-alternatives
 
 do_install () {
         oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install
-        mv ${D}${bindir}/less ${D}${bindir}/less.${BPN}
 }
 
-ALTERNATIVE_NAME = "less"
-ALTERNATIVE_PATH = "less.${BPN}"
+ALTERNATIVE_${PN} = "less"
 ALTERNATIVE_PRIORITY = "100"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 25/64] shadow: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/shadow/shadow_4.1.4.3.bb |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index de10f64..6794cc1 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
 
 DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
            file://login_defs_pam.sed \
@@ -105,17 +105,11 @@ inherit update-alternatives
 
 ALTERNATIVE_PRIORITY = "200"
 
-bindir_progs = "passwd chfn newgrp chsh groups"
-ALTERNATIVE_LINKS += "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}"
-
-sbindir_progs = "chpasswd"
-ALTERNATIVE_LINKS += "${sbindir}/${@' ${sbindir}/'.join((d.getVar('sbindir_progs', True)).split())}"
-
-base_bindir_progs = "login"
-ALTERNATIVE_LINKS += "${base_bindir}/${@' ${base_bindir}/'.join((d.getVar('base_bindir_progs', True)).split())}"
-
-base_sbindir_progs = "vipw vigr"
-ALTERNATIVE_LINKS += "${base_sbindir}/${@' ${base_sbindir}/'.join((d.getVar('base_sbindir_progs', True)).split())}"
+ALTERNATIVE_${PN} = "passwd chfn newgrp chsh groups chpasswd login vipw vigr"
+ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd"
+ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login"
+ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw"
+ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr"
 
 pkg_postinst_${PN} () {
 	if [ "x$D" != "x" ]; then
-- 
1.7.7.6

[CONSOLIDATED REQUEST 26/64] mingetty: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/mingetty/mingetty_1.08.bb |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-extended/mingetty/mingetty_1.08.bb b/meta/recipes-extended/mingetty/mingetty_1.08.bb
index a1f9eb2..235a3be 100644
--- a/meta/recipes-extended/mingetty/mingetty_1.08.bb
+++ b/meta/recipes-extended/mingetty/mingetty_1.08.bb
@@ -13,14 +13,13 @@ SRC_URI[sha256sum] = "0f55c90ba4faa913d91ef99cbf5cb2eb4dbe2780314c3bb17953f849c8
 EXTRA_OEMAKE = "CC='${CC}'"
 
 do_install(){
-    mkdir -p ${D}${mandir}/man8
-    mkdir -p ${D}${base_sbindir}
+    install -d ${D}${mandir}/man8 ${D}/${base_sbindir}
     oe_runmake install DESTDIR=${D}
 }
 
 inherit update-alternatives
 
-ALTERNATIVE_NAME = "getty"
-ALTERNATIVE_LINK = "${base_sbindir}/getty"
-ALTERNATIVE_PATH = "${base_sbindir}/mingetty"
+ALTERNATIVE_${PN} = "getty"
+ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty"
+ALTERNATIVE_TARGET[getty] = "${base_sbindir}/mingetty"
 ALTERNATIVE_PRIORITY = "50"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 27/64] hdparm: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/hdparm/hdparm_9.39.bb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/hdparm/hdparm_9.39.bb b/meta/recipes-extended/hdparm/hdparm_9.39.bb
index 40ebd35..1dfc57f 100644
--- a/meta/recipes-extended/hdparm/hdparm_9.39.bb
+++ b/meta/recipes-extended/hdparm/hdparm_9.39.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=910a8a42c962d238619c75fdb78bdb24 \
                     file://wiper/GPLv2.txt;md5=fcb02dc552a041dee27e4b85c7396067 \
                     file://wiper/wiper.sh;beginline=7;endline=31;md5=b7bc642addc152ea307505bf1a296f09"
 
-PR = "r2"
+PR = "r3"
 
 PACKAGES += "wiper"
 
@@ -25,7 +25,8 @@ EXTRA_OEMAKE += 'STRIP="echo"'
 
 inherit update-alternatives
 
-ALTERNATIVE_LINKS = "${base_sbindir}/hdparm"
+ALTERNATIVE_${PN} = "hdparm"
+ALTERNATIVE_LINK_NAME[hdparm] = "${base_sbindir}/hdparm"
 ALTERNATIVE_PRIORITY = "100"
 
 do_install () {
-- 
1.7.7.6

[CONSOLIDATED REQUEST 28/64] gzip: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/gzip/gzip_1.3.12.bb |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/gzip/gzip_1.3.12.bb b/meta/recipes-extended/gzip/gzip_1.3.12.bb
index 6d18d47..7a04b87 100644
--- a/meta/recipes-extended/gzip/gzip_1.3.12.bb
+++ b/meta/recipes-extended/gzip/gzip_1.3.12.bb
@@ -16,7 +16,7 @@ SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz \
 SRC_URI[md5sum] = "b5bac2d21840ae077e0217bc5e4845b1"
 SRC_URI[sha256sum] = "3f565be05f7f3d1aff117c030eb7c738300510b7d098cedea796ca8e4cd587af"
 
-PR = "r1"
+PR = "r2"
 
 inherit autotools
 
@@ -30,7 +30,10 @@ do_install_append () {
 
 inherit update-alternatives
 
-ALTERNATIVE_LINKS = "${base_bindir}/gunzip ${base_bindir}/gzip ${base_bindir}/zcat"
+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"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 29/64] procps: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/procps/procps.inc      |    9 +++++++--
 meta/recipes-extended/procps/procps_3.2.8.bb |    9 +--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-extended/procps/procps.inc b/meta/recipes-extended/procps/procps.inc
index 80080fc..6ee4a04 100644
--- a/meta/recipes-extended/procps/procps.inc
+++ b/meta/recipes-extended/procps/procps.inc
@@ -13,8 +13,13 @@ DEPENDS = "ncurses"
 SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
            file://install.patch"
 
-inherit autotools
+inherit autotools update-alternatives
 
 FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so"
 FILES_SOLIBSDEV = ""
-FILES_${PN} += ""
+
+ALTERNATIVE_${PN} = "top uptime free pkill pmap kill sysctl ps pgrep pwdx watch"
+ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
+ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl"
+ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps"
+ALTERNATIVE_PRIORITY = "110"
diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb
index 5508eb0..7b011a0 100644
--- a/meta/recipes-extended/procps/procps_3.2.8.bb
+++ b/meta/recipes-extended/procps/procps_3.2.8.bb
@@ -1,13 +1,6 @@
 require procps.inc
 
-PR = "r8"
-
-inherit update-alternatives
-
-ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill ${bindir}/pmap \
-                     ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps \
-                     ${bindir}/pgrep ${bindir}/pwdx ${bindir}/watch"
-ALTERNATIVE_PRIORITY = "110"
+PR = "r9"
 
 SRC_URI += "file://procmodule.patch \
             file://psmodule.patch \
-- 
1.7.7.6

[CONSOLIDATED REQUEST 30/64] time: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/time/time.inc    |    8 +-------
 meta/recipes-extended/time/time_1.7.bb |    2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-extended/time/time.inc b/meta/recipes-extended/time/time.inc
index 8e35843..028da7c 100644
--- a/meta/recipes-extended/time/time.inc
+++ b/meta/recipes-extended/time/time.inc
@@ -8,11 +8,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
 inherit update-alternatives
 
-do_install_append () {
-        mv ${D}${bindir}/time ${D}${bindir}/time.${BPN}
-}
-
-ALTERNATIVE_NAME = "time"
-ALTERNATIVE_LINK = "${bindir}/time"
-ALTERNATIVE_PATH = "${bindir}/time.${BPN}"
+ALTERNATIVE_${PN} = "time"
 ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/time/time_1.7.bb b/meta/recipes-extended/time/time_1.7.bb
index c38608f..92c5353 100644
--- a/meta/recipes-extended/time/time_1.7.bb
+++ b/meta/recipes-extended/time/time_1.7.bb
@@ -1,6 +1,6 @@
 require time.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \
 	   file://debian.patch"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 31/64] wget: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/wget/wget.inc |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index 4e1e931..3575c87 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -4,17 +4,11 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS = "openssl"
 
-INC_PR = "r14"
+INC_PR = "r15"
 
 inherit autotools gettext update-alternatives
 
 EXTRA_OECONF = "--with-libc --enable-ipv6 --with-libssl-prefix=${STAGING_DIR_HOST} --with-ssl=openssl --disable-rpath"
 
-do_install_append () {
-	mv ${D}${bindir}/wget ${D}${bindir}/wget.${BPN}
-}
-
-ALTERNATIVE_NAME = "wget"
-ALTERNATIVE_LINK = "${bindir}/wget"
-ALTERNATIVE_PATH = "${bindir}/wget.${BPN}"
+ALTERNATIVE_${PN} = "wget"
 ALTERNATIVE_PRIORITY = "100"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 32/64] sed: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/sed/sed_4.1.2.bb |    9 ++++-----
 meta/recipes-extended/sed/sed_4.2.1.bb |    9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb
index 3455c20..821ff65 100644
--- a/meta/recipes-extended/sed/sed_4.1.2.bb
+++ b/meta/recipes-extended/sed/sed_4.1.2.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://sed/sed.h;beginline=1;endline=17;md5=e00ffd1837f298439a214fd197f6a407"
 SECTION = "console/utils"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz \
            file://fix_return_type.patch \
@@ -18,13 +18,12 @@ inherit autotools update-alternatives gettext
 do_install () {
 	autotools_do_install
 	install -d ${D}${base_bindir}
-	mv ${D}${bindir}/sed ${D}${base_bindir}/sed.${BPN}
+	mv ${D}${bindir}/sed ${D}${base_bindir}/sed
 	rmdir ${D}${bindir}/
 }
 
-ALTERNATIVE_NAME = "sed"
-ALTERNATIVE_PATH = "sed.${BPN}"
-ALTERNATIVE_LINK = "${base_bindir}/sed"
+ALTERNATIVE_${PN} = "sed"
+ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed"
 ALTERNATIVE_PRIORITY = "100"
 
 BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/sed/sed_4.2.1.bb b/meta/recipes-extended/sed/sed_4.2.1.bb
index b39eca0..96c509a 100644
--- a/meta/recipes-extended/sed/sed_4.2.1.bb
+++ b/meta/recipes-extended/sed/sed_4.2.1.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
                     file://sed/sed.h;beginline=1;endline=17;md5=767ab3a06d7584f6fd0469abaec4412f"
 SECTION = "console/utils"
-PR = "r3"
+PR = "r5"
 
 SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz"
 
@@ -18,13 +18,12 @@ EXTRA_OECONF = "--disable-acl"
 do_install () {
 	autotools_do_install
 	install -d ${D}${base_bindir}
-	mv ${D}${bindir}/sed ${D}${base_bindir}/sed.${BPN}
+	mv ${D}${bindir}/sed ${D}${base_bindir}/sed
 	rmdir ${D}${bindir}/
 }
 
-ALTERNATIVE_NAME = "sed"
-ALTERNATIVE_PATH = "sed.${BPN}"
-ALTERNATIVE_LINK = "${base_bindir}/sed"
+ALTERNATIVE_${PN} = "sed"
+ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed"
 ALTERNATIVE_PRIORITY = "100"
 
 BBCLASSEXTEND = "native"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 33/64] gawk: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/gawk/gawk_3.1.5.bb |    7 +++----
 meta/recipes-extended/gawk/gawk_4.0.1.bb |    7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-extended/gawk/gawk_3.1.5.bb b/meta/recipes-extended/gawk/gawk_3.1.5.bb
index 89dd01c..5500974 100644
--- a/meta/recipes-extended/gawk/gawk_3.1.5.bb
+++ b/meta/recipes-extended/gawk/gawk_3.1.5.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 RDEPENDS_gawk += "gawk-common"
 RDEPENDS_pgawk += "gawk-common"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
 	file://gawk-3.1.5_fix_for_automake-1.12.patch"
@@ -30,9 +30,8 @@ FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/*"
 FILES_pgawk = "${bindir}/pgawk*"
 FILES_${PN}-dbg += "${libexecdir}/awk/.debug"
 
-ALTERNATIVE_NAME = "awk"
-ALTERNATIVE_PATH = "gawk"
-ALTERNATIVE_LINK = "${bindir}/awk"
+ALTERNATIVE_${PN} = "awk"
+ALTERNATIVE_TARGET[awk] = "${bindir}/gawk"
 ALTERNATIVE_PRIORITY = "100"
 
 CFLAGS += "-D PROTOTYPES"
diff --git a/meta/recipes-extended/gawk/gawk_4.0.1.bb b/meta/recipes-extended/gawk/gawk_4.0.1.bb
index b986ebd..fcd7619 100644
--- a/meta/recipes-extended/gawk/gawk_4.0.1.bb
+++ b/meta/recipes-extended/gawk/gawk_4.0.1.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 RDEPENDS_gawk += "gawk-common"
 RDEPENDS_pgawk += "gawk-common"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz"
 
@@ -28,9 +28,8 @@ FILES_pgawk = "${bindir}/pgawk*"
 FILES_${PN}-dbg += "${libexecdir}/awk/.debug"
 FILES_dgawk = "${bindir}/dgawk*"
 
-ALTERNATIVE_NAME = "awk"
-ALTERNATIVE_PATH = "gawk"
-ALTERNATIVE_LINK = "${bindir}/awk"
+ALTERNATIVE_${PN} = "awk"
+ALTERNATIVE_TARGET[awk] = "${bindir}/gawk"
 ALTERNATIVE_PRIORITY = "100"
 
 do_install_append() {
-- 
1.7.7.6

[CONSOLIDATED REQUEST 34/64] net-tools: cleanup update-alternatives deprecated code

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../net-tools/net-tools_1.60-23.bb                 |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
index 764955e..309363b 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
@@ -5,7 +5,7 @@ BUGTRACKER = "http://bugs.debian.org/net-tools"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
                     file://ifconfig.c;startline=11;endline=15;md5=da4c7bb79a5d0798faa99ef869721f4a"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/n/net-tools/net-tools_1.60.orig.tar.gz;name=tarball \
            ${DEBIAN_MIRROR}/main/n/net-tools/${BPN}_${PV}.diff.gz;apply=no;name=patch \
@@ -67,16 +67,21 @@ do_compile() {
 	oe_runmake
 }
 
+do_install() {
+	oe_runmake 'BASEDIR=${D}' install
+}
+
 inherit update-alternatives
 
 base_sbindir_progs = "arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach"
-ALTERNATIVE_LINKS += "${base_sbindir}/${@' ${base_sbindir}/'.join((d.getVar('base_sbindir_progs', True)).split())}"
-
 base_bindir_progs  = "dnsdomainname domainname hostname netstat nisdomainname ypdomainname"
-ALTERNATIVE_LINKS += "${base_bindir}/${@' ${base_bindir}/'.join((d.getVar('base_bindir_progs', True)).split())}"
 
+ALTERNATIVE_${PN} = "${base_sbindir_progs} ${base_bindir_progs}"
+python __anonymous() {
+	for prog in d.getVar('base_sbindir_progs', True).split():
+		d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_sbindir', True), prog))
+	for prog in d.getVar('base_bindir_progs', True).split():
+		d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog))
+}
 ALTERNATIVE_PRIORITY = "100"
 
-do_install() {
-	oe_runmake 'BASEDIR=${D}' install
-}
-- 
1.7.7.6

[CONSOLIDATED REQUEST 00/64] Post Milestone Catch-Up

[Saul Wold]

Richard,

Here is a set of patches that I have pulled together after the
milestone freeze, I know there is more, these have been through
the AB together, and passed local testing.

I have also included my update-alternative patch set, which I verified
with buildhistory (it showed no changes, which is good).

I will start working on the next patch today to put to the AB tonight
before I leave back the US tomorrow.

Thanks
	Sau!

The following changes since commit b5028cc84ad7c40c51cadbdf7fdc892cde4462cb:

  createrepo: add wrapper script to fix paths (2012-08-13 20:09:22 +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

Andy Ross (1):
  dbus: Fix pid file in dbus init script

Björn Stenberg (1):
  pigz: Update to upstream version 2.2.5

Bruce Ashfield (1):
  kernel.bbclass: remove default module_autoload and module_conf values

Christopher Larson (1):
  base.bbclass: allow specifying an lsb distro hook via the metadata

Constantin Musca (1):
  libdrm: package update 2.4.35 -> 2.4.37

Jackie Huang (2):
  tcl: uncomment a line that causing TCL_SRC_DIR point to the workdir.
  gdk-pixbuf: fix the postinstall script failure when no icon is
    installed

Jesse Zhang (1):
  libxpm-native: add dependency on gettext-native

Kenneth Solbjerg (1):
  run-postinsts does not run any scripts

Khem Raj (2):
  chrpath.bbclass: Account for case when ORIGIN is in RPATH
  kernel.bbclass: Preserve generated headers

Koen Kooi (2):
  man: fix RDEPENDS and reformat recipe
  man: make man actually work by installing custom man.config

Marcin Juszkiewicz (1):
  dbus: provide/replace dbus-x11 only for target

Martin Jansa (2):
  bitbake.conf: store cooker logs in subdirectory of LOG_DIR
  layer.conf: add udev-extraconf to SIGGEN_EXCLUDERECIPES_ABISAFE

Matthew McClintock (1):
  owl-video_git.bb: fix compilation on Fedora 13 machine

Mihai Lindner (1):
  sysklogd: removed tabs from syslog.conf

Paul Eggleton (1):
  rpmresolve: improve debug output

Peter Seebach (2):
  base.bbclass: Expand PNBLACKLIST across multilibs too
  base.bbclass: Restructure multilib variable cloning

Radu Moisan (1):
  pango: upgrade to upstream stable 1.30.0

Roy.Li (1):
  qemu: backport patch to fix pl031 RTC

Saul Wold (34):
  rxvt-unicode: remove setting of LD_LIBRARY_PATH
  rxvt-unicode: cleanup update-alternatives deprecated code
  openssh: cleanup update-alternatives deprecated code
  mini-x-session: cleanup update-alternatives deprecated code
  console-tools: cleanup update-alternatives deprecated code
  kbd: cleanup update-alternatives deprecated code
  tinylogin: cleanup update-alternatives deprecated code
  patch: cleanup update-alternatives deprecated code
  ubootchart: cleanup update-alternatives deprecated code
  bc: cleanup update-alternatives deprecated code
  diffutils: refactor to add a common diffutils.inc
  diffutils: cleanup update-alternatives deprecated code
  findutils: refactor common code to findutils.inc
  findutils: cleanup update-alternatives deprecated code
  powertop: cleanup update-alternatives deprecated code
  mutter: cleanup update-alternatives deprecated code
  matchbox-wm-2: cleanup update-alternatives deprecated code
  matchbox-session: cleanup update-alternatives deprecated code
  metacity: cleanup update-alternatives deprecated code
  pigz: cleanup update-alternatives deprecated code
  msmtp: cleanup update-alternatives deprecated code
  mktemp: cleanup update-alternatives deprecated code
  which: cleanup update-alternatives deprecated code
  less: cleanup update-alternatives deprecated code
  shadow: cleanup update-alternatives deprecated code
  mingetty: cleanup update-alternatives deprecated code
  hdparm: cleanup update-alternatives deprecated code
  gzip: cleanup update-alternatives deprecated code
  procps: cleanup update-alternatives deprecated code
  time: cleanup update-alternatives deprecated code
  wget: cleanup update-alternatives deprecated code
  sed: cleanup update-alternatives deprecated code
  gawk: cleanup update-alternatives deprecated code
  net-tools: cleanup update-alternatives deprecated code

Wade Farnsworth (1):
  systemtap-uprobes: inhibit package strip

Wenzong Fan (2):
  at 3.1.13: get 'at' depends on 'flex-native' explicitly
  sysfsutils: install libs to base_libdir

Xin Ouyang (1):
  gettext-0.18: explicitly disable acl.

Yao Zhao (3):
  base.bbclass: fix PACKAGECONFIG handling code
  gstreamer: gst-ffmpeg: fix build issues for libav
  cracklib, zlib, perl: install libz, libcrack to /lib instead of
    /usr/libxx

 meta/classes/base.bbclass                          |   97 +++--
 meta/classes/chrpath.bbclass                       |    1 +
 meta/classes/kernel.bbclass                        |   21 +-
 meta/classes/package_rpm.bbclass                   |    4 +-
 meta/classes/rootfs_rpm.bbclass                    |    2 +-
 meta/conf/bitbake.conf                             |    4 +-
 meta/conf/layer.conf                               |    1 +
 meta/recipes-connectivity/openssh/openssh_6.0p1.bb |    4 -
 .../console-tools/console-tools_0.3.2.bb           |    8 +-
 meta/recipes-core/dbus/dbus-1.4.20/dbus-1.init     |   11 +-
 meta/recipes-core/dbus/dbus-1.5.12/dbus-1.init     |   11 +-
 meta/recipes-core/dbus/dbus.inc                    |    4 +
 meta/recipes-core/gettext/gettext_0.18.1.1.bb      |    3 +-
 meta/recipes-core/kbd/kbd_1.15.2.bb                |    7 +-
 meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb   |    4 +-
 meta/recipes-core/tinylogin/tinylogin_1.4.bb       |   11 +-
 meta/recipes-core/zlib/zlib_1.2.7.bb               |   11 +-
 .../dpkg/run-postinsts/run-postinsts.awk           |    2 +-
 meta/recipes-devtools/patch/patch.inc              |    7 +-
 meta/recipes-devtools/patch/patch_2.5.9.bb         |    2 +-
 meta/recipes-devtools/patch/patch_2.6.1.bb         |    2 +-
 meta/recipes-devtools/perl/perl_5.14.2.bb          |    4 +-
 ...-Actually-raise-interrupt-on-timer-expiry.patch |   41 ++
 meta/recipes-devtools/qemu/qemu_0.15.1.bb          |    1 +
 meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c  |   69 +++-
 meta/recipes-devtools/tcltk/tcl_8.5.11.bb          |    2 +-
 meta/recipes-devtools/ubootchart/ubootchart_svn.bb |    6 +-
 meta/recipes-extended/at/at_3.1.13.bb              |    4 +-
 meta/recipes-extended/bc/bc_1.06.bb                |    4 +-
 meta/recipes-extended/cracklib/cracklib_2.8.19.bb  |    4 +-
 meta/recipes-extended/diffutils/diffutils.inc      |   22 +
 meta/recipes-extended/diffutils/diffutils_2.8.1.bb |   24 +-
 meta/recipes-extended/diffutils/diffutils_3.2.bb   |   22 +-
 meta/recipes-extended/findutils/findutils.inc      |    7 +-
 .../recipes-extended/findutils/findutils_4.2.31.bb |   31 +--
 meta/recipes-extended/findutils/findutils_4.4.2.bb |    6 +-
 meta/recipes-extended/gawk/gawk_3.1.5.bb           |    7 +-
 meta/recipes-extended/gawk/gawk_4.0.1.bb           |    7 +-
 meta/recipes-extended/gzip/gzip_1.3.12.bb          |    7 +-
 meta/recipes-extended/hdparm/hdparm_9.39.bb        |    5 +-
 meta/recipes-extended/less/less_444.bb             |    6 +-
 meta/recipes-extended/man/man-1.6f/man.conf        |  140 +++++++
 meta/recipes-extended/man/man_1.6f.bb              |   11 +-
 meta/recipes-extended/mingetty/mingetty_1.08.bb    |    9 +-
 meta/recipes-extended/mktemp/mktemp_1.7.bb         |   11 +-
 meta/recipes-extended/msmtp/msmtp_1.4.24.bb        |    8 +-
 .../net-tools/net-tools_1.60-23.bb                 |   19 +-
 meta/recipes-extended/pigz/pigz.inc                |    4 +-
 meta/recipes-extended/pigz/pigz_2.2.4.bb           |   11 -
 meta/recipes-extended/pigz/pigz_2.2.5.bb           |    9 +
 meta/recipes-extended/procps/procps.inc            |    9 +-
 meta/recipes-extended/procps/procps_3.2.8.bb       |    9 +-
 meta/recipes-extended/sed/sed_4.1.2.bb             |    9 +-
 meta/recipes-extended/sed/sed_4.2.1.bb             |    9 +-
 meta/recipes-extended/shadow/shadow_4.1.4.3.bb     |   18 +-
 meta/recipes-extended/sysklogd/files/syslog.conf   |   23 +-
 meta/recipes-extended/sysklogd/sysklogd_1.5.bb     |    2 +-
 meta/recipes-extended/time/time.inc                |    8 +-
 meta/recipes-extended/time/time_1.7.bb             |    2 +-
 meta/recipes-extended/wget/wget.inc                |   10 +-
 meta/recipes-extended/which/which_2.18.bb          |    8 +-
 meta/recipes-extended/which/which_2.20.bb          |   10 +-
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |   10 +-
 meta/recipes-gnome/gnome/metacity_2.30.3.bb        |    7 +-
 .../drm/{libdrm_2.4.35.bb => libdrm_2.4.37.bb}     |    4 +-
 .../matchbox-session/matchbox-session_0.1.bb       |    7 +-
 .../matchbox-wm-2/matchbox-wm-2_git.bb             |    7 +-
 .../mini-x-session/mini-x-session_0.1.bb           |    7 +-
 meta/recipes-graphics/mutter/mutter.inc            |    5 +-
 meta/recipes-graphics/mutter/mutter_2.29.1.bb      |    2 +-
 .../pango/pango-1.28.4/no-tests.patch              |   16 -
 .../pango/pango-1.28.4/noconst.patch               |  408 --------------------
 .../multilib-fix-clean.patch                       |    0
 .../pango/pango-1.30.0/no-tests.patch              |   12 +
 .../pango/{pango_1.28.4.bb => pango_1.30.0.bb}     |    9 +-
 meta/recipes-graphics/xorg-lib/libxpm_3.5.10.bb    |    3 +-
 meta/recipes-kernel/powertop/powertop_1.13.bb      |   13 +-
 .../systemtap/systemtap-uprobes_git.bb             |    2 +
 .../gst-ffmpeg-0.10.13/libav_e500mc.patch          |   21 +
 .../gstreamer/gst-ffmpeg_0.10.13.bb                |   16 +-
 .../owl-video/0001-add-dependency-for-xrandr.patch |   30 ++
 .../recipes-sato/owl-video-widget/owl-video_git.bb |    5 +-
 .../recipes-sato/rxvt-unicode/rxvt-unicode_9.15.bb |   10 +-
 83 files changed, 621 insertions(+), 808 deletions(-)
 create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/hw-pl031-Actually-raise-interrupt-on-timer-expiry.patch
 create mode 100644 meta/recipes-extended/diffutils/diffutils.inc
 create mode 100644 meta/recipes-extended/man/man-1.6f/man.conf
 delete mode 100644 meta/recipes-extended/pigz/pigz_2.2.4.bb
 create mode 100644 meta/recipes-extended/pigz/pigz_2.2.5.bb
 rename meta/recipes-graphics/drm/{libdrm_2.4.35.bb => libdrm_2.4.37.bb} (50%)
 delete mode 100644 meta/recipes-graphics/pango/pango-1.28.4/no-tests.patch
 delete mode 100644 meta/recipes-graphics/pango/pango-1.28.4/noconst.patch
 rename meta/recipes-graphics/pango/{pango-1.28.4 => pango-1.30.0}/multilib-fix-clean.patch (100%)
 create mode 100644 meta/recipes-graphics/pango/pango-1.30.0/no-tests.patch
 rename meta/recipes-graphics/pango/{pango_1.28.4.bb => pango_1.30.0.bb} (49%)
 create mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav_e500mc.patch
 create mode 100644 meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch

-- 
1.7.7.6

[CONSOLIDATED REQUEST 35/64] run-postinsts does not run any scripts

[Saul Wold]

From: Kenneth Solbjerg <kenneth.solbjerg@moveinnovation.dk>

Hi

Sorry for any mistakes, but this is my first patch...

On my system (core-image-base, .deb package files), run-postinsts does
not run any scripts due to a failed test in run-postinsts.awk.
As dpkg is not actually installed on target, opkg is identified as the
pkgdir and that is not right...

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../dpkg/run-postinsts/run-postinsts.awk           |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk
index 18a0492..cbc8d1a 100644
--- a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk
+++ b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk
@@ -7,7 +7,7 @@
 #
 
 BEGIN {
-  rc=system("test -d /usr/dpkg/info/")
+  rc=system("test -d /var/lib/dpkg/info/")
   if (rc==0)
     pkgdir="/var/lib/dpkg/info"
   else
-- 
1.7.7.6

[CONSOLIDATED REQUEST 36/64] dbus: provide/replace dbus-x11 only for target

[Saul Wold]

From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/dbus/dbus.inc |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 1984c74..fc75592 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -39,6 +39,10 @@ OLDPKGNAME_virtclass-nativesdk = ""
 # for compatibility
 RPROVIDES_${PN} = "${OLDPKGNAME}"
 RREPLACES_${PN} += "${OLDPKGNAME}"
+RPROVIDES_${PN}_virtclass-native = ""
+RREPLACES_${PN}_virtclass-native = ""
+RPROVIDES_${PN}_virtclass-nativesdk = ""
+RREPLACES_${PN}_virtclass-nativesdk = ""
 
 FILES_${PN}-systemd = "${systemd_unitdir}/system/"
 
-- 
1.7.7.6

[CONSOLIDATED REQUEST 37/64] systemtap-uprobes: inhibit package strip

[Saul Wold]

From: Wade Farnsworth <wade_farnsworth@mentor.com>

uprobes.ko is not located in /lib/modules, so it fails the check in
runstrip that ensures that only the debug section is stripped, leaving
the symbols untouched.  This prevents the module from being inserted at
run time.  Inhibiting package stripping fixes the problem.

Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../systemtap/systemtap-uprobes_git.bb             |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
index 0cfcbe4..12ab139 100644
--- a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
@@ -9,6 +9,8 @@ PR = "r1"
 # On systems without CONFIG_UTRACE, this package is empty.
 ALLOW_EMPTY_${PN} = "1"
 
+INHIBIT_PACKAGE_STRIP = "1"
+
 inherit module-base gettext
 
 FILES_${PN} += "${datadir}/systemtap/runtime/uprobes"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 38/64] base.bbclass: fix PACKAGECONFIG handling code

[Saul Wold]

From: Yao Zhao <yao.zhao@windriver.com>

PACKAGECONFIG flag code only handles that when it has 3 or 4 items in flag,
it may have a stale data if some flags doesn't need DEPENDS and RDEPENDS.

Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/base.bbclass |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e15fa26..3e6a7de 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -364,20 +364,19 @@ python () {
             if flag == "defaultval":
                 continue
             items = flagval.split(",")
-            if len(items) == 3:
-                enable, disable, depend = items
-                rdepend = ""
-            elif len(items) == 4:
-                enable, disable, depend, rdepend = items
+            num = len(items)
+            if num > 4:
+                bb.error("Only enable,disable,depend,rdepend can be specified!")
+
             if flag in pkgconfig:
-                if depend:
-                    extradeps.append(depend)
-                if rdepend:
-                    extrardeps.append(rdepend)
-                if enable:
-                    extraconf.append(enable)
-            elif disable:
-                    extraconf.append(disable)
+                if num >= 3 and items[2]:
+                    extradeps.append(items[2])
+                if num >= 4 and items[3]:
+                    extrardeps.append(items[3])
+                if num >= 1 and items[0]:
+                    extraconf.append(items[0])
+            elif num >= 2 and items[1]:
+                    extraconf.append(items[1])
         appendVar('DEPENDS', extradeps)
         appendVar('RDEPENDS_${PN}', extrardeps)
         appendVar('EXTRA_OECONF', extraconf)
-- 
1.7.7.6

[CONSOLIDATED REQUEST 39/64] bitbake.conf: store cooker logs in subdirectory of LOG_DIR

[Saul Wold]

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

* we should probably wait until
  http://git.openembedded.org/bitbake/commit/?id=1e06d8012868ba5a31503dc99cbf18570be629d9
  is in next required bitbake version, but error message if the directory doesn't exist is quite clear
* people with new enough bitbake could just change this in their local.conf

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

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d5a43e9..8074684 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -753,8 +753,8 @@ DISTRO[unexport] = "1"
 # Used by canadian-cross to handle string conversions on TARGET_ARCH where needed
 TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH', True).replace("_", "-")}"
 
-# Complete output from bitbake, if you're changing it, make sure to use existing directory
-BB_CONSOLELOG ?= "${TMPDIR}/cooker.log.${DATETIME}"
+# Complete output from bitbake
+BB_CONSOLELOG ?= "${LOG_DIR}/cooker/${MACHINE}/${DATETIME}.log"
 
 # Setup our default hash policy
 BB_SIGNATURE_HANDLER ?= "OEBasicHash"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 40/64] base.bbclass: allow specifying an lsb distro hook via the metadata

[Saul Wold]

From: Christopher Larson <chris_larson@mentor.com>

This is useful when you have a rather large set of compatible distros. For
example: Centos 5.4, 5.5, 5.6, etc, RHEL server 5.x, RHEL workstation 5.x.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/base.bbclass |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 3e6a7de..8845d81 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -34,11 +34,21 @@ def oe_import(d):
 python oe_import_eh () {
     if isinstance(e, bb.event.ConfigParsed):
         oe_import(e.data)
-        e.data.setVar("NATIVELSBSTRING", oe.lsb.distro_identifier())
+        e.data.setVar("NATIVELSBSTRING", lsb_distro_identifier(e.data))
 }
 
 addhandler oe_import_eh
 
+def lsb_distro_identifier(d):
+    adjust = d.getVar('LSB_DISTRO_ADJUST', True)
+    adjust_func = None
+    if adjust:
+        try:
+            adjust_func = globals()[adjust]
+        except KeyError:
+            pass
+    return oe.lsb.distro_identifier(adjust_func)
+
 die() {
 	bbfatal "$*"
 }
-- 
1.7.7.6

[CONSOLIDATED REQUEST 41/64] libxpm-native: add dependency on gettext-native

[Saul Wold]

From: Jesse Zhang <sen.zhang@windriver.com>

libxpm needs xgettext to build po files. Add explicit dependency on
gettext-native.

Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-graphics/xorg-lib/libxpm_3.5.10.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libxpm_3.5.10.bb b/meta/recipes-graphics/xorg-lib/libxpm_3.5.10.bb
index 9eaa212..6830216 100644
--- a/meta/recipes-graphics/xorg-lib/libxpm_3.5.10.bb
+++ b/meta/recipes-graphics/xorg-lib/libxpm_3.5.10.bb
@@ -10,7 +10,8 @@ protocol."
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3e07763d16963c3af12db271a31abaa5"
 DEPENDS += "libxext libsm libxt"
-PR = "r0"
+DEPENDS_virtclass-native = "gettext-native"
+PR = "r1"
 PE = "1"
 
 XORG_PN = "libXpm"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 42/64] layer.conf: add udev-extraconf to SIGGEN_EXCLUDERECIPES_ABISAFE

[Saul Wold]

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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/conf/layer.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 090c8e2..dfcb1f3 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -23,4 +23,5 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
   pointercal \
   base-files \
   keymaps \
+  udev-extraconf \
 "
-- 
1.7.7.6

[CONSOLIDATED REQUEST 43/64] tcl: uncomment a line that causing TCL_SRC_DIR point to the workdir.

[Saul Wold]

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

The line 'sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh'
is commented somehow in previous commit, so that TCL_SRC_DIR
point to the tcl workdir which will cause package that use it
fail to configure or compile when the tcl workdir is removed,
so uncomment it back.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/tcltk/tcl_8.5.11.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
index f19e25a..e5fe7d3 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
@@ -46,7 +46,7 @@ do_install() {
 	autotools_do_install
 	oe_libinstall -so libtcl8.5 ${STAGING_LIBDIR}
 	ln -sf ./tclsh8.5 ${D}${bindir}/tclsh
-	#sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
+	sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
 	sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
 	sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh 
 	install -d ${D}${bindir_crossscripts}
-- 
1.7.7.6

[CONSOLIDATED REQUEST 44/64] qemu: backport patch to fix pl031 RTC

[Saul Wold]

From: "Roy.Li" <rongqing.li@windriver.com>

Intergrate the patch from:
http://repo.or.cz/w/qemu.git/commit/13a16f1d91fc7a46b65b22a33f6ffea1b826a097

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 ...-Actually-raise-interrupt-on-timer-expiry.patch |   41 ++++++++++++++++++++
 meta/recipes-devtools/qemu/qemu_0.15.1.bb          |    1 +
 2 files changed, 42 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/hw-pl031-Actually-raise-interrupt-on-timer-expiry.patch

diff --git a/meta/recipes-devtools/qemu/qemu-0.15.1/hw-pl031-Actually-raise-interrupt-on-timer-expiry.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/hw-pl031-Actually-raise-interrupt-on-timer-expiry.patch
new file mode 100644
index 0000000..2ccc663
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.15.1/hw-pl031-Actually-raise-interrupt-on-timer-expiry.patch
@@ -0,0 +1,41 @@
+Upstream-Status: Backport
+commit 13a16f1d91fc7a46b65b22a33f6ffea1b826a097 
+in git://git.qemu.org/qemu.git master
+
+From 13a16f1d91fc7a46b65b22a33f6ffea1b826a097 Mon Sep 17 00:00:00 2001
+From: Peter Maydell <peter.maydell@linaro.org>
+Date: Thu, 16 Feb 2012 09:56:10 +0000
+Subject: [PATCH] hw/pl031: Actually raise interrupt on timer expiry
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix a typo in pl031_interrupt() which meant we were setting a bit
+in the interrupt mask rather than the interrupt status register
+and thus not actually raising an interrupt. This fix allows the
+rtctest program from the kernel's Documentation/rtc.txt to pass
+rather than hanging.
+
+Reported-by: Daniel Forsgren <daniel.forsgren@enea.com>
+Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+Acked-by: Andreas Färber <afaerber@suse.de>
+---
+ hw/pl031.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/hw/pl031.c b/hw/pl031.c
+index 05b5b11..69abc4f 100644
+--- a/hw/pl031.c
++++ b/hw/pl031.c
+@@ -76,7 +76,7 @@ static void pl031_interrupt(void * opaque)
+ {
+     pl031_state *s = (pl031_state *)opaque;
+ 
+-    s->im = 1;
++    s->is = 1;
+     DPRINTF("Alarm raised\n");
+     pl031_update(s);
+ }
+-- 
+1.7.4.1
+
diff --git a/meta/recipes-devtools/qemu/qemu_0.15.1.bb b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
index 7b862ed..a914bcf 100644
--- a/meta/recipes-devtools/qemu/qemu_0.15.1.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
@@ -22,6 +22,7 @@ SRC_URI = "\
     file://dummy-gl-config.patch \
     file://0001-ppc64-Fix-linker-script.patch \
     file://ppc-s500-set-invalid-mask.patch \
+    file://hw-pl031-Actually-raise-interrupt-on-timer-expiry.patch \
     "
 
 # Only use the GL passthrough patches for native/nativesdk versions
-- 
1.7.7.6

[CONSOLIDATED REQUEST 45/64] pango: upgrade to upstream stable 1.30.0

[Saul Wold]

From: Radu Moisan <radu.moisan@intel.com>

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../pango/pango-1.28.4/no-tests.patch              |   16 -
 .../pango/pango-1.28.4/noconst.patch               |  408 --------------------
 .../multilib-fix-clean.patch                       |    0
 .../pango/pango-1.30.0/no-tests.patch              |   12 +
 .../pango/{pango_1.28.4.bb => pango_1.30.0.bb}     |    9 +-
 5 files changed, 17 insertions(+), 428 deletions(-)
 delete mode 100644 meta/recipes-graphics/pango/pango-1.28.4/no-tests.patch
 delete mode 100644 meta/recipes-graphics/pango/pango-1.28.4/noconst.patch
 rename meta/recipes-graphics/pango/{pango-1.28.4 => pango-1.30.0}/multilib-fix-clean.patch (100%)
 create mode 100644 meta/recipes-graphics/pango/pango-1.30.0/no-tests.patch
 rename meta/recipes-graphics/pango/{pango_1.28.4.bb => pango_1.30.0.bb} (49%)

diff --git a/meta/recipes-graphics/pango/pango-1.28.4/no-tests.patch b/meta/recipes-graphics/pango/pango-1.28.4/no-tests.patch
deleted file mode 100644
index 6d9e74b..0000000
--- a/meta/recipes-graphics/pango/pango-1.28.4/no-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Inappropriate [ disable tests make sense in embedded, but not appropriate for upstream]
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
-Index: pango-1.22.2/Makefile.am
-===================================================================
---- pango-1.22.2.orig/Makefile.am
-+++ pango-1.22.2/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to create Makefile.in.
- 
--SUBDIRS= pango modules pango-view examples docs tools tests
-+SUBDIRS= pango modules pango-view examples docs tools
- 
- EXTRA_DIST = 			\
- 	autogen.sh		\
diff --git a/meta/recipes-graphics/pango/pango-1.28.4/noconst.patch b/meta/recipes-graphics/pango/pango-1.28.4/noconst.patch
deleted file mode 100644
index d4832a5..0000000
--- a/meta/recipes-graphics/pango/pango-1.28.4/noconst.patch
+++ /dev/null
@@ -1,408 +0,0 @@
-G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid
-build failures.
-
-RP 2011/10/12
-
-Upstream-Status: Pending
-
-Index: pango-1.28.4/pango/fonts.c
-===================================================================
---- pango-1.28.4.orig/pango/fonts.c	2011-10-12 01:32:09.372046342 +0100
-+++ pango-1.28.4/pango/fonts.c	2011-10-12 01:32:34.512036630 +0100
-@@ -165,7 +165,7 @@
-  *               %NULL if not previously set.  This has the same life-time
-  *               as the font description itself and should not be freed.
-  **/
--G_CONST_RETURN char *
-+const char *
- pango_font_description_get_family (const PangoFontDescription *desc)
- {
-   g_return_val_if_fail (desc != NULL, NULL);
-@@ -1927,7 +1927,7 @@
-  * Return value: the name of the family. This string is owned
-  *   by the family object and must not be modified or freed.
-  **/
--G_CONST_RETURN char *
-+const char *
- pango_font_family_get_name (PangoFontFamily  *family)
- {
-   g_return_val_if_fail (PANGO_IS_FONT_FAMILY (family), NULL);
-@@ -2060,7 +2060,7 @@
-  * Return value: the face name for the face. This string is
-  *   owned by the face object and must not be modified or freed.
-  **/
--G_CONST_RETURN char *
-+const char *
- pango_font_face_get_face_name (PangoFontFace *face)
- {
-   g_return_val_if_fail (PANGO_IS_FONT_FACE (face), NULL);
-Index: pango-1.28.4/pango/pango-attributes.c
-===================================================================
---- pango-1.28.4.orig/pango/pango-attributes.c	2011-10-12 01:32:09.552046155 +0100
-+++ pango-1.28.4/pango/pango-attributes.c	2011-10-12 01:32:34.522037975 +0100
-@@ -97,7 +97,7 @@
-  *
-  * Since: 1.22
-  **/
--G_CONST_RETURN char *
-+const char *
- pango_attr_type_get_name (PangoAttrType type)
- {
-   const char *result = NULL;
-Index: pango-1.28.4/pango/pango-attributes.h
-===================================================================
---- pango-1.28.4.orig/pango/pango-attributes.h	2011-10-12 01:32:12.712046218 +0100
-+++ pango-1.28.4/pango/pango-attributes.h	2011-10-12 01:32:36.342045777 +0100
-@@ -180,7 +180,7 @@
- };
- 
- PangoAttrType         pango_attr_type_register (const gchar        *name);
--G_CONST_RETURN char * pango_attr_type_get_name (PangoAttrType       type) G_GNUC_CONST;
-+const char * pango_attr_type_get_name (PangoAttrType       type) G_GNUC_CONST;
- 
- void             pango_attribute_init        (PangoAttribute       *attr,
- 					      const PangoAttrClass *klass);
-Index: pango-1.28.4/pango/pango-context.c
-===================================================================
---- pango-1.28.4.orig/pango/pango-context.c	2011-10-12 01:32:09.782046152 +0100
-+++ pango-1.28.4/pango/pango-context.c	2011-10-12 01:32:34.532039187 +0100
-@@ -188,7 +188,7 @@
-  *
-  * Since: 1.6
-  **/
--G_CONST_RETURN PangoMatrix *
-+const PangoMatrix *
- pango_context_get_matrix (PangoContext *context)
- {
-   g_return_val_if_fail (PANGO_IS_CONTEXT (context), NULL);
-Index: pango-1.28.4/pango/pango-context.h
-===================================================================
---- pango-1.28.4.orig/pango/pango-context.h	2011-10-12 01:32:12.892046153 +0100
-+++ pango-1.28.4/pango/pango-context.h	2011-10-12 01:32:36.352046105 +0100
-@@ -86,7 +86,7 @@
- 
- void                        pango_context_set_matrix (PangoContext      *context,
- 						      const PangoMatrix *matrix);
--G_CONST_RETURN PangoMatrix *pango_context_get_matrix (PangoContext      *context);
-+const PangoMatrix *pango_context_get_matrix (PangoContext      *context);
- 
- /* Break a string of Unicode characters into segments with
-  * consistent shaping/language engine and bidrectional level.
-Index: pango-1.28.4/pango/pango-font.h
-===================================================================
---- pango-1.28.4.orig/pango/pango-font.h	2011-10-12 01:32:13.072046150 +0100
-+++ pango-1.28.4/pango/pango-font.h	2011-10-12 01:32:36.362046243 +0100
-@@ -117,7 +117,7 @@
- 							       const char           *family);
- void                 pango_font_description_set_family_static (PangoFontDescription *desc,
- 							       const char           *family);
--G_CONST_RETURN char *pango_font_description_get_family        (const PangoFontDescription *desc) G_GNUC_PURE;
-+const char *pango_font_description_get_family        (const PangoFontDescription *desc) G_GNUC_PURE;
- void                 pango_font_description_set_style         (PangoFontDescription *desc,
- 							       PangoStyle            style);
- PangoStyle           pango_font_description_get_style         (const PangoFontDescription *desc) G_GNUC_PURE;
-@@ -212,7 +212,7 @@
- void                 pango_font_family_list_faces (PangoFontFamily  *family,
- 						   PangoFontFace  ***faces,
- 						   int              *n_faces);
--G_CONST_RETURN char *pango_font_family_get_name   (PangoFontFamily  *family) G_GNUC_PURE;
-+const char *pango_font_family_get_name   (PangoFontFamily  *family) G_GNUC_PURE;
- gboolean   pango_font_family_is_monospace         (PangoFontFamily  *family) G_GNUC_PURE;
- 
- #ifdef PANGO_ENABLE_BACKEND
-@@ -261,7 +261,7 @@
- GType      pango_font_face_get_type       (void) G_GNUC_CONST;
- 
- PangoFontDescription *pango_font_face_describe       (PangoFontFace  *face);
--G_CONST_RETURN char  *pango_font_face_get_face_name  (PangoFontFace  *face) G_GNUC_PURE;
-+const char  *pango_font_face_get_face_name  (PangoFontFace  *face) G_GNUC_PURE;
- void                  pango_font_face_list_sizes     (PangoFontFace  *face,
- 						      int           **sizes,
- 						      int            *n_sizes);
-Index: pango-1.28.4/pango/pango-fontmap.c
-===================================================================
---- pango-1.28.4.orig/pango/pango-fontmap.c	2011-10-12 01:32:09.912046152 +0100
-+++ pango-1.28.4/pango/pango-fontmap.c	2011-10-12 01:32:34.542040267 +0100
-@@ -290,7 +290,7 @@
-  *
-  * Since: 1.4
-  **/
--G_CONST_RETURN char *
-+const char *
- pango_font_map_get_shape_engine_type (PangoFontMap *fontmap)
- {
-   g_return_val_if_fail (PANGO_IS_FONT_MAP (fontmap), NULL);
-Index: pango-1.28.4/pango/pango-language.c
-===================================================================
---- pango-1.28.4.orig/pango/pango-language.c	2011-10-12 01:32:10.052046151 +0100
-+++ pango-1.28.4/pango/pango-language.c	2011-10-12 01:32:34.542040267 +0100
-@@ -319,7 +319,7 @@
-  * Returns: a string representing the language tag.  This is owned by
-  *          Pango and should not be freed.
-  */
--G_CONST_RETURN char *
-+const char *
- (pango_language_to_string) (PangoLanguage *language)
- {
-   return pango_language_to_string (language);
-@@ -531,7 +531,7 @@
-  * Return value: the sample string. This value is owned by Pango
-  *   and should not be freed.
-  **/
--G_CONST_RETURN char *
-+const char *
- pango_language_get_sample_string (PangoLanguage *language)
- {
-   const LangInfo *lang_info;
-@@ -592,7 +592,7 @@
-  
-  * Since: 1.22
-  **/
--G_CONST_RETURN PangoScript *
-+const PangoScript *
- pango_language_get_scripts (PangoLanguage *language,
- 			    int           *num_scripts)
- {
-Index: pango-1.28.4/pango/pango-language.h
-===================================================================
---- pango-1.28.4.orig/pango/pango-language.h	2011-10-12 01:32:13.262046150 +0100
-+++ pango-1.28.4/pango/pango-language.h	2011-10-12 01:32:36.362046243 +0100
-@@ -34,11 +34,11 @@
- GType          pango_language_get_type    (void) G_GNUC_CONST;
- PangoLanguage *pango_language_from_string (const char *language);
- 
--G_CONST_RETURN char *pango_language_to_string   (PangoLanguage *language) G_GNUC_CONST;
-+const char *pango_language_to_string   (PangoLanguage *language) G_GNUC_CONST;
- /* For back compat.  Will have to keep indefinitely. */
- #define pango_language_to_string(language) ((const char *)language)
- 
--G_CONST_RETURN char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST;
-+const char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST;
- PangoLanguage *pango_language_get_default (void) G_GNUC_CONST;
- 
- gboolean      pango_language_matches  (PangoLanguage *language,
-@@ -48,7 +48,7 @@
- 
- gboolean		    pango_language_includes_script (PangoLanguage *language,
- 							    PangoScript    script) G_GNUC_PURE;
--G_CONST_RETURN PangoScript *pango_language_get_scripts	   (PangoLanguage *language,
-+const PangoScript *pango_language_get_scripts	   (PangoLanguage *language,
- 							    int           *num_scripts);
- 
- G_END_DECLS
-Index: pango-1.28.4/pango/pango-layout.c
-===================================================================
---- pango-1.28.4.orig/pango/pango-layout.c	2011-10-12 01:32:10.072046151 +0100
-+++ pango-1.28.4/pango/pango-layout.c	2011-10-12 01:32:34.552041215 +0100
-@@ -677,7 +677,7 @@
-  *
-  * Since: 1.8
-  **/
--G_CONST_RETURN PangoFontDescription *
-+const PangoFontDescription *
- pango_layout_get_font_description (PangoLayout *layout)
- {
-   g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL);
-@@ -1087,7 +1087,7 @@
-  *
-  * Return value: the text in the @layout.
-  **/
--G_CONST_RETURN char*
-+const char*
- pango_layout_get_text (PangoLayout *layout)
- {
-   g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL);
-Index: pango-1.28.4/pango/pango-layout.h
-===================================================================
---- pango-1.28.4.orig/pango/pango-layout.h	2011-10-12 01:32:13.302046150 +0100
-+++ pango-1.28.4/pango/pango-layout.h	2011-10-12 01:32:36.362046243 +0100
-@@ -116,7 +116,7 @@
- void           pango_layout_set_font_description (PangoLayout                *layout,
- 						  const PangoFontDescription *desc);
- 
--G_CONST_RETURN PangoFontDescription *pango_layout_get_font_description (PangoLayout *layout);
-+const PangoFontDescription *pango_layout_get_font_description (PangoLayout *layout);
- 
- void           pango_layout_set_width            (PangoLayout                *layout,
- 						  int                         width);
-Index: pango-1.28.4/pango/pango-ot-ruleset.c
-===================================================================
---- pango-1.28.4.orig/pango/pango-ot-ruleset.c	2011-10-12 01:32:10.152046150 +0100
-+++ pango-1.28.4/pango/pango-ot-ruleset.c	2011-10-12 01:32:34.552041215 +0100
-@@ -107,7 +107,7 @@
-  *
-  * Since: 1.18
-  **/
--G_CONST_RETURN PangoOTRuleset *
-+const PangoOTRuleset *
- pango_ot_ruleset_get_for_description (PangoOTInfo                     *info,
- 				      const PangoOTRulesetDescription *desc)
- {
-Index: pango-1.28.4/pango/pango-renderer.c
-===================================================================
---- pango-1.28.4.orig/pango/pango-renderer.c	2011-10-12 01:32:10.192046151 +0100
-+++ pango-1.28.4/pango/pango-renderer.c	2011-10-12 01:32:34.562041682 +0100
-@@ -1352,7 +1352,7 @@
-  *
-  * Since: 1.8
-  **/
--G_CONST_RETURN PangoMatrix *
-+const PangoMatrix *
- pango_renderer_get_matrix (PangoRenderer *renderer)
- {
-   g_return_val_if_fail (PANGO_IS_RENDERER (renderer), NULL);
-Index: pango-1.28.4/pango/pango-renderer.h
-===================================================================
---- pango-1.28.4.orig/pango/pango-renderer.h	2011-10-12 01:32:13.402046150 +0100
-+++ pango-1.28.4/pango/pango-renderer.h	2011-10-12 01:32:36.362046243 +0100
-@@ -249,7 +249,7 @@
- 
- void                        pango_renderer_set_matrix (PangoRenderer     *renderer,
- 						       const PangoMatrix *matrix);
--G_CONST_RETURN PangoMatrix *pango_renderer_get_matrix (PangoRenderer     *renderer);
-+const PangoMatrix *pango_renderer_get_matrix (PangoRenderer     *renderer);
- 
- PangoLayout     *pango_renderer_get_layout      (PangoRenderer     *renderer);
- PangoLayoutLine *pango_renderer_get_layout_line (PangoRenderer     *renderer);
-Index: pango-1.28.4/pango/pango-script.c
-===================================================================
---- pango-1.28.4.orig/pango/pango-script.c	2011-10-12 01:32:10.212046151 +0100
-+++ pango-1.28.4/pango/pango-script.c	2011-10-12 01:32:34.562041682 +0100
-@@ -165,8 +165,8 @@
-  **/
- void
- pango_script_iter_get_range (PangoScriptIter      *iter,
--			     G_CONST_RETURN char **start,
--			     G_CONST_RETURN char **end,
-+			     const char **start,
-+			     const char **end,
- 			     PangoScript          *script)
- {
-   if (start)
-Index: pango-1.28.4/pango/pango-script.h
-===================================================================
---- pango-1.28.4.orig/pango/pango-script.h	2011-10-12 01:32:13.422046150 +0100
-+++ pango-1.28.4/pango/pango-script.h	2011-10-12 01:32:36.362046243 +0100
-@@ -129,8 +129,8 @@
- PangoScriptIter *pango_script_iter_new       (const char          *text,
- 					      int                  length);
- void             pango_script_iter_get_range (PangoScriptIter      *iter,
--					      G_CONST_RETURN char **start,
--					      G_CONST_RETURN char **end,
-+					      const char **start,
-+					      const char **end,
- 					      PangoScript          *script);
- gboolean         pango_script_iter_next      (PangoScriptIter      *iter);
- void             pango_script_iter_free      (PangoScriptIter      *iter);
-Index: pango-1.28.4/pango/pango-utils.c
-===================================================================
---- pango-1.28.4.orig/pango/pango-utils.c	2011-10-12 01:32:10.242046149 +0100
-+++ pango-1.28.4/pango/pango-utils.c	2011-10-12 01:32:34.562041682 +0100
-@@ -689,7 +689,7 @@
-  * Return value: the Pango sysconf directory. The returned string should
-  * not be freed.
-  */
--G_CONST_RETURN char *
-+const char *
- pango_get_sysconf_subdirectory (void)
- {
- #ifdef G_OS_WIN32
-@@ -718,7 +718,7 @@
-  * Return value: the Pango lib directory. The returned string should
-  * not be freed.
-  */
--G_CONST_RETURN char *
-+const char *
- pango_get_lib_subdirectory (void)
- {
- #ifdef G_OS_WIN32
-Index: pango-1.28.4/pango/pango-utils.h
-===================================================================
---- pango-1.28.4.orig/pango/pango-utils.h	2011-10-12 01:32:13.512046149 +0100
-+++ pango-1.28.4/pango/pango-utils.h	2011-10-12 01:32:36.362046243 +0100
-@@ -82,13 +82,13 @@
-  * stored in the registry). The returned string should not be
-  * g_free'd.
-  */
--G_CONST_RETURN char *   pango_get_sysconf_subdirectory (void) G_GNUC_PURE;
-+const char *   pango_get_sysconf_subdirectory (void) G_GNUC_PURE;
- 
- /* Ditto for LIBDIR/pango. On Win32, use the same Pango
-  * installation directory. This returned string should not be
-  * g_free'd either.
-  */
--G_CONST_RETURN char *   pango_get_lib_subdirectory (void) G_GNUC_PURE;
-+const char *   pango_get_lib_subdirectory (void) G_GNUC_PURE;
- 
- #endif /* PANGO_ENABLE_BACKEND */
- 
-@@ -131,10 +131,10 @@
- int pango_version (void) G_GNUC_CONST;
- 
- /* Return run-time Pango version as an string */
--G_CONST_RETURN char * pango_version_string (void) G_GNUC_CONST;
-+const char * pango_version_string (void) G_GNUC_CONST;
- 
- /* Check that run-time Pango is as new as required */
--G_CONST_RETURN char * pango_version_check (int required_major,
-+const char * pango_version_check (int required_major,
- 					   int required_minor,
- 					   int required_micro) G_GNUC_CONST;
- 
-Index: pango-1.28.4/pango/pangocairo-context.c
-===================================================================
---- pango-1.28.4.orig/pango/pangocairo-context.c	2011-10-12 01:32:09.622046154 +0100
-+++ pango-1.28.4/pango/pangocairo-context.c	2011-10-12 01:32:34.522037975 +0100
-@@ -260,7 +260,7 @@
-  *
-  * Since: 1.10
-  **/
--G_CONST_RETURN cairo_font_options_t *
-+const cairo_font_options_t *
- pango_cairo_context_get_font_options (PangoContext *context)
- {
-   PangoCairoContextInfo *info;
-@@ -286,7 +286,7 @@
-  * Return value: the combined set of font options. This value is owned
-  * by the context and must not be modified or freed.
-  **/
--G_CONST_RETURN cairo_font_options_t *
-+const cairo_font_options_t *
- _pango_cairo_context_get_merged_font_options (PangoContext *context)
- {
-   PangoCairoContextInfo *info = get_context_info (context, TRUE);
-Index: pango-1.28.4/pango/pangoft2.c
-===================================================================
---- pango-1.28.4.orig/pango/pangoft2.c	2011-10-12 01:32:09.942046152 +0100
-+++ pango-1.28.4/pango/pangoft2.c	2011-10-12 01:32:34.542040267 +0100
-@@ -520,7 +520,7 @@
-   return ((ft_error_description *) pkey)->code - ((ft_error_description *) pbase)->code;
- }
- 
--G_CONST_RETURN char *
-+const char *
- _pango_ft2_ft_strerror (FT_Error error)
- {
- #undef __FTERRORS_H__
-Index: pango-1.28.4/pango/pangox-fontmap.c
-===================================================================
---- pango-1.28.4.orig/pango/pangox-fontmap.c	2011-10-12 01:32:10.352046151 +0100
-+++ pango-1.28.4/pango/pangox-fontmap.c	2011-10-12 01:32:34.572042704 +0100
-@@ -1441,7 +1441,7 @@
- }
- 
- 
--G_CONST_RETURN char *
-+const char *
- pango_x_fontmap_name_from_atom (PangoFontMap *fontmap,
- 				Atom          atom)
- {
-@@ -1645,7 +1645,7 @@
-     }
- }
- 
--static G_CONST_RETURN char *
-+static const char *
- pango_x_family_get_name (PangoFontFamily  *family)
- {
-   PangoXFamily *xfamily = PANGO_X_FAMILY (family);
diff --git a/meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch b/meta/recipes-graphics/pango/pango-1.30.0/multilib-fix-clean.patch
similarity index 100%
rename from meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch
rename to meta/recipes-graphics/pango/pango-1.30.0/multilib-fix-clean.patch
diff --git a/meta/recipes-graphics/pango/pango-1.30.0/no-tests.patch b/meta/recipes-graphics/pango/pango-1.30.0/no-tests.patch
new file mode 100644
index 0000000..5a6e4c1
--- /dev/null
+++ b/meta/recipes-graphics/pango/pango-1.30.0/no-tests.patch
@@ -0,0 +1,12 @@
+Index: pango-1.30.0/Makefile.am
+===================================================================
+--- pango-1.30.0.orig/Makefile.am	2011-08-16 04:11:08.000000000 +0300
++++ pango-1.30.0/Makefile.am	2012-08-06 12:48:27.000000000 +0300
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in.
+ 
+-SUBDIRS= pango modules pango-view examples docs tools tests build
++SUBDIRS= pango modules pango-view examples docs tools build
+ 
+ EXTRA_DIST = 			\
+ 	autogen.sh		\
diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb b/meta/recipes-graphics/pango/pango_1.30.0.bb
similarity index 49%
rename from meta/recipes-graphics/pango/pango_1.28.4.bb
rename to meta/recipes-graphics/pango/pango_1.30.0.bb
index 4869592..25101f2 100644
--- a/meta/recipes-graphics/pango/pango_1.28.4.bb
+++ b/meta/recipes-graphics/pango/pango_1.30.0.bb
@@ -2,13 +2,14 @@ require pango.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
-PR = "r9"
+PR = "r0"
+
+GNOME_COMPRESS_TYPE="xz"
 
 SRC_URI += "file://no-tests.patch \
-            file://noconst.patch \
             file://multilib-fix-clean.patch"
 
-SRC_URI[archive.md5sum] = "3f3989700f04e9117d30544a9078b3a0"
-SRC_URI[archive.sha256sum] = "7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f"
+SRC_URI[archive.md5sum] = "2a70627ffd9f43c52c04cc0b05fe359f"
+SRC_URI[archive.sha256sum] = "7c6d2ab024affaed0e942f9279b818235f9c6a36d9fc50688f48d387f4102dff"
 
 #PARALLEL_MAKE = ""
-- 
1.7.7.6

[CONSOLIDATED REQUEST 46/64] owl-video_git.bb: fix compilation on Fedora 13 machine

[Saul Wold]

From: Matthew McClintock <msm@freescale.com>

This adds libXrandr to the link step and fixes this issue:

| /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetOutputInfo'
| /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetScreenResourcesCurrent'
| /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRFreeOutputInfo'
| /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRFreeScreenResources'
| /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetOutputPrimary'
| /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRFreeCrtcInfo'
| /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetCrtcInfo'
| collect2: ld returned 1 exit status

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../owl-video/0001-add-dependency-for-xrandr.patch |   30 ++++++++++++++++++++
 .../recipes-sato/owl-video-widget/owl-video_git.bb |    5 ++-
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch

diff --git a/meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch b/meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch
new file mode 100644
index 0000000..8c14578
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch
@@ -0,0 +1,30 @@
+Upstream-Status: Pending
+
+This patch should probably go upstream
+
+From 18bdd57b36489439dc5c18b20abd9d59c6778662 Mon Sep 17 00:00:00 2001
+From: Matthew McClintock <msm@freescale.com>
+Date: Wed, 25 Jul 2012 15:05:40 -0500
+Subject: [PATCH] add dependency for xrandr
+
+Signed-off-by: Matthew McClintock <msm@freescale.com>
+---
+ src/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 60e845b..00e4b11 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,7 +12,7 @@ video_SOURCES = video.c	\
+ 	owl-overlay-bin.c	\
+ 	owl-overlay-bin.h
+ 
+-video_LDADD = $(VIDEO_LIBS)
++video_LDADD = $(VIDEO_LIBS) -lXrandr
+ 
+ dist_pkgdata_DATA = gtk-fullscreen.png
+ 
+-- 
+1.7.5.4
+
diff --git a/meta/recipes-sato/owl-video-widget/owl-video_git.bb b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
index bc63273..321b71b 100644
--- a/meta/recipes-sato/owl-video-widget/owl-video_git.bb
+++ b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
@@ -10,7 +10,7 @@ DEPENDS = "libowl-av"
 
 SRCREV = "f133472318970796fae1ea3e98ac062156768baf"
 PV = "0.1+git${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 S = "${WORKDIR}/git"
 
@@ -23,7 +23,8 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
            file://stock_volume-med.png \
            file://stock_volume-max.png \
            file://owl-video-widget.desktop \
-	   file://make-382.patch"
+	   file://make-382.patch \
+	   file://0001-add-dependency-for-xrandr.patch"
 
 inherit autotools pkgconfig
 
-- 
1.7.7.6

[CONSOLIDATED REQUEST 47/64] gstreamer: gst-ffmpeg: fix build issues for libav

[Saul Wold]

From: Yao Zhao <yao.zhao@windriver.com>

1.The included libav configure is not generated by autotools
  modify recipe to use correct toolchain wrapper with configure

2.add bzip2 dependency explicitly.
  or configure will detect whether libbz2 is installed, if bzip2
is triggered earlier then it will be detected, if not then won't

3.backport libav_e500mc.patch from upstream to patch configure to
disable-altivec if it is e500mc.

4.move the GSTREAMER_DEBUG to libav's configure, it is not the
option for the main configure.

Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../gst-ffmpeg-0.10.13/libav_e500mc.patch          |   21 ++++++++++++++++++++
 .../gstreamer/gst-ffmpeg_0.10.13.bb                |   16 ++++++++++++--
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav_e500mc.patch

diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav_e500mc.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav_e500mc.patch
new file mode 100644
index 0000000..eba4988
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/libav_e500mc.patch
@@ -0,0 +1,21 @@
+diff --git a/gst-libs/ext/libav/configure b/gst-libs/ext/libav/configure
+index 8473069..4f74952 100755
+--- a/gst-libs/ext/libav/configure
++++ b/gst-libs/ext/libav/configure
+Fix gst-ffmpeg build issues for libav on e500mc (fsl-p4080)
+
+Upstream-Status: Backport
+
+Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
+
+@@ -2210,6 +2210,10 @@ elif enabled ppc; then
+             cpuflags="-mcpu=cell"
+             enable ldbrx
+         ;;
++        e500mc)
++            cpuflags="-mcpu=e500mc"
++            disable altivec
++        ;;
+         e500v2)
+             cpuflags="-mcpu=8548 -mhard-float -mfloat-gprs=double"
+             disable altivec
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
index a166290..efab2cf 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \
                     file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 HOMEPAGE = "http://www.gstreamer.net/"
-DEPENDS = "gstreamer gst-plugins-base zlib"
+DEPENDS = "gstreamer gst-plugins-base zlib bzip2"
 
 inherit autotools pkgconfig
 
@@ -19,15 +19,25 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://lower-rank.diff \
            file://configure-fix.patch \
            file://h264_qpel_mmx.patch \
+           file://libav_e500mc.patch \
 "
 
 SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4"
 SRC_URI[sha256sum] = "76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62"
 
-PR = "r3"
+PR = "r4"
 
 GSTREAMER_DEBUG ?= "--disable-debug"
-EXTRA_OECONF = "--with-ffmpeg-extra-configure=\"--target-os=linux\" ${GSTREAMER_DEBUG}"
+
+FFMPEG_EXTRA_CONFIGURE = "--with-ffmpeg-extra-configure"
+FFMPEG_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \
+  --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \
+  --ranlib='${RANLIB}' \
+  ${GSTREAMER_DEBUG}"
+FFMPEG_EXTRA_CONFIGURE_COMMON = \
+'${FFMPEG_EXTRA_CONFIGURE}="${FFMPEG_EXTRA_CONFIGURE_COMMON_ARG}"'
+
+EXTRA_OECONF = "${FFMPEG_EXTRA_CONFIGURE_COMMON}"
 
 # yasm not found, use --disable-yasm for a crippled build for libav
 EXTRA_OECONF_append_x86-64 = " --disable-yasm "
-- 
1.7.7.6

[CONSOLIDATED REQUEST 48/64] cracklib, zlib, perl: install libz, libcrack to /lib instead of /usr/libxx

[Saul Wold]

From: Yao Zhao <yao.zhao@windriver.com>

In order to fix the QA Issue for libpam which installed to /lib but
reference /usr/libxx/libz and libcrack, install libz and libcrack
to /lib.

Modify perl recipe to add STAGING_BASELIBDIR to library search path, original
recipe only has STAGING_LIBDIR, /lib, /usr/lib, which can't find the libz.

Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/zlib/zlib_1.2.7.bb              |   11 +++++++++--
 meta/recipes-devtools/perl/perl_5.14.2.bb         |    4 ++--
 meta/recipes-extended/cracklib/cracklib_2.8.19.bb |    4 +++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/zlib/zlib_1.2.7.bb b/meta/recipes-core/zlib/zlib_1.2.7.bb
index 803fec3..0d8b6bd 100644
--- a/meta/recipes-core/zlib/zlib_1.2.7.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.7.bb
@@ -12,8 +12,11 @@ SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "2ab442d169156f34c379c968f3f482dd"
 SRC_URI[sha256sum] = "49e2e9658dfb036900da6ea0267a737fa3c4eee6666776d378c79d52e9334934"
 
+PR = "r1"
+
 do_configure (){
-	./configure --prefix=${prefix} --shared --libdir=${libdir}
+	#sharedlibdir sets to {libdir} if not set
+	./configure --prefix=${prefix} --shared --libdir="${base_libdir}"
 }
 
 do_compile (){
@@ -21,7 +24,11 @@ do_compile (){
 }
 
 do_install() {
-	oe_runmake DESTDIR=${D} install
+	#install libz.so.1.2.7 libz.a to /lib
+	#libz.a installs to libdir, overwrite the env libdir
+	#install pkgconfig to env libdir/pkgconfig
+	oe_runmake DESTDIR=${D} pkgconfigdir="${libdir}/pkgconfig" \
+		   libdir="${base_libdir}" install
 }
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index 561b30e..40dbc80 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db grep-native"
 DEPENDS += "gdbm zlib"
-PR = "r8"
+PR = "r9"
 
 # 5.10.1 has Module::Build built-in
 PROVIDES += "libmodule-build-perl"
@@ -180,7 +180,7 @@ do_compile() {
         sed -i -e "s|\([ \"\']\+\)/usr/include|\1${STAGING_INCDIR}|g" ext/Errno/Errno_pm.PL
         sed -i -e "s|\([ \"\']\+\)/usr/include|\1${STAGING_INCDIR}|g" cpan/Compress-Raw-Zlib/config.in
         sed -i -e 's|/usr/lib|""|g' cpan/Compress-Raw-Zlib/config.in
-        sed -i -e 's|SYSROOTLIB|${STAGING_LIBDIR}|g' cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+        sed -i -e 's|"SYSROOTLIB"|("${STAGING_BASELIBDIR}", "${STAGING_LIBDIR}")|g' cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
 
         cd Cross
         oe_runmake perl LD="${CCLD}"
diff --git a/meta/recipes-extended/cracklib/cracklib_2.8.19.bb b/meta/recipes-extended/cracklib/cracklib_2.8.19.bb
index 2951396..e36703e 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.8.19.bb
+++ b/meta/recipes-extended/cracklib/cracklib_2.8.19.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
 
 DEPENDS = "zlib"
-PR ="r0"
+PR ="r1"
 
 EXTRA_OECONF = "--without-python"
 
@@ -15,3 +15,5 @@ SRC_URI[md5sum] = "ca0ec168d9c6466612204e8dfb2df8a9"
 SRC_URI[sha256sum] = "7086b0ca23f875c9cd9ea2a993c262384b274dba9c4ea1da845ec8ac290748a9"
 
 inherit autotools gettext
+
+libdir = "${base_libdir}"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 49/64] gdk-pixbuf: fix the postinstall script failure when no icon is installed

[Saul Wold]

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

If gtk+ is added to core-image-minimal, postinstall script failed on boot:

Running postinst /etc/rpm-postinsts/104...
gtk-update-icon-cache: No theme index file.
ERROR: postinst /etc/rpm-postinsts/104 failed.

This patch fixed the postinstall script to check for the icon
file first and not run the gtk-update-icon-cache if no icon
is installed.

[YOCTO #2905]

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
index 484fb12..159bdae 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
@@ -21,7 +21,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
 SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
 SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
 
-PR = "r4"
+PR = "r5"
 
 inherit autotools pkgconfig gettext
 
@@ -62,7 +62,13 @@ fi
 
 GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders gdk-pixbuf-query-loaders --update-cache
 
-test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache  -q ${datadir}/icons/hicolor
+if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
+    for icondir in /usr/share/icons/*; do
+        if [ -d ${icondir} ]; then
+            gtk-update-icon-cache -q ${icondir}
+        fi
+    done
+fi
 }
 
 PACKAGES_DYNAMIC += "gdk-pixbuf-loader-*"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 50/64] at 3.1.13: get 'at' depends on 'flex-native' explicitly

[Saul Wold]

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

'at' needs flex to generate source file lex.yy.c, but it doesn't
depend on flex-native directly; This maybe cause a do_compile
failure if flex-native is not built or included in project.

Error message is:
    error: lex.yy.c: No such file or directory

Get 'at' depends on flex-native to fix this potential issue.

[YOCTO #2919]

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/at/at_3.1.13.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/at/at_3.1.13.bb b/meta/recipes-extended/at/at_3.1.13.bb
index ce9396a..a391d6e 100644
--- a/meta/recipes-extended/at/at_3.1.13.bb
+++ b/meta/recipes-extended/at/at_3.1.13.bb
@@ -4,14 +4,14 @@ the system load levels drop to a particular level."
 SECTION = "base"
 LICENSE="GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
-DEPENDS = "flex initscripts \
+DEPENDS = "flex flex-native initscripts \
 	${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}"
 PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
 
 RCONFLICTS_${PN} = "atd"
 RREPLACES_${PN} = "atd"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
     file://configure.patch \
-- 
1.7.7.6

[CONSOLIDATED REQUEST 51/64] sysfsutils: install libs to base_libdir

[Saul Wold]

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

Fix the warning form pcmciautils building:

"WARNING: QA Issue: pcmciautils: /sbin/pccardctl, installed in the
base_prefix, requires a shared library under exec_prefix (/usr):
libsysfs.so.2 => /usr/lib/libsysfs.so.2"

Just refer to Debian/Ubuntu distributions, install sysfsutils libs
to "/lib*" instead of "/usr/lib*".

[YOCTO #2907]

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
index 3e4fdda..f01d19b 100644
--- a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
+++ b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
@@ -8,7 +8,7 @@ LICENSE_libsysfs = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3d06403ea54c7574a9e581c6478cc393 \
                     file://cmd/GPL;md5=d41d4e2e1e108554e0388ea4aecd8d27 \
                     file://lib/LGPL;md5=b75d069791103ffe1c0d6435deeff72e"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \
 	  file://sysfsutils-2.0.0-class-dup.patch \
@@ -24,3 +24,5 @@ PACKAGES =+ "libsysfs libsysfs-dev libsysfs-staticdev"
 FILES_libsysfs = "${libdir}/lib*${SOLIBS}"
 FILES_libsysfs-dev = "${libdir}/lib*${SOLIBSDEV} ${includedir}"
 FILES_libsysfs-staticdev = "${libdir}/lib*.a"
+
+export libdir = "${base_libdir}"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 52/64] base.bbclass: Expand PNBLACKLIST across multilibs too

[Saul Wold]

From: Peter Seebach <peter.seebach@windriver.com>

The PNBLACKLIST feature does not currently work with multilibs,
because they have different ${PN}. The obvious thing to do is to
do this at the same point that we do the PREFERRED_PROVIDER
and PREFERRED_VERSION fixups. (Making the PNBLACKLIST check
do the for-each-multilib check requires it to do the multilib
list generation repeatedly.)

Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/base.bbclass |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 8845d81..01ed800 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -161,7 +161,8 @@ def pkgarch_mapping(d):
 
 def preferred_ml_updates(d):
     # If any PREFERRED_PROVIDER or PREFERRED_VERSIONS are set,
-    # we need to mirror these variables in the multilib case
+    # we need to mirror these variables in the multilib case;
+    # likewise the PNBLACKLIST flags.
     multilibs = d.getVar('MULTILIBS', True) or ""
     if not multilibs:
         return
@@ -174,12 +175,19 @@ def preferred_ml_updates(d):
 
     versions = []
     providers = []
+    blacklists = d.getVarFlags('PNBLACKLIST') or []
     for v in d.keys():
         if v.startswith("PREFERRED_VERSION_"):
             versions.append(v)
         if v.startswith("PREFERRED_PROVIDER_"):
             providers.append(v)
 
+    for pkg, reason in blacklists.items():
+        for p in prefixes:
+            newpkg = p + "-" + pkg
+            if not d.getVarFlag('PNBLACKLIST', newpkg, True):
+                d.setVarFlag('PNBLACKLIST', newpkg, reason)
+
     for v in versions:
         val = d.getVar(v, False)
         pkg = v.replace("PREFERRED_VERSION_", "")
-- 
1.7.7.6

[CONSOLIDATED REQUEST 53/64] base.bbclass: Restructure multilib variable cloning

[Saul Wold]

From: Peter Seebach <peter.seebach@windriver.com>

The checks for -native/-nativesdk packages, and the iteration over
multilibs, are shared between two (now three) blocks of code, and
nothing ever uses the bare multilib name (instead of the multilib
name plus a hyphen), so restructure this a bit. The checks for
-nativesdk/-native packages are now done before checking whether
something is a PREFERRED_* value, and the iteration over the lists
of preferred versions, preferred providers, and blacklists is done
inside a single iteration over multilibs. Out of sheer paranoia,
limit replacements to one.

Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/base.bbclass |   58 ++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 01ed800..ee8b282 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -177,43 +177,43 @@ def preferred_ml_updates(d):
     providers = []
     blacklists = d.getVarFlags('PNBLACKLIST') or []
     for v in d.keys():
+        if v.endswith("-native") or v.endswith("-nativesdk"):
+            continue
         if v.startswith("PREFERRED_VERSION_"):
             versions.append(v)
         if v.startswith("PREFERRED_PROVIDER_"):
             providers.append(v)
 
-    for pkg, reason in blacklists.items():
-        for p in prefixes:
-            newpkg = p + "-" + pkg
+    for p in prefixes:
+        p = p + "-"
+        # Prepend <multilib>- to everything in PNBLACKLIST:
+        for pkg, reason in blacklists.items():
+            newpkg = p + pkg
             if not d.getVarFlag('PNBLACKLIST', newpkg, True):
                 d.setVarFlag('PNBLACKLIST', newpkg, reason)
-
-    for v in versions:
-        val = d.getVar(v, False)
-        pkg = v.replace("PREFERRED_VERSION_", "")
-        if pkg.endswith("-native") or pkg.endswith("-nativesdk"):
-            continue
-        for p in prefixes:
-            newname = "PREFERRED_VERSION_" + p + "-" + pkg
-            if not d.getVar(newname, False):
-                d.setVar(newname, val)
-
-    for prov in providers:
-        val = d.getVar(prov, False)
-        pkg = prov.replace("PREFERRED_PROVIDER_", "")
-        if pkg.endswith("-native") or pkg.endswith("-nativesdk"):
-            continue
-        virt = ""
-        if pkg.startswith("virtual/"):
-             pkg = pkg.replace("virtual/", "")
-             virt = "virtual/"
-        for p in prefixes:
-            newname = "PREFERRED_PROVIDER_" + virt + p + "-" + pkg
+        # Prepend <multilib>- to all PREFERRED_VERSION_ values:
+        for v in versions:
+            val = d.getVar(v, False)
+            name = v.replace("PREFERRED_VERSION_", "PREFERRED_VERSION_" + p, 1)
+            if not d.getVar(name, False):
+                d.setVar(name, val)
+        # Trickier. We don't want lib32-virtual/foo, we want
+        # virtual/lib32-foo. Also, for recipes other than the
+        # kernel, we want to change the provider. So for instance,
+        # PREFERRED_PROVIDER_virtual/xyzzy = "plugh" yields
+        # PREFERRED_PROVIDER_virtual/lib32-xyzzy = "lib32-plugh"
+        for prov in providers:
+            val = d.getVar(prov, False)
+            pkg = prov.replace("PREFERRED_PROVIDER_", "", 1)
+            virt = ""
+            if pkg.startswith("virtual/"):
+                pkg = pkg.replace("virtual/", "", 1)
+                virt = "virtual/"
             if pkg != "kernel":
-                val = p + "-" + val
-            if not d.getVar(newname, False):
-                d.setVar(newname, val)
-
+                val = p + val
+            name = "PREFERRED_PROVIDER_" + virt + p + pkg
+            if not d.getVar(name, False):
+                d.setVar(name, val)
 
     mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split()
     extramp = []
-- 
1.7.7.6

[CONSOLIDATED REQUEST 54/64] dbus: Fix pid file in dbus init script

[Saul Wold]

From: Andy Ross <andy.ross@windriver.com>

The PIDFILE (/var/run/dbus/pid) referenced by /etc/init.d/dbus-1 did
not match the path (/var/run/messagebus.pid) configured in
/etc/dbus-1/system.conf, so the initscript could start the daemon, but
not stop it.  Also remove needless directory ownership logic
(dbus-daemon drops its pid file as root before calling setuid).

Signed-off-by: Andy Ross <andy.ross@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/dbus/dbus-1.4.20/dbus-1.init |   11 +++--------
 meta/recipes-core/dbus/dbus-1.5.12/dbus-1.init |   11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus-1.4.20/dbus-1.init b/meta/recipes-core/dbus/dbus-1.4.20/dbus-1.init
index 4abc4cb..17b58ed 100644
--- a/meta/recipes-core/dbus/dbus-1.4.20/dbus-1.init
+++ b/meta/recipes-core/dbus/dbus-1.4.20/dbus-1.init
@@ -18,9 +18,8 @@ set -e
 
 DAEMON=/usr/bin/dbus-daemon
 NAME=dbus
-DAEMONUSER=messagebus
-PIDDIR=/var/run/dbus
-PIDFILE=$PIDDIR/pid
+DAEMONUSER=messagebus           # must match /etc/dbus-1/system.conf
+PIDFILE=/var/run/messagebus.pid # must match /etc/dbus-1/system.conf
 UUIDDIR=/var/lib/dbus
 DESC="system message bus"
 EVENTDIR=/etc/dbus-1/event.d
@@ -38,11 +37,7 @@ test "$ENABLED" != "0" || exit 0
 
 start_it_up()
 {
-  if [ ! -d $PIDDIR ]; then
-    mkdir -p $PIDDIR
-    chown $DAEMONUSER $PIDDIR
-    chgrp $DAEMONUSER $PIDDIR
-  fi
+  mkdir -p "`dirname $PIDFILE`"
   if [ -e $PIDFILE ]; then
     PIDDIR=/proc/$(cat $PIDFILE)
     if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
diff --git a/meta/recipes-core/dbus/dbus-1.5.12/dbus-1.init b/meta/recipes-core/dbus/dbus-1.5.12/dbus-1.init
index 4abc4cb..17b58ed 100644
--- a/meta/recipes-core/dbus/dbus-1.5.12/dbus-1.init
+++ b/meta/recipes-core/dbus/dbus-1.5.12/dbus-1.init
@@ -18,9 +18,8 @@ set -e
 
 DAEMON=/usr/bin/dbus-daemon
 NAME=dbus
-DAEMONUSER=messagebus
-PIDDIR=/var/run/dbus
-PIDFILE=$PIDDIR/pid
+DAEMONUSER=messagebus           # must match /etc/dbus-1/system.conf
+PIDFILE=/var/run/messagebus.pid # must match /etc/dbus-1/system.conf
 UUIDDIR=/var/lib/dbus
 DESC="system message bus"
 EVENTDIR=/etc/dbus-1/event.d
@@ -38,11 +37,7 @@ test "$ENABLED" != "0" || exit 0
 
 start_it_up()
 {
-  if [ ! -d $PIDDIR ]; then
-    mkdir -p $PIDDIR
-    chown $DAEMONUSER $PIDDIR
-    chgrp $DAEMONUSER $PIDDIR
-  fi
+  mkdir -p "`dirname $PIDFILE`"
   if [ -e $PIDFILE ]; then
     PIDDIR=/proc/$(cat $PIDFILE)
     if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
-- 
1.7.7.6

[CONSOLIDATED REQUEST 55/64] chrpath.bbclass: Account for case when ORIGIN is in RPATH

[Saul Wold]

From: Khem Raj <raj.khem@gmail.com>

This fixes a case when RPATH embedded in program have one of
its path already relative to ORIGIN. We were losing that path
if such a path existed. This patch appends it to the new edited
rpath being created when we see it.

so RPATH like below

(RPATH)              Library rpath:
[$ORIGIN/../lib/amd64/jli:$ORIGIN/../jre/lib/amd64/jli]

would end up being empty

but after this patch its kept intact

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/chrpath.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass
index 10b5ca0..e903b65 100644
--- a/meta/classes/chrpath.bbclass
+++ b/meta/classes/chrpath.bbclass
@@ -49,6 +49,7 @@ def process_dir (directory, d):
             new_rpaths = []
             for rpath in rpaths:
                 # If rpath is already dynamic continue
+                new_rpaths.append("%s" % (rpath.strip()))
                 if rpath.find("$ORIGIN") != -1:
                     continue
                 # If the rpath shares a root with base_prefix determine a new dynamic rpath from the
-- 
1.7.7.6

[CONSOLIDATED REQUEST 56/64] gettext-0.18: explicitly disable acl.

[Saul Wold]

From: Xin Ouyang <Xin.Ouyang@windriver.com>

gettext-0.18 gets a new option for acl, but we do not place acl
into DEPENDS.
So, explicitly disable acl for deterministic builds.

Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/gettext/gettext_0.18.1.1.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index 09a9465..ae3e28b 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "GPLv3+ & LGPL-2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r15"
+PR = "r16"
 DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat"
 DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native"
 PROVIDES = "virtual/libintl virtual/gettext"
@@ -32,6 +32,7 @@ EXTRA_OECONF += "--without-lispdir \
                  --disable-java \
                  --disable-native-java \
                  --disable-openmp \
+                 --disable-acl \
                  --with-included-glib \
                  --with-libncurses-prefix=${STAGING_LIBDIR}/.. \
                  --without-emacs \
-- 
1.7.7.6

[CONSOLIDATED REQUEST 57/64] sysklogd: removed tabs from syslog.conf

[Saul Wold]

From: Mihai Lindner <mihaix.lindner@linux.intel.com>

Yocto #2926: syslog.conf should not have tabs within the selector field.
Removed tabs from the selector field of syslog rules. Tabs or spaces
should be used, in syslog.conf, only when separating selectors from
actions.

Signed-off-by: Mihai Lindner <mihaix.lindner@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/sysklogd/files/syslog.conf |   23 +++++++++++----------
 meta/recipes-extended/sysklogd/sysklogd_1.5.bb   |    2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/meta/recipes-extended/sysklogd/files/syslog.conf b/meta/recipes-extended/sysklogd/files/syslog.conf
index 7d1858c..0849de1 100644
--- a/meta/recipes-extended/sysklogd/files/syslog.conf
+++ b/meta/recipes-extended/sysklogd/files/syslog.conf
@@ -34,12 +34,13 @@ news.notice			-/var/log/news.notice
 # Some `catch-all' logfiles.
 #
 *.=debug;\
-	auth,authpriv.none;\
-	news.none;mail.none	-/var/log/debug
+auth,authpriv.none;\
+news.none;mail.none	-/var/log/debug
+
 *.=info;*.=notice;*.=warn;\
-	auth,authpriv.none;\
-	cron,daemon.none;\
-	mail,news.none		-/var/log/messages
+auth,authpriv.none;\
+cron,daemon.none;\
+mail,news.none		-/var/log/messages
 
 #
 # Emergencies are sent to everybody logged in.
@@ -51,9 +52,9 @@ news.notice			-/var/log/news.notice
 # console I usually leave idle.
 #
 #daemon,mail.*;\
-#	news.=crit;news.=err;news.=notice;\
-#	*.=debug;*.=info;\
-#	*.=notice;*.=warn	/dev/tty8
+#news.=crit;news.=err;news.=notice;\
+#*.=debug;*.=info;\
+#*.=notice;*.=warn	/dev/tty8
 
 # The named pipe /dev/xconsole is for the `xconsole' utility.  To use it,
 # you must invoke `xconsole' with the `-file' option:
@@ -64,7 +65,7 @@ news.notice			-/var/log/news.notice
 #      busy site..
 #
 daemon.*;mail.*;\
-	news.err;\
-	*.=debug;*.=info;\
-	*.=notice;*.=warn	|/dev/xconsole
+news.err;\
+*.=debug;*.=info;\
+*.=notice;*.=warn	|/dev/xconsole
 
diff --git a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
index 471c8c8..5c95889 100644
--- a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
+++ b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
@@ -1,5 +1,5 @@
 require sysklogd.inc
-PR = "r6"
+PR = "r7"
 
 SRC_URI[md5sum] = "e053094e8103165f98ddafe828f6ae4b"
 SRC_URI[sha256sum] = "6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 58/64] pigz: Update to upstream version 2.2.5

[Saul Wold]

From: Björn Stenberg <bjst@enea.com>

Also added beginline/endline to LIC_FILES_CHKSUM to not track whole pigz.c.

Signed-off-by: Bjorn Stenberg <bjst@enea.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/pigz/pigz_2.2.4.bb |   11 -----------
 meta/recipes-extended/pigz/pigz_2.2.5.bb |    9 +++++++++
 2 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 meta/recipes-extended/pigz/pigz_2.2.4.bb
 create mode 100644 meta/recipes-extended/pigz/pigz_2.2.5.bb

diff --git a/meta/recipes-extended/pigz/pigz_2.2.4.bb b/meta/recipes-extended/pigz/pigz_2.2.4.bb
deleted file mode 100644
index 1cb9d08..0000000
--- a/meta/recipes-extended/pigz/pigz_2.2.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require pigz.inc
-
-PR = "r3"
-
-NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
-
-BBCLASSEXTEND = "native"
-
-SRC_URI[md5sum] = "9df2a3c742524446fa4e797c17e8fd85"
-SRC_URI[sha256sum] = "7e7967c47f66c07be97cbfa25c8816b72f9d35258466ea31eddc7666c914160e"
-LIC_FILES_CHKSUM = "file://pigz.c;md5=53f47c097bbf11b937a421b1816a8dc5"
diff --git a/meta/recipes-extended/pigz/pigz_2.2.5.bb b/meta/recipes-extended/pigz/pigz_2.2.5.bb
new file mode 100644
index 0000000..76c7c6c
--- /dev/null
+++ b/meta/recipes-extended/pigz/pigz_2.2.5.bb
@@ -0,0 +1,9 @@
+require pigz.inc
+
+NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
+
+BBCLASSEXTEND = "native"
+
+SRC_URI[md5sum] = "188f769ccedc403893d03049ad31e969"
+SRC_URI[sha256sum] = "e37498cbf3a475d7ebe2519751188c29564bf8dd27ba68bd3c7fe1ac08792759"
+LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 59/64] man: fix RDEPENDS and reformat recipe

[Saul Wold]

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

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/man/man_1.6f.bb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/man/man_1.6f.bb b/meta/recipes-extended/man/man_1.6f.bb
index 9f75307..3dce1ae 100644
--- a/meta/recipes-extended/man/man_1.6f.bb
+++ b/meta/recipes-extended/man/man_1.6f.bb
@@ -3,11 +3,11 @@ DESCRIPTION = "A set of documentation tools: man, apropos and whatis"
 SECTION = "console/utils"
 HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
 LICENSE = "GPLv2"
-PR = "r3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-DEPENDS = "groff less"
+PR = "r4"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+DEPENDS = "groff less"
 
 SRC_URI = "http://primates.ximian.com/~flucifredi/${BPN}/${BPN}-${PV}.tar.gz \
            file://man-1.5k-confpath.patch;striplevel=0 \
@@ -61,4 +61,5 @@ do_install_append(){
 }
 
 
+RDEPENDS_${PN} = "less groff"
 FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.conf"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 60/64] kernel.bbclass: Preserve generated headers

[Saul Wold]

From: Khem Raj <raj.khem@gmail.com>

asm/unistd.h includes asm/unistd_64.h on x86_64
and asm/unistd_32.h on i386 but these files are
generated files in 3.4 and when we do 'make clean' they get
deleted and it shows up as an error when building
external modules. May be its a 3.4 kernel bug may be not
but make clean should have left the tree in
a shape to build modules but it does not.

Probably we should run make modules_prepare after having
run make clean.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/kernel.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index e2f2441..2e8e86b 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -191,6 +191,8 @@ kernel_do_install() {
 	if [ -f include/generated/bounds.h ]; then
 		cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
 	fi
+	mkdir -p $kerneldir/arch/${ARCH}/include/generated/
+	cp -fR arch/${ARCH}/include/generated/* $kerneldir/arch/${ARCH}/include/generated/
 
 	# Remove the following binaries which cause strip or arch QA errors
 	# during do_package for cross-compiled platforms
-- 
1.7.7.6

[CONSOLIDATED REQUEST 61/64] kernel.bbclass: remove default module_autoload and module_conf values

[Saul Wold]

From: Bruce Ashfield <bruce.ashfield@windriver.com>

kernel.bbclass is a common class for many different kernel versions,
and as such the default module_autoload and module_conf values that
it contains are not relevant, or out of date for most builds.

Individual kernel recipes or distros can better specify these
values to meet their needs.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/kernel.bbclass |   19 -------------------
 1 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 2e8e86b..b24ab1a 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -297,25 +297,6 @@ if [ x"$D" = "x" ]; then
 fi
 }
 
-# autoload defaults (alphabetically sorted)
-module_autoload_hidp = "hidp"
-module_autoload_ipv6 = "ipv6"
-module_autoload_ipsec = "ipsec"
-module_autoload_ircomm-tty = "ircomm-tty"
-module_autoload_rfcomm = "rfcomm"
-module_autoload_sa1100-rtc = "sa1100-rtc"
-# sa1100-rtc was renamed in 2.6.23 onwards
-module_autoload_rtc-sa1100 = "rtc-sa1100"
-
-# alias defaults (alphabetically sorted)
-module_conf_af_packet = "alias net-pf-17 af_packet"
-module_conf_bluez = "alias net-pf-31 bluez"
-module_conf_bnep = "alias bt-proto-4 bnep"
-module_conf_hci_uart = "alias tty-ldisc-15 hci_uart"
-module_conf_l2cap = "alias bt-proto-0 l2cap"
-module_conf_sco = "alias bt-proto-2 sco"
-module_conf_rfcomm = "alias bt-proto-3 rfcomm"
-
 python populate_packages_prepend () {
     def extract_modinfo(file):
         import tempfile, re, subprocess
-- 
1.7.7.6

[CONSOLIDATED REQUEST 62/64] man: make man actually work by installing custom man.config

[Saul Wold]

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

The default man.conf is named wrong and doesn't work. It references gtbl, while groff installs tbl and other things. This man.conf is imported from OE classic and runtime tested on angstrom.

Before:

root@beaglebone:~# man man
sh: /usr/bin/gtbl: No such file or directory
sh: line 0: echo: write error: Broken pipe
gunzip: write: Broken pipe
gunzip: error inflating
sh: line 0: echo: write error: Broken pipe
sh: line 0: echo: write error: Broken pipe

After:

root@beaglebone:~# man man
MAN(1)                        Manual pager utils                        MAN(1)

NAME
       man - an interface to the on-line reference manuals

SYNOPSIS
       man  [-C  file]  [-d]  [-D]  [--warnings[=warnings]]  [-R encoding] [-L
       locale] [-m system[,...]] [-M path] [-S list]  [-e  extension]  [-i|-I]
       [--regex|--wildcard]   [--names-only]  [-a]  [-u]  [--no-subpages]  [-P
       pager] [-r prompt] [-7] [-E encoding] [--no-hyphenation] [--no-justifi-
       cation]  [-p  string]  [-t]  [-T[device]]  [-H[browser]] [-X[dpi]] [-Z]
       [[section] page ...] ...
       man -k [apropos options] regexp ...
       man -K [-w|-W] [-S list] [-i|-I] [--regex] [section] term ...
       man -f [whatis options] page ...
       man -l [-C file] [-d] [-D] [--warnings[=warnings]]  [-R  encoding]  [-L
       locale]  [-P  pager]  [-r  prompt]  [-7] [-E encoding] [-p string] [-t]
       [-T[device]] [-H[browser]] [-X[dpi]] [-Z] file ...
       man -w|-W [-C file] [-d] [-D] page ...
       man -c [-C file] [-d] [-D] page ...
       man [-hV]

Check for config name:

root@beaglebone:~# rm /etc/man.config
root@beaglebone:~# man man
Warning: cannot open configuration file /etc/man.config
No manual entry for man

As a bonus a bunch of references to the buildhost get removed from the config file.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/man/man-1.6f/man.conf |  140 +++++++++++++++++++++++++++
 meta/recipes-extended/man/man_1.6f.bb       |    6 +-
 2 files changed, 143 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-extended/man/man-1.6f/man.conf

diff --git a/meta/recipes-extended/man/man-1.6f/man.conf b/meta/recipes-extended/man/man-1.6f/man.conf
new file mode 100644
index 0000000..bb3c697
--- /dev/null
+++ b/meta/recipes-extended/man/man-1.6f/man.conf
@@ -0,0 +1,140 @@
+#
+# Generated automatically from man.conf.in by the
+# configure script.
+#
+# man.conf from man-1.5p
+#
+# For more information about this file, see the man pages man(1)
+# and man.conf(5).
+#
+# This file is read by man to configure the default manpath (also used
+# when MANPATH contains an empty substring), to find out where the cat
+# pages corresponding to given man pages should be stored,
+# and to map each PATH element to a manpath element.
+# It may also record the pathname of the man binary. [This is unused.]
+# The format is:
+#
+# MANBIN		pathname
+# MANPATH		manpath_element	[corresponding_catdir]
+# MANPATH_MAP		path_element	manpath_element
+#
+# If no catdir is given, it is assumed to be equal to the mandir
+# (so that this dir has both man1 etc. and cat1 etc. subdirs).
+# This is the traditional Unix setup.
+# Certain versions of the FSSTND recommend putting formatted versions
+# of /usr/.../man/manx/page.x into /var/catman/.../catx/page.x.
+# The keyword FSSTND will cause this behaviour.
+# Certain versions of the FHS recommend putting formatted versions of
+# /usr/.../share/man/[locale/]manx/page.x into
+# /var/cache/man/.../[locale/]catx/page.x.
+# The keyword FHS will cause this behaviour (and overrides FSSTND).
+# Explicitly given catdirs override.
+#
+# FSSTND
+FHS
+#
+# This file is also read by man in order to find how to call nroff, less, etc.,
+# and to determine the correspondence between extensions and decompressors.
+#
+# MANBIN		/usr/local/bin/man
+#
+# Every automatically generated MANPATH includes these fields
+#
+MANPATH	/usr/man
+MANPATH	/usr/share/man
+MANPATH	/usr/local/man
+MANPATH	/usr/local/share/man
+MANPATH	/usr/X11R6/man
+#
+# Uncomment if you want to include one of these by default
+#
+# MANPATH	/opt/*/man
+# MANPATH	/usr/lib/*/man
+# MANPATH	/usr/share/*/man
+# MANPATH	/usr/kerberos/man
+#
+# Set up PATH to MANPATH mapping
+#
+# If people ask for "man foo" and have "/dir/bin/foo" in their PATH
+# and the docs are found in "/dir/man", then no mapping is required.
+#
+# The below mappings are superfluous when the right hand side is
+# in the mandatory manpath already, but will keep man from statting
+# lots of other nearby files and directories.
+#
+MANPATH_MAP	/bin			/usr/share/man
+MANPATH_MAP	/sbin			/usr/share/man
+MANPATH_MAP	/usr/bin		/usr/share/man
+MANPATH_MAP	/usr/sbin		/usr/share/man
+MANPATH_MAP	/usr/local/bin		/usr/local/share/man
+MANPATH_MAP	/usr/local/sbin		/usr/local/share/man
+MANPATH_MAP	/usr/X11R6/bin		/usr/X11R6/man
+MANPATH_MAP	/usr/bin/X11		/usr/X11R6/man
+MANPATH_MAP	/usr/bin/mh		/usr/share/man
+#
+# NOAUTOPATH keeps man from automatically adding directories that look like
+# manual page directories to the path.
+#
+#NOAUTOPATH
+#
+# NOCACHE keeps man from creating cache pages ("cat pages")
+# (generally one enables/disable cat page creation by creating/deleting
+# the directory they would live in - man never does mkdir)
+# 
+#NOCACHE
+#
+# Useful paths - note that COL should not be defined when
+# NROFF is defined as "groff -Tascii" or "groff -Tlatin1";
+# not only is it superfluous, but it actually damages the output.
+# For use with utf-8, NROFF should be "nroff -mandoc" without -T option.
+# (Maybe - but today I need -Tlatin1 to prevent double conversion to utf8.)
+#
+# If you have a new troff (version 1.18.1?) and its colored output
+# causes problems, add the -c option to TROFF, NROFF, JNROFF.
+#
+TROFF		/usr/bin/groff -Tps -mandoc
+NROFF		/usr/bin/nroff -Tlatin1 -mandoc
+JNROFF		/usr/bin/groff -Tnippon -mandocj
+EQN		/usr/bin/eqn -Tps
+NEQN		/usr/bin/eqn -Tlatin1
+JNEQN		/usr/bin/eqn -Tnippon
+TBL		/usr/bin/tbl
+# COL		/usr/bin/col
+REFER		/usr/bin/refer
+PIC		/usr/bin/pic
+VGRIND		
+GRAP		
+PAGER		/usr/bin/less -isR
+CAT		/bin/cat
+#
+# The command "man -a xyzzy" will show all man pages for xyzzy.
+# When CMP is defined man will try to avoid showing the same
+# text twice. (But compressed pages compare unequal.)
+#
+CMP		/usr/bin/cmp -s
+#
+# Compress cat pages
+#
+COMPRESS	/bin/bzip2
+COMPRESS_EXT	.bz2
+#
+# Default manual sections (and order) to search if -S is not specified
+# and the MANSECT environment variable is not set.
+#
+MANSECT		1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o
+#
+# Default options to use when man is invoked without options
+# This is mainly for the benefit of those that think -a should be the default
+# Note that some systems have /usr/man/allman, causing pages to be shown twice.
+#
+#MANDEFOPTIONS	-a
+#
+# Decompress with given decompressor when input file has given extension
+# The command given must act as a filter.
+#
+.gz		/bin/gunzip -c
+.bz2		/bin/bzip2 -c -d
+.z		
+.Z		/bin/zcat
+.F		
+.Y		
diff --git a/meta/recipes-extended/man/man_1.6f.bb b/meta/recipes-extended/man/man_1.6f.bb
index 3dce1ae..90bd0d3 100644
--- a/meta/recipes-extended/man/man_1.6f.bb
+++ b/meta/recipes-extended/man/man_1.6f.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-PR = "r4"
+PR = "r5"
 
 DEPENDS = "groff less"
 
@@ -54,7 +54,7 @@ do_install_append(){
 	mkdir -p  ${D}${sysconfdir}
         mkdir -p ${D}${datadir}/man/man5
         mkdir -p ${D}${datadir}/man/man7
-	cp ${S}/src/man.conf ${D}${sysconfdir}
+	cp ${WORKDIR}/man.conf ${D}${sysconfdir}/man.config
         cp ${WORKDIR}/man.1.gz ${D}${datadir}/man/man1/
         cp ${WORKDIR}/man.7.gz ${D}${datadir}/man/man7/
         cp ${WORKDIR}/manpath.5.gz ${D}${datadir}/man/man5/
@@ -62,4 +62,4 @@ do_install_append(){
 
 
 RDEPENDS_${PN} = "less groff"
-FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.conf"
+FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.config"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 63/64] libdrm: package update 2.4.35 -> 2.4.37

[Saul Wold]

From: Constantin Musca <constantinx.musca@intel.com>

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../drm/{libdrm_2.4.35.bb => libdrm_2.4.37.bb}     |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/drm/{libdrm_2.4.35.bb => libdrm_2.4.37.bb} (50%)

diff --git a/meta/recipes-graphics/drm/libdrm_2.4.35.bb b/meta/recipes-graphics/drm/libdrm_2.4.37.bb
similarity index 50%
rename from meta/recipes-graphics/drm/libdrm_2.4.35.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.37.bb
index 58ee449..d704b90 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.35.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.37.bb
@@ -6,5 +6,5 @@ SRC_URI += "file://installtests.patch \
             file://GNU_SOURCE_definition.patch \
            "
 
-SRC_URI[md5sum] = "a40f5293dc0a7b49d2a1e959d7d60194"
-SRC_URI[sha256sum] = "c390aee132f05910edb09398b70e108c6b53f9b69b21914a9ea3165eed6f1b21"
+SRC_URI[md5sum] = "9765919c28d4a54887576db3680137cc"
+SRC_URI[sha256sum] = "e4ea39a901d4a8e59064f10f413bb037dad7790f7c16a5986e7cc1453b36488f"
-- 
1.7.7.6

[CONSOLIDATED REQUEST 64/64] rpmresolve: improve debug output

[Saul Wold]

From: Paul Eggleton <paul.eggleton@linux.intel.com>

Rename rpmresolve's -d option to -t and make -d enable debug output;
add a -o option to specify the output file (so rpm debug output doesn't
go to the output file) and also add a little more detail to some of the
error messages.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/package_rpm.bbclass                  |    4 +-
 meta/classes/rootfs_rpm.bbclass                   |    2 +-
 meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c |   69 ++++++++++++++++----
 3 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 50e9b31..b58ae85 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -235,9 +235,9 @@ process_pkg_list_rpm() {
 		extraopt="-i"
 	fi
 
-	rpmresolve $extraopt ${confbase}-base_archs.conf ${target_rootfs}/install/base_archs.pkglist >> ${target_rootfs}/install/${manifestpfx}.manifest
+	rpmresolve $extraopt ${confbase}-base_archs.conf ${target_rootfs}/install/base_archs.pkglist -o ${target_rootfs}/install/${manifestpfx}.manifest
 	if [ -s ${target_rootfs}/install/ml_archs.pkglist ] ; then
-		rpmresolve $extraopt ${confbase}-ml_archs.conf ${target_rootfs}/install/ml_archs.pkglist >> ${target_rootfs}/install/${manifestpfx}_multilib.manifest
+		rpmresolve $extraopt ${confbase}-ml_archs.conf ${target_rootfs}/install/ml_archs.pkglist -o ${target_rootfs}/install/${manifestpfx}_multilib.manifest
 	fi
 }
 
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index a03e9f3..c0207d8 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -151,7 +151,7 @@ list_installed_packages() {
 }
 
 rootfs_list_installed_depends() {
-	rpmresolve -d $INSTALL_ROOTFS_RPM/${rpmlibdir}
+	rpmresolve -t $INSTALL_ROOTFS_RPM/${rpmlibdir}
 }
 
 rootfs_install_packages() {
diff --git a/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c b/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
index 2d9ed14..aedea05 100644
--- a/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
+++ b/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
@@ -36,6 +36,9 @@
 #include <argv.h>
 #include <mire.h>
 
+int debugmode;
+FILE *outf;
+
 int getPackageStr(rpmts ts, const char *NVRA, rpmTag tag, char **value)
 {
     int rc = -1;
@@ -69,6 +72,8 @@ int loadTs(rpmts **ts, int *tsct, const char *dblistfn)
         listfile = 0;
 
     if(listfile) {
+        if(debugmode)
+            printf("DEBUG: reading database list file '%s'\n", dblistfn);
         *ts = malloc(sz * sizeof(rpmts));
         FILE *f = fopen(dblistfn, "r" );
         if(f) {
@@ -87,6 +92,8 @@ int loadTs(rpmts **ts, int *tsct, const char *dblistfn)
                         *ts = (rpmts *)realloc(*ts, sz);
                     }
 
+                    if(debugmode)
+                        printf("DEBUG: opening database '%s'\n", line);
                     char *dbpathm = malloc(strlen(line) + 10);
                     sprintf(dbpathm, "_dbpath %s", line);
                     rpmDefineMacro(NULL, dbpathm, RMIL_CMDLINE);
@@ -113,6 +120,8 @@ int loadTs(rpmts **ts, int *tsct, const char *dblistfn)
         }
     }
     else {
+        if(debugmode)
+            printf("DEBUG: opening database '%s'\n", dblistfn);
         // Load from single database
         *ts = malloc(sizeof(rpmts));
         char *dbpathm = malloc(strlen(dblistfn) + 10);
@@ -164,13 +173,22 @@ int processPackages(rpmts *ts, int tscount, const char *packagelistfn, int ignor
                             char *value = NULL;
                             rc = getPackageStr(ts[i], keys[0], RPMTAG_PACKAGEORIGIN, &value);
                             if(rc == 0)
-                                printf("%s\n", value);
+                                fprintf(outf, "%s\n", value);
                             else
                                 fprintf(stderr, "Failed to get package origin for %s\n", line);
                             found = 1;
                         }
                         else if( nkeys > 1 ) {
-                            fprintf(stderr, "Multiple matches for %s!\n", line);
+                            int keyindex = 0;
+                            fprintf(stderr, "Multiple matches for %s:\n", line);
+                            for( keyindex=0; keyindex<nkeys; keyindex++) {
+                                char *value = NULL;
+                                rc = getPackageStr(ts[i], keys[keyindex], RPMTAG_PACKAGEORIGIN, &value);
+                                if(rc == 0)
+                                    fprintf(outf, "  %s\n", value);
+                                else
+                                    fprintf(stderr, "  (%s)\n", keys[keyindex]);
+                            }
                         }
                     }
                     if(found)
@@ -230,7 +248,7 @@ int printDepList(rpmts *ts, int tscount)
     int rc = 0;
 
     if( tscount > 1 )
-        printf(">1 database specified with dependency list, using first only\n");
+        fprintf(stderr, ">1 database specified with dependency list, using first only\n");
 
     /* Get list of names */
     rpmdb db = rpmtsGetRdb(ts[0]);
@@ -274,17 +292,17 @@ int printDepList(rpmts *ts, int tscount)
                     }
                     if(prov) {
                         if((int)reqflags[j] & 0x80000)
-                            printf("%s|%s [REC]\n", name, prov);
+                            fprintf(outf, "%s|%s [REC]\n", name, prov);
                         else
-                            printf("%s|%s\n", name, prov);
+                            fprintf(outf, "%s|%s\n", name, prov);
                     }
                     else {
                         rc = lookupProvider(ts[0], reqs[j], &prov);
                         if(rc==0 && prov) {
                             if((int)reqflags[j] & 0x80000)
-                                printf("%s|%s [REC]\n", name, prov);
+                                fprintf(outf, "%s|%s [REC]\n", name, prov);
                             else
-                                printf("%s|%s\n", name, prov);
+                                fprintf(outf, "%s|%s\n", name, prov);
                             free(prov);
                         }
                     }
@@ -301,7 +319,7 @@ int printDepList(rpmts *ts, int tscount)
 void usage()
 {
     fprintf(stderr, "OpenEmbedded rpm resolver utility\n");
-    fprintf(stderr, "syntax: rpmresolve [-i] [-d] <dblistfile> <packagelistfile>\n");
+    fprintf(stderr, "syntax: rpmresolve [-i] [-d] [-t] <dblistfile> <packagelistfile>\n");
 }
 
 int main(int argc, char **argv)
@@ -313,16 +331,26 @@ int main(int argc, char **argv)
     int c;
     int ignoremissing = 0;
     int deplistmode = 0;
+    char *outfile = NULL;
+
+    debugmode = 0;
+    outf = stdout;
 
     opterr = 0;
-    while ((c = getopt (argc, argv, "id")) != -1) {
+    while ((c = getopt (argc, argv, "itdo:")) != -1) {
         switch (c) {
             case 'i':
                 ignoremissing = 1;
                 break;
-            case 'd':
+            case 't':
                 deplistmode = 1;
                 break;
+            case 'd':
+                debugmode = 1;
+                break;
+            case 'o':
+                outfile = strdup(optarg);
+                break;
             case '?':
                 if(isprint(optopt))
                     fprintf(stderr, "Unknown option `-%c'.\n", optopt);
@@ -341,9 +369,16 @@ int main(int argc, char **argv)
         return 1;
     }
 
+    if( outfile ) {
+        if(debugmode)
+            printf("DEBUG: Using output file %s\n", outfile);
+        outf = fopen(outfile, "w");
+    }
+
     const char *dblistfn = argv[optind];
 
-    //rpmSetVerbosity(RPMLOG_DEBUG);
+    if(debugmode)
+        rpmSetVerbosity(RPMLOG_DEBUG);
 
     rpmReadConfigFiles( NULL, NULL );
     rpmDefineMacro(NULL, "__dbi_txn create nofsync", RMIL_CMDLINE);
@@ -362,15 +397,21 @@ int main(int argc, char **argv)
     else {
         if( argc - optind < 2 ) {
             fprintf(stderr, "Please specify package list file\n");
-            return 1;
         }
-        const char *pkglistfn = argv[optind+1];
-        rc = processPackages(ts, tscount, pkglistfn, ignoremissing);
+        else {
+            const char *pkglistfn = argv[optind+1];
+            rc = processPackages(ts, tscount, pkglistfn, ignoremissing);
+        }
     }
 
     for(i=0; i<tscount; i++)
         (void) rpmtsCloseDB(ts[i]);
     free(ts);
 
+    if( outfile ) {
+        fclose(outf);
+        free(outfile);
+    }
+
     return rc;
 }
-- 
1.7.7.6

Re: [CONSOLIDATED REQUEST 46/64] owl-video_git.bb: fix compilation on Fedora 13 machine

[McClintock Matthew-B29882]

Saul,

I think we decided to wait / ignore this one.

-M

On Tue, Aug 14, 2012 at 7:13 AM, Saul Wold <sgw@linux.intel.com> wrote:
> From: Matthew McClintock <msm@freescale.com>
>
> This adds libXrandr to the link step and fixes this issue:
>
> | /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetOutputInfo'
> | /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetScreenResourcesCurrent'
> | /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRFreeOutputInfo'
> | /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRFreeScreenResources'
> | /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetOutputPrimary'
> | /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRFreeCrtcInfo'
> | /opt/yocto/upstream/label/master/machine/atom-pc/poky/edison/tmp/sysroots/atom-pc/usr/lib/libgdk-x11-2.0.so: undefined reference to `XRRGetCrtcInfo'
> | collect2: ld returned 1 exit status
>
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  .../owl-video/0001-add-dependency-for-xrandr.patch |   30 ++++++++++++++++++++
>  .../recipes-sato/owl-video-widget/owl-video_git.bb |    5 ++-
>  2 files changed, 33 insertions(+), 2 deletions(-)
>  create mode 100644 meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch
>
> diff --git a/meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch b/meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch
> new file mode 100644
> index 0000000..8c14578
> --- /dev/null
> +++ b/meta/recipes-sato/owl-video-widget/owl-video/0001-add-dependency-for-xrandr.patch
> @@ -0,0 +1,30 @@
> +Upstream-Status: Pending
> +
> +This patch should probably go upstream
> +
> +From 18bdd57b36489439dc5c18b20abd9d59c6778662 Mon Sep 17 00:00:00 2001
> +From: Matthew McClintock <msm@freescale.com>
> +Date: Wed, 25 Jul 2012 15:05:40 -0500
> +Subject: [PATCH] add dependency for xrandr
> +
> +Signed-off-by: Matthew McClintock <msm@freescale.com>
> +---
> + src/Makefile.am |    2 +-
> + 1 files changed, 1 insertions(+), 1 deletions(-)
> +
> +diff --git a/src/Makefile.am b/src/Makefile.am
> +index 60e845b..00e4b11 100644
> +--- a/src/Makefile.am
> ++++ b/src/Makefile.am
> +@@ -12,7 +12,7 @@ video_SOURCES = video.c      \
> +       owl-overlay-bin.c       \
> +       owl-overlay-bin.h
> +
> +-video_LDADD = $(VIDEO_LIBS)
> ++video_LDADD = $(VIDEO_LIBS) -lXrandr
> +
> + dist_pkgdata_DATA = gtk-fullscreen.png
> +
> +--
> +1.7.5.4
> +
> diff --git a/meta/recipes-sato/owl-video-widget/owl-video_git.bb b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
> index bc63273..321b71b 100644
> --- a/meta/recipes-sato/owl-video-widget/owl-video_git.bb
> +++ b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
> @@ -10,7 +10,7 @@ DEPENDS = "libowl-av"
>
>  SRCREV = "f133472318970796fae1ea3e98ac062156768baf"
>  PV = "0.1+git${SRCPV}"
> -PR = "r1"
> +PR = "r2"
>
>  S = "${WORKDIR}/git"
>
> @@ -23,7 +23,8 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
>             file://stock_volume-med.png \
>             file://stock_volume-max.png \
>             file://owl-video-widget.desktop \
> -          file://make-382.patch"
> +          file://make-382.patch \
> +          file://0001-add-dependency-for-xrandr.patch"
>
>  inherit autotools pkgconfig
>
> --
> 1.7.7.6
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [CONSOLIDATED REQUEST 46/64] owl-video_git.bb: fix compilation on Fedora 13 machine

[Burton, Ross]

On 14 August 2012 15:48, McClintock Matthew-B29882 <B29882@freescale.com> wrote:
> I think we decided to wait / ignore this one.

Yes, unless this crops up again this can be dropped.

Ross

Re: [CONSOLIDATED REQUEST 05/64] console-tools: cleanup update-alternatives deprecated code

[Richard Purdie]

On Tue, 2012-08-14 at 15:12 +0300, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  .../console-tools/console-tools_0.3.2.bb           |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
> index 6027d4a..1446368 100644
> --- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
> +++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
> @@ -3,7 +3,7 @@ LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9"
>  SUMMARY = "Allows you to set-up and manipulate the Linux console."
>  DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files."
> -PR = "r5"
> +PR = "r6"
>  
>  SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
>             file://codepage.patch \
> @@ -35,6 +35,10 @@ inherit autotools gettext update-alternatives
>  ALTERNATIVE_PRIORITY = "100"
>  
>  bindir_progs = "chvt deallocvt fgconsole openvt"
> -ALTERNATIVE_LINKS = "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}"
> +ALTERNATIVE_${PN} = "${bindir_progs}"
> +#python __anonymous() {
> +#	for prog in d.getVar('bindir_progs', True).split():
> +#		d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog))
> +#}

Any particular reason we're adding in this anonymous python function
which is commented out?

Cheers,

Richard

Re: [CONSOLIDATED REQUEST 55/64] chrpath.bbclass: Account for case when ORIGIN is in RPATH

[Richard Purdie]

On Tue, 2012-08-14 at 15:13 +0300, Saul Wold wrote:
> From: Khem Raj <raj.khem@gmail.com>
> 
> This fixes a case when RPATH embedded in program have one of
> its path already relative to ORIGIN. We were losing that path
> if such a path existed. This patch appends it to the new edited
> rpath being created when we see it.
> 
> so RPATH like below
> 
> (RPATH)              Library rpath:
> [$ORIGIN/../lib/amd64/jli:$ORIGIN/../jre/lib/amd64/jli]
> 
> would end up being empty
> 
> but after this patch its kept intact
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/classes/chrpath.bbclass |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass
> index 10b5ca0..e903b65 100644
> --- a/meta/classes/chrpath.bbclass
> +++ b/meta/classes/chrpath.bbclass
> @@ -49,6 +49,7 @@ def process_dir (directory, d):
>              new_rpaths = []
>              for rpath in rpaths:
>                  # If rpath is already dynamic continue
> +                new_rpaths.append("%s" % (rpath.strip()))
>                  if rpath.find("$ORIGIN") != -1:
>                      continue
>                  # If the rpath shares a root with base_prefix determine a new dynamic rpath from the

Shouldn't this read:

                if rpath.find("$ORIGIN") != -1:
                      new_rpaths.append("%s" % (rpath.strip()))
                      continue

as the code above would add *all* the old rpaths to the binary as well
as any relocations?

Cheers,

Richard

Re: [CONSOLIDATED REQUEST 36/64] dbus: provide/replace dbus-x11 only for target

[Richard Purdie]

On Tue, 2012-08-14 at 15:13 +0300, Saul Wold wrote:
> From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> 
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/recipes-core/dbus/dbus.inc |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)

This was superseded by
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=0125438b853348e8a0869e17848173c9d8d51c5d

Cheers,

Richard

Re: [CONSOLIDATED REQUEST 55/64] chrpath.bbclass: Account for case when ORIGIN is in RPATH

[Khem Raj]

On Wed, Aug 15, 2012 at 6:12 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> Shouldn't this read:
>
>                 if rpath.find("$ORIGIN") != -1:
>                       new_rpaths.append("%s" % (rpath.strip()))
>                       continue
>
> as the code above would add *all* the old rpaths to the binary as well
> as any relocations?

sorry I sent a wrong patch to ML and was testing a different one. I
will send out the correct one.

Re: [CONSOLIDATED REQUEST 05/64] console-tools: cleanup update-alternatives deprecated code

[Saul Wold]

On 08/14/2012 12:01 PM, Richard Purdie wrote:
> On Tue, 2012-08-14 at 15:12 +0300, Saul Wold wrote:
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> ---
>>   .../console-tools/console-tools_0.3.2.bb           |    8 ++++++--
>>   1 files changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
>> index 6027d4a..1446368 100644
>> --- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
>> +++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
>> @@ -3,7 +3,7 @@ LICENSE = "GPLv2"
>>   LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9"
>>   SUMMARY = "Allows you to set-up and manipulate the Linux console."
>>   DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files."
>> -PR = "r5"
>> +PR = "r6"
>>
>>   SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
>>              file://codepage.patch \
>> @@ -35,6 +35,10 @@ inherit autotools gettext update-alternatives
>>   ALTERNATIVE_PRIORITY = "100"
>>
>>   bindir_progs = "chvt deallocvt fgconsole openvt"
>> -ALTERNATIVE_LINKS = "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}"
>> +ALTERNATIVE_${PN} = "${bindir_progs}"
>> +#python __anonymous() {
>> +#	for prog in d.getVar('bindir_progs', True).split():
>> +#		d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog))
>> +#}
>
Oops, that should not be there as I solved with the line above. Thanks 
for taking care of that.

Sau!

> Any particular reason we're adding in this anonymous python function
> which is commented out?
>
> Cheers,
>
> Richard
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>