diff options
author | Philipp Zabel <philipp.zabel@gmail.com> | 2006-03-09 14:22:10 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-09 14:22:10 +0000 |
commit | 888cc72f39206a5176a473b2b3017d03ff2132be (patch) | |
tree | 476dc63646765cef4925fe9f1e5ebe8feea64d7e | |
parent | 821f658df56520e2b340e139532c7868eeef40eb (diff) |
distro/*.conf: change PREFERRED_VERSION_x11 to PREFERRED_VERSION_libx11
-rw-r--r-- | conf/distro/familiar-unstable.conf | 3 | ||||
-rw-r--r-- | conf/distro/maemo-1.0.conf | 2 | ||||
-rw-r--r-- | conf/distro/openzaurus-unstable.conf | 2 | ||||
-rw-r--r-- | conf/distro/slugos.conf | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index e51d15b90f..1b5d6ba2bf 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -28,7 +28,6 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDER_virtual/libiconv=glibc PREFERRED_PROVIDER_virtual/libintl=glibc -PREFERRED_PROVIDER_x11=diet-x11 PREFERRED_VERSION_hostap-modules ?= "0.3.9" @@ -64,7 +63,7 @@ PREFERRED_VERSION_qte = "2.3.10" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_x11 = "diet-x11" +PREFERRED_PROVIDER_libx11 = "diet-x11" include conf/distro/preferred-gpe-versions-2.8.inc diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf index f83e4b1d96..d30ecc9084 100644 --- a/conf/distro/maemo-1.0.conf +++ b/conf/distro/maemo-1.0.conf @@ -29,7 +29,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_x11 = "diet-x11" +PREFERRED_PROVIDER_libx11 = "diet-x11" include conf/distro/preferred-gpe-versions.inc diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index f424b16696..1143f1d940 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -57,7 +57,7 @@ PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" # GPE # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDER_x11 = "diet-x11" +PREFERRED_PROVIDER_libx11 = "diet-x11" include conf/distro/preferred-gpe-versions-2.8.inc # diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index cf2cb078c5..929a93ad08 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -179,7 +179,7 @@ PREFERRED_VERSION_ixp-osal ?= "2.1" PREFERRED_VERSION_ixp400-eth ?= "1.5" # Select the smallest provider of x11 libraries -PREFERRED_PROVIDER_x11 ?= "diet-x11" +PREFERRED_PROVIDER_libx11 ?= "diet-x11" SRCDATE_diet-x11 ?= "20060106" # Ensure consistency across all SlugOS builds for the provider of a |