* [PATCH 1/3] shared-mime-info: package runtime data separately
2011-11-09 0:53 [PATCH 0/3] Switch to upstream GConf Joshua Lock
@ 2011-11-09 0:53 ` Joshua Lock
2011-11-18 12:20 ` Rainer Koenig
2011-11-09 0:53 ` [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes Joshua Lock
` (2 subsequent siblings)
3 siblings, 1 reply; 16+ messages in thread
From: Joshua Lock @ 2011-11-09 0:53 UTC (permalink / raw)
To: openembedded-core
The freedesktop.org.xml is required when updating the mime database but
otherwise not much use. Therefore package it separately, rather than
removing it completely, so that it can be used as required for on-device
updates without adding almost 2MB to every image which hase shared-mime-info.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../shared-mime-info/shared-mime-info.inc | 9 ++++++---
.../shared-mime-info/shared-mime-info_0.91.bb | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
index c8cab29..57e829c 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info.inc
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
@@ -17,13 +17,16 @@ EXTRA_OECONF = "--disable-update-mimedb"
FILES_${PN} += "${datadir}/mime"
FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc"
+# freedesktop.org.xml is only required when updating the mime database,
+# package it separately
+PACKAGES += "shared-mime-info-data"
+FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml"
+RDEPENDS_shared-mime-info-data = "shared-mime-info"
+
do_install () {
autotools_do_install
update-mime-database ${D}${datadir}/mime
-
- # we do not need it on device and it is huge
- rm ${D}${datadir}/mime/packages/freedesktop.org.xml
}
do_install_virtclass-native () {
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
index 0c3b01c..bc4a8f7 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
@@ -1,5 +1,5 @@
require shared-mime-info.inc
-PR = "r1"
+PR = "r2"
SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
--
1.7.7
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH 1/3] shared-mime-info: package runtime data separately
2011-11-09 0:53 ` [PATCH 1/3] shared-mime-info: package runtime data separately Joshua Lock
@ 2011-11-18 12:20 ` Rainer Koenig
2011-11-23 21:45 ` Khem Raj
0 siblings, 1 reply; 16+ messages in thread
From: Rainer Koenig @ 2011-11-18 12:20 UTC (permalink / raw)
To: openembedded-core
Am 09.11.2011 01:53, schrieb Joshua Lock:
> The freedesktop.org.xml is required when updating the mime database but
> otherwise not much use. Therefore package it separately, rather than
> removing it completely, so that it can be used as required for on-device
> updates without adding almost 2MB to every image which hase shared-mime-info.
somehow this patch breaks the image creation for systemd-gnome-image.
Famous last words from bitbake:
--------------8<-snip-----------------
| Collected errors:
| * satisfy_dependencies_for: Cannot satisfy the following dependencies
for task-gnome:
| * shared-mime-info-data * shared-mime-info-data *
| * opkg_install_cmd: Cannot install package task-gnome.
| ERROR: Function 'do_rootfs' failed (see
/srv/oe/setup-scripts/build/tmp-angstrom_2010_x-eglibc/work/dm814x_evm-angstrom-linux-gnueabi/systemd-gnome-image-1.0-r0/temp/log.do_rootfs.6501
for further information)
NOTE: package systemd-gnome-image-1.0-r0: task do_rootfs: Failed
ERROR: Task 8
(/srv/oe/setup-scripts/sources/meta-angstrom/recipes-images/angstrom/systemd-gnome-image.bb,
do_rootfs) failed with exit code '1'
ERROR:
'/srv/oe/setup-scripts/sources/meta-angstrom/recipes-images/angstrom/systemd-gnome-image.bb'
failed
--------------8<-snip-----------------
And there is no package names shared-mime-info-data*. :-(
> Signed-off-by: Joshua Lock <josh@linux.intel.com>
> ---
> .../shared-mime-info/shared-mime-info.inc | 9 ++++++---
> .../shared-mime-info/shared-mime-info_0.91.bb | 2 +-
> 2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
> index c8cab29..57e829c 100644
> --- a/meta/recipes-support/shared-mime-info/shared-mime-info.inc
> +++ b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
> @@ -17,13 +17,16 @@ EXTRA_OECONF = "--disable-update-mimedb"
> FILES_${PN} += "${datadir}/mime"
> FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc"
>
> +# freedesktop.org.xml is only required when updating the mime database,
> +# package it separately
> +PACKAGES += "shared-mime-info-data"
> +FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml"
> +RDEPENDS_shared-mime-info-data = "shared-mime-info"
> +
> do_install () {
> autotools_do_install
>
> update-mime-database ${D}${datadir}/mime
> -
> - # we do not need it on device and it is huge
> - rm ${D}${datadir}/mime/packages/freedesktop.org.xml
> }
>
> do_install_virtclass-native () {
> diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
> index 0c3b01c..bc4a8f7 100644
> --- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
> +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
> @@ -1,5 +1,5 @@
> require shared-mime-info.inc
> -PR = "r1"
> +PR = "r2"
>
> SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
> SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
Regards
Rainer
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 1/3] shared-mime-info: package runtime data separately
2011-11-18 12:20 ` Rainer Koenig
@ 2011-11-23 21:45 ` Khem Raj
2011-11-23 21:59 ` Koen Kooi
0 siblings, 1 reply; 16+ messages in thread
From: Khem Raj @ 2011-11-23 21:45 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, Nov 18, 2011 at 4:20 AM, Rainer Koenig
<Rainer.Koenig@ts.fujitsu.com> wrote:
> Am 09.11.2011 01:53, schrieb Joshua Lock:
>> The freedesktop.org.xml is required when updating the mime database but
>> otherwise not much use. Therefore package it separately, rather than
>> removing it completely, so that it can be used as required for on-device
>> updates without adding almost 2MB to every image which hase shared-mime-info.
>
> somehow this patch breaks the image creation for systemd-gnome-image.
> Famous last words from bitbake:
Did you do a clean build ? if not try that
>
> --------------8<-snip-----------------
> | Collected errors:
> | * satisfy_dependencies_for: Cannot satisfy the following dependencies
> for task-gnome:
> | * shared-mime-info-data * shared-mime-info-data *
> | * opkg_install_cmd: Cannot install package task-gnome.
> | ERROR: Function 'do_rootfs' failed (see
> /srv/oe/setup-scripts/build/tmp-angstrom_2010_x-eglibc/work/dm814x_evm-angstrom-linux-gnueabi/systemd-gnome-image-1.0-r0/temp/log.do_rootfs.6501
> for further information)
> NOTE: package systemd-gnome-image-1.0-r0: task do_rootfs: Failed
> ERROR: Task 8
> (/srv/oe/setup-scripts/sources/meta-angstrom/recipes-images/angstrom/systemd-gnome-image.bb,
> do_rootfs) failed with exit code '1'
> ERROR:
> '/srv/oe/setup-scripts/sources/meta-angstrom/recipes-images/angstrom/systemd-gnome-image.bb'
> failed
> --------------8<-snip-----------------
>
> And there is no package names shared-mime-info-data*. :-(
>
>
>> Signed-off-by: Joshua Lock <josh@linux.intel.com>
>> ---
>> .../shared-mime-info/shared-mime-info.inc | 9 ++++++---
>> .../shared-mime-info/shared-mime-info_0.91.bb | 2 +-
>> 2 files changed, 7 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
>> index c8cab29..57e829c 100644
>> --- a/meta/recipes-support/shared-mime-info/shared-mime-info.inc
>> +++ b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
>> @@ -17,13 +17,16 @@ EXTRA_OECONF = "--disable-update-mimedb"
>> FILES_${PN} += "${datadir}/mime"
>> FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc"
>>
>> +# freedesktop.org.xml is only required when updating the mime database,
>> +# package it separately
>> +PACKAGES += "shared-mime-info-data"
>> +FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml"
>> +RDEPENDS_shared-mime-info-data = "shared-mime-info"
>> +
>> do_install () {
>> autotools_do_install
>>
>> update-mime-database ${D}${datadir}/mime
>> -
>> - # we do not need it on device and it is huge
>> - rm ${D}${datadir}/mime/packages/freedesktop.org.xml
>> }
>>
>> do_install_virtclass-native () {
>> diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
>> index 0c3b01c..bc4a8f7 100644
>> --- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
>> +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
>> @@ -1,5 +1,5 @@
>> require shared-mime-info.inc
>> -PR = "r1"
>> +PR = "r2"
>>
>> SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
>> SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
>
> Regards
> Rainer
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH 1/3] shared-mime-info: package runtime data separately
2011-11-23 21:45 ` Khem Raj
@ 2011-11-23 21:59 ` Koen Kooi
0 siblings, 0 replies; 16+ messages in thread
From: Koen Kooi @ 2011-11-23 21:59 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 785 bytes --]
Op 23 nov. 2011, om 22:45 heeft Khem Raj het volgende geschreven:
> On Fri, Nov 18, 2011 at 4:20 AM, Rainer Koenig
> <Rainer.Koenig@ts.fujitsu.com> wrote:
>> Am 09.11.2011 01:53, schrieb Joshua Lock:
>>> The freedesktop.org.xml is required when updating the mime database but
>>> otherwise not much use. Therefore package it separately, rather than
>>> removing it completely, so that it can be used as required for on-device
>>> updates without adding almost 2MB to every image which hase shared-mime-info.
>>
>> somehow this patch breaks the image creation for systemd-gnome-image.
>> Famous last words from bitbake:
>
> Did you do a clean build ? if not try that
http://cgit.openembedded.org/openembedded-core/commit/?id=79ee0f8c849cd5de16b6ae1b3dd6c43bbad472b2
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
2011-11-09 0:53 [PATCH 0/3] Switch to upstream GConf Joshua Lock
2011-11-09 0:53 ` [PATCH 1/3] shared-mime-info: package runtime data separately Joshua Lock
@ 2011-11-09 0:53 ` Joshua Lock
2011-11-09 9:27 ` Koen Kooi
2011-11-09 0:53 ` [PATCH 3/3] gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus Joshua Lock
2011-11-10 12:26 ` [PATCH 0/3] Switch to upstream GConf Richard Purdie
3 siblings, 1 reply; 16+ messages in thread
From: Joshua Lock @ 2011-11-09 0:53 UTC (permalink / raw)
To: openembedded-core
This patch pulls in the gnome related classes from oe-core which
adds extra packaging rules and functionality whilst modularising things
so that one can get a subset of gnome functionality without adding a lot
of extra dependencies.
These aren't an exact copy of the classes from meta-openembedded, notable
differences are:
* gnome.bbclass - I dropped the BBCLASSEXTEND
* mime.bbclass:
- updated coding style
- use which to find update-mime-database program rather than hard coded
- fix typo in populate_packges_append such that it's actually called
CC: Koen Kooi <koen@dominion.thruhere.net>
CC: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/classes/gnome.bbclass | 18 +-----------
meta/classes/gnomebase.bbclass | 30 ++++++++++++++++++++
meta/classes/mime.bbclass | 58 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 90 insertions(+), 16 deletions(-)
create mode 100644 meta/classes/gnomebase.bbclass
create mode 100644 meta/classes/mime.bbclass
diff --git a/meta/classes/gnome.bbclass b/meta/classes/gnome.bbclass
index 3d68b12..a19dd17 100644
--- a/meta/classes/gnome.bbclass
+++ b/meta/classes/gnome.bbclass
@@ -1,17 +1,3 @@
-def gnome_verdir(v):
- import re
- m = re.match("^([0-9]+)\.([0-9]+)", v)
- return "%s.%s" % (m.group(1), m.group(2))
+inherit gnomebase gtk-icon-cache gconf mime
-SECTION ?= "x11/gnome"
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive"
-
-DEPENDS += "gnome-common"
-
-FILES_${PN} += "${datadir}/application-registry \
- ${datadir}/mime-info \
- ${datadir}/gnome-2.0"
-
-inherit autotools pkgconfig gconf
-
-EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
+EXTRA_OECONF += "--enable-introspection=no"
diff --git a/meta/classes/gnomebase.bbclass b/meta/classes/gnomebase.bbclass
new file mode 100644
index 0000000..a4209a0
--- /dev/null
+++ b/meta/classes/gnomebase.bbclass
@@ -0,0 +1,30 @@
+def gnome_verdir(v):
+ import re
+ m = re.match("^([0-9]+)\.([0-9]+)", v)
+ return "%s.%s" % (m.group(1), m.group(2))
+
+SECTION ?= "x11/gnome"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive"
+
+DEPENDS += "gnome-common"
+
+FILES_${PN} += "${datadir}/application-registry \
+ ${datadir}/mime-info \
+ ${datadir}/mime/packages \
+ ${datadir}/mime/application \
+ ${datadir}/gnome-2.0 \
+ ${datadir}/polkit* \
+ ${datadir}/GConf \
+ ${datadir}/glib-2.0/schemas \
+"
+
+FILES_${PN}-doc += "${datadir}/devhelp"
+
+inherit autotools pkgconfig
+
+do_install_append() {
+ rm -rf ${D}${localstatedir}/lib/scrollkeeper/*
+ rm -rf ${D}${localstatedir}/scrollkeeper/*
+ rm -f ${D}${datadir}/applications/*.cache
+}
+
diff --git a/meta/classes/mime.bbclass b/meta/classes/mime.bbclass
new file mode 100644
index 0000000..2d17d9c
--- /dev/null
+++ b/meta/classes/mime.bbclass
@@ -0,0 +1,58 @@
+DEPENDS += "shared-mime-info-native shared-mime-info"
+
+mime_postinst() {
+if [ "$1" = configure ]; then
+ UPDATEMIMEDB=`which update-mime-database`
+ if [ -x "$UPDATEMIMEDB" ] ; then
+ echo "Updating MIME database... this may take a while."
+ $UPDATEMIMEDB $D${datadir}/mime
+ else
+ echo "Missing update-mime-database, update of mime database failed!"
+ exit 1
+ fi
+fi
+}
+
+mime_postrm() {
+if [ "$1" = remove ] || [ "$1" = upgrade ]; then
+ UPDATEMIMEDB=`which update-mime-database`
+ if [ -x "$UPDATEMIMEDB" ] ; then
+ echo "Updating MIME database... this may take a while."
+ $UPDATEMIMEDB $D${datadir}/mime
+ else
+ echo "Missing update-mime-database, update of mime database failed!"
+ exit 1
+ fi
+fi
+}
+
+python populate_packages_append () {
+ import os.path, re
+ packages = d.getVar('PACKAGES', True).split()
+ pkgdest = d.getVar('PKGDEST', True)
+
+ for pkg in packages:
+ mime_dir = '%s/%s/usr/share/mime/packages' % (pkgdest, pkg)
+ mimes = []
+ mime_re = re.compile(".*\.xml$")
+ if os.path.exists(mime_dir):
+ for f in os.listdir(mime_dir):
+ if mime_re.match(f):
+ mimes.append(f)
+ if mimes:
+ bb.note("adding mime postinst and postrm scripts to %s" % pkg)
+ postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)
+ if not postinst:
+ postinst = '#!/bin/sh\n'
+ postinst += d.getVar('mime_postinst', True)
+ d.setVar('pkg_postinst_%s' % pkg, postinst)
+ postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True)
+ if not postrm:
+ postrm = '#!/bin/sh\n'
+ postrm += d.getVar('mime_postrm', True)
+ d.setVar('pkg_postrm_%s' % pkg, postrm)
+ bb.note("adding shared-mime-info-data dependency to %s" % pkg)
+ rdepends = explode_deps(dgetVar('RDEPENDS_' + pkg, False) or d.getVar('RDEPENDS', False)) or ""
+ rdepends.append("shared-mime-info-data")
+ d.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends))
+}
--
1.7.7
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
2011-11-09 0:53 ` [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes Joshua Lock
@ 2011-11-09 9:27 ` Koen Kooi
2011-11-09 9:37 ` Richard Purdie
2011-11-09 19:14 ` Joshua Lock
0 siblings, 2 replies; 16+ messages in thread
From: Koen Kooi @ 2011-11-09 9:27 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 952 bytes --]
Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven:
> This patch pulls in the gnome related classes from oe-core which
> adds extra packaging rules and functionality whilst modularising things
> so that one can get a subset of gnome functionality without adding a lot
> of extra dependencies.
>
> These aren't an exact copy of the classes from meta-openembedded, notable
> differences are:
> * gnome.bbclass - I dropped the BBCLASSEXTEND
It looks that will break a number of things in meta-oe, why was it dropped?
> * mime.bbclass:
> - updated coding style
> - use which to find update-mime-database program rather than hard coded
> - fix typo in populate_packges_append such that it's actually called
Will it drag in the shared-mime-info-data package you created automatically now?
Also, do you have matching patches to update meta-oe now that these things are heading into oe-core?
regards,
Koen
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
2011-11-09 9:27 ` Koen Kooi
@ 2011-11-09 9:37 ` Richard Purdie
2011-11-09 10:27 ` Koen Kooi
2011-11-09 19:14 ` Joshua Lock
1 sibling, 1 reply; 16+ messages in thread
From: Richard Purdie @ 2011-11-09 9:37 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-11-09 at 10:27 +0100, Koen Kooi wrote:
> Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven:
>
> > This patch pulls in the gnome related classes from oe-core which
> > adds extra packaging rules and functionality whilst modularising things
> > so that one can get a subset of gnome functionality without adding a lot
> > of extra dependencies.
> >
> > These aren't an exact copy of the classes from meta-openembedded, notable
> > differences are:
> > * gnome.bbclass - I dropped the BBCLASSEXTEND
>
> It looks that will break a number of things in meta-oe, why was it dropped?
Unconditionally BBCLASSEXTENDing everything gnome is a great way to hack
around build issues and create a convoluted dependency mess that isn't
really required. I'd much rather we try and minimise the amount of
-native dependencies to those actually needed.
Comparing our builds against other systems its becoming clear our
convoluted dependency trees are one of the areas we don't do as well and
it hurts performance :(.
Cheers,
Richard
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
2011-11-09 9:37 ` Richard Purdie
@ 2011-11-09 10:27 ` Koen Kooi
2011-11-09 10:35 ` Richard Purdie
0 siblings, 1 reply; 16+ messages in thread
From: Koen Kooi @ 2011-11-09 10:27 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1573 bytes --]
Op 9 nov. 2011, om 10:37 heeft Richard Purdie het volgende geschreven:
> On Wed, 2011-11-09 at 10:27 +0100, Koen Kooi wrote:
>> Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven:
>>
>>> This patch pulls in the gnome related classes from oe-core which
>>> adds extra packaging rules and functionality whilst modularising things
>>> so that one can get a subset of gnome functionality without adding a lot
>>> of extra dependencies.
>>>
>>> These aren't an exact copy of the classes from meta-openembedded, notable
>>> differences are:
>>> * gnome.bbclass - I dropped the BBCLASSEXTEND
>>
>> It looks that will break a number of things in meta-oe, why was it dropped?
>
> Unconditionally BBCLASSEXTENDing everything gnome is a great way to hack
> around build issues and create a convoluted dependency mess that isn't
> really required. I'd much rather we try and minimise the amount of
> -native dependencies to those actually needed.
>
> Comparing our builds against other systems its becoming clear our
> convoluted dependency trees are one of the areas we don't do as well and
> it hurts performance :(.
The list of -native needed in meta-gnome:
bison-native
cairo-native
docbook-utils-native
flex-native
gconf-native
gdk-pixbuf-native
glib-2.0-native
gnome-doc-utils-native
gobject-introspection-native
gtk-doc-native
icon-naming-utils-native
intltool-native
libffi-native
libidl-native
libxml-parser-perl-native
orbit2-native
pango-native
perl-native
popt-native
python-native
regards,
Koen
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
2011-11-09 10:27 ` Koen Kooi
@ 2011-11-09 10:35 ` Richard Purdie
2011-11-09 11:18 ` Koen Kooi
0 siblings, 1 reply; 16+ messages in thread
From: Richard Purdie @ 2011-11-09 10:35 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-11-09 at 11:27 +0100, Koen Kooi wrote:
> Op 9 nov. 2011, om 10:37 heeft Richard Purdie het volgende geschreven:
>
> > On Wed, 2011-11-09 at 10:27 +0100, Koen Kooi wrote:
> >> Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven:
> >>
> >>> This patch pulls in the gnome related classes from oe-core which
> >>> adds extra packaging rules and functionality whilst modularising things
> >>> so that one can get a subset of gnome functionality without adding a lot
> >>> of extra dependencies.
> >>>
> >>> These aren't an exact copy of the classes from meta-openembedded, notable
> >>> differences are:
> >>> * gnome.bbclass - I dropped the BBCLASSEXTEND
> >>
> >> It looks that will break a number of things in meta-oe, why was it dropped?
> >
> > Unconditionally BBCLASSEXTENDing everything gnome is a great way to hack
> > around build issues and create a convoluted dependency mess that isn't
> > really required. I'd much rather we try and minimise the amount of
> > -native dependencies to those actually needed.
> >
> > Comparing our builds against other systems its becoming clear our
> > convoluted dependency trees are one of the areas we don't do as well and
> > it hurts performance :(.
>
> The list of -native needed in meta-gnome:
>
> bison-native
> cairo-native
> docbook-utils-native
> flex-native
> gconf-native
> gdk-pixbuf-native
> glib-2.0-native
> gnome-doc-utils-native
> gobject-introspection-native
> gtk-doc-native
> icon-naming-utils-native
> intltool-native
> libffi-native
> libidl-native
> libxml-parser-perl-native
> orbit2-native
> pango-native
> perl-native
> popt-native
> python-native
Many of which are not gnome bbclass derived recipes. I therefore think
it makes sense to put the BBCLASSEXTEND in the recipes where its needed
and not the core class...
Cheers,
Richard
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
2011-11-09 10:35 ` Richard Purdie
@ 2011-11-09 11:18 ` Koen Kooi
2011-11-09 20:20 ` Joshua Lock
0 siblings, 1 reply; 16+ messages in thread
From: Koen Kooi @ 2011-11-09 11:18 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2223 bytes --]
Op 9 nov. 2011, om 11:35 heeft Richard Purdie het volgende geschreven:
> On Wed, 2011-11-09 at 11:27 +0100, Koen Kooi wrote:
>> Op 9 nov. 2011, om 10:37 heeft Richard Purdie het volgende geschreven:
>>
>>> On Wed, 2011-11-09 at 10:27 +0100, Koen Kooi wrote:
>>>> Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven:
>>>>
>>>>> This patch pulls in the gnome related classes from oe-core which
>>>>> adds extra packaging rules and functionality whilst modularising things
>>>>> so that one can get a subset of gnome functionality without adding a lot
>>>>> of extra dependencies.
>>>>>
>>>>> These aren't an exact copy of the classes from meta-openembedded, notable
>>>>> differences are:
>>>>> * gnome.bbclass - I dropped the BBCLASSEXTEND
>>>>
>>>> It looks that will break a number of things in meta-oe, why was it dropped?
>>>
>>> Unconditionally BBCLASSEXTENDing everything gnome is a great way to hack
>>> around build issues and create a convoluted dependency mess that isn't
>>> really required. I'd much rather we try and minimise the amount of
>>> -native dependencies to those actually needed.
>>>
>>> Comparing our builds against other systems its becoming clear our
>>> convoluted dependency trees are one of the areas we don't do as well and
>>> it hurts performance :(.
>>
>> The list of -native needed in meta-gnome:
>>
>> bison-native
>> cairo-native
>> docbook-utils-native
>> flex-native
>> gconf-native
>> gdk-pixbuf-native
>> glib-2.0-native
>> gnome-doc-utils-native
>> gobject-introspection-native
>> gtk-doc-native
>> icon-naming-utils-native
>> intltool-native
>> libffi-native
>> libidl-native
>> libxml-parser-perl-native
>> orbit2-native
>> pango-native
>> perl-native
>> popt-native
>> python-native
>
> Many of which are not gnome bbclass derived recipes. I therefore think
> it makes sense to put the BBCLASSEXTEND in the recipes where its needed
> and not the core class...
Exactly! I did a lot of dependency cleanup when importing them, so the situation isn't as bad as it was in OE classic.
Josh, what kind of test builds did you do for the meta-gnome recipes after moving the classes?
regards,
Koen
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
2011-11-09 11:18 ` Koen Kooi
@ 2011-11-09 20:20 ` Joshua Lock
0 siblings, 0 replies; 16+ messages in thread
From: Joshua Lock @ 2011-11-09 20:20 UTC (permalink / raw)
To: openembedded-core
On 09/11/11 03:18, Koen Kooi wrote:
>
> Op 9 nov. 2011, om 11:35 heeft Richard Purdie het volgende geschreven:
>
>> On Wed, 2011-11-09 at 11:27 +0100, Koen Kooi wrote:
>>> Op 9 nov. 2011, om 10:37 heeft Richard Purdie het volgende geschreven:
>>>
>>>> On Wed, 2011-11-09 at 10:27 +0100, Koen Kooi wrote:
>>>>> Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven:
>>>>>
>>>>>> This patch pulls in the gnome related classes from oe-core which
>>>>>> adds extra packaging rules and functionality whilst modularising things
>>>>>> so that one can get a subset of gnome functionality without adding a lot
>>>>>> of extra dependencies.
>>>>>>
>>>>>> These aren't an exact copy of the classes from meta-openembedded, notable
>>>>>> differences are:
>>>>>> * gnome.bbclass - I dropped the BBCLASSEXTEND
>>>>>
>>>>> It looks that will break a number of things in meta-oe, why was it dropped?
>>>>
>>>> Unconditionally BBCLASSEXTENDing everything gnome is a great way to hack
>>>> around build issues and create a convoluted dependency mess that isn't
>>>> really required. I'd much rather we try and minimise the amount of
>>>> -native dependencies to those actually needed.
>>>>
>>>> Comparing our builds against other systems its becoming clear our
>>>> convoluted dependency trees are one of the areas we don't do as well and
>>>> it hurts performance :(.
>>>
>>> The list of -native needed in meta-gnome:
>>>
>>> bison-native
>>> cairo-native
>>> docbook-utils-native
>>> flex-native
>>> gconf-native
>>> gdk-pixbuf-native
>>> glib-2.0-native
>>> gnome-doc-utils-native
>>> gobject-introspection-native
>>> gtk-doc-native
>>> icon-naming-utils-native
>>> intltool-native
>>> libffi-native
>>> libidl-native
>>> libxml-parser-perl-native
>>> orbit2-native
>>> pango-native
>>> perl-native
>>> popt-native
>>> python-native
>>
>> Many of which are not gnome bbclass derived recipes. I therefore think
>> it makes sense to put the BBCLASSEXTEND in the recipes where its needed
>> and not the core class...
>
> Exactly! I did a lot of dependency cleanup when importing them, so the situation isn't as bad as it was in OE classic.
>
> Josh, what kind of test builds did you do for the meta-gnome recipes after moving the classes?
>
I'm sorry to say almost zero.
Joshua
--
Joshua Lock
Yocto Project "Johannes factotum"
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes
2011-11-09 9:27 ` Koen Kooi
2011-11-09 9:37 ` Richard Purdie
@ 2011-11-09 19:14 ` Joshua Lock
1 sibling, 0 replies; 16+ messages in thread
From: Joshua Lock @ 2011-11-09 19:14 UTC (permalink / raw)
To: openembedded-core
On 09/11/11 01:27, Koen Kooi wrote:
>
> Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven:
>
>> This patch pulls in the gnome related classes from oe-core which
>> adds extra packaging rules and functionality whilst modularising things
>> so that one can get a subset of gnome functionality without adding a lot
>> of extra dependencies.
>>
>> These aren't an exact copy of the classes from meta-openembedded, notable
>> differences are:
>> * gnome.bbclass - I dropped the BBCLASSEXTEND
>
> It looks that will break a number of things in meta-oe, why was it dropped?
Richard didn't want us to add native variants of everything that uses
the gnome class.
At least in the short term it should be easy enough to keep meta-oe's
gnome.bbclass where the BBCLASSEXTEND is still set.
Whether you'd want to keep that or instead set BBCLASSEXTEND in the
required places feels like a policy decision for meta-oe.
>> * mime.bbclass:
>> - updated coding style
>> - use which to find update-mime-database program rather than hard coded
>> - fix typo in populate_packges_append such that it's actually called
>
> Will it drag in the shared-mime-info-data package you created automatically now?
>
> Also, do you have matching patches to update meta-oe now that these things are heading into oe-core?
I have not, I wanted to see what the feedback on this series was.
Particularly the BBCLASSEXTEND bit as above.
Joshua
--
Joshua Lock
Yocto Project "Johannes factotum"
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 3/3] gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus
2011-11-09 0:53 [PATCH 0/3] Switch to upstream GConf Joshua Lock
2011-11-09 0:53 ` [PATCH 1/3] shared-mime-info: package runtime data separately Joshua Lock
2011-11-09 0:53 ` [PATCH 2/3] classes/[gnome|gnomebase|mime]: enhance gnome related classes Joshua Lock
@ 2011-11-09 0:53 ` Joshua Lock
2011-11-09 15:18 ` Richard Purdie
2011-11-10 12:26 ` [PATCH 0/3] Switch to upstream GConf Richard Purdie
3 siblings, 1 reply; 16+ messages in thread
From: Joshua Lock @ 2011-11-09 0:53 UTC (permalink / raw)
To: openembedded-core
The D-Bus backend has been integrated into upstream GConf so we can
switch to upstream and drop gconf-dbus.
I've gone for a release in the 3.2 series as we disable Gtk+, and
therefore are not impacted by the gtk+3 changes, and the D-Bus backend
was unstable before this release.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/conf/distro/include/default-providers.inc | 2 -
meta/conf/multilib.conf | 2 +-
meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch | 59 ++++++++++++++++++++
meta/recipes-gnome/gnome/gconf-dbus_705.bb | 43 --------------
meta/recipes-gnome/gnome/gconf_3.2.3.bb | 43 ++++++++++++++
5 files changed, 103 insertions(+), 46 deletions(-)
create mode 100644 meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
delete mode 100644 meta/recipes-gnome/gnome/gconf-dbus_705.bb
create mode 100644 meta/recipes-gnome/gnome/gconf_3.2.3.bb
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index be23d36..afea5e7 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -21,8 +21,6 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
#
PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
-PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
-PREFERRED_PROVIDER_gconf-native ?= "gconf-dbus-native"
PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"
PREFERRED_PROVIDER_libgcc ?= "libgcc"
PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 5e4b435..de53540 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -103,7 +103,7 @@ BBCLASSEXTEND_append_pn-gcc-cross-initial = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-gcc-cross-intermediate = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-gcc-cross = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-gcc-runtime = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-gconf-dbus = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-gconf = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-gdbm = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-gdb = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-gdk-pixbuf = " ${MULTILIBS}"
diff --git a/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch b/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
new file mode 100644
index 0000000..29181e3
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
@@ -0,0 +1,59 @@
+This is a hacky way to prevent GConf from trying to build the introspection related pieces.
+Clearly not appropriate for upstream.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Joshua Lock <josh@linux.intel.com>
+
+Index: GConf-3.2.2/gconf/Makefile.am
+===================================================================
+--- GConf-3.2.2.orig/gconf/Makefile.am
++++ GConf-3.2.2/gconf/Makefile.am
+@@ -145,34 +145,6 @@ libgconf_2_la_LDFLAGS = -version-info $(
+
+ libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(DEPENDENT_DBUS_LIBS) $(DEPENDENT_ORBIT_LIBS)
+
+--include $(INTROSPECTION_MAKEFILE)
+-INTROSPECTION_GIRS =
+-INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
+-INTROSPECTION_COMPILER_ARGS= --includedir=$(srcdir)
+-
+-if HAVE_INTROSPECTION
+-introspection_files = \
+- $(gconfinclude_HEADERS) \
+- $(filter-out $(CORBA_SOURCECODE), $(filter %.c,$(libgconf_2_la_SOURCES)))
+-GConf-2.0.gir: libgconf-2.la Makefile
+-GConf_2_0_gir_INCLUDES = GObject-2.0
+-GConf_2_0_gir_CFLAGS = \
+- $(INCLUDES)
+-GConf_2_0_gir_LIBS = libgconf-2.la
+-GConf_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+-GConf_2_0_gir_SCANNERFLAGS = --identifier-prefix=GConf --symbol-prefix=gconf --c-include "gconf/gconf.h"
+-GConf_2_0_gir_EXPORT_PACKAGES = gconf-2.0
+-INTROSPECTION_GIRS += GConf-2.0.gir
+-
+-girdir = $(datadir)/gir-1.0/
+-gir_DATA = $(INTROSPECTION_GIRS)
+-
+-typelibsdir = $(libdir)/girepository-1.0/
+-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+-
+-CLEANFILES += $(gir_DATA) $(typelibs_DATA)
+-endif
+-
+ EXTRA_DIST=GConfX.idl default.path.in org.gnome.GConf.service.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
+
+ default.path: $(srcdir)/default.path.in
+Index: GConf-3.2.2/configure.in
+===================================================================
+--- GConf-3.2.2.orig/configure.in
++++ GConf-3.2.2/configure.in
+@@ -354,8 +354,6 @@ AM_GLIB_GNU_GETTEXT
+
+ AC_CHECK_FUNCS(bind_textdomain_codeset)
+
+-GOBJECT_INTROSPECTION_CHECK([0.9.5])
+-
+ AC_SUBST(CFLAGS)
+ AC_SUBST(CPPFLAGS)
+ AC_SUBST(LDFLAGS)
diff --git a/meta/recipes-gnome/gnome/gconf-dbus_705.bb b/meta/recipes-gnome/gnome/gconf-dbus_705.bb
deleted file mode 100644
index 52e8a08..0000000
--- a/meta/recipes-gnome/gnome/gconf-dbus_705.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "Settings daemon using DBUS for communication."
-SECTION = "x11/utils"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
-
-DEPENDS = "intltool-native virtual/libintl glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native"
-PROVIDES = "gconf"
-RPROVIDES_${PN} = "gconf"
-RPROVIDES_${PN}-dev = "gconf-dev"
-
-#SRCREV = "705"
-#PV = "2.16.0+svnr${SRCPV}"
-PR = "r2"
-
-# This SVN repo is no longer available use a tarball mirror site until
-# we move to proper gconf recipe.
-#SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http"
-SRC_URI = "http://autobuilder.pokylinux.org/sources/trunk_developer.imendio.com_.svn.gconf-dbus_705_.tar.gz"
-
-SRC_URI[md5sum] = "dba8d534b0c6262d24817c842b36369d"
-SRC_URI[sha256sum] = "5552b1884d42d4072a199c93e35a28dc1799f9166baefbf9243394966039e416"
-
-S = "${WORKDIR}/trunk"
-
-inherit pkgconfig autotools
-
-PARALLEL_MAKE = ""
-
-
-EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes"
-
-
-do_configure_prepend() {
- touch gtk-doc.make
-}
-
-FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
-FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
-FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd \
- ${libdir}/GConf-dbus/2/*.la"
-
-BBCLASSEXTEND = "native"
-
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
new file mode 100644
index 0000000..0e06cb5
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = "GNOME configuration system"
+SECTION = "x11/gnome"
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
+
+DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit"
+
+inherit gnomebase
+
+SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.bz2;name=archive \
+ file://nointro.patch"
+
+SRC_URI[archive.md5sum] = "f80329173cd9d134ad07e36002dd2a15"
+SRC_URI[archive.sha256sum] = "52008a82a847527877d9e1e549a351c86cc53cada4733b8a70a1123925d6aff4"
+
+S = "${WORKDIR}/GConf-${PV}"
+
+EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes --disable-introspection --disable-orbit --with-openldap=no"
+
+do_configure_prepend () {
+ touch gtk-doc.make
+}
+
+do_install_append() {
+ # this directory need to be created to avoid an Error 256 at gdm launch
+ install -d ${D}${sysconfdir}/gconf/gconf.xml.system
+
+ # this stuff is unusable
+ rm ${D}${libdir}/GConf/*/*.*a
+ rm ${D}${libdir}/gio/*/*.*a
+}
+
+RDEPENDS_${PN} += "dbus-x11"
+FILES_${PN} += "${libdir}/GConf/* \
+ ${libdir}/gio/*/*.so \
+ ${datadir}/polkit* \
+ ${datadir}/dbus-1/services/*.service \
+ ${datadir}/dbus-1/system-services/*.service \
+ "
+FILES_${PN}-dbg += "${libdir}/*/*/.debug"
+FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd"
+
+BBCLASSEXTEND = "native"
--
1.7.7
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH 3/3] gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus
2011-11-09 0:53 ` [PATCH 3/3] gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus Joshua Lock
@ 2011-11-09 15:18 ` Richard Purdie
0 siblings, 0 replies; 16+ messages in thread
From: Richard Purdie @ 2011-11-09 15:18 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-11-08 at 16:53 -0800, Joshua Lock wrote:
> The D-Bus backend has been integrated into upstream GConf so we can
> switch to upstream and drop gconf-dbus.
>
> I've gone for a release in the 3.2 series as we disable Gtk+, and
> therefore are not impacted by the gtk+3 changes, and the D-Bus backend
> was unstable before this release.
>
> Signed-off-by: Joshua Lock <josh@linux.intel.com>
> ---
> meta/conf/distro/include/default-providers.inc | 2 -
> meta/conf/multilib.conf | 2 +-
> meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch | 59 ++++++++++++++++++++
> meta/recipes-gnome/gnome/gconf-dbus_705.bb | 43 --------------
> meta/recipes-gnome/gnome/gconf_3.2.3.bb | 43 ++++++++++++++
> 5 files changed, 103 insertions(+), 46 deletions(-)
> create mode 100644 meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
> delete mode 100644 meta/recipes-gnome/gnome/gconf-dbus_705.bb
> create mode 100644 meta/recipes-gnome/gnome/gconf_3.2.3.bb
>
> diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> index be23d36..afea5e7 100644
> --- a/meta/conf/distro/include/default-providers.inc
> +++ b/meta/conf/distro/include/default-providers.inc
> @@ -21,8 +21,6 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
> #
> PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
> PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
> -PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
> -PREFERRED_PROVIDER_gconf-native ?= "gconf-dbus-native"
> PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"
> PREFERRED_PROVIDER_libgcc ?= "libgcc"
> PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"
> diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
> index 5e4b435..de53540 100644
> --- a/meta/conf/multilib.conf
> +++ b/meta/conf/multilib.conf
> @@ -103,7 +103,7 @@ BBCLASSEXTEND_append_pn-gcc-cross-initial = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-gcc-cross-intermediate = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-gcc-cross = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-gcc-runtime = " ${MULTILIBS}"
> -BBCLASSEXTEND_append_pn-gconf-dbus = " ${MULTILIBS}"
> +BBCLASSEXTEND_append_pn-gconf = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-gdbm = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-gdb = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-gdk-pixbuf = " ${MULTILIBS}"
> diff --git a/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch b/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
> new file mode 100644
> index 0000000..29181e3
> --- /dev/null
> +++ b/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
> @@ -0,0 +1,59 @@
> +This is a hacky way to prevent GConf from trying to build the introspection related pieces.
> +Clearly not appropriate for upstream.
> +
> +Upstream-Status: Inappropriate
> +
> +Signed-off-by: Joshua Lock <josh@linux.intel.com>
> +
> +Index: GConf-3.2.2/gconf/Makefile.am
> +===================================================================
> +--- GConf-3.2.2.orig/gconf/Makefile.am
> ++++ GConf-3.2.2/gconf/Makefile.am
> +@@ -145,34 +145,6 @@ libgconf_2_la_LDFLAGS = -version-info $(
> +
> + libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(DEPENDENT_DBUS_LIBS) $(DEPENDENT_ORBIT_LIBS)
> +
> +--include $(INTROSPECTION_MAKEFILE)
> +-INTROSPECTION_GIRS =
> +-INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
> +-INTROSPECTION_COMPILER_ARGS= --includedir=$(srcdir)
> +-
> +-if HAVE_INTROSPECTION
> +-introspection_files = \
> +- $(gconfinclude_HEADERS) \
> +- $(filter-out $(CORBA_SOURCECODE), $(filter %.c,$(libgconf_2_la_SOURCES)))
> +-GConf-2.0.gir: libgconf-2.la Makefile
> +-GConf_2_0_gir_INCLUDES = GObject-2.0
> +-GConf_2_0_gir_CFLAGS = \
> +- $(INCLUDES)
> +-GConf_2_0_gir_LIBS = libgconf-2.la
> +-GConf_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
> +-GConf_2_0_gir_SCANNERFLAGS = --identifier-prefix=GConf --symbol-prefix=gconf --c-include "gconf/gconf.h"
> +-GConf_2_0_gir_EXPORT_PACKAGES = gconf-2.0
> +-INTROSPECTION_GIRS += GConf-2.0.gir
> +-
> +-girdir = $(datadir)/gir-1.0/
> +-gir_DATA = $(INTROSPECTION_GIRS)
> +-
> +-typelibsdir = $(libdir)/girepository-1.0/
> +-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
> +-
> +-CLEANFILES += $(gir_DATA) $(typelibs_DATA)
> +-endif
> +-
> + EXTRA_DIST=GConfX.idl default.path.in org.gnome.GConf.service.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
> +
> + default.path: $(srcdir)/default.path.in
> +Index: GConf-3.2.2/configure.in
> +===================================================================
> +--- GConf-3.2.2.orig/configure.in
> ++++ GConf-3.2.2/configure.in
> +@@ -354,8 +354,6 @@ AM_GLIB_GNU_GETTEXT
> +
> + AC_CHECK_FUNCS(bind_textdomain_codeset)
> +
> +-GOBJECT_INTROSPECTION_CHECK([0.9.5])
> +-
> + AC_SUBST(CFLAGS)
> + AC_SUBST(CPPFLAGS)
> + AC_SUBST(LDFLAGS)
> diff --git a/meta/recipes-gnome/gnome/gconf-dbus_705.bb b/meta/recipes-gnome/gnome/gconf-dbus_705.bb
> deleted file mode 100644
> index 52e8a08..0000000
> --- a/meta/recipes-gnome/gnome/gconf-dbus_705.bb
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -DESCRIPTION = "Settings daemon using DBUS for communication."
> -SECTION = "x11/utils"
> -LICENSE = "LGPLv2+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
> -
> -DEPENDS = "intltool-native virtual/libintl glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native"
> -PROVIDES = "gconf"
> -RPROVIDES_${PN} = "gconf"
> -RPROVIDES_${PN}-dev = "gconf-dev"
> -
> -#SRCREV = "705"
> -#PV = "2.16.0+svnr${SRCPV}"
> -PR = "r2"
> -
> -# This SVN repo is no longer available use a tarball mirror site until
> -# we move to proper gconf recipe.
> -#SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http"
> -SRC_URI = "http://autobuilder.pokylinux.org/sources/trunk_developer.imendio.com_.svn.gconf-dbus_705_.tar.gz"
> -
> -SRC_URI[md5sum] = "dba8d534b0c6262d24817c842b36369d"
> -SRC_URI[sha256sum] = "5552b1884d42d4072a199c93e35a28dc1799f9166baefbf9243394966039e416"
> -
> -S = "${WORKDIR}/trunk"
> -
> -inherit pkgconfig autotools
> -
> -PARALLEL_MAKE = ""
> -
> -
> -EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes"
> -
> -
> -do_configure_prepend() {
> - touch gtk-doc.make
> -}
> -
> -FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
> -FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
> -FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd \
> - ${libdir}/GConf-dbus/2/*.la"
> -
> -BBCLASSEXTEND = "native"
> -
> diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
> new file mode 100644
> index 0000000..0e06cb5
> --- /dev/null
> +++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
> @@ -0,0 +1,43 @@
> +DESCRIPTION = "GNOME configuration system"
> +SECTION = "x11/gnome"
> +LICENSE = "LGPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
> +
> +DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit"
I can't build a sato image with this due to nothing providing
polkit-native :(
Cheers,
Richard
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 0/3] Switch to upstream GConf
2011-11-09 0:53 [PATCH 0/3] Switch to upstream GConf Joshua Lock
` (2 preceding siblings ...)
2011-11-09 0:53 ` [PATCH 3/3] gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus Joshua Lock
@ 2011-11-10 12:26 ` Richard Purdie
3 siblings, 0 replies; 16+ messages in thread
From: Richard Purdie @ 2011-11-10 12:26 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-11-08 at 16:53 -0800, Joshua Lock wrote:
> This series' primary goal is to switch us from gconf-dbus to the upstream
> GConf, where the D-Bus backend is now maintained.
>
> To ease recipe writing I also pulled in and cleaned up the GNOME related
> classes from meta-openembedded.
>
> Cheers,
> Joshua
>
> The following changes since commit 25fae81538a92e15eab3fc169ebce44505f67839:
>
> python: skip setup.py 'import check' when cross-compiling (2011-11-08 21:44:23 +0000)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib josh/work
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/work
>
> Joshua Lock (3):
> shared-mime-info: package runtime data separately
> classes/[gnome|gnomebase|mime]: enhance gnome related classes
> gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus
Merged to master, thanks. I did add a couple of follow up tweaks to
these to fix various issues.
Cheers,
Richard
^ permalink raw reply [flat|nested] 16+ messages in thread