[PATCH 0/9] UPDATED: 21/22-May 2011 Pull

[PATCH 0/9] UPDATED: 21/22-May 2011 Pull

[Saul Wold]

Richard,

This is the updated pull request from the 21st, it contains both
Nitin's and Khem's Updates to their branches for GCC, eglibc along with
distcc & opkg.

Also included are some fixes for world build issues.

Thanks
	Sau!


The following changes since commit 54ecf8e3992b8a01c2e5bd16720e1819b71b68bd:

  packagedata: don't choke on empty PACKAGES (2011-05-20 17:41:34 +0100)

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

Khem Raj (2):
  distcc_2.18.3.bb: Fix compilation on uclibc
  opkg_svn.bb: Install rcS.d into $D instead of $IMAGE_ROOTFS

Nitin A Kamble (3):
  tcmode-default: switch to eglibc 2.13 from 2.12
  tcmode-default: switch to gcc 4.6.0 for ppc & mips also
  gplv2 recipes update upstream status of patches

Saul Wold (4):
  gail: Add LIC_FILES_CHKSUM
  update-alternatives-dpkg: Update to dpkg base 1.15.8.7
  puzzles: update to r9173
  package_rpm.bbclass: create method for createrepo cmd

 meta/classes/package_rpm.bbclass                   |    6 +++++-
 meta/conf/distro/include/tcmode-default.inc        |    6 +-----
 meta/recipes-devtools/distcc/distcc_2.18.3.bb      |   15 +++++++++++----
 meta/recipes-devtools/opkg/opkg/headerfix.patch    |   19 -------------------
 meta/recipes-devtools/opkg/opkg_svn.bb             |    3 +--
 .../update-alternatives-dpkg.inc                   |    6 ++++--
 .../update-alternatives-dpkg_1.13.22.bb            |    7 -------
 .../update-alternatives-dpkg_1.15.8.7.bb           |   13 +++++++++++++
 meta/recipes-extended/at/at-3.1.12/configure.patch |    2 ++
 .../cpio/cpio-2.8/m4extensions.patch               |    2 ++
 meta/recipes-extended/cpio/cpio-2.8/statdef.patch  |    2 ++
 .../grep/grep-2.5.1a/uclibc-fix.patch              |    2 ++
 .../recipes-extended/tar/tar-1.17/gcc43build.patch |    2 ++
 .../tar/tar-1.17/m4extensions.patch                |    2 ++
 meta/recipes-gnome/gnome/gail_1.20.0.bb            |   10 +++++++---
 .../puzzles/{puzzles_r9163.bb => puzzles_r9173.bb} |    0
 16 files changed, 54 insertions(+), 43 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg/opkg/headerfix.patch
 delete mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
 create mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
 rename meta/recipes-sato/puzzles/{puzzles_r9163.bb => puzzles_r9173.bb} (100%)

-- 
1.7.3.4

[PATCH 1/9] gail: Add LIC_FILES_CHKSUM

[Saul Wold]

[YOCTO #1042]

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

diff --git a/meta/recipes-gnome/gnome/gail_1.20.0.bb b/meta/recipes-gnome/gnome/gail_1.20.0.bb
index 2e9f857..ab6aa1f 100644
--- a/meta/recipes-gnome/gnome/gail_1.20.0.bb
+++ b/meta/recipes-gnome/gnome/gail_1.20.0.bb
@@ -1,10 +1,14 @@
-LICENSE = "LGPL"
-SECTION = "x11/libs"
-PR = "r1"
 DESCRIPTION = "GNOME Accessibility Implementation Library"
+SECTION = "x11/libs"
+
 DEPENDS = "gtk+"
 PROVIDES = "virtual/gail"
 
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
+
+PR = "r1"
+
 inherit gnome
 
 EXTRA_OECONF = "--disable-gtk-doc"
-- 
1.7.3.4

[PATCH 2/9] update-alternatives-dpkg: Update to dpkg base 1.15.8.7

[Saul Wold]

[YOCTO #1062]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../update-alternatives-dpkg.inc                   |    6 ++++--
 .../update-alternatives-dpkg_1.13.22.bb            |    7 -------
 .../update-alternatives-dpkg_1.15.8.7.bb           |   13 +++++++++++++
 3 files changed, 17 insertions(+), 9 deletions(-)
 delete mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
 create mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb

diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
index 9b53df8..63bfe95 100644
--- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
+++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
@@ -5,10 +5,12 @@ programs fulfilling the same or similar functions and how they can be installed
 time."
 LICENSE = "GPL"
 SECTION = "base"
-SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2"
 S = "${WORKDIR}/dpkg-${PV}"
 PACKAGE_ARCH = "all"
-PR = "r2"
+PR = "r0"
+
+inherit gettext
 
 do_patch () {
     cat ${S}/scripts/update-alternatives.pl | \
diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
deleted file mode 100644
index 5d38d5d..0000000
--- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require update-alternatives-dpkg.inc
-
-PROVIDES += "virtual/update-alternatives"
-RPROVIDES_${PN} += "update-alternatives"
-EXTRA_RDEPENDS = "perl dpkg"
-EXTRA_RDEPENDS_virtclass-native = ""
-RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"
diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
new file mode 100644
index 0000000..15f3ced
--- /dev/null
+++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
@@ -0,0 +1,13 @@
+require update-alternatives-dpkg.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc"
+SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5"
+
+
+PROVIDES += "virtual/update-alternatives"
+RPROVIDES_${PN} += "update-alternatives"
+EXTRA_RDEPENDS = "perl dpkg"
+EXTRA_RDEPENDS_virtclass-native = ""
+RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"
-- 
1.7.3.4

[PATCH 3/9] puzzles: update to r9173

[Saul Wold]

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

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

[PATCH 4/9] package_rpm.bbclass: create method for createrepo cmd

[Saul Wold]

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

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 1d8c686..666eb54 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -15,6 +15,10 @@ python package_rpm_install () {
 	bb.fatal("package_rpm_install not implemented!")
 }
 
+package_createrepo () {
+	createrepo ${DEPLOY_DIR_RPM}
+}
+
 RPMCONF_TARGET_BASE = "${DEPLOY_DIR_RPM}/solvedb"
 RPMCONF_HOST_BASE = "${DEPLOY_DIR_RPM}/solvedb-sdk"
 #
@@ -816,6 +820,6 @@ python do_package_write_rpm () {
 do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}"
 addtask package_write_rpm before do_package_write after do_package
 
-PACKAGEINDEXES += "package_update_index_rpm; createrepo ${DEPLOY_DIR_RPM};"
+PACKAGEINDEXES += "package_update_index_rpm; package_createrepo"
 PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot"
 PACKAGEINDEXDEPS += "createrepo-native:do_populate_sysroot"
-- 
1.7.3.4

[PATCH 5/9] distcc_2.18.3.bb: Fix compilation on uclibc

[Saul Wold]

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

We enable gtk/gnome in distcc that code uses loadavg()
a function unimplemented in uclibc. Therefore for uclibc
we disable gnome and gtk+ features in distcc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/distcc/distcc_2.18.3.bb |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-devtools/distcc/distcc_2.18.3.bb b/meta/recipes-devtools/distcc/distcc_2.18.3.bb
index 1f5c2af..ece1b02 100644
--- a/meta/recipes-devtools/distcc/distcc_2.18.3.bb
+++ b/meta/recipes-devtools/distcc/distcc_2.18.3.bb
@@ -6,7 +6,10 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 PR = "r6"
 
-DEPENDS = "avahi gtk+"
+DEPENDS = "avahi ${GTKDEP}"
+GTKDEP_libc-uclibc = ""
+GTKDEP = "gtk+"
+
 RRECOMMENDS_${PN} = "avahi-daemon"
 
 # Upstream change this patch periodically so store locally
@@ -24,16 +27,20 @@ inherit autotools pkgconfig update-rc.d
 
 INITSCRIPT_NAME = "distcc"
 
-EXTRA_OECONF = " --with-gtk "
-
+EXTRA_OECONF = "--with-gtk"
+EXTRA_OECONF_libc-uclibc = "--without-gtk --without-gnome"
 do_install_append() {
     install -d ${D}${sysconfdir}/init.d/
     install -d ${D}${sysconfdir}/default
     install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/
     install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc
+    ${DESKTOPINSTALL}
+}
+DESKTOPINSTALL = ""
+DESKTOPINSTALL_libc-glibc () {
+    install -d ${D}${datadir}/distcc/
     install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/
 }
-
 PACKAGES += "distcc-distmon-gnome"
 
 FILES_${PN} = " ${sysconfdir} \
-- 
1.7.3.4

[PATCH 6/9] opkg_svn.bb: Install rcS.d into $D instead of $IMAGE_ROOTFS

[Saul Wold]

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

Remove headerfix.patch, its already applied upstream

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/opkg/opkg/headerfix.patch |   19 -------------------
 meta/recipes-devtools/opkg/opkg_svn.bb          |    3 +--
 2 files changed, 1 insertions(+), 21 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg/opkg/headerfix.patch

diff --git a/meta/recipes-devtools/opkg/opkg/headerfix.patch b/meta/recipes-devtools/opkg/opkg/headerfix.patch
deleted file mode 100644
index b3515a0..0000000
--- a/meta/recipes-devtools/opkg/opkg/headerfix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Without this, the FILE reference in this header can cause compile issues.
-
-RP - 29/1/10
-
-Upstream-Status: Pending
-
-Index: trunk/libopkg/pkg_dest.h
-===================================================================
---- trunk.orig/libopkg/pkg_dest.h	2010-01-29 09:37:22.000000000 +0000
-+++ trunk/libopkg/pkg_dest.h	2010-01-29 09:37:33.000000000 +0000
-@@ -18,6 +18,8 @@
- #ifndef PKG_DEST_H
- #define PKG_DEST_H
- 
-+#include <stdio.h>
-+
- typedef struct pkg_dest pkg_dest_t;
- struct pkg_dest
- {
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 5964a47..5f07c17 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -11,7 +11,6 @@ RREPLACES_${PN} = "opkg-nogpg"
 
 SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
            file://add_vercmp.patch \
-           file://headerfix.patch \
 "
 
 S = "${WORKDIR}/trunk"
@@ -34,7 +33,7 @@ do_install_append() {
 pkg_postinst_${PN} () {
 #!/bin/sh
 if [ "x$D" != "x" ]; then
-	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
+	install -d $D${sysconfdir}/rcS.d
 	# this happens at S98 where our good 'ole packages script used to run
 	echo "#!/bin/sh
 opkg-cl configure
-- 
1.7.3.4

[PATCH 7/9] tcmode-default: switch to eglibc 2.13 from 2.12

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/conf/distro/include/tcmode-default.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index ae6f272..c2c9efe 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -24,7 +24,7 @@ GCCVERSION_ppc ?= "4.5.1"
 SDKGCCVERSION_ppc ?= "4.5.1"
 BINUVERSION ?= "2.21"
 GLIBCVERSION ?= "2.10.1"
-EGLIBCVERSION ?= "2.12"
+EGLIBCVERSION ?= "2.13"
 LINUXLIBCVERSION ?= "2.6.37.2"
 
 # Temporary preferred version overrides for PPC
-- 
1.7.3.4

[PATCH 8/9] tcmode-default: switch to gcc 4.6.0 for ppc & mips also

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Now the kernel issues related to gcc 4.6.0 for mips & ppc are fixed.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/conf/distro/include/tcmode-default.inc |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index c2c9efe..d279231 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -18,10 +18,6 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
 
 GCCVERSION ?= "4.6.0"
 SDKGCCVERSION ?= "4.6.0"
-GCCVERSION_mips ?= "4.5.1"
-SDKGCCVERSION_mips ?= "4.5.1"
-GCCVERSION_ppc ?= "4.5.1"
-SDKGCCVERSION_ppc ?= "4.5.1"
 BINUVERSION ?= "2.21"
 GLIBCVERSION ?= "2.10.1"
 EGLIBCVERSION ?= "2.13"
-- 
1.7.3.4

[PATCH 9/9] gplv2 recipes update upstream status of patches

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

grep-2.5.1a: update upstream status of patches
tar-1.17: update upstream-status of patches
at-3.1.12: update upstream-status for patches
cpio-2.8: update upstream-status for patches

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-extended/at/at-3.1.12/configure.patch |    2 ++
 .../cpio/cpio-2.8/m4extensions.patch               |    2 ++
 meta/recipes-extended/cpio/cpio-2.8/statdef.patch  |    2 ++
 .../grep/grep-2.5.1a/uclibc-fix.patch              |    2 ++
 .../recipes-extended/tar/tar-1.17/gcc43build.patch |    2 ++
 .../tar/tar-1.17/m4extensions.patch                |    2 ++
 6 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-extended/at/at-3.1.12/configure.patch b/meta/recipes-extended/at/at-3.1.12/configure.patch
index 079a6b4..99b4077 100644
--- a/meta/recipes-extended/at/at-3.1.12/configure.patch
+++ b/meta/recipes-extended/at/at-3.1.12/configure.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
 Fix cross-compilation issues in configure.ac
 Derived from an OE patch for at-3.1.8
 
diff --git a/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch b/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch
index 648c725..e16585d 100644
--- a/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch
+++ b/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
 # Define AC_USE_SYSTEM_EXTENSIONS only if it was previously undefined.
 # This is needed to configure correctly with newer versions of autoconf.
 
diff --git a/meta/recipes-extended/cpio/cpio-2.8/statdef.patch b/meta/recipes-extended/cpio/cpio-2.8/statdef.patch
index dfa0d91..a00799f 100644
--- a/meta/recipes-extended/cpio/cpio-2.8/statdef.patch
+++ b/meta/recipes-extended/cpio/cpio-2.8/statdef.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
 # Avoid multiple stat definitions
 # Patch taken from cpio mailing list posting 2010-03-19
 
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch b/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch
index 8fc7c48..de054fc 100644
--- a/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch
+++ b/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
 # Fix to use mempcpy instead of __mempcpy. This is needed for uclibc which
 # doesn't define __mempcpy, only mempcpy. Since both uclibc and glibc have
 # mempcpy, we'll just use that instead.
diff --git a/meta/recipes-extended/tar/tar-1.17/gcc43build.patch b/meta/recipes-extended/tar/tar-1.17/gcc43build.patch
index cc5f0e1..f8059a0 100644
--- a/meta/recipes-extended/tar/tar-1.17/gcc43build.patch
+++ b/meta/recipes-extended/tar/tar-1.17/gcc43build.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
 # Fix errors when built with gcc 4.3
 # Patch taken from Debian bug #452096
 
diff --git a/meta/recipes-extended/tar/tar-1.17/m4extensions.patch b/meta/recipes-extended/tar/tar-1.17/m4extensions.patch
index 11b981a..30534c2 100644
--- a/meta/recipes-extended/tar/tar-1.17/m4extensions.patch
+++ b/meta/recipes-extended/tar/tar-1.17/m4extensions.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [licensing]
+
 # Define AC_USE_SYSTEM_EXTENSIONS only if it was previously undefined.
 # This is needed to configure correctly with newer versions of autoconf.
 
-- 
1.7.3.4

Re: [PATCH 2/9] update-alternatives-dpkg: Update to dpkg base 1.15.8.7

[Joshua Lock]

On Sun, 2011-05-22 at 11:48 -0700, Saul Wold wrote:
> [YOCTO #1062]

Can we include more of a description than just the bug ID here? It's a
pain to have to switch to the browser when your navigating git logs to
try and understand changes. Further it makes patches more difficult to
review.

I thought we'd encoded this in our patch policy?

Cheers,
Joshua

> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  .../update-alternatives-dpkg.inc                   |    6 ++++--
>  .../update-alternatives-dpkg_1.13.22.bb            |    7 -------
>  .../update-alternatives-dpkg_1.15.8.7.bb           |   13 +++++++++++++
>  3 files changed, 17 insertions(+), 9 deletions(-)
>  delete mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
>  create mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
> 
> diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
> index 9b53df8..63bfe95 100644
> --- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
> +++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
> @@ -5,10 +5,12 @@ programs fulfilling the same or similar functions and how they can be installed
>  time."
>  LICENSE = "GPL"
>  SECTION = "base"
> -SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
> +SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2"
>  S = "${WORKDIR}/dpkg-${PV}"
>  PACKAGE_ARCH = "all"
> -PR = "r2"
> +PR = "r0"
> +
> +inherit gettext
>  
>  do_patch () {
>      cat ${S}/scripts/update-alternatives.pl | \
> diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
> deleted file mode 100644
> index 5d38d5d..0000000
> --- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -require update-alternatives-dpkg.inc
> -
> -PROVIDES += "virtual/update-alternatives"
> -RPROVIDES_${PN} += "update-alternatives"
> -EXTRA_RDEPENDS = "perl dpkg"
> -EXTRA_RDEPENDS_virtclass-native = ""
> -RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"
> diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
> new file mode 100644
> index 0000000..15f3ced
> --- /dev/null
> +++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
> @@ -0,0 +1,13 @@
> +require update-alternatives-dpkg.inc
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
> +
> +SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc"
> +SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5"
> +
> +
> +PROVIDES += "virtual/update-alternatives"
> +RPROVIDES_${PN} += "update-alternatives"
> +EXTRA_RDEPENDS = "perl dpkg"
> +EXTRA_RDEPENDS_virtclass-native = ""
> +RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"

-- 
Joshua Lock
        Yocto Build System Monkey
        Intel Open Source Technology Centre

Re: [PATCH 4/9] package_rpm.bbclass: create method for createrepo cmd

[Joshua Lock]

Can we have an explanation of why this change was made in the commit
message?

Thanks,
Joshua

On Sun, 2011-05-22 at 11:48 -0700, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/classes/package_rpm.bbclass |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
> index 1d8c686..666eb54 100644
> --- a/meta/classes/package_rpm.bbclass
> +++ b/meta/classes/package_rpm.bbclass
> @@ -15,6 +15,10 @@ python package_rpm_install () {
>  	bb.fatal("package_rpm_install not implemented!")
>  }
>  
> +package_createrepo () {
> +	createrepo ${DEPLOY_DIR_RPM}
> +}
> +
>  RPMCONF_TARGET_BASE = "${DEPLOY_DIR_RPM}/solvedb"
>  RPMCONF_HOST_BASE = "${DEPLOY_DIR_RPM}/solvedb-sdk"
>  #
> @@ -816,6 +820,6 @@ python do_package_write_rpm () {
>  do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}"
>  addtask package_write_rpm before do_package_write after do_package
>  
> -PACKAGEINDEXES += "package_update_index_rpm; createrepo ${DEPLOY_DIR_RPM};"
> +PACKAGEINDEXES += "package_update_index_rpm; package_createrepo"
>  PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot"
>  PACKAGEINDEXDEPS += "createrepo-native:do_populate_sysroot"

-- 
Joshua Lock
        Yocto Build System Monkey
        Intel Open Source Technology Centre

Re: [PATCH 2/9] update-alternatives-dpkg: Update to dpkg base 1.15.8.7

[Phil Blundell]

On Sun, 2011-05-22 at 11:48 -0700, Saul Wold wrote:
> --- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
> +++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
> @@ -5,10 +5,12 @@ programs fulfilling the same or similar functions and how they can be installed
>  time."
>  LICENSE = "GPL"
>  SECTION = "base"
> -SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
> +SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2"
>  S = "${WORKDIR}/dpkg-${PV}"
>  PACKAGE_ARCH = "all"
> -PR = "r2"
> +PR = "r0"

Why is this in the .inc file at all?  It seems a bit bogus to have a PR
value defined here that needs to be rewound whenever PV is changed
somewhere else.

> +PROVIDES += "virtual/update-alternatives"
> +RPROVIDES_${PN} += "update-alternatives"
> +EXTRA_RDEPENDS = "perl dpkg"
> +EXTRA_RDEPENDS_virtclass-native = ""
> +RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"

Conversely, why is this stuff in the .bb file rather than in the .inc?
Presumably all the lines above are version invariant.

Also (although this isn't really a comment on your patch), why does
u-a-dpkg RDEPEND on dpkg in the first place?  That seems like it rather
defeats the whole point of having this as a separate recipe.

p.

Re: [PATCH 1/9] gail: Add LIC_FILES_CHKSUM

[Phil Blundell]

On Sun, 2011-05-22 at 11:48 -0700, Saul Wold wrote:
> -LICENSE = "LGPL"
> -SECTION = "x11/libs"
> -PR = "r1"
>  DESCRIPTION = "GNOME Accessibility Implementation Library"
> +SECTION = "x11/libs"
> +
>  DEPENDS = "gtk+"
>  PROVIDES = "virtual/gail"
>  
> +LICENSE = "LGPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
> +
> +PR = "r1"
> +

If you're changing LICENSE then I think you probably want to bump PR as
well.

p.

Re: [PATCH 0/9] UPDATED: 21/22-May 2011 Pull

[Richard Purdie]

On Sun, 2011-05-22 at 11:48 -0700, Saul Wold wrote:
> This is the updated pull request from the 21st, it contains both
> Nitin's and Khem's Updates to their branches for GCC, eglibc along with
> distcc & opkg.
> 
> Also included are some fixes for world build issues.
> 
>   git://git.openembedded.org/openembedded-core-contrib.git sgw/stage
>   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
> 
[...]
> Saul Wold (4):
>   gail: Add LIC_FILES_CHKSUM
>   update-alternatives-dpkg: Update to dpkg base 1.15.8.7
>   package_rpm.bbclass: create method for createrepo cmd

These three have feedback against them we should address, I took the
rest.

Cheers,

Richard

Re: [PATCH 4/9] package_rpm.bbclass: create method for createrepo cmd

[Richard Purdie]

A couple of comments:

Firstly the commit message says what you changed, not why...

On Sun, 2011-05-22 at 11:48 -0700, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/classes/package_rpm.bbclass |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
> index 1d8c686..666eb54 100644
> --- a/meta/classes/package_rpm.bbclass
> +++ b/meta/classes/package_rpm.bbclass
> @@ -15,6 +15,10 @@ python package_rpm_install () {
>  	bb.fatal("package_rpm_install not implemented!")
>  }
>  
> +package_createrepo () {
> +	createrepo ${DEPLOY_DIR_RPM}
> +}
> +
>  RPMCONF_TARGET_BASE = "${DEPLOY_DIR_RPM}/solvedb"
>  RPMCONF_HOST_BASE = "${DEPLOY_DIR_RPM}/solvedb-sdk"
>  #
> @@ -816,6 +820,6 @@ python do_package_write_rpm () {
>  do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}"
>  addtask package_write_rpm before do_package_write after do_package
>  
> -PACKAGEINDEXES += "package_update_index_rpm; createrepo ${DEPLOY_DIR_RPM};"
> +PACKAGEINDEXES += "package_update_index_rpm; package_createrepo"

Secondly this should end in a ;. I'd just add the
package_update_index_rpm call to package_createrepo to be honest.
package_createrepo could also do with rpm in the name somewhere just to
we're reminded its rpm specific in other contexts.

Cheers,

Richard