diff options
| author | Chris Lord <chris@openedhand.com> | 2005-09-23 13:12:36 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2005-09-23 13:12:36 +0000 |
| commit | f7b6fee10f06be9f3ee04b179b9677d5eef0dca9 (patch) | |
| tree | 1445a4aef0c5feb63e475d0ba4878c8c617006cf /openembedded/conf | |
| parent | ac9e4d68a2e766a0f0bf387adb834fab04000de6 (diff) | |
| download | poky-f7b6fee10f06be9f3ee04b179b9677d5eef0dca9.tar.gz | |
Disable gconf-dbus for now
git-svn-id: https://svn.o-hand.com/repos/poky@31 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf')
| -rw-r--r-- | openembedded/conf/distro/maemo-1.0.conf | 2 | ||||
| -rw-r--r-- | openembedded/conf/distro/poky-additions.inc | 2 | ||||
| -rw-r--r-- | openembedded/conf/distro/preferred-gpe-versions-2.6.inc | 2 | ||||
| -rw-r--r-- | openembedded/conf/distro/preferred-gpe-versions.inc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/openembedded/conf/distro/maemo-1.0.conf b/openembedded/conf/distro/maemo-1.0.conf index 15ec45f34e..f8211dc3c7 100644 --- a/openembedded/conf/distro/maemo-1.0.conf +++ b/openembedded/conf/distro/maemo-1.0.conf | |||
| @@ -28,7 +28,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" | |||
| 28 | # | 28 | # |
| 29 | 29 | ||
| 30 | PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" | 30 | PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" |
| 31 | PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" | 31 | #PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" |
| 32 | PREFERRED_PROVIDER_x11 = "diet-x11" | 32 | PREFERRED_PROVIDER_x11 = "diet-x11" |
| 33 | 33 | ||
| 34 | include conf/distro/preferred-gpe-versions.inc | 34 | include conf/distro/preferred-gpe-versions.inc |
diff --git a/openembedded/conf/distro/poky-additions.inc b/openembedded/conf/distro/poky-additions.inc index 278c07abbe..c72d959d0c 100644 --- a/openembedded/conf/distro/poky-additions.inc +++ b/openembedded/conf/distro/poky-additions.inc | |||
| @@ -7,7 +7,7 @@ DISTRO_VERSION = "0.0-snapshot-${DATE}" | |||
| 7 | DISTRO_TYPE = "debug" | 7 | DISTRO_TYPE = "debug" |
| 8 | # DISTRO_TYPE = "release" | 8 | # DISTRO_TYPE = "release" |
| 9 | 9 | ||
| 10 | PREFERRED_PROVIDER_gconf=gconf-dbus | 10 | #PREFERRED_PROVIDER_gconf=gconf-dbus |
| 11 | 11 | ||
| 12 | PREFERRED_VERSION_libmatchbox = "1.7" | 12 | PREFERRED_VERSION_libmatchbox = "1.7" |
| 13 | PREFERRED_VERSION_matchbox = "0.9.1" | 13 | PREFERRED_VERSION_matchbox = "0.9.1" |
diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.6.inc b/openembedded/conf/distro/preferred-gpe-versions-2.6.inc index 98c1a969fa..504d495c15 100644 --- a/openembedded/conf/distro/preferred-gpe-versions-2.6.inc +++ b/openembedded/conf/distro/preferred-gpe-versions-2.6.inc | |||
| @@ -9,7 +9,7 @@ CVSDATE_cairo=20050330 | |||
| 9 | CVSDATE_xext=20050222 | 9 | CVSDATE_xext=20050222 |
| 10 | 10 | ||
| 11 | #set some preferred providers: | 11 | #set some preferred providers: |
| 12 | PREFERRED_PROVIDER_gconf=gconf-dbus | 12 | #PREFERRED_PROVIDER_gconf=gconf-dbus |
| 13 | 13 | ||
| 14 | #specify versions, as the header says :) | 14 | #specify versions, as the header says :) |
| 15 | PREFERRED_VERSION_libmatchbox ?= "1.6" | 15 | PREFERRED_VERSION_libmatchbox ?= "1.6" |
diff --git a/openembedded/conf/distro/preferred-gpe-versions.inc b/openembedded/conf/distro/preferred-gpe-versions.inc index b68eb32c2a..de4fdb15bf 100644 --- a/openembedded/conf/distro/preferred-gpe-versions.inc +++ b/openembedded/conf/distro/preferred-gpe-versions.inc | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #CVSDATE_xext=20050222 | 6 | #CVSDATE_xext=20050222 |
| 7 | 7 | ||
| 8 | #set some preferred providers: | 8 | #set some preferred providers: |
| 9 | PREFERRED_PROVIDER_gconf=gconf-dbus | 9 | #PREFERRED_PROVIDER_gconf=gconf-dbus |
| 10 | PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus | 10 | PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus |
| 11 | 11 | ||
| 12 | #specify versions, as the header says :) | 12 | #specify versions, as the header says :) |