diff options
| author | Matthias Hentges <oe@hentges.net> | 2007-05-24 17:06:27 +0000 |
|---|---|---|
| committer | Matthias Hentges <oe@hentges.net> | 2007-05-24 17:06:27 +0000 |
| commit | 52ad68d8311927e27b51d88a57aaa98ee79dbf93 (patch) | |
| tree | ae451c9838c4caa5a6a39eabe9ce1dc4b4accffa /conf | |
| parent | 34dde4e4767cc985e246b24f5c4e2eb5934f3b4c (diff) | |
| parent | 4b354150f6b88b8507f1fab1bc6df48103f84b10 (diff) | |
merge of '2e1d9e05c5b3d9382dab5905a71f66a069c6915d'
and '6f3630e0c94aef5b64cc3ea808814c67c4fb0fd1'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/slugos.conf | 5 | ||||
| -rw-r--r-- | conf/machine/guinness.conf | 1 | ||||
| -rw-r--r-- | conf/machine/htcuniversal.conf | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 980c158181..564a2d0cfb 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -14,3 +14,8 @@ ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux" require conf/distro/include/slugos.inc + +# glibc: +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libintl ?= "glibc" +PREFERRED_PROVIDER_virtual/libc ?= "glibc" diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf index 11dbadacb8..1996a1603b 100644 --- a/conf/machine/guinness.conf +++ b/conf/machine/guinness.conf @@ -7,6 +7,7 @@ TARGET_ARCH = "i686" PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" +PREFERRED_PROVIDER_xserver = "xserver-xorg" udevdir = "/dev" diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index dbf7b76e32..95eb7354fe 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -40,7 +40,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \ # # Modules autoload and other boot properties # -#module_autoload_acx = "acx" +module_autoload_acx = "acx" module_autoload_htcuniversal_acx = "htcuniversal_acx" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" |