summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/openslug-packages.conf1
-rw-r--r--conf/distro/preferred-gpe-versions-2.7.inc2
-rw-r--r--conf/distro/ucslugc-packages.conf2
-rw-r--r--conf/machine/zaurus-clamshell-2.4.conf30
4 files changed, 22 insertions, 13 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 316a030f8a..6bd6708814 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -184,6 +184,7 @@ ${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/vsftpd/*.bb \
${PKGDIR}/packages/wakelan/*.bb \
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
index 8d3d03f779..3fb62d08a8 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -48,7 +48,7 @@ PREFERRED_VERSION_gpe-contacts ?= "0.41"
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-bluetooth ?= "0.42"
PREFERRED_VERSION_gpe-su ?= "0.18"
PREFERRED_VERSION_gpe-conf ?= "0.1.24"
PREFERRED_VERSION_gpe-clock ?= "0.20"
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index 66bb74577b..5ecc44fb03 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -51,6 +51,7 @@ ${PKGDIR}/packages/gzip/*.bb \
${PKGDIR}/packages/hotplug-ng/*.bb \
${PKGDIR}/packages/initscripts/*.bb \
${PKGDIR}/packages/install/*.bb \
+${PKGDIR}/packages/intltool/*.bb \
${PKGDIR}/packages/ipkg-utils/*.bb \
${PKGDIR}/packages/ipkg/*.bb \
${PKGDIR}/packages/ircp/*.bb \
@@ -62,6 +63,7 @@ ${PKGDIR}/packages/libaal/*.bb \
${PKGDIR}/packages/libao/*.bb \
${PKGDIR}/packages/libexif/*.bb \
${PKGDIR}/packages/libgphoto2/*.bb \
+${PKGDIR}/packages/libgsm/*.bb \
${PKGDIR}/packages/libiconv/*.bb \
${PKGDIR}/packages/libid3tag/*.bb \
${PKGDIR}/packages/libmad/*.bb \
diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf
index 0934d84baa..d61dc197b2 100644
--- a/conf/machine/zaurus-clamshell-2.4.conf
+++ b/conf/machine/zaurus-clamshell-2.4.conf
@@ -1,9 +1,10 @@
# Zaurus Clamshell specific configuration for kernel 2.4
# Don't forget to include zaurus-clamshell.conf as well
-PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix"
-PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x"
-PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x"
+PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix"
+PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x"
+PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x"
+PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x"
# Later versions are broken on kernel 2.4
PREFERRED_VERSION_orinoco-modules = "0.13e"
@@ -29,14 +30,19 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluez kernel-module-l2cap kernel-modu
kernel-module-firmware-class kernel-module-bt3c-cs"
# BI Module
-BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = " kernel-module-pxa-bi"
-BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-pxa27x-bi"
-BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-pxa27x-bi"
+BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = " kernel-module-pxa-bi"
+BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-pxa27x-bi"
+BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-pxa27x-bi"
+BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-pxa27x-bi"
# USB Host Modules
-BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
- kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
- kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
-BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
- kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
- kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
+BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
+ kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
+ kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
+BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
+ kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
+ kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
+BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
+ kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
+ kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
+