conf/distro cleanup. conf/distro should only contain files that are ok to be directly included

by means of setting DISTRO. conf/distro/include should contain those which doesn't.

20 files changed, 1376 insertions, 0 deletions

diff --git a/conf/distro/include/angstrom.conf b/conf/distro/include/angstrom.conf
new file mode 100644
index 0000000000..13ac2b16bf
--- /dev/null
+++ b/conf/distro/include/angstrom.conf
@@ -0,0 +1,48 @@
+#@TYPE: Distribution
+#@NAME: Angstrom 
+#@DESCRIPTION: Distribution configuration for Angstrom
+
+DISTRO = "angstrom"
+DISTRO_NAME = "Angstrom"
+
+#Use this variable in feeds and other parts that need a URI
+ANGSTROM_URI = "http://www.angstrom-distribution.org"
+
+#Set the default maintainer to angstrom-dev
+MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>"
+
+#use ipkg package format with debian style naming
+#use multimachine buildrules 
+INHERIT += "package_ipk debian multimachine"
+
+#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
+PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native"
+ENABLE_BINARY_LOCALE_GENERATION ?= ""
+
+
+#Use the ARM EABI when building for an ARM cpu. We can't use overrides
+#here because this breaks all places where ":=" is used.
+#if you want to build using uclibc, specify "-uclibcgnueabi"
+TARGET_VENDOR = "-angstrom"
+TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
+#uclibc (needs gcc 4.1.1 or newer)
+#TARGET_OS = "linux${@['','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
+
+#mess with compiler flags to use -Os instead of -O2
+#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
+BUILD_OPTIMIZATION = "-Os"
+
+#ARM EABI is softfloat by default, but let's make sure :)
+TARGET_FPU_arm = "soft"
+
+#Always ship these packages
+BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version coreutils dropbear sysvinit"
+BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit"
+
+#Name the generated images in a sane way
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
+DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE}
+
+# Angstrom *always* has some form of release config, so error out if someone thinks he knows better 
+DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
diff --git a/conf/distro/include/debianslug-packages.conf b/conf/distro/include/debianslug-packages.conf
new file mode 100644
index 0000000000..a4b9a6720f
--- /dev/null
+++ b/conf/distro/include/debianslug-packages.conf
@@ -0,0 +1,2 @@
+SLUGOS_EXTRA_BBFILES = "${DEBIANSLUG_EXTRA_BBFILES}"
+require conf/distro/include/slugos-packages.conf
diff --git a/conf/distro/include/familiar.conf b/conf/distro/include/familiar.conf
new file mode 100644
index 0000000000..2646fe78a6
--- /dev/null
+++ b/conf/distro/include/familiar.conf
@@ -0,0 +1,17 @@
+#@TYPE: Distribution
+#@NAME: Familiar Linux
+#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
+
+MAINTAINER ?= "Familiar Developers <familiar-dev@handhelds.org>"
+
+INHERIT += "package_ipk debian multimachine"
+TARGET_OS = "linux"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
+IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
+
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
+PARALLEL_INSTALL_MODULES = "1"
+UDEV_DEVFS_RULES = "1"
+
+DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
diff --git a/conf/distro/include/ludeos-packages.conf b/conf/distro/include/ludeos-packages.conf
new file mode 100644
index 0000000000..f88d593a17
--- /dev/null
+++ b/conf/distro/include/ludeos-packages.conf
@@ -0,0 +1,2 @@
+SLUGOS_EXTRA_BBFILES = ""
+require conf/distro/include/slugos-packages.conf
diff --git a/conf/distro/include/maemo-preferred.inc b/conf/distro/include/maemo-preferred.inc
new file mode 100644
index 0000000000..943f244326
--- /dev/null
+++ b/conf/distro/include/maemo-preferred.inc
@@ -0,0 +1,10 @@
+PREFERRED_PROVIDER_gconf = "gconf-osso"
+PREFERRED_PROVIDER_tslib = "tslib-maemo"
+PREFERRED_VERSION_dbus = "0.23.1-osso5"
+PREFERRED_VERSION_audiofile = "0.2.6-3osso4"
+PREFERRED_PROVIDER_esd = "osso-esd"
+PREFERRED_VERSION_gtk+ = "2.6.4-1.osso7"
+PREFERRED_VERSION_glib-2.0 = "2.6.4"
+PREFERRED_VERSION_pango = "1.8.1"
+PREFERRED_VERSION_atk = "1.9.0"
+PREFERRED_VERSION_diet-x11 ?= "6.2.1"
\ No newline at end of file
diff --git a/conf/distro/include/openslug-native-packages.conf b/conf/distro/include/openslug-native-packages.conf
new file mode 100644
index 0000000000..7f7a448434
--- /dev/null
+++ b/conf/distro/include/openslug-native-packages.conf
@@ -0,0 +1,11 @@
+# automatically generated by bitbake freeze
+BBFILES := "\
+${PKGDIR}/packages/apache/*.bb \
+${PKGDIR}/packages/openssl/*.bb \
+${PKGDIR}/packages/ipkg-utils/*.bb \
+${PKGDIR}/packages/meta/package-index.bb \
+${PKGDIR}/packages/meta/openslug-native-packages.bb \
+${PKGDIR}/packages/freeze/*.bb \
+${PKGDIR}/packages/pcre/*.bb \
+${PKGDIR}/packages/expat/*.bb \
+${OPENSLUG_NATIVE_EXTRA_BBFILES}"
diff --git a/conf/distro/include/openslug-packages.conf b/conf/distro/include/openslug-packages.conf
new file mode 100644
index 0000000000..fe09a7bcfa
--- /dev/null
+++ b/conf/distro/include/openslug-packages.conf
@@ -0,0 +1,2 @@
+SLUGOS_EXTRA_BBFILES = "${OPENSLUG_EXTRA_BBFILES}"
+require conf/distro/include/slugos-packages.conf
diff --git a/conf/distro/include/openzaurus.conf b/conf/distro/include/openzaurus.conf
new file mode 100644
index 0000000000..b7f456320f
--- /dev/null
+++ b/conf/distro/include/openzaurus.conf
@@ -0,0 +1,18 @@
+#@TYPE: Distribution
+#@NAME: OpenZaurus
+#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org)
+
+DISTRO = "openzaurus"
+DISTRO_NAME = "OpenZaurus"
+
+INHERIT += " package_ipk debian multimachine"
+# For some reason, this doesn't work
+# TARGET_OS ?= "linux"
+TARGET_OS = "linux"
+TARGET_FPU = "soft"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version"
+
+PARALLEL_INSTALL_MODULES = "1"
+
+DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
diff --git a/conf/distro/include/preferred-e-versions.inc b/conf/distro/include/preferred-e-versions.inc
new file mode 100644
index 0000000000..607acad858
--- /dev/null
+++ b/conf/distro/include/preferred-e-versions.inc
@@ -0,0 +1,33 @@
+#
+# Specify which versions of E-related libraries and applications to build
+#
+
+#PREFERRED_VERSION_e = "0.16.999.025"
+#PREFERRED_VERSION_ecore-x11 = "0.9.9.025"
+#PREFERRED_VERSION_ecore-native = "0.9.9.025"
+#PREFERRED_VERSION_edb = "1.0.5.006"
+#PREFERRED_VERSION_edb-native = "1.0.5.006"
+#PREFERRED_VERSION_edje = "0.5.0.025"
+#PREFERRED_VERSION_edje-native = "0.5.0.025"
+#PREFERRED_VERSION_eet = "0.9.10.025"
+#PREFERRED_VERSION_eet-native = "0.9.10.025"
+#PREFERRED_VERSION_embryo = "0.9.1.025"
+#PREFERRED_VERSION_embryo-native = "0.9.1.025"
+#PREFERRED_VERSION_emotion = "0.0.1.004"
+#PREFERRED_VERSION_emotion-native = "0.0.1.004"
+#PREFERRED_VERSION_epeg = "0.9.0.006"
+#PREFERRED_VERSION_epsilon = "0.3.0.006"
+#PREFERRED_VERSION_esmart-x11 = "0.9.0.006"
+#PREFERRED_VERSION_evas-x11 = "0.9.9.025"
+#PREFERRED_VERSION_evas-native = "0.9.9.025"
+#PREFERRED_VERSION_ewl = "0.0.4.006"
+#PREFERRED_VERSION_imlib2-x11 = "1.2.1.011"
+#PREFERRED_VERSION_imlib2-native = "1.2.1.011"
+#PREFERRED_VERSION_e-wm = "0.16.999.025"
+#PREFERRED_VERSION_entrance = "0.9.0.006"
+
+PREFERRED_PROVIDER_virtual/evas ?= "evas-x11"
+PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
+PREFERRED_PROVIDER_virtual/imlib2 ?= "imlib2-x11"
+PREFERRED_PROVIDER_virtual/esmart ?= "esmart-x11"
+
diff --git a/conf/distro/include/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc
new file mode 100644
index 0000000000..1d09ae6051
--- /dev/null
+++ b/conf/distro/include/preferred-gpe-versions-2.6.inc
@@ -0,0 +1,86 @@
+#
+# Specify which versions of GPE (and related) applications to build
+#
+
+#work around some breakages
+SRCDATE_xserver-kdrive=20050207
+SRCDATE_minimo=20050401
+SRCDATE_cairo=20050330
+SRCDATE_xext=20050222
+
+#set some preferred providers:
+PREFERRED_PROVIDER_gconf=gconf-dbus
+
+#specify versions, as the header says :)
+PREFERRED_VERSION_libmatchbox ?= "1.6"
+PREFERRED_VERSION_matchbox ?= "0.9.1"
+PREFERRED_VERSION_matchbox-common ?= "0.9.1"
+PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
+PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
+PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
+PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_gtk+ ?= "2.6.3"
+PREFERRED_VERSION_libgpewidget ?= "0.97"
+PREFERRED_VERSION_libgpepimc ?= "0.4"
+PREFERRED_VERSION_libgpevtype ?= "0.11"
+PREFERRED_VERSION_libschedule ?= "0.14"
+PREFERRED_VERSION_gpe-icons ?= "0.24"
+PREFERRED_VERSION_libgsm ?= "1.0.10"
+PREFERRED_VERSION_diet-x11 ?= "6.2.1"
+PREFERRED_VERSION_xproto ?= "6.6.2"
+PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
+PREFERRED_VERSION_rxvt-unicode ?= "5.3"
+PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
+PREFERRED_VERSION_xst ?= "0.14"
+#PREFERRED_VERSION_xextensions ?= "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 
+PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
+PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_gpe-login ?= "0.76"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.62"
+PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
+PREFERRED_VERSION_gpe-todo ?= "0.50"
+PREFERRED_VERSION_gpe-calendar ?= "0.61"
+PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
+PREFERRED_VERSION_gpe-contacts ?= "0.36"
+PREFERRED_VERSION_gpe-today ?= "0.08"
+PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
+PREFERRED_VERSION_dbus ?= "0.23"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.38"
+PREFERRED_VERSION_gpe-su ?= "0.18"
+PREFERRED_VERSION_gpe-conf ?= "0.1.23"
+PREFERRED_VERSION_gpe-clock ?= "0.20"
+PREFERRED_VERSION_gpe-mininet ?= "0.5"
+PREFERRED_VERSION_gpe-mixer ?= "0.40"
+PREFERRED_VERSION_gpe-shield ?= "0.7"
+PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
+PREFERRED_VERSION_gpe-taskmanager ?= "0.17"
+PREFERRED_VERSION_keylaunch ?= "2.0.7"
+PREFERRED_VERSION_minilite ?= "0.47"
+PREFERRED_VERSION_xmonobut ?= "0.4"
+PREFERRED_VERSION_gpe-edit ?= "0.28"
+PREFERRED_VERSION_gpe-gallery ?= "0.95"
+PREFERRED_VERSION_gpe-calculator ?= "0.2"
+PREFERRED_VERSION_gpe-package ?= "0.2"
+PREFERRED_VERSION_gpe-soundbite ?= "1.0.5"
+PREFERRED_VERSION_gpe-terminal ?= "1.1"
+PREFERRED_VERSION_gpe-watch ?= "0.10"
+PREFERRED_VERSION_gpe-what ?= "0.33"
+PREFERRED_VERSION_gpe-filemanager ?= "0.20"
+PREFERRED_VERSION_gpe-go ?= "0.05"
+PREFERRED_VERSION_gpe-irc ?= "0.07"
+PREFERRED_VERSION_gpe-lights ?= "0.13"
+#PREFERRED_VERSION_gpe-nmf ?= "0.19"
+PREFERRED_VERSION_gpe-othello ?= "0.2-1"
+PREFERRED_VERSION_gpe-plucker ?= "0.2"
+PREFERRED_VERSION_gpe-tetris ?= "0.6-2"
+PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
+PREFERRED_VERSION_xdemineur ?= "2.1.1"
+PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
+PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_dillo2 ?= "0.6.6"
+PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
+PREFERRED_VERSION_linphone ?= "0.12.2"
+PREFERRED_VERSION_firefox ?= "1.0"
+
diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc
new file mode 100644
index 0000000000..933195977d
--- /dev/null
+++ b/conf/distro/include/preferred-gpe-versions-2.7.inc
@@ -0,0 +1,96 @@
+#
+# Specify which versions of GPE (and related) applications to build
+#
+
+#work around some breakages
+#SRCDATE_minimo=20050401
+
+#set some preferred providers:
+PREFERRED_PROVIDER_gconf=gconf-dbus
+PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
+
+#specify versions, as the header says :)
+PREFERRED_VERSION_libmatchbox ?= "1.7"
+PREFERRED_VERSION_matchbox ?= "0.9.1"
+PREFERRED_VERSION_matchbox-common ?= "0.9.1"
+PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
+PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
+PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_atk ?= "1.9.0"
+PREFERRED_VERSION_cairo ?= "0.5.2"
+PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
+PREFERRED_VERSION_gtk+ ?= "2.6.10"
+PREFERRED_VERSION_pango ?= "1.8.1"
+PREFERRED_VERSION_librsvg ?= "2.6.5"
+PREFERRED_VERSION_libgpewidget ?= "0.109"
+PREFERRED_VERSION_libgpepimc ?= "0.5"
+PREFERRED_VERSION_libgpevtype ?= "0.14"
+PREFERRED_VERSION_libschedule ?= "0.15"
+PREFERRED_VERSION_libcontactsdb ?= "0.3"
+PREFERRED_VERSION_libtododb ?= "0.09"
+PREFERRED_VERSION_gpe-icons ?= "0.25"
+PREFERRED_VERSION_libgsm ?= "1.0.10"
+PREFERRED_VERSION_diet-x11 ?= "6.2.1"
+PREFERRED_VERSION_xproto ?= "6.6.2"
+PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
+PREFERRED_VERSION_rxvt-unicode ?= "5.6"
+PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
+PREFERRED_VERSION_xst ?= "0.15"
+PREFERRED_VERSION_xextensions ?= "1.0.1"
+PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207"
+PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 
+PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
+PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_gpe-login ?= "0.83"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
+PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
+PREFERRED_VERSION_gpe-todo ?= "0.55"
+PREFERRED_VERSION_gpe-calendar ?= "0.70"
+PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9"
+PREFERRED_VERSION_gpe-contacts ?= "0.43"
+PREFERRED_VERSION_gpe-today ?= "0.10"
+PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
+PREFERRED_VERSION_dbus ?= "0.23.4"
+PREFERRED_VERSION_gpe-beam ?= "0.2.8" 
+PREFERRED_VERSION_gpe-bluetooth ?= "0.51"
+PREFERRED_VERSION_gpe-su ?= "0.19"
+PREFERRED_VERSION_gpe-conf ?= "0.1.29"
+PREFERRED_VERSION_gpe-clock ?= "0.23"
+PREFERRED_VERSION_gpe-mininet ?= "0.7"
+PREFERRED_VERSION_gpe-mixer ?= "0.42"
+PREFERRED_VERSION_gpe-shield ?= "0.8"
+PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
+PREFERRED_VERSION_gpe-taskmanager ?= "0.19"
+PREFERRED_VERSION_keylaunch ?= "2.0.7"
+PREFERRED_VERSION_minilite ?= "0.49"
+PREFERRED_VERSION_xmonobut ?= "0.4"
+PREFERRED_VERSION_gpe-edit ?= "0.29"
+PREFERRED_VERSION_gpe-gallery ?= "0.96"
+PREFERRED_VERSION_gpe-calculator ?= "0.2"
+PREFERRED_VERSION_gpe-package ?= "0.3"
+PREFERRED_VERSION_gpe-soundbite ?= "1.0.6"
+PREFERRED_VERSION_gpe-terminal ?= "1.1"
+PREFERRED_VERSION_gpe-watch ?= "0.10"
+PREFERRED_VERSION_gpe-what ?= "0.42"
+PREFERRED_VERSION_gpe-filemanager ?= "0.23"
+PREFERRED_VERSION_gpe-go ?= "0.05"
+PREFERRED_VERSION_gpe-irc ?= "0.07"
+PREFERRED_VERSION_gpe-lights ?= "0.13"
+#PREFERRED_VERSION_gpe-nmf ?= "0.21"
+PREFERRED_VERSION_gpe-othello ?= "0.2-1"
+PREFERRED_VERSION_gpe-plucker ?= "0.2"
+PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
+PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
+PREFERRED_VERSION_xdemineur ?= "2.1.1"
+PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
+PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_dillo2 ?= "0.6.6"
+PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
+PREFERRED_VERSION_linphone ?= "0.12.2"
+PREFERRED_VERSION_firefox ?= "1.0"
+PREFERRED_VERSION_gaim ?= "2.0.0+cvs20050904-mco1"
+PREFERRED_VERSION_poppler ?= "0.3.3"
+PREFERRED_VERSION_evince ?= "0.3.2"
+PREFERRED_VERSION_gpe_mini_browser ?= "0.19"
diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
new file mode 100644
index 0000000000..9c9be528df
--- /dev/null
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -0,0 +1,12 @@
+#
+# 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
+
+PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
+
+# - the GPE roadmap doesn't state any versions for 2.8 yet
+#   http://www.handhelds.org/moin/moin.cgi/GPERoadmap
diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc
new file mode 100644
index 0000000000..676e0ee9f9
--- /dev/null
+++ b/conf/distro/include/preferred-gpe-versions.inc
@@ -0,0 +1,84 @@
+#
+# Specify which versions of GPE (and related) applications to build
+#
+
+#work around some breakages
+#SRCDATE_xext=20050222
+
+#set some preferred providers:
+PREFERRED_PROVIDER_gconf=gconf-dbus
+PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
+
+#specify versions, as the header says :)
+#PREFERRED_VERSION_libmatchbox ?= "1.6"
+#PREFERRED_VERSION_matchbox ?= "0.9.1"
+#PREFERRED_VERSION_matchbox-common ?= "0.9.1"
+#PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
+#PREFERRED_VERSION_matchbox-wm ?= "0.9.3"
+#PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
+#PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+#PREFERRED_VERSION_gtk+ ?= "2.6.3"
+#PREFERRED_VERSION_libgpewidget ?= "0.97"
+#PREFERRED_VERSION_libgpepimc ?= "0.4"
+#PREFERRED_VERSION_libgpevtype ?= "0.11"
+#PREFERRED_VERSION_libschedule ?= "0.14"
+#PREFERRED_VERSION_gpe-icons ?= "0.24"
+#PREFERRED_VERSION_libgsm ?= "1.0.10"
+PREFERRED_VERSION_diet-x11 ?= "6.2.1"
+PREFERRED_VERSION_xproto ?= "6.6.2"
+#PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
+PREFERRED_VERSION_rxvt-unicode ?= "5.3"
+#PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
+#PREFERRED_VERSION_xst ?= "0.14"
+PREFERRED_VERSION_xextensions ?= "1.0.1"
+PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 
+PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
+PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
+#PREFERRED_VERSION_gpe-login ?= "0.76"
+#PREFERRED_VERSION_gpe-session-scripts ?= "0.62"
+#PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
+#PREFERRED_VERSION_gpe-todo ?= "0.50"
+#PREFERRED_VERSION_gpe-calendar ?= "0.61"
+#PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8"
+#PREFERRED_VERSION_gpe-contacts ?= "0.36"
+#PREFERRED_VERSION_gpe-today ?= "0.08"
+#PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
+PREFERRED_VERSION_dbus ?= "0.23.4"
+#PREFERRED_VERSION_gpe-bluetooth ?= "0.38"
+#PREFERRED_VERSION_gpe-su ?= "0.18"
+#PREFERRED_VERSION_gpe-conf ?= "0.1.23"
+#PREFERRED_VERSION_gpe-clock ?= "0.20"
+#PREFERRED_VERSION_gpe-mininet ?= "0.5"
+#PREFERRED_VERSION_gpe-mixer ?= "0.40"
+#PREFERRED_VERSION_gpe-shield ?= "0.7"
+#PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6"
+#PREFERRED_VERSION_gpe-taskmanager ?= "0.17"
+#PREFERRED_VERSION_keylaunch ?= "2.0.7"
+#PREFERRED_VERSION_minilite ?= "0.47"
+#PREFERRED_VERSION_xmonobut ?= "0.4"
+#PREFERRED_VERSION_gpe-edit ?= "0.28"
+#PREFERRED_VERSION_gpe-gallery ?= "0.95"
+#PREFERRED_VERSION_gpe-calculator ?= "0.2"
+#PREFERRED_VERSION_gpe-package ?= "0.2"
+#PREFERRED_VERSION_gpe-soundbite ?= "1.0.5"
+#PREFERRED_VERSION_gpe-terminal ?= "1.1"
+#PREFERRED_VERSION_gpe-watch ?= "0.10"
+#PREFERRED_VERSION_gpe-what ?= "0.33"
+#PREFERRED_VERSION_gpe-filemanager ?= "0.20"
+#PREFERRED_VERSION_gpe-go ?= "0.05"
+#PREFERRED_VERSION_gpe-irc ?= "0.07"
+#PREFERRED_VERSION_gpe-lights ?= "0.13"
+#PREFERRED_VERSION_gpe-nmf ?= "0.19"
+#PREFERRED_VERSION_gpe-othello ?= "0.2-1"
+#PREFERRED_VERSION_gpe-plucker ?= "0.2"
+#PREFERRED_VERSION_gpe-tetris ?= "0.6-2"
+#PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
+#PREFERRED_VERSION_xdemineur ?= "2.1.1"
+#PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
+PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
+#PREFERRED_VERSION_dillo2 ?= "0.6.6"
+PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
+#PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
+#PREFERRED_VERSION_linphone ?= "0.12.2"
+#PREFERRED_VERSION_firefox ?= "1.0"
+
diff --git a/conf/distro/include/preferred-opie-cvs-versions.inc b/conf/distro/include/preferred-opie-cvs-versions.inc
new file mode 100644
index 0000000000..93b068ee65
--- /dev/null
+++ b/conf/distro/include/preferred-opie-cvs-versions.inc
@@ -0,0 +1,208 @@
+#
+# Default versions
+QTE_VERSION ?= "2.3.10"
+# OPIE_VERSION ?= "1.2.2"
+PALMTOP_USE_MULTITHREADED_QT ?= "yes"
+
+#
+#
+# Opie libraries
+#
+PREFERRED_PROVIDER_virtual/libqte2 ?= '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
+PREFERRED_PROVIDER_virtual/libqpe1 ?= "libqpe-opie"
+PREFERRED_VERSION_qte-mt ?= "${QTE_VERSION}"
+PREFERRED_VERSION_qte ?= "${QTE_VERSION}"
+SRCDATE_libopie2 ?= "${OPIE_VERSION}"
+SRCDATE_libopieobex0 ?= "${OPIE_VERSION}"
+SRCDATE_libopietooth1 ?= "${OPIE_VERSION}"
+SRCDATE_libqpe-opie ?= "${OPIE_VERSION}"
+SRCDATE_libqtaux2 ?= "${OPIE_VERSION}"
+SRCDATE_libmailwrapper ?= "${OPIE_VERSION}"
+#
+# Opie applications
+#
+SRCDATE_opie-aboutapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-addressbook ?= "${OPIE_VERSION}"
+SRCDATE_opie-advancedfm ?= "${OPIE_VERSION}"
+SRCDATE_opie-alarm ?= "${OPIE_VERSION}"
+SRCDATE_opie-appearance ?= "${OPIE_VERSION}"
+SRCDATE_opie-aqpkg ?= "${OPIE_VERSION}"
+SRCDATE_opie-autorotateapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-backgammon ?= "${OPIE_VERSION}"
+SRCDATE_opie-backup ?= "${OPIE_VERSION}"
+SRCDATE_opie-bartender ?= "${OPIE_VERSION}"
+SRCDATE_opie-batteryapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-bluepin ?= "${OPIE_VERSION}"
+SRCDATE_opie-bluetoothapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-bluetoothmanager ?= "${OPIE_VERSION}"
+SRCDATE_opie-bounce ?= "${OPIE_VERSION}"
+SRCDATE_opie-brightnessapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-button-settings ?= "${OPIE_VERSION}"
+SRCDATE_opie-buzzword ?= "${OPIE_VERSION}"
+SRCDATE_opie-calculator ?= "${OPIE_VERSION}"
+SRCDATE_opie-calibrate ?= "${OPIE_VERSION}"
+SRCDATE_opie-camera ?= "${OPIE_VERSION}"
+SRCDATE_opie-cardmon ?= "${OPIE_VERSION}"
+SRCDATE_opie-checkbook ?= "${OPIE_VERSION}"
+SRCDATE_opie-citytime ?= "${OPIE_VERSION}"
+SRCDATE_opie-clipboardapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-clockapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-clock ?= "${OPIE_VERSION}"
+SRCDATE_opie-confeditor ?= "${OPIE_VERSION}"
+SRCDATE_opie-console ?= "${OPIE_VERSION}"
+SRCDATE_opie-dagger ?= "${OPIE_VERSION}"
+SRCDATE_opie-dasher ?= "${OPIE_VERSION}"
+SRCDATE_opie-datebook ?= "${OPIE_VERSION}"
+SRCDATE_opie-datebook-chrisholidayplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-datebook-nationalholidayplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-datebook-birthdayplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-deco-flat ?= "${OPIE_VERSION}"
+SRCDATE_opie-deco-liquid ?= "${OPIE_VERSION}"
+SRCDATE_opie-deco-polished ?= "${OPIE_VERSION}"
+SRCDATE_opie-doctab ?= "${OPIE_VERSION}"
+SRCDATE_opie-drawpad ?= "${OPIE_VERSION}"
+SRCDATE_opie-dvorak ?= "${OPIE_VERSION}"
+SRCDATE_opie-embeddedkonsole ?= "${OPIE_VERSION}"
+SRCDATE_opie-euroconv ?= "${OPIE_VERSION}"
+SRCDATE_opie-examples-python ?= "${OPIE_VERSION}"
+SRCDATE_opie-examples ?= "${OPIE_VERSION}"
+SRCDATE_opie-eye ?= "${OPIE_VERSION}"
+SRCDATE_opie-fifteen ?= "${OPIE_VERSION}"
+SRCDATE_opie-formatter ?= "${OPIE_VERSION}"
+SRCDATE_opie-freetype ?= "${OPIE_VERSION}"
+SRCDATE_opie-ftplib ?= "${OPIE_VERSION}"
+SRCDATE_opie-ftp ?= "${OPIE_VERSION}"
+SRCDATE_opie-go ?= "${OPIE_VERSION}"
+SRCDATE_opie-gutenbrowser ?= "${OPIE_VERSION}"
+SRCDATE_opie-handwriting ?= "${OPIE_VERSION}"
+SRCDATE_opie-helpbrowser ?= "${OPIE_VERSION}"
+SRCDATE_opie-help-en ?= "${OPIE_VERSION}"
+SRCDATE_opie-homeapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-i18n ?= "${OPIE_VERSION}"
+SRCDATE_opie-lrelease-native ?= "${OPIE_VERSION}"
+SRCDATE_opie-lupdate-native ?= "${OPIE_VERSION}"
+SRCDATE_opie-icon-reload ?= "${OPIE_VERSION}"
+SRCDATE_opie-irc ?= "${OPIE_VERSION}"
+SRCDATE_opie-irdaapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-jumpx ?= "${OPIE_VERSION}"
+SRCDATE_opie-kbill ?= "${OPIE_VERSION}"
+SRCDATE_opie-kcheckers ?= "${OPIE_VERSION}"
+SRCDATE_opie-keyboard ?= "${OPIE_VERSION}"
+SRCDATE_opie-keypebble ?= "${OPIE_VERSION}"
+SRCDATE_opie-keytabs ?= "${OPIE_VERSION}"
+SRCDATE_opie-keyview ?= "${OPIE_VERSION}"
+SRCDATE_opie-kjumpx ?= "${OPIE_VERSION}"
+SRCDATE_opie-kpacman ?= "${OPIE_VERSION}"
+SRCDATE_opie-language ?= "${OPIE_VERSION}"
+SRCDATE_opie-launcher-settings ?= "${OPIE_VERSION}"
+SRCDATE_opie-libqrsync ?= "${OPIE_VERSION}"
+SRCDATE_opie-light-and-power ?= "${OPIE_VERSION}"
+SRCDATE_opie-lockapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-login ?= "${OPIE_VERSION}"
+SRCDATE_opie-logoutapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-mailapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-mail ?= "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer1-libmadplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer1-libmodplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer1-libtremorplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer1-libwavplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer1 ?= "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer2 ?= "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer2-skin-default ?= "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer2-skin-default-landscape ?= "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer2-skin-pod ?= "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer2-skin-techno ?= "${OPIE_VERSION}"
+SRCDATE_opie-mediummount ?= "${OPIE_VERSION}"
+SRCDATE_opie-memoryapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-mindbreaker ?= "${OPIE_VERSION}"
+SRCDATE_opie-minesweep ?= "${OPIE_VERSION}"
+SRCDATE_opie-mobilemsg ?= "${OPIE_VERSION}"
+SRCDATE_opie-multikeyapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-multikey ?= "${OPIE_VERSION}"
+SRCDATE_opie-networkapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-networksettings ?= "${OPIE_VERSION}"
+SRCDATE_opie-notesapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-odict ?= "${OPIE_VERSION}"
+SRCDATE_opie-osearch ?= "${OPIE_VERSION}"
+SRCDATE_opie-oxygen ?= "${OPIE_VERSION}"
+SRCDATE_opie-oyatzee ?= "${OPIE_VERSION}"
+SRCDATE_opie-packagemanager ?= "${OPIE_VERSION}"
+SRCDATE_opie-parashoot ?= "${OPIE_VERSION}"
+SRCDATE_opie-pcmciaapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-performance ?= "${OPIE_VERSION}"
+SRCDATE_opie-pickboard ?= "${OPIE_VERSION}"
+SRCDATE_opie-pics ?= "${OPIE_VERSION}"
+SRCDATE_opie-pimconverter ?= "${OPIE_VERSION}"
+SRCDATE_opie-powerchord ?= "${OPIE_VERSION}"
+SRCDATE_opie-pyquicklaunchapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-qasteroids ?= "${OPIE_VERSION}"
+SRCDATE_opie-qcop ?= "${OPIE_VERSION}"
+SRCDATE_opie-quicklauncher ?= "${OPIE_VERSION}"
+SRCDATE_opie-qss ?= "${OPIE_VERSION}"
+SRCDATE_opie-rdesktop ?= "${OPIE_VERSION}"
+SRCDATE_opie-reader ?= "${OPIE_VERSION}"
+SRCDATE_opie-recorder ?= "${OPIE_VERSION}"
+SRCDATE_opie-remote ?= "${OPIE_VERSION}"
+SRCDATE_opie-restartapplet2 ?= "${OPIE_VERSION}"
+SRCDATE_opie-restartapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-restartapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-rotateapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-screenshotapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-search ?= "${OPIE_VERSION}"
+SRCDATE_opie-security ?= "${OPIE_VERSION}"
+SRCDATE_opie-securityplugin-blueping ?= "${OPIE_VERSION}"
+SRCDATE_opie-securityplugin-dummy ?= "${OPIE_VERSION}"
+SRCDATE_opie-securityplugin-notice ?= "${OPIE_VERSION}"
+SRCDATE_opie-securityplugin-pin ?= "${OPIE_VERSION}"
+SRCDATE_opie-sfcave ?= "${OPIE_VERSION}"
+SRCDATE_opie-sheet ?= "${OPIE_VERSION}"
+SRCDATE_opie-sh ?= "${OPIE_VERSION}"
+SRCDATE_opie-showimg ?= "${OPIE_VERSION}"
+SRCDATE_opie-snake ?= "${OPIE_VERSION}"
+SRCDATE_opie-solitaire ?= "${OPIE_VERSION}"
+SRCDATE_opie-sshkeys ?= "${OPIE_VERSION}"
+SRCDATE_opie-style-flat ?= "${OPIE_VERSION}"
+SRCDATE_opie-style-fresh ?= "${OPIE_VERSION}"
+SRCDATE_opie-style-liquid ?= "${OPIE_VERSION}"
+SRCDATE_opie-style-metal ?= "${OPIE_VERSION}"
+SRCDATE_opie-style-phase ?= "${OPIE_VERSION}"
+SRCDATE_opie-style-web ?= "${OPIE_VERSION}"
+SRCDATE_opie-sounds ?= "${OPIE_VERSION}"
+SRCDATE_opie-stumbler ?= "${OPIE_VERSION}"
+SRCDATE_opie-suspendapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-symlinker ?= "${OPIE_VERSION}"
+SRCDATE_opie-sysinfo ?= "${OPIE_VERSION}"
+SRCDATE_opie-systemtime ?= "${OPIE_VERSION}"
+SRCDATE_opie-tableviewer ?= "${OPIE_VERSION}"
+SRCDATE_opie-tabmanager ?= "${OPIE_VERSION}"
+SRCDATE_opie-taskbar ?= "${OPIE_VERSION}"
+SRCDATE_opie-tetrix ?= "${OPIE_VERSION}"
+SRCDATE_opie-textedit ?= "${OPIE_VERSION}"
+SRCDATE_opie-theme ?= "${OPIE_VERSION}"
+SRCDATE_opie-tictac ?= "${OPIE_VERSION}"
+SRCDATE_opie-tinykate ?= "${OPIE_VERSION}"
+SRCDATE_opie-today-addressbookplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-today-datebookplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-today-fortuneplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-today-mailplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-today ?= "${OPIE_VERSION}"
+SRCDATE_opie-today-stocktickerplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-today-todolistplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-today-weatherplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-todo ?= "${OPIE_VERSION}"
+SRCDATE_opie-tonleiter ?= "${OPIE_VERSION}"
+SRCDATE_opie-unikeyboard ?= "${OPIE_VERSION}"
+SRCDATE_opie-usermanager ?= "${OPIE_VERSION}"
+SRCDATE_opie-vmemo ?= "${OPIE_VERSION}"
+SRCDATE_opie-vmemo-settings ?= "${OPIE_VERSION}"
+SRCDATE_opie-volumeapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-vtapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-wellenreiter ?= "${OPIE_VERSION}"
+SRCDATE_opie-wirelessapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-wordgame ?= "${OPIE_VERSION}"
+SRCDATE_opie-write ?= "${OPIE_VERSION}"
+SRCDATE_opie-zkbapplet ?= "${OPIE_VERSION}"
+SRCDATE_opie-zlines ?= "${OPIE_VERSION}"
+SRCDATE_opie-zsafe ?= "${OPIE_VERSION}"
+SRCDATE_opie-zsame ?= "${OPIE_VERSION}"
+PREFERRED_VERSION_konqueror-embedded = "20060404"
diff --git a/conf/distro/include/preferred-opie-versions.inc b/conf/distro/include/preferred-opie-versions.inc
new file mode 100644
index 0000000000..51c9937628
--- /dev/null
+++ b/conf/distro/include/preferred-opie-versions.inc
@@ -0,0 +1,206 @@
+#
+# Default versions
+QTE_VERSION ?= "2.3.10"
+OPIE_VERSION ?= "1.2.2"
+PALMTOP_USE_MULTITHREADED_QT ?= "yes"
+
+#
+#
+# Opie libraries
+#
+PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
+PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
+PREFERRED_VERSION_qte-mt = "${QTE_VERSION}"
+PREFERRED_VERSION_qte = "${QTE_VERSION}"
+PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
+PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}"
+#
+# Opie applications
+#
+PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluetoothapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluetoothmanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-brightnessapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-camera = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-checkbook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-console = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-chrisholidayplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-nationalholidayplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook-birthdayplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-go = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lrelease-native = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lupdate-native = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-icon-reload = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-language = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lockapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-login = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-default = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-default-landscape = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-pod = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2-skin-techno = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-oxygen = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pcmciaapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qcop = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qss = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-search = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-security = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-blueping = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-dummy = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-notice = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugin-pin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sounds = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wellenreiter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-write = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
+PREFERRED_VERSION_konqueror-embedded = "20060404"
diff --git a/conf/distro/include/preferred-x-versions-pre-X11R7.inc b/conf/distro/include/preferred-x-versions-pre-X11R7.inc
new file mode 100644
index 0000000000..b8cd34a3fb
--- /dev/null
+++ b/conf/distro/include/preferred-x-versions-pre-X11R7.inc
@@ -0,0 +1,44 @@
+#
+# Specify to build old/old CVS versions of X libraries and apps
+#
+
+PREFERRED_VERSION_xproto         = "0.0+cvs${SRCDATE}"
+
+PREFERRED_VERSION_diet-x11       = "6.2.1+cvs${SRCDATE}"
+PREFERRED_VERSION_libice         = "6.3.3"
+PREFERRED_VERSION_libsm          = "6.0.3"
+PREFERRED_VERSION_libx11         = "6.2.1+cvs${SRCDATE}"
+PREFERRED_VERSION_libxau         = "1.0.1"
+PREFERRED_VERSION_libxaw         = "7.0.2"
+PREFERRED_VERSION_libxcomposite  = "1.0.1"
+PREFERRED_VERSION_libxcursor     = "1.1.2"
+PREFERRED_VERSION_libxdamage     = "1.0.1"
+PREFERRED_VERSION_libxdmcp       = "0.1.3"
+PREFERRED_VERSION_libxext        = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxfixes      = "2.0.1"
+PREFERRED_VERSION_libxfont       = "1.4.2"
+PREFERRED_VERSION_libxft         = "2.1.6"
+PREFERRED_VERSION_libxi          = "6.0.1"
+PREFERRED_VERSION_libxinerama    = "1.0.2+cvs20050505"
+PREFERRED_VERSION_libxkbfile     = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxmu         = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxp          = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxpm         = "3.5.1"
+PREFERRED_VERSION_libxrandr      = "1.0.2"
+PREFERRED_VERSION_libxrender     = "0.8.4"
+PREFERRED_VERSION_libxres        = "1.0.1"
+PREFERRED_VERSION_libxss         = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxt          = "0.1.5"
+PREFERRED_VERSION_libxtst        = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxv          = "2.2.2+cvs20040918"
+PREFERRED_VERSION_libxxf86dga    = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_libxxf86vm     = "0.0+cvs${SRCDATE}"
+
+PREFERRED_VERSION_xcalibrate     = "0.0+cvs20060312"
+PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207"
+
+PREFERRED_VERSION_xdpyinfo       = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_xev            = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_xhost          = "0.0+cvs20040413"
+PREFERRED_VERSION_xmodmap        = "0.0+cvs${SRCDATE}"
+PREFERRED_VERSION_xrandr         = "0.0+cvs${SRCDATE}"
diff --git a/conf/distro/include/slugos-packages.conf b/conf/distro/include/slugos-packages.conf
new file mode 100644
index 0000000000..650368a990
--- /dev/null
+++ b/conf/distro/include/slugos-packages.conf
@@ -0,0 +1,259 @@
+BBFILES := "\
+${PKGDIR}/packages/alsa/*.bb \
+${PKGDIR}/packages/apr/*.bb \
+${PKGDIR}/packages/asterisk/*.bb \
+${PKGDIR}/packages/asterisk-sounds/*.bb \
+${PKGDIR}/packages/atftp/*.bb \
+${PKGDIR}/packages/audiofile/*.bb \
+${PKGDIR}/packages/aumix/*.bb \
+${PKGDIR}/packages/autoconf/*.bb \
+${PKGDIR}/packages/automake/*.bb \
+${PKGDIR}/packages/base-files/*.bb \
+${PKGDIR}/packages/base-passwd/*.bb \
+${PKGDIR}/packages/bash/*.bb \
+${PKGDIR}/packages/beep/*.bb \
+${PKGDIR}/packages/bind/*.bb \
+${PKGDIR}/packages/binutils/*.bb \
+${PKGDIR}/packages/bison/*.bb \
+${PKGDIR}/packages/bluez/*.bb \
+${PKGDIR}/packages/bogofilter/*.bb \
+${PKGDIR}/packages/boost/*.bb \
+${PKGDIR}/packages/bridge-utils/*.bb \
+${PKGDIR}/packages/btsco/*.bb \
+${PKGDIR}/packages/busybox/*.bb \
+${PKGDIR}/packages/bwmon/*.bb \
+${PKGDIR}/packages/bzip2/*.bb \
+${PKGDIR}/packages/ccxstream/*.bb \
+${PKGDIR}/packages/cdparanoia/*.bb \
+${PKGDIR}/packages/cdstatus/*.bb \
+${PKGDIR}/packages/cherokee/*.bb \
+${PKGDIR}/packages/coreutils/*.bb \
+${PKGDIR}/packages/cpio/*.bb \
+${PKGDIR}/packages/cron/*.bb \
+${PKGDIR}/packages/ctorrent/*.bb \
+${PKGDIR}/packages/ctrlproxy/*.bb \
+${PKGDIR}/packages/curl/*.bb \
+${PKGDIR}/packages/cvs/*.bb \
+${PKGDIR}/packages/cyrus-imapd/*.bb \
+${PKGDIR}/packages/cyrus-sasl/*.bb \
+${PKGDIR}/packages/davfs2/*.bb \
+${PKGDIR}/packages/db/*.bb \
+${PKGDIR}/packages/dbus/*.bb \
+${PKGDIR}/packages/devio/*.bb \
+${PKGDIR}/packages/device-mapper/*.bb \
+${PKGDIR}/packages/devlabel/*.bb \
+${PKGDIR}/packages/dhcp/*.bb \
+${PKGDIR}/packages/didiwiki/*.bb \
+${PKGDIR}/packages/diffstat/*.bb \
+${PKGDIR}/packages/diffutils/*.bb \
+${PKGDIR}/packages/dnsmasq/*.bb \
+${PKGDIR}/packages/docbook-utils/*.bb \
+${PKGDIR}/packages/dropbear/*.bb \
+${PKGDIR}/packages/dsniff/*.bb \
+${PKGDIR}/packages/e2fsprogs/*.bb \
+${PKGDIR}/packages/e2fsprogs-libs/*.bb \
+${PKGDIR}/packages/eciadsl/*.bb \
+${PKGDIR}/packages/expat/*.bb \
+${PKGDIR}/packages/ez-ipupdate/*.bb \
+${PKGDIR}/packages/fakeroot/*.bb \
+${PKGDIR}/packages/fetchmail/*.bb \
+${PKGDIR}/packages/file/*.bb \
+${PKGDIR}/packages/findutils/*.bb \
+${PKGDIR}/packages/flac/*.bb \
+${PKGDIR}/packages/flex/*.bb \
+${PKGDIR}/packages/freeze/*.bb \
+${PKGDIR}/packages/ftpd-topfield/*.bb \
+${PKGDIR}/packages/gawk/*.bb \
+${PKGDIR}/packages/gcc/*.bb \
+${PKGDIR}/packages/gd/*.bb \
+${PKGDIR}/packages/gdb/*.bb \
+${PKGDIR}/packages/gdbm/*.bb \
+${PKGDIR}/packages/gettext/*.bb \
+${PKGDIR}/packages/glib-1.2/*.bb \
+${PKGDIR}/packages/glib-2.0/*.bb \
+${PKGDIR}/packages/glibc/*.bb \
+${PKGDIR}/packages/gnu-config/*.bb \
+${PKGDIR}/packages/gnutls/*.bb \
+${PKGDIR}/packages/gphoto2/*.bb \
+${PKGDIR}/packages/gpsd/*.bb \
+${PKGDIR}/packages/grep/*.bb \
+${PKGDIR}/packages/groff/*.bb \
+${PKGDIR}/packages/gtk-doc/*.bb \
+${PKGDIR}/packages/gzip/*.bb \
+${PKGDIR}/packages/hal/*.bb \
+${PKGDIR}/packages/hotplug-ng/*.bb \
+${PKGDIR}/packages/icecast/*.bb \
+${PKGDIR}/packages/ifupdown/*.bb \
+${PKGDIR}/packages/initscripts/*.bb \
+${PKGDIR}/packages/install/*.bb \
+${PKGDIR}/packages/intltool/*.bb \
+${PKGDIR}/packages/iperf/*.bb \
+${PKGDIR}/packages/ipkg-utils/*.bb \
+${PKGDIR}/packages/ipkg/*.bb \
+${PKGDIR}/packages/iptables/*.bb \
+${PKGDIR}/packages/ircp/*.bb \
+${PKGDIR}/packages/irssi/*.bb \
+${PKGDIR}/packages/ixp425-eth/*.bb \
+${PKGDIR}/packages/ixp4xx/*.bb \
+${PKGDIR}/packages/joe/*.bb \
+${PKGDIR}/packages/jpeg/*.bb \
+${PKGDIR}/packages/lcdproc/*.bb \
+${PKGDIR}/packages/less/*.bb \
+${PKGDIR}/packages/libaal/*.bb \
+${PKGDIR}/packages/libao/*.bb \
+${PKGDIR}/packages/libdvb/*.bb \
+${PKGDIR}/packages/libexif/*.bb \
+${PKGDIR}/packages/libgcrypt/*.bb \
+${PKGDIR}/packages/libgpg-error/*.bb \
+${PKGDIR}/packages/libgphoto2/*.bb \
+${PKGDIR}/packages/libgsm/*.bb \
+${PKGDIR}/packages/libiconv/*.bb \
+${PKGDIR}/packages/libid3tag/*.bb \
+${PKGDIR}/packages/liblockfile/*.bb \
+${PKGDIR}/packages/libmad/*.bb \
+${PKGDIR}/packages/libmikmod/*.bb \
+${PKGDIR}/packages/libnet/*.bb \
+${PKGDIR}/packages/libnids/*.bb \
+${PKGDIR}/packages/libogg/*.bb \
+${PKGDIR}/packages/libol/*.bb \
+${PKGDIR}/packages/libpcap/*.bb \
+${PKGDIR}/packages/libpng/*.bb \
+${PKGDIR}/packages/libtiff/*.bb \
+${PKGDIR}/packages/libtool/*.bb \
+${PKGDIR}/packages/libusb/*.bb \
+${PKGDIR}/packages/libvorbis/*.bb \
+${PKGDIR}/packages/libxml/*.bb \
+${PKGDIR}/packages/libxslt/* \
+${PKGDIR}/packages/linux-libc-headers/*.bb \
+${PKGDIR}/packages/linux/*.bb \
+${PKGDIR}/packages/lirc/*.bb \
+${PKGDIR}/packages/lrzsz/*.bb \
+${PKGDIR}/packages/lsof/*.bb \
+${PKGDIR}/packages/lvm2/*.bb \
+${PKGDIR}/packages/lzo/*.bb \
+${PKGDIR}/packages/m4/*.bb \
+${PKGDIR}/packages/madplay/*.bb \
+${PKGDIR}/packages/madwifi/*.bb \
+${PKGDIR}/packages/mailx/*.bb \
+${PKGDIR}/packages/make/*.bb \
+${PKGDIR}/packages/makedevs/*.bb \
+${PKGDIR}/packages/man-pages/*.bb \
+${PKGDIR}/packages/man/*.bb \
+${PKGDIR}/packages/masqmail/*.bb \
+${PKGDIR}/packages/mdadm/*.bb \
+${PKGDIR}/packages/memtester/*.bb \
+${PKGDIR}/packages/meta/*.bb \
+${PKGDIR}/packages/mgetty/*.bb \
+${PKGDIR}/packages/miau/*.bb \
+${PKGDIR}/packages/microcom/*.bb \
+${PKGDIR}/packages/minicom/*.bb \
+${PKGDIR}/packages/module-init-tools/*.bb \
+${PKGDIR}/packages/modutils/*.bb \
+${PKGDIR}/packages/monotone/*.bb \
+${PKGDIR}/packages/motion/*.bb \
+${PKGDIR}/packages/mt-daapd/*.bb \
+${PKGDIR}/packages/mtd/*.bb \
+${PKGDIR}/packages/musicpd/*.bb \
+${PKGDIR}/packages/mutt/*.bb \
+${PKGDIR}/packages/mysql/*.bb \
+${PKGDIR}/packages/nail/*.bb \
+${PKGDIR}/packages/nano/*.bb \
+${PKGDIR}/packages/ncftp/*.bb \
+${PKGDIR}/packages/ncurses/*.bb \
+${PKGDIR}/packages/neon/*.bb \
+${PKGDIR}/packages/netbase/*.bb \
+${PKGDIR}/packages/netcat/*.bb \
+${PKGDIR}/packages/netpbm/*.bb \
+${PKGDIR}/packages/nfs-utils/*.bb \
+${PKGDIR}/packages/nis/*.bb \
+${PKGDIR}/packages/nmap/*.bb \
+${PKGDIR}/packages/nslu2-binary-only/*.bb \
+${PKGDIR}/packages/ntp/*.bb \
+${PKGDIR}/packages/obexftp/*.bb \
+${PKGDIR}/packages/openjade/*.bb \
+${PKGDIR}/packages/openldap/*.bb \
+${PKGDIR}/packages/openntpd/*.bb \
+${PKGDIR}/packages/openobex/*.bb \
+${PKGDIR}/packages/opensp/*.bb \
+${PKGDIR}/packages/openssh/*.bb \
+${PKGDIR}/packages/openssl/*.bb \
+${PKGDIR}/packages/openvpn/*.bb \
+${PKGDIR}/packages/pam/*.bb \
+${PKGDIR}/packages/patch/*.bb \
+${PKGDIR}/packages/patcher/*.bb \
+${PKGDIR}/packages/patchutils/*.bb \
+${PKGDIR}/packages/pciutils/*.bb \
+${PKGDIR}/packages/pcmcia-cs/*.bb \
+${PKGDIR}/packages/pcre/*.bb \
+${PKGDIR}/packages/perl/*.bb \
+${PKGDIR}/packages/php/*.bb \
+${PKGDIR}/packages/pkgconfig/*.bb \
+${PKGDIR}/packages/popt/*.bb \
+${PKGDIR}/packages/portmap/*.bb \
+${PKGDIR}/packages/postfix/*.bb \
+${PKGDIR}/packages/ppp/*.bb \
+${PKGDIR}/packages/procps/*.bb \
+${PKGDIR}/packages/psmisc/*.bb \
+${PKGDIR}/packages/puppy/*.bb \
+${PKGDIR}/packages/pvrusb2-mci/*.bb \
+${PKGDIR}/packages/pwc/*.bb \
+${PKGDIR}/packages/python/*.bb \
+${PKGDIR}/packages/qc-usb/*.bb \
+${PKGDIR}/packages/quilt/*.bb \
+${PKGDIR}/packages/radlib/*.bb \
+${PKGDIR}/packages/readline/*.bb \
+${PKGDIR}/packages/reiser4progs/*.bb \
+${PKGDIR}/packages/reiserfsprogs/*.bb \
+${PKGDIR}/packages/rsync/*.bb \
+${PKGDIR}/packages/samba/*.bb \
+${PKGDIR}/packages/sane-backends/*.bb \
+${PKGDIR}/packages/screen/*.bb \
+${PKGDIR}/packages/sed/*.bb \
+${PKGDIR}/packages/setpwc/*.bb \
+${PKGDIR}/packages/setserial/*.bb \
+${PKGDIR}/packages/sgml-common/*.bb \
+${PKGDIR}/packages/slugimage/*.bb \
+${PKGDIR}/packages/slugos-init/*.bb \
+${PKGDIR}/packages/spca5xx/*.bb \
+${PKGDIR}/packages/ssmtp/*.bb \
+${PKGDIR}/packages/strace/*.bb \
+${PKGDIR}/packages/streamripper/*.bb \
+${PKGDIR}/packages/subversion/*.bb \
+${PKGDIR}/packages/sudo/*.bb \
+${PKGDIR}/packages/sysfsutils/*.bb \
+${PKGDIR}/packages/syslog-ng/*.bb \
+${PKGDIR}/packages/sysvinit/*.bb \
+${PKGDIR}/packages/tar/*.bb \
+${PKGDIR}/packages/tcltk/*.bb \
+${PKGDIR}/packages/thttpd/*.bb \
+${PKGDIR}/packages/time/*.bb \
+${PKGDIR}/packages/timezones/*.bb \
+${PKGDIR}/packages/tinylogin/*.bb \
+${PKGDIR}/packages/uclibc/*.bb \
+${PKGDIR}/packages/udev/*.bb \
+${PKGDIR}/packages/unionfs/*.bb \
+${PKGDIR}/packages/unzip/*.bb \
+${PKGDIR}/packages/update-modules/*.bb \
+${PKGDIR}/packages/update-rc.d/*.bb \
+${PKGDIR}/packages/upslug/*.bb \
+${PKGDIR}/packages/usbutils/*.bb \
+${PKGDIR}/packages/util-linux/*.bb \
+${PKGDIR}/packages/vim/*.bb \
+${PKGDIR}/packages/vlan/*.bb \
+${PKGDIR}/packages/vpnc/*.bb \
+${PKGDIR}/packages/vsftpd/*.bb \
+${PKGDIR}/packages/w3cam/*.bb \
+${PKGDIR}/packages/wakelan/*.bb \
+${PKGDIR}/packages/wget/*.bb \
+${PKGDIR}/packages/whois/*.bb \
+${PKGDIR}/packages/wireless-tools/*.bb \
+${PKGDIR}/packages/wpa-supplicant/*.bb \
+${PKGDIR}/packages/wview/*.bb \
+${PKGDIR}/packages/xlibs/*.bb \
+${PKGDIR}/packages/xextensions/*.bb \
+${PKGDIR}/packages/xinetd/*.bb \
+${PKGDIR}/packages/xproto/*.bb \
+${PKGDIR}/packages/zd1211/*.bb \
+${PKGDIR}/packages/zip/*.bb \
+${PKGDIR}/packages/zlib/*.bb \
+${SLUGOS_EXTRA_BBFILES}"
diff --git a/conf/distro/include/slugos.conf b/conf/distro/include/slugos.conf
new file mode 100644
index 0000000000..c2b169106f
--- /dev/null
+++ b/conf/distro/include/slugos.conf
@@ -0,0 +1,195 @@
+#@TYPE: Distribution
+#@NAME: SlugOS
+#@DESCRIPTION: SlugOS Linux Distribution for the NSLU2
+
+# WARNING: this file should not be used directly, use one of
+# the supported slugos-???.conf instead:
+
+# Explanation of the naming
+#
+# slugos-dist - the base distro configuration for an NSLU2
+# slugos-[bl][at][gu] - a specific configuration encoded as follows:
+#
+#  b or l - big or little endian
+#         set ARCH_BYTE_SEX to match
+#
+#  a or t - ARM or Thumb instructions in the low level libraries
+#         set ARM_INSTRUCTION_SET to match
+#
+#  g or u - glibc or uclibc libc implementation
+#         set TARGET_OS to match
+#
+# The following names are deprecated:
+#
+# openslug - the historical name of a canonical slugos-bag distro
+#            also the name of a standard slugos-bag distro with a package feed
+# ucslugc  - the historical (and obsolete) name of slugos-btu
+#            also the name of a standard slugos-btu distro with a package feed
+#
+
+#----------------------------------------------------------------------------------
+# STANDARD SLUGOS DEFINITIONS
+#----------------------------------------------------------------------------------
+# The following must be set in the top level distro file:
+#
+#DISTRO_NAME
+#DISTRO_TYPE
+
+# The following may be overridden to make sub-versions
+SLUGOS_VERSION = "4.0"
+DISTRO_REVISION ?= ""
+DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
+# For release (only):
+# DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}"
+DISTRO_FEED ?= "unstable"
+
+# The following must also be set, they define the basic format of the build
+#
+#ARCH_BYTE_SEX "be" or "le"
+#ARM_INSTRUCTION_SET "arm" or "thumb"
+#TARGET_OS "linux" or "linux-uclibc"
+#SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format)
+
+# The following need not be set, the defaults should be adequate
+#USE_NLS = "no" or "yes"
+USE_NLS ?= "no"
+
+# To make errors easier to identify:
+DISTRO_NAME ?= "INVALID-${ARCH_BYTE_SEX}-${ARM_INSTRUCTION_SET}-${TARGET_OS}"
+DISTRO_TYPE ?= "INVALID"
+
+# The following must not be changed.
+TARGET_FPU = "soft"
+
+# glib-2.0 builds require USE_NLS to be overridden
+USE_NLS_glib-2.0 = "yes"
+
+INHERIT += "package_ipk debian"
+
+DISTRO_BASE = ":slugos"
+
+# packages/meta/slugos-image.bb generates a binary image of the root file system
+# with a name controlled by the following setting - it defaults to the top level
+# ${DISTRO_NAME} and this should always be correct, but it may be too specific (e.g.
+# if you change the DISTRO from one of the standard ones in a way which does not
+# change the generated image).
+SLUGOS_IMAGENAME ?= "${DISTRO_NAME}"
+
+# pull in the frozen list of bbfiles - this sets BBFILES and this will override any
+# setting in local.conf  Since this depends on ${DISTRO} it doesn't actually do
+# anything by default unless conf/distro/${DISTRO}-packages.conf exists.
+# require conf/distro/include/freeze.conf
+
+#----------------------------------------------------------------------------------
+# FEEDS
+#  The FEED_URIS lines define where on the internet SlugOS looks for packages
+#  when downloading new packages or updating existing packages.  Additional feeds
+#  (such as a local feed) can be defined in local.conf
+#----------------------------------------------------------------------------------
+# Add to the user's feeds from local.conf (there may be none).
+# In general slugos-[bl][at][gu] is sufficient to identify a set of packages which
+# will work on any derived distro.  The slugos-???.conf files set the FEED_URIS to
+# an appropriate ipkg.nslu2-linux.org default if nslu2-linux is actually building
+# such a feed:
+#
+#FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/${DISTRO_FEED}"
+#FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/${DISTRO_FEED}"
+#
+# When such a feed exists the corresponding 'unstable' feed will normally also
+# exist - the packages in unstable are the latest but very unlikely to be the
+# greatest.  Use at your own risk!
+# 
+#FEED_URIS_append += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/unstable"
+#FEED_URIS_append += "unstable_native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/unstable"
+
+#----------------------------------------------------------------------------------
+# FIRMWARE CONFIGURATION
+#----------------------------------------------------------------------------------
+# IMAGE BUILD OPTIONS
+# -------------------
+# CMDLINE* macros define the kernel command line.  CMDLINE_DEBUG is provided
+# to enable/disable debugging in the distro.  Here noirqdebug is used to
+# remove the messages about unhandled interrupts - people debugging interrupt
+# issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
+CMDLINE_DEBUG = "noirqdebug"
+
+# Building a full image.  If you set SLUGOS_FLASH_IMAGE to "yes" a complete
+# 8MByte flash image will be built after the rootfs JFFS2 image.
+#
+# If you do this you will need to find a source for the LinkSys software to be
+# placed in the full image - 'RedBoot' (the boot loader), 'Trailer' (just a bunch
+# of bytes to flag the image as valid) and 'SysConf' (actually just a block of
+# unset data - you could modify this to pre-configure the SysConf partition of the
+# image).  If you own an NSLU2 then this data is already in the flash of the NSLU2
+# and you can download it (including new versions) from the LinkSys web site - see
+# packages/meta/slugos-image.bb for information about where to put the downloaded
+# data.
+SLUGOS_FLASH_IMAGE ?= "no"
+
+# EXTRA PACKAGES
+# --------------
+# SlugOS builds an image with no extra packages - to add packages to the
+# firmware include this file in a new 'distro' configuration file) and set
+# the definition below to include the requirements.
+# NOTE: as built this system will *not* be able to boot off anything other than
+# the flash file system ('turnup' will not work).  You need to add the filesystem
+# modules for your chosen root file system (and any others which will be used).
+# See openslug.conf for a more full-featured system!
+#
+# Everything in this list gets added to the flash image, along with any RDEPENDS
+# it has itself!
+SLUGOS_EXTRA_RDEPENDS ?= ""
+
+#----------------------------------------------------------------------------------
+# PACKAGE VERSION CONTROL
+#----------------------------------------------------------------------------------
+# Define how to bootstrap the system - we need cross compilers.  It is also
+# necessary to define which gets generated first, glibc or the kernel, and
+# this is done by selecting the provider of libc (in this case it needs the
+# kernel, so there has to be a non-libc gcc to build the kernel!)
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
+# Select 2.6 versions of the depmod support
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
+
+# compiler/binary/library versions (unslung uses different ones so these
+# cannot be in ${MACHINE}.conf)
+PREFERRED_VERSION_binutils ?= "2.16"
+PREFERRED_VERSION_binutils-cross ?= "2.16"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross ?= "4.1.1"
+PREFERRED_VERSION_gcc ?= "4.1.1"
+PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
+#For SVN uclibc:
+#SRCDATE_uclibc ?= "20060120"
+#PREFERRED_VERSION_uclibc ?= "0.9.28+svn${SRCDATE_uclibc}"
+
+# Select the correct versions of the kernel and modules (these are the
+# defaults, override in the conf/distro top-level distro file).
+PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.17"
+
+# Built-in ethernet modules
+PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth"
+PREFERRED_VERSION_ixp4xx-csr ?= "2.1"
+PREFERRED_VERSION_ixp-osal ?= "2.1"
+PREFERRED_VERSION_ixp400-eth ?= "1.5"
+
+# Select the smallest provider of x11 libraries
+PREFERRED_PROVIDER_libx11 ?= "diet-x11"
+SRCDATE_diet-x11 ?= "20060106"
+
+# Latest wpa-supplicant which supports madwifi-ng
+PREFERRED_VERSION_wpa-supplicant ?= "0.5.1"
+
+# Ensure consistency across all SlugOS builds for the provider of a
+# relational database - use the latest version of the SleepyCat
+# Berkeley database
+PREFERRED_PROVIDER_virtual/db = "db"
+PREFERRED_PROVIDER_virtual/db-native = "db-native"
+
+#FIXME: HACK: REMOVE THIS
+IGNORE_STRIP_ERRORS = ""
diff --git a/conf/distro/include/ucslugc-packages.conf b/conf/distro/include/ucslugc-packages.conf
new file mode 100644
index 0000000000..3b3e9fca75
--- /dev/null
+++ b/conf/distro/include/ucslugc-packages.conf
@@ -0,0 +1,2 @@
+SLUGOS_EXTRA_BBFILES = "${UCSLUGC_EXTRA_BBFILES}"
+require conf/distro/include/slugos-packages.conf
diff --git a/conf/distro/include/unslung-packages.conf b/conf/distro/include/unslung-packages.conf
new file mode 100644
index 0000000000..e889a65df5
--- /dev/null
+++ b/conf/distro/include/unslung-packages.conf
@@ -0,0 +1,41 @@
+BBFILES := "\
+${PKGDIR}/packages/autoconf/*.bb \
+${PKGDIR}/packages/automake/*.bb \
+${PKGDIR}/packages/binutils/*.bb \
+${PKGDIR}/packages/bison/*.bb \
+${PKGDIR}/packages/busybox/*.bb \
+${PKGDIR}/packages/cpio/*.bb \
+${PKGDIR}/packages/devio/*.bb \
+${PKGDIR}/packages/fakeroot/*.bb \
+${PKGDIR}/packages/file/*.bb \
+${PKGDIR}/packages/findutils/*.bb \
+${PKGDIR}/packages/flex/*.bb \
+${PKGDIR}/packages/freeze/*.bb \
+${PKGDIR}/packages/gcc/*.bb \
+${PKGDIR}/packages/genext2fs/*.bb \
+${PKGDIR}/packages/gettext/*.bb \
+${PKGDIR}/packages/glibc/*.bb \
+${PKGDIR}/packages/gnu-config/*.bb \
+${PKGDIR}/packages/ipkg-utils/*.bb \
+${PKGDIR}/packages/ipkg/*.bb \
+${PKGDIR}/packages/libtool/*.bb \
+${PKGDIR}/packages/linux-libc-headers/*.bb \
+${PKGDIR}/packages/linux/*.bb \
+${PKGDIR}/packages/m4/*.bb \
+${PKGDIR}/packages/makedevs/*.bb \
+${PKGDIR}/packages/meta/*.bb \
+${PKGDIR}/packages/modutils/*.bb \
+${PKGDIR}/packages/mtd/*.bb \
+${PKGDIR}/packages/nslu2-binary-only/*.bb \
+${PKGDIR}/packages/pkgconfig/*.bb \
+${PKGDIR}/packages/portmap/*.bb \
+${PKGDIR}/packages/python/*.bb \
+${PKGDIR}/packages/quilt/*.bb \
+${PKGDIR}/packages/slugimage/*.bb \
+${PKGDIR}/packages/unzip/*.bb \
+${PKGDIR}/packages/update-modules/*.bb \
+${PKGDIR}/packages/wget/*.bb \
+${PKGDIR}/packages/wireless-tools/*.bb \
+${PKGDIR}/packages/zlib/*.bb \
+${PKGDIR}/packages/zd1211/*.bb \
+${UNSLUNG_EXTRA_BBFILES}"