summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/maemo-preferred.inc3
-rw-r--r--conf/distro/openslug-native-packages.conf2
-rw-r--r--conf/distro/openslug-packages.conf9
-rw-r--r--conf/distro/preferred-gpe-versions-2.7.inc6
-rw-r--r--conf/distro/ucslugc-packages.conf2
-rw-r--r--conf/machine/borzoi.conf20
-rw-r--r--conf/machine/netvista.conf4
-rw-r--r--conf/machine/zaurus-clamshell-2.4.conf30
-rw-r--r--conf/machine/zaurus-clamshell-2.6.conf8
9 files changed, 63 insertions, 21 deletions
diff --git a/conf/distro/maemo-preferred.inc b/conf/distro/maemo-preferred.inc
index 9c087f3b3c..943f244326 100644
--- a/conf/distro/maemo-preferred.inc
+++ b/conf/distro/maemo-preferred.inc
@@ -4,4 +4,7 @@ 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/openslug-native-packages.conf b/conf/distro/openslug-native-packages.conf
index 2599b71d94..158d7757b6 100644
--- a/conf/distro/openslug-native-packages.conf
+++ b/conf/distro/openslug-native-packages.conf
@@ -6,4 +6,6 @@ ${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_EXTRA_BBFILES}"
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 6c76c86780..6bd6708814 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -1,6 +1,8 @@
BBFILES := "\
+${PKGDIR}/packages/alsa/*.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 \
@@ -56,6 +58,7 @@ ${PKGDIR}/packages/hotplug-ng/*.bb \
${PKGDIR}/packages/icecast/*.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 \
@@ -67,11 +70,14 @@ ${PKGDIR}/packages/ixp425-eth/*.bb \
${PKGDIR}/packages/ixp4xx/*.bb \
${PKGDIR}/packages/jpeg/*.bb \
${PKGDIR}/packages/joe/*.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/libgphoto2/*.bb \
+${PKGDIR}/packages/libgsm/*.bb \
${PKGDIR}/packages/libid3tag/*.bb \
${PKGDIR}/packages/liblockfile/*.bb \
${PKGDIR}/packages/libmad/*.bb \
@@ -147,6 +153,7 @@ ${PKGDIR}/packages/puppy/*.bb \
${PKGDIR}/packages/pwc/*.bb \
${PKGDIR}/packages/python/*.bb \
${PKGDIR}/packages/quilt/*.bb \
+${PKGDIR}/packages/qc-usb/*.bb \
${PKGDIR}/packages/readline/*.bb \
${PKGDIR}/packages/reiser4progs/*.bb \
${PKGDIR}/packages/reiserfsprogs/*.bb \
@@ -157,6 +164,7 @@ ${PKGDIR}/packages/screen/*.bb \
${PKGDIR}/packages/sed/*.bb \
${PKGDIR}/packages/setpwc/*.bb \
${PKGDIR}/packages/slugimage/*.bb \
+${PKGDIR}/packages/spca5xx/*.bb \
${PKGDIR}/packages/ssmtp/*.bb \
${PKGDIR}/packages/strace/*.bb \
${PKGDIR}/packages/streamripper/*.bb \
@@ -176,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 1d512fa292..502e3594fd 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -3,7 +3,7 @@
#
#work around some breakages
-CVSDATE_minimo=20050401
+#CVSDATE_minimo=20050401
#set some preferred providers:
PREFERRED_PROVIDER_gconf=gconf-dbus
@@ -48,9 +48,9 @@ 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-conf ?= "0.1.25"
PREFERRED_VERSION_gpe-clock ?= "0.20"
PREFERRED_VERSION_gpe-mininet ?= "0.5"
PREFERRED_VERSION_gpe-mixer ?= "0.42"
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/borzoi.conf b/conf/machine/borzoi.conf
new file mode 100644
index 0000000000..0950a5a008
--- /dev/null
+++ b/conf/machine/borzoi.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C3100
+#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3100 device
+
+KERNEL_VERSION ?= "2.4"
+
+include conf/machine/zaurus-clamshell.conf
+include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+
+PIVOTBOOT_EXTRA_DEPENDS += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RRECOMMENDS += ""
+
+# Useful things for the built-in Harddisk
+BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs"
+BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
+
+IMAGE_FSTYPES = "jffs2 tar"
+
+ROOT_FLASH_SIZE = "32"
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index fc61ba4f6a..30223a485d 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -17,8 +17,8 @@ TARGET_VENDOR = "-oe"
PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista"
IMAGE_FSTYPE = "ext2"
GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser"
-GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser"
+GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser abiword"
+GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword"
#BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace"
#BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace
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"
+
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf
index 9b0ef708fa..b3e0a50bc6 100644
--- a/conf/machine/zaurus-clamshell-2.6.conf
+++ b/conf/machine/zaurus-clamshell-2.6.conf
@@ -27,10 +27,10 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-
kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
# Infrared Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \
- kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm
+# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
# USB Gadget Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
- kernel-module-g-serial kernel-module-g-ether"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
+# kernel-module-g-serial kernel-module-g-ether"