Skip to contentSkip to conversation

21-May-Consolidated Pull

PATCH In review Saul Wold 4 participants 15 messages May 21, 2011 – May 23, 2011

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover 21-May-Consolidated Pull

Richard,

This has a couple of fixes that are bound for M1, and will be cherry-picked there once in oe-core / poky master.

The GCC Version update to 4.6 along with a corresponding change to eglibc 2.13 has been build tested and will be QA'ed as part of RC1 in 1.1 m1.

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):
opkg_svn.bb: Install rcS.d into $D instead of $IMAGE_ROOTFS distcc_2.18.3.bb: Fix compilation on uclibc

Saul Wold (6):
gail: Add LIC_FILES_CHKSUM
update-alternatives-dpkg: Update to dpkg base 1.15.8.7
puzzles: update to r9173
tcmode-default: set *GCCVERSION to 4.6 for all Arches
tcmode-default: Update Eglibc to 2.13 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      |   17 ++++++++++++-----
 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-gnome/gnome/gail_1.20.0.bb            |   10 +++++++---
 .../puzzles/{puzzles_r9163.bb => puzzles_r9173.bb} |    0
 10 files changed, 43 insertions(+), 44 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%)
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 1/8 gail: Add LIC_FILES_CHKSUM

[YOCTO #1042]

Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-gnome/gnome/gail_1.20.0.bb |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
meta/recipes-gnome/gnome/gail_1.20.0.bb +7 -3
index 2e9f857..ab6aa1f 100644
@@ -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"
Signature · 1 line
1.7.3.4
author
#2 lore raw

PATCH 2/8 update-alternatives-dpkg: Update to dpkg base 1.15.8.7

In reply to Saul Wold

[YOCTO #1062]

Signed-off-by Saul Wold <[email protected]>
---
 .../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
meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc +4 -2
index 9b53df8..63bfe95 100644
@@ -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 | \
meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb deleted +0 -7
deleted file mode 100644
index 5d38d5d..0000000
@@ -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}"
meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb new file +13 -0
new file mode 100644
index 0000000..15f3ced
@@ -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}"
Signature · 1 line
1.7.3.4
author
#3 lore raw

PATCH 3/8 puzzles: update to r9173

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 .../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%)
meta/recipes-sato/puzzles/puzzles_r9173.bb renamed from meta/recipes-sato/puzzles/puzzles_r9163.bb +0 -0
similarity index 100%
rename from meta/recipes-sato/puzzles/puzzles_r9163.bb
rename to meta/recipes-sato/puzzles/puzzles_r9173.bb
Signature · 1 line
1.7.3.4
#4 lore raw

Re: [PATCH 3/8] puzzles: update to r9173

Quoted 5 lines · Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 .../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%)

No doubt the patch is fine, but why is this recipe in oe-core at all? It doesn't seem to fit any reasonable definition of "core" functionality that I can immediately think of.

p.

#5 lore raw

Re: [PATCH 3/8] puzzles: update to r9173

Quoted 10 lines · Phil Blundell
Quoted 5 lines · Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 .../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%)

No doubt the patch is fine, but why is this recipe in oe-core at all? It doesn't seem to fit any reasonable definition of "core" functionality that I can immediately think of.

This is a discussion that the TSC had. Somehow we need the ensure we had the ability to test oe-core easily and extensively and sato is a pretty contained way to do that. Originally I'd expected sato to get split into its own layer but we didn't do that for this reason.

Cheers,

Richard

author
#6 lore raw

PATCH 4/8 tcmode-default: set *GCCVERSION to 4.6 for all Arches

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 meta/conf/distro/include/tcmode-default.inc |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
meta/conf/distro/include/tcmode-default.inc +0 -4
index ae6f272..4541508 100644
@@ -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.12"
Signature · 1 line
1.7.3.4
author
#7 lore raw

PATCH 5/8 tcmode-default: Update Eglibc to 2.13

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 meta/conf/distro/include/tcmode-default.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/distro/include/tcmode-default.inc +1 -1
index 4541508..d279231 100644
@@ -20,7 +20,7 @@ GCCVERSION ?= "4.6.0"
 SDKGCCVERSION ?= "4.6.0"
 BINUVERSION ?= "2.21"
 GLIBCVERSION ?= "2.10.1"
-EGLIBCVERSION ?= "2.12"
+EGLIBCVERSION ?= "2.13"
 LINUXLIBCVERSION ?= "2.6.37.2"
 
 # Temporary preferred version overrides for PPC
Signature · 1 line
1.7.3.4
author
#8 lore raw

PATCH 6/8 package_rpm.bbclass: create method for createrepo cmd

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 meta/classes/package_rpm.bbclass |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
meta/classes/package_rpm.bbclass +5 -1
index 1d8c686..666eb54 100644
@@ -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"
Signature · 1 line
1.7.3.4
author
#9 lore raw

PATCH 7/8 opkg_svn.bb: Install rcS.d into $D instead of $IMAGE_ROOTFS

In reply to Saul Wold

From: Khem Raj <[email protected]>

Remove headerfix.patch, its already applied upstream

Signed-off-by Khem Raj <[email protected]>
---
 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
meta/recipes-devtools/opkg/opkg/headerfix.patch deleted +0 -19
deleted file mode 100644
index b3515a0..0000000
@@ -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
- {
meta/recipes-devtools/opkg/opkg_svn.bb +1 -2
index 5964a47..3f2c22b 100644
@@ -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
Signature · 1 line
1.7.3.4
#10 lore raw

Re: [PATCH 7/8] opkg_svn.bb: Install rcS.d into $D instead of $IMAGE_ROOTFS

Quoted 4 lines · Saul Wold

From: Khem Raj <[email protected]>

Remove headerfix.patch, its already applied upstream

This patch had reviews to be addressed which I have done the patch is updated in pull branch. Use that one

Quoted 57 lines
Signed-off-by Khem Raj <[email protected]>

---
 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

meta/recipes-devtools/opkg/opkg/headerfix.patch deleted +0 -19
deleted file mode 100644
index b3515a0..0000000
@@ -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
- {
meta/recipes-devtools/opkg/opkg_svn.bb +0 -1
index 5964a47..3f2c22b 100644
@@ -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"

meta/recipes-devtools/opkg/opkg_svn.bb +0 -0
@@ -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
author
#11 lore raw

PATCH 8/8 distcc_2.18.3.bb: Fix compilation on uclibc

In reply to Saul Wold

From: Khem Raj <[email protected]>

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 <[email protected]>
---
 meta/recipes-devtools/distcc/distcc_2.18.3.bb |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
meta/recipes-devtools/distcc/distcc_2.18.3.bb +12 -5
index 1f5c2af..34b04a5 100644
@@ -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,17 +27,21 @@ inherit autotools pkgconfig update-rc.d
 
 INITSCRIPT_NAME = "distcc"
 
-EXTRA_OECONF = " --with-gtk "
-
+EXTRA_OECONF_libc-glibc = " --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"
+PACKAGES_append_libc-glibc = " distcc-distmon-gnome"
 
 FILES_${PN} = " ${sysconfdir} \
 		${bindir}/distcc \
Signature · 1 line
1.7.3.4
#12 lore raw

Re: [PATCH 8/8] distcc_2.18.3.bb: Fix compilation on uclibc

Quoted 6 lines · Saul Wold

From: Khem Raj <[email protected]>

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

This patch had reviews to be addressed which I have done the patch is updated in pull branch. Use that one

Quoted 51 lines
Signed-off-by Khem Raj <[email protected]>

---
 meta/recipes-devtools/distcc/distcc_2.18.3.bb |   17 ++++++++++++-----

 1 files changed, 12 insertions(+), 5 deletions(-)
meta/recipes-devtools/distcc/distcc_2.18.3.bb +0 -0
index 1f5c2af..34b04a5 100644
@@ -6,7 +6,10 @@ LICENSE = "GPLv2"

 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PR = "r6"

meta/recipes-devtools/distcc/distcc_2.18.3.bb +4 -1
-DEPENDS = "avahi gtk+"
+DEPENDS = "avahi ${GTKDEP}"
+GTKDEP_libc-uclibc = ""
+GTKDEP = "gtk+"
+

 RRECOMMENDS_${PN} = "avahi-daemon"

 # Upstream change this patch periodically so store locally

meta/recipes-devtools/distcc/distcc_2.18.3.bb +0 -0
@@ -24,17 +27,21 @@ inherit autotools pkgconfig update-rc.d

 INITSCRIPT_NAME = "distcc"

meta/recipes-devtools/distcc/distcc_2.18.3.bb +2 -2
-EXTRA_OECONF = " --with-gtk "
-
+EXTRA_OECONF_libc-glibc = " --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}

meta/recipes-devtools/distcc/distcc_2.18.3.bb +4 -0
+}
+DESKTOPINSTALL = ""
+DESKTOPINSTALL_libc-glibc () {
+    install -d ${D}${datadir}/distcc/

    install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ }

meta/recipes-devtools/distcc/distcc_2.18.3.bb +1 -2
-
-PACKAGES += "distcc-distmon-gnome"
+PACKAGES_append_libc-glibc = " distcc-distmon-gnome"

 FILES_${PN} = " ${sysconfdir} \
               ${bindir}/distcc \
--
1.7.3.4

author
#13 lore raw

Re: [PATCH 8/8] distcc_2.18.3.bb: Fix compilation on uclibc

Quoted 12 lines · Khem Raj
Quoted 6 lines · Saul Wold

From: Khem Raj<[email protected]>

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

This patch had reviews to be addressed which I have done the patch is updated in pull branch. Use that one

I will pull the lastest into my sgw/stage branch. When I did the pull, I thought things were completed, I guess bad timing on my part.

Sau!

Quoted 51 lines
Quoted 51 lines
Signed-off-by Khem Raj<[email protected]>
---
  meta/recipes-devtools/distcc/distcc_2.18.3.bb |   17 ++++++++++++-----
  1 files changed, 12 insertions(+), 5 deletions(-)
meta/recipes-devtools/distcc/distcc_2.18.3.bb +12 -6
index 1f5c2af..34b04a5 100644
@@ -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,17 +27,21 @@ inherit autotools pkgconfig update-rc.d
 
  INITSCRIPT_NAME = "distcc"
 
-EXTRA_OECONF = " --with-gtk "
-
+EXTRA_OECONF_libc-glibc = " --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"
+PACKAGES_append_libc-glibc = " distcc-distmon-gnome"
 
  FILES_${PN} = " ${sysconfdir} \
                ${bindir}/distcc \
--

1.7.3.4

author
#14 lore raw
In reply to Saul Wold
Quoted 16 lines · Saul Wold

Richard,

This has a couple of fixes that are bound for M1, and will be cherry-picked there once in oe-core / poky master.

The GCC Version update to 4.6 along with a corresponding change to eglibc 2.13 has been build tested and will be QA'ed as part of RC1 in 1.1 m1.

Thanks
Sau!

The following changes since commit 54ecf8e3992b8a01c2e5bd16720e1819b71b68bd:

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

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):
opkg_svn.bb: Install rcS.d into $D instead of $IMAGE_ROOTFS distcc_2.18.3.bb: Fix compilation on uclibc

I have updated sgw/stage with the changes from Khem's latest branch.

Sau!

Quoted 24 lines

Saul Wold (6):
gail: Add LIC_FILES_CHKSUM
update-alternatives-dpkg: Update to dpkg base 1.15.8.7
puzzles: update to r9173
tcmode-default: set *GCCVERSION to 4.6 for all Arches
tcmode-default: Update Eglibc to 2.13 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      |   17 ++++++++++++-----
  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-gnome/gnome/gail_1.20.0.bb            |   10 +++++++---
  .../puzzles/{puzzles_r9163.bb =>  puzzles_r9173.bb} |    0
  10 files changed, 43 insertions(+), 44 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%)