summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/familiar-unstable.conf3
-rw-r--r--conf/distro/maemo-1.0.conf2
-rw-r--r--conf/distro/openzaurus-unstable.conf2
-rw-r--r--conf/distro/slugos.conf2
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