merge of 78224668a76c9e5a8eb51b5e4683dac08c86d491

     and 9fb367cc630cde7d5a99ef88ca4205d54aeb4dd9

5 files changed, 169 insertions, 1 deletions

diff --git a/packages/gtk+/gtk+_2.8.9.bb b/packages/gtk+/gtk+_2.8.9.bb
index 3cdb610538..cd2e331dfd 100644
--- a/packages/gtk+/gtk+_2.8.9.bb
+++ b/packages/gtk+/gtk+_2.8.9.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \
@@ -35,6 +35,8 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
 
 RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1"
+RRECOMMENDS_${PN}_append_angstrom = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
+RRECOMMENDS_${PN}_append_openzaurus = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
 
 EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 # --disable-cruft
diff --git a/packages/meta/essential-image.bb b/packages/meta/essential-image.bb
new file mode 100644
index 0000000000..53510ddc09
--- /dev/null
+++ b/packages/meta/essential-image.bb
@@ -0,0 +1,29 @@
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: essential-image.bb
+# Date: 23-Apr-06
+
+DESCRIPTION = "<description>"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
+HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+
+######################################################################################
+
+PV = "0.0.1"
+PR = "r0"
+
+######################################################################################
+
+inherit image_ipk
+
+######################################################################################
+
+DEPENDS = "task-essential-to-boot"
+
+######################################################################################
+
+export IMAGE_BASENAME = "essential-image"
+export IMAGE_LINGUAS = ""
+export IPKG_INSTALL = "task-essential-to-boot"
diff --git a/packages/meta/essential-machine-image.bb b/packages/meta/essential-machine-image.bb
new file mode 100644
index 0000000000..c3c7b33b92
--- /dev/null
+++ b/packages/meta/essential-machine-image.bb
@@ -0,0 +1,37 @@
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: essential-machine-image.bb
+# Date: 24-Apr-06
+
+DESCRIPTION = "<description>"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
+HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+
+######################################################################################
+
+PV = "0.0.1"
+PR = "r0"
+
+######################################################################################
+
+inherit image_ipk
+
+######################################################################################
+
+DEPENDS = "task-essential-to-boot task-essential-parts"
+
+######################################################################################
+
+MACHINE_TASKS_akita = "task-essential-to-boot \
+		       task-essential-pcmcia task-essential-userspace \
+		       task-essential-usbhost task-essential-usbclient \
+		       task-essential-sound task-essential-irda \
+		       task-essential-sd"
+		       
+######################################################################################
+
+export IMAGE_BASENAME = "essential-image"
+export IMAGE_LINGUAS = ""
+export IPKG_INSTALL = "${MACHINE_TASKS}"
diff --git a/packages/meta/task-essential-parts.bb b/packages/meta/task-essential-parts.bb
new file mode 100644
index 0000000000..49183170c4
--- /dev/null
+++ b/packages/meta/task-essential-parts.bb
@@ -0,0 +1,64 @@
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: task-essential-parts.bb
+# Date: 23-Apr-06
+
+DESCRIPTION = "Creates all task-essential-* tasks"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
+HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+
+######################################################################################
+
+PV = "0.0.1"
+PR = "r1"
+
+######################################################################################
+
+PACKAGE_ARCH = "${MACHINE}"
+ALLOW_EMPTY = 1
+
+PACKAGES = "task-essential-irda task-essential-bluetooth task-essential-bluetooth-all \
+	    task-essential-sound task-essential-sd task-essential-wifi task-essential-wifi-all \
+	    task-essential-usbclient task-essential-usbhost task-essential-pcmcia \
+	    task-essential-userspace task-essential-serial"
+
+######################################################################################
+
+DISTRO_PCMCIA ?= ""
+
+DISTRO_SERIAL ?= ""
+DISTRO_IRDA ?= ""
+DISTRO_BLUETOOTH ?= ""
+DISTRO_SOUND ?= ""
+DISTRO_WIFI ?= "hostap-utils prism3-firmware prism3-support spectrum-fw hostap-conf orinoco-conf \
+		wireless-tools wpa-supplicant-nossl"
+
+DISTRO_USBCLIENT ?= ""
+DISTRO_USBHOST ?= ""
+
+DISTRO_SD ?= ""
+
+DISTRO_USERSPACE ?= "ipkg keymaps"
+
+DISTRO_DEPENDS ?= "hostap-utils prism3-firmware prism3-support spectrum-fw hostap-conf orinoco-conf \
+		   ipkg keymaps altboot wireless-tools wpa-supplicant-nossl"
+
+######################################################################################
+
+RDEPENDS_task-essential-serial = "${KMODULES_SERIAL} ${MACHINE_MODUTILS} ${MACHINE_SERIAL} ${DISTRO_SERIAL}"
+RDEPENDS_task-essential-irda = "task-essential-serial ${KMODULES_IRDA} ${MACHINE_MODUTILS} ${MACHINE_IRDA} ${DISTRO_IRDA}"
+RDEPENDS_task-essential-bluetooth = "${KMODULES_BLUETOOTH} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_BLUETOOTH} "
+RDEPENDS_task-essential-bluetooth-all = "task-essential-bluetooth ${KMODULES_BLUETOOTH_DRIVER} ${DISTRO_BLUETOOTH}"
+RDEPENDS_task-essential-pcmcia = "${KMODULES_PCMCIA} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_PCMCIA} ${DISTRO_PCMCIA}"
+RDEPENDS_task-essential-sound = "${KMODULES_SOUND} ${MACHINE_MODUTILS} ${MACHINE_SOUND} ${DISTRO_SOUND}"
+RDEPENDS_task-essential-sd = "${KMODULES_SD} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_SD} ${DISTRO_SD}"
+RDEPENDS_task-essential-wifi = "${KMODULES_WIFI} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_WIFI}"
+RDEPENDS_task-essential-wifi-all = "task-essential-wifi ${KMODULES_WIFI_DRIVER} ${DISTRO_WIFI}"
+RDEPENDS_task-essential-usbclient = "${KMODULES_USBCLIENT} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_USBCLIENT} ${DISTRO_USBCLIENT}"
+RDEPENDS_task-essential-usbhost = "${KMODULES_USBHOST} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_USBHOST} ${DISTRO_USBHOST}"
+RDEPENDS_task-essential-userspace = "${DISTRO_USERSPACE}"
+
+
+DEPENDS = "${MACHINE_DEPENDS} ${DISTRO_DEPENDS}"
diff --git a/packages/meta/task-essential-to-boot.bb b/packages/meta/task-essential-to-boot.bb
new file mode 100644
index 0000000000..8bcd182b58
--- /dev/null
+++ b/packages/meta/task-essential-to-boot.bb
@@ -0,0 +1,36 @@
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: task-essential-to-boot.bb
+# Date: 23-Apr-06
+
+DESCRIPTION = "This task includes everything to make a bootable image. And not a bit more."
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
+HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+
+######################################################################################
+
+ALLOW_EMPTY = 1
+PACKAGES = "${PN}"
+
+######################################################################################
+
+PV = "0.0.1"
+PR = "r0"
+
+######################################################################################
+
+CORE_EXTRA_D ?= ""
+CORE_EXTRA_RD ?= ""
+
+CORE_PACKAGES_D = "virtual/kernel base-files base-passwd-3.5.9 busybox initscripts \
+		   sysvinit tinylogin ${CORE_EXTRA_D}"
+
+CORE_PACKAGES_RD = "kernel base-files base-passwd busybox initscripts sysvinit \
+		    tinylogin ${CORE_EXTRA_RD}"
+
+######################################################################################		    
+		    
+DEPENDS = "${CORE_PACKAGES_D}"
+RDEPENDS = "${CORE_PACKAGES_RD}"