summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/familiar-unstable.conf4
-rw-r--r--conf/distro/preferred-gpe-versions-2.8.inc10
-rw-r--r--conf/machine/include/zaurus-clamshell-2.6.conf5
3 files changed, 16 insertions, 3 deletions
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf
index 1a5600c986..f7d941063d 100644
--- a/conf/distro/familiar-unstable.conf
+++ b/conf/distro/familiar-unstable.conf
@@ -1,6 +1,8 @@
DISTRO = "familiar"
DISTRO_NAME = "Familiar Linux"
DISTRO_VERSION = "unstable-${DATE}"
+MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+# Do not touch this file before notifying familiar-dev@handhelds.org
include conf/distro/familiar.conf
@@ -61,7 +63,7 @@ PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
PREFERRED_PROVIDER_x11 = "diet-x11"
-include conf/distro/preferred-gpe-versions-2.7.inc
+include conf/distro/preferred-gpe-versions-2.8.inc
#
# E
diff --git a/conf/distro/preferred-gpe-versions-2.8.inc b/conf/distro/preferred-gpe-versions-2.8.inc
new file mode 100644
index 0000000000..c62d0aff6e
--- /dev/null
+++ b/conf/distro/preferred-gpe-versions-2.8.inc
@@ -0,0 +1,10 @@
+#
+# Specify which versions of GPE (and related) applications to build
+#
+
+#set some preferred providers:
+PREFERRED_PROVIDER_gconf=gconf-dbus
+PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
+
+# - the GPE roadmap doesn't state any versions for 2.8 yet
+# http://www.handhelds.org/moin/moin.cgi/GPERoadmap
diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf
index e89183b204..d8a82ea9f7 100644
--- a/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -32,12 +32,13 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage
# Wireless Modules
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
kernel-module-hermes kernel-module-orinoco \
- kernel-module-orinoco-cs kernel-module-spectrum-cs"
+ kernel-module-orinoco-cs kernel-module-spectrum-cs \
+ hostap-conf orinoco-conf"
# Sound Modules
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
kernel-module-snd-pcm kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss \
- kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
+ kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += " kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 "
BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "