From 0b456cd1ef653bec940af540829e379cebda967b Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 20 Mar 2007 14:13:24 +0000
Subject: site/ix86-common: Add enca bits

---
 site/ix86-common | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/site/ix86-common b/site/ix86-common
index 496c2e3403..96a36cf9c8 100644
--- a/site/ix86-common
+++ b/site/ix86-common
@@ -107,6 +107,9 @@ ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
 dpkg_cv_va_copy=${ac_cv_va_copy=no}
 dpkg_cv___va_copy=${ac_cv___va_copy=yes}
 
+# enca
+yeti_cv_func_scanf_modif_size_t=yes
+
 # ettercap
 ettercap_cv_type_socklen_t=${ettercap_cv_type_socklen_t=yes}
 
-- 
cgit v1.2.3


From 641c1e3a046058117d109e26f4a9a290ce5165c1 Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 20 Mar 2007 15:06:37 +0000
Subject: gpephone: Update some library descriptions.

---
 packages/gpephone/libabenabler_0.1.bb  | 2 +-
 packages/gpephone/libcalenabler_1.0.bb | 2 +-
 packages/gpephone/libim_0.2.bb         | 2 +-
 packages/gpephone/libmsgenabler_1.0.bb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/gpephone/libabenabler_0.1.bb b/packages/gpephone/libabenabler_0.1.bb
index 7a8efb8382..c76d8f469b 100644
--- a/packages/gpephone/libabenabler_0.1.bb
+++ b/packages/gpephone/libabenabler_0.1.bb
@@ -1,5 +1,5 @@
 LICENSE     = "LGPL"
-DESCRIPTION = "LiPS event model library."
+DESCRIPTION = "LiPS address book library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 librecord liblipsevent libim sqlite3"
diff --git a/packages/gpephone/libcalenabler_1.0.bb b/packages/gpephone/libcalenabler_1.0.bb
index f4be78092e..c23e1b42a5 100644
--- a/packages/gpephone/libcalenabler_1.0.bb
+++ b/packages/gpephone/libcalenabler_1.0.bb
@@ -1,5 +1,5 @@
 LICENSE     = "LiPS"
-DESCRIPTION = "LiPS event model library."
+DESCRIPTION = "LiPS calendar database backend library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 e2fsprogs-libs sqlite3"
diff --git a/packages/gpephone/libim_0.2.bb b/packages/gpephone/libim_0.2.bb
index 4d59957d79..a802aface5 100644
--- a/packages/gpephone/libim_0.2.bb
+++ b/packages/gpephone/libim_0.2.bb
@@ -1,5 +1,5 @@
 LICENSE     = "LGPL"
-DESCRIPTION = "LiPS event model library."
+DESCRIPTION = "LiPS instant messenger library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 libgpg-error libgcrypt gnutls libidn iksemel gloox dbus-glib liblipsevent"
diff --git a/packages/gpephone/libmsgenabler_1.0.bb b/packages/gpephone/libmsgenabler_1.0.bb
index 385501c959..0522507db0 100644
--- a/packages/gpephone/libmsgenabler_1.0.bb
+++ b/packages/gpephone/libmsgenabler_1.0.bb
@@ -1,5 +1,5 @@
 LICENSE     = "LiPS"
-DESCRIPTION = "LiPS event model library."
+DESCRIPTION = "LiPS message backend library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 dbus-glib librecord sqlite3"
-- 
cgit v1.2.3


From bdbeafd6707c45f347b98c43c91236c48fc2d8c8 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 20 Mar 2007 19:39:12 +0000
Subject: foonas: Update config, moving more stuff away from foonas-image.bb

---
 conf/distro/foonas.conf | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index b43090202d..d21e5cfe6f 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -1,3 +1,4 @@
+
 #
 # FooNAS distribution - a NAS-centric distribution
 # based on openprotium
@@ -20,6 +21,12 @@ FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage"
 FOONAS_SUPPORT_n2100 += "fis"
 BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm"
 
+IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;"
+IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;"
+IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"
+FOONAS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}"
+
+
 # Various defines for QNAP Turbostation
 FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \
 				kernel-module-usb-storage"
@@ -36,6 +43,8 @@ FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd}
 IMAGE_FSTYPES_lsppchd = "tar.gz"
 IMAGE_FSTYPES_lsppchg = ${IMAGE_FSTYPES_lsppchd}
 
+IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;'
+
 #
 # Naming schemes
 #
-- 
cgit v1.2.3


From 5159493694eb43b75253759374604e9f1ed8f898 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 20 Mar 2007 19:40:28 +0000
Subject: turbostation,n2100: Update machine definitions

---
 conf/machine/n2100.conf        | 3 ++-
 conf/machine/turbostation.conf | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
index 6aee9f1b71..fe1f396254 100644
--- a/conf/machine/n2100.conf
+++ b/conf/machine/n2100.conf
@@ -7,9 +7,10 @@ SERIAL_CONSOLE="115200 console"
 USE_VT="0"
 
 MODUTILS=26
-MACHINE_FEATURES= "kernel26 usbhost"
+MACHINE_FEATURES= "kernel26 usbhost pci ext2"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.20"
+MACHINE_TASK_PROVIDER = "task-base"
 
 # We want udev support in the image
 udevdir = "/dev"
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index a3856dbaf1..ef09fa72cd 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -9,8 +9,9 @@ SERIAL_CONSOLE="115200 console"
 USE_VT="0"
 
 MODUTILS=26
-MACHINE_FEATURES= "kernel26 usbhost"
+MACHINE_FEATURES= "kernel26 usbhost pci ext2"
 PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation"
+MACHINE_TASK_PROVIDER = "task-base"
 
 # We want udev support in the image
 udevdir = "/dev"
-- 
cgit v1.2.3


From bbc4eb7e941b003801d564b9a6cd959f29181d03 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 20 Mar 2007 19:41:48 +0000
Subject: n2100, turbostation, linkstation: Move more stuff away from
 foonas-image to machine configs

---
 conf/machine/lsppchd.conf      | 1 +
 conf/machine/lsppchg.conf      | 1 +
 conf/machine/n2100.conf        | 7 +++++++
 conf/machine/turbostation.conf | 4 ++++
 4 files changed, 13 insertions(+)

diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf
index 52d58ded5b..51d0186dbe 100644
--- a/conf/machine/lsppchd.conf
+++ b/conf/machine/lsppchd.conf
@@ -3,5 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD
 
 UBOOT_MACHINE = "linkstation_HDLAN"
+IMAGE_FSTYPES = "tar.gz"
 
 require conf/machine/include/linkstationppc.conf
diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf
index b7ceb6fc95..516a3aaa98 100644
--- a/conf/machine/lsppchg.conf
+++ b/conf/machine/lsppchg.conf
@@ -3,5 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG
 
 UBOOT_MACHINE = "linkstation_HGLAN"
+IMAGE_FSTYPES = "tar.gz"
 
 require conf/machine/include/linkstationppc.conf
diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
index fe1f396254..c84bf352da 100644
--- a/conf/machine/n2100.conf
+++ b/conf/machine/n2100.conf
@@ -15,4 +15,11 @@ MACHINE_TASK_PROVIDER = "task-base"
 # We want udev support in the image
 udevdir = "/dev"
 
+ERASEBLOCK_SIZE = "0x20000"
+IMAGE_FSTYPES = "jffs2"
+EXTRA_IMAGECMD = "--little-endian"
+# Creating an image that works with the webinterface required encrypting it
+# So we'll need openssl
+EXTRA_IMAGEDEPENDS = "openssl-native"
+
 require conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index ef09fa72cd..ffa44207cd 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -16,4 +16,8 @@ MACHINE_TASK_PROVIDER = "task-base"
 # We want udev support in the image
 udevdir = "/dev"
 
+EXTRA_IMAGECMD = "--big-endian"
+ERASEBLOCK_SIZE = "0x20000"
+IMAGE_FSTYPES = "jffs2"
+
 require conf/machine/include/tune-ppc603e.conf
-- 
cgit v1.2.3


From a36eda03cab7dcd78872e03077dddca2aac3499c Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 20 Mar 2007 19:42:53 +0000
Subject: n2100, turbostation, linkstation: Move machine-stuff out of classes

---
 classes/lsppchd-image.bbclass      | 4 +++-
 classes/lsppchg-image.bbclass      | 4 +++-
 classes/n2100-image.bbclass        | 6 ------
 classes/turbostation-image.bbclass | 5 -----
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/classes/lsppchd-image.bbclass b/classes/lsppchd-image.bbclass
index da280551d4..6aab20127a 100644
--- a/classes/lsppchd-image.bbclass
+++ b/classes/lsppchd-image.bbclass
@@ -1 +1,3 @@
-IMAGE_POSTPROCESS_COMMAND += ""
+lsppchd_pack_image() {
+:
+}
\ No newline at end of file
diff --git a/classes/lsppchg-image.bbclass b/classes/lsppchg-image.bbclass
index da280551d4..5d9da87c7d 100644
--- a/classes/lsppchg-image.bbclass
+++ b/classes/lsppchg-image.bbclass
@@ -1 +1,3 @@
-IMAGE_POSTPROCESS_COMMAND += ""
+lsppchg_pack_image() {
+:
+}
\ No newline at end of file
diff --git a/classes/n2100-image.bbclass b/classes/n2100-image.bbclass
index 811b1d37b7..519be213d5 100644
--- a/classes/n2100-image.bbclass
+++ b/classes/n2100-image.bbclass
@@ -1,9 +1,3 @@
-DEPENDS += "openssl-native"
-EXTRA_IMAGECMD = "--little-endian"
-ERASEBLOCK_SIZE = "0x20000"
-IMAGE_FSTYPES = "jffs2"
-IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;'
-
 n2100_pack_image() {
         # find latest kernel
         KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/zImage* | tail -1`
diff --git a/classes/turbostation-image.bbclass b/classes/turbostation-image.bbclass
index d82e3996d5..e61ffc825b 100644
--- a/classes/turbostation-image.bbclass
+++ b/classes/turbostation-image.bbclass
@@ -1,8 +1,3 @@
-EXTRA_IMAGECMD = "--big-endian"
-ERASEBLOCK_SIZE = "0x20000"
-IMAGE_FSTYPES = "jffs2"
-IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;'
-
 turbostation_pack_image() {
         # find latest kernel
         KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1`
-- 
cgit v1.2.3


From ddf7b46c66b130f5cd3ed15709183c0fe5f8188a Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 20 Mar 2007 19:44:01 +0000
Subject: foonas-image: Move preprocessing away

---
 packages/images/foonas-image.bb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb
index db5ff198fc..8dc2370b5e 100644
--- a/packages/images/foonas-image.bb
+++ b/packages/images/foonas-image.bb
@@ -2,15 +2,11 @@ DESCRIPTION = "Foonas image"
 LICENSE = "GPL"
 PR = "r0"
 
-inherit image
+inherit image n2100-image turbostation-image lsppchg-image lsppchd-image storcenter-image
 
 DEPENDS = "${MACHINE_TASK_PROVIDER} makedevs-native mtd-utils-native"
 
-IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;"
-IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;"
-IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"
-FOONAS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}"
-EXTRA_IMAGECMD_jffs2 += " --eraseblock=${ERASEBLOCK_SIZE} -D ${FOONAS_DEVICE_TABLE}"
+EXTRA_IMAGECMD_jffs2 += " --pad --eraseblock=${ERASEBLOCK_SIZE} -D ${FOONAS_DEVICE_TABLE}"
 IMAGE_LINGUAS = ""
 
 RDEPENDS = " \
@@ -20,11 +16,10 @@ RDEPENDS = " \
 	module-init-tools-depmod modutils-initscripts \
         ipkg-collateral ipkg ipkg-link \
 	libgcc1 diffutils cpio findutils\
-	portmap dropbear e2fsprogs-blkid \
+	dropbear e2fsprogs-blkid \
 	mdadm hdparm mtd-utils udev \
 	${FOONAS_SUPPORT} \
 	${FOONAS_KERNEL} "
 
 PACKAGE_INSTALL = "${RDEPENDS}"
 
-inherit n2100-image turbostation-image lsppchg-image lsppchd-image
\ No newline at end of file
-- 
cgit v1.2.3


From 47dd1d922104b464b93bdda8f646b94b82908e9d Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Tue, 20 Mar 2007 21:06:34 +0000
Subject: angstrom-e: add e-image and tasks for angstrom

---
 packages/angstrom/angstrom-e-image.bb | 37 +++++++++++++++++++++++++++++++++++
 packages/angstrom/task-angstrom-e.bb  | 27 +++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 packages/angstrom/angstrom-e-image.bb
 create mode 100644 packages/angstrom/task-angstrom-e.bb

diff --git a/packages/angstrom/angstrom-e-image.bb b/packages/angstrom/angstrom-e-image.bb
new file mode 100644
index 0000000000..da40f7e00c
--- /dev/null
+++ b/packages/angstrom/angstrom-e-image.bb
@@ -0,0 +1,37 @@
+#Angstrom e image
+LICENSE = "MIT"
+PR = "r0"
+
+
+PREFERRED_PROVIDER_virtual/evas   ?= "evas-x11"
+PREFERRED_PROVIDER_virtual/ecore  ?= "ecore-x11"
+PREFERRED_PROVIDER_virtual/imlib2 ?= "imlib2-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+
+PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
+PREFERRED_PROVIDER_tslib 		    ?= "tslib"
+PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
+
+ANGSTROM_EXTRA_INSTALL ?= ""
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "e-image"
+
+DEPENDS = "task-base"
+RDEPENDS = "\
+    ${XSERVER} \
+    task-base-core-default \
+    task-base \
+    angstrom-e-base-depends \
+    angstrom-e-depends \
+    angstrom-gpe-task-settings \
+    ${ANGSTROM_EXTRA_INSTALL}"
+
+
+export PACKAGE_INSTALL = "${RDEPENDS}"
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
diff --git a/packages/angstrom/task-angstrom-e.bb b/packages/angstrom/task-angstrom-e.bb
new file mode 100644
index 0000000000..ab963dee57
--- /dev/null
+++ b/packages/angstrom/task-angstrom-e.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r0"
+ALLOW_EMPTY = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PACKAGES = "\
+    angstrom-e-base-depends \
+    angstrom-e-depends"
+
+RDEPENDS_angstrom-e-base-depends := "\
+    angstrom-x11-base-depends \
+    rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \
+    ttf-bitstream-vera gpe-bootsplash-theme-e \
+    entrance e-wm \
+    glibc-charmap-utf-8 glibc-localedata-i18n"
+#xserver-kdrive-fbdev 
+
+RDEPENDS_angstrom-e-depends := "\
+                        pango-module-basic-fc \
+                        gdk-pixbuf-loader-bmp \
+                        gdk-pixbuf-loader-gif \
+                        gdk-pixbuf-loader-jpeg \
+                        gdk-pixbuf-loader-png \
+                        gdk-pixbuf-loader-pnm \
+                        gdk-pixbuf-loader-xbm \
+                        gdk-pixbuf-loader-xpm"
\ No newline at end of file
-- 
cgit v1.2.3


From f90f361ece64d0e5c999d6c4e6ee22f976339b52 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 20 Mar 2007 21:36:37 +0000
Subject: disapproval of revision '6cb06ec6fefb58a8630562ccfdd7e9b156c05f3d'

---
 packages/angstrom/angstrom-e-image.bb | 37 -----------------------------------
 packages/angstrom/task-angstrom-e.bb  | 27 -------------------------
 2 files changed, 64 deletions(-)
 delete mode 100644 packages/angstrom/angstrom-e-image.bb
 delete mode 100644 packages/angstrom/task-angstrom-e.bb

diff --git a/packages/angstrom/angstrom-e-image.bb b/packages/angstrom/angstrom-e-image.bb
deleted file mode 100644
index da40f7e00c..0000000000
--- a/packages/angstrom/angstrom-e-image.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-#Angstrom e image
-LICENSE = "MIT"
-PR = "r0"
-
-
-PREFERRED_PROVIDER_virtual/evas   ?= "evas-x11"
-PREFERRED_PROVIDER_virtual/ecore  ?= "ecore-x11"
-PREFERRED_PROVIDER_virtual/imlib2 ?= "imlib2-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-
-PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
-PREFERRED_PROVIDER_tslib 		    ?= "tslib"
-PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
-
-ANGSTROM_EXTRA_INSTALL ?= ""
-XSERVER ?= "xserver-kdrive-fbdev"
-
-export IMAGE_BASENAME = "e-image"
-
-DEPENDS = "task-base"
-RDEPENDS = "\
-    ${XSERVER} \
-    task-base-core-default \
-    task-base \
-    angstrom-e-base-depends \
-    angstrom-e-depends \
-    angstrom-gpe-task-settings \
-    ${ANGSTROM_EXTRA_INSTALL}"
-
-
-export PACKAGE_INSTALL = "${RDEPENDS}"
-
-#zap root password for release images
-ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
-
-inherit image
diff --git a/packages/angstrom/task-angstrom-e.bb b/packages/angstrom/task-angstrom-e.bb
deleted file mode 100644
index ab963dee57..0000000000
--- a/packages/angstrom/task-angstrom-e.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r0"
-ALLOW_EMPTY = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PACKAGES = "\
-    angstrom-e-base-depends \
-    angstrom-e-depends"
-
-RDEPENDS_angstrom-e-base-depends := "\
-    angstrom-x11-base-depends \
-    rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \
-    ttf-bitstream-vera gpe-bootsplash-theme-e \
-    entrance e-wm \
-    glibc-charmap-utf-8 glibc-localedata-i18n"
-#xserver-kdrive-fbdev 
-
-RDEPENDS_angstrom-e-depends := "\
-                        pango-module-basic-fc \
-                        gdk-pixbuf-loader-bmp \
-                        gdk-pixbuf-loader-gif \
-                        gdk-pixbuf-loader-jpeg \
-                        gdk-pixbuf-loader-png \
-                        gdk-pixbuf-loader-pnm \
-                        gdk-pixbuf-loader-xbm \
-                        gdk-pixbuf-loader-xpm"
\ No newline at end of file
-- 
cgit v1.2.3


From 4f638ac8976f54caba8e27c62ff28719a394832b Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 21 Mar 2007 05:10:16 +0000
Subject: linux-rp-2.6.20: add sharpsl-rc patch for the CE-RH2 remote

---
 packages/linux/linux-rp-2.6.20/defconfig-spitz     |   1 +
 packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch | 491 +++++++++++++++++++++
 packages/linux/linux-rp_2.6.20.bb                  |   3 +-
 3 files changed, 494 insertions(+), 1 deletion(-)
 create mode 100644 packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch

diff --git a/packages/linux/linux-rp-2.6.20/defconfig-spitz b/packages/linux/linux-rp-2.6.20/defconfig-spitz
index 824fd57aaa..91f73ed4e9 100644
--- a/packages/linux/linux-rp-2.6.20/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.20/defconfig-spitz
@@ -1601,3 +1601,4 @@ CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
+CONFIG_SHARPSL_RC=m
\ No newline at end of file
diff --git a/packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch b/packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch
new file mode 100644
index 0000000000..9761f43aca
--- /dev/null
+++ b/packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch
@@ -0,0 +1,491 @@
+Index: linux-2.6.20/arch/arm/mach-pxa/spitz.c
+===================================================================
+--- linux-2.6.20.orig/arch/arm/mach-pxa/spitz.c
++++ linux-2.6.20/arch/arm/mach-pxa/spitz.c
+@@ -244,6 +244,13 @@ static struct platform_device spitzkbd_d
+ 	.id		= -1,
+ };
+ 
++/*
++ * Spitz Remote Control Device
++ */
++static struct platform_device sharpsl_rc_device = {
++	.name		= "sharpsl-remote-control",
++	.id		= -1,
++};
+ 
+ /*
+  * Spitz LEDs
+@@ -476,6 +483,7 @@ static struct platform_device *devices[]
+ 	&spitzscoop_device,
+ 	&spitzssp_device,
+ 	&spitzkbd_device,
++	&sharpsl_rc_device,
+ 	&spitzts_device,
+ 	&spitzbl_device,
+ 	&spitzled_device,
+Index: linux-2.6.20/drivers/input/keyboard/Kconfig
+===================================================================
+--- linux-2.6.20.orig/drivers/input/keyboard/Kconfig
++++ linux-2.6.20/drivers/input/keyboard/Kconfig
+@@ -154,6 +154,17 @@ config KEYBOARD_SPITZ
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called spitzkbd.
+ 
++config SHARPSL_RC
++	tristate "Sharp SL-Cxx00 Remote Control"
++	depends on PXA_SHARPSL
++	default y
++	help
++	  Say Y here to enable the remote on the Sharp Zaurus SL-Cxx00,
++	  SL-C1000, SL-C3000 and Sl-C3100 series of PDAs.
++
++	  To compile this driver as a module, choose M here: the
++	  module will be called sharpsl_rc.
++
+ config KEYBOARD_AMIGA
+ 	tristate "Amiga keyboard"
+ 	depends on AMIGA
+Index: linux-2.6.20/drivers/input/keyboard/Makefile
+===================================================================
+--- linux-2.6.20.orig/drivers/input/keyboard/Makefile
++++ linux-2.6.20/drivers/input/keyboard/Makefile
+@@ -14,6 +14,7 @@ obj-$(CONFIG_KEYBOARD_NEWTON)		+= newton
+ obj-$(CONFIG_KEYBOARD_STOWAWAY)		+= stowaway.o
+ obj-$(CONFIG_KEYBOARD_CORGI)		+= corgikbd.o
+ obj-$(CONFIG_KEYBOARD_SPITZ)		+= spitzkbd.o
++obj-$(CONFIG_SHARPSL_RC)			+= sharpsl_rc.o
+ obj-$(CONFIG_KEYBOARD_HIL)		+= hil_kbd.o
+ obj-$(CONFIG_KEYBOARD_HIL_OLD)		+= hilkbd.o
+ obj-$(CONFIG_KEYBOARD_OMAP)             += omap-keypad.o
+Index: linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c
+===================================================================
+--- /dev/null
++++ linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c
+@@ -0,0 +1,263 @@
++/*
++ *  Keyboard driver for Sharp Clamshell Models (SL-Cxx00)
++ *
++ *  Copyright (c) 2004-2005 Richard Purdie
++ *
++ *  Based on corgikbd.c and Sharp's RC driver
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License version 2 as
++ *  published by the Free Software Foundation.
++ *
++ */
++
++#define DEBUG 1
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++#include <linux/init.h>
++#include <linux/input.h>
++#include <linux/interrupt.h>
++#include <linux/jiffies.h>
++#include <linux/module.h>
++#include <linux/slab.h>
++
++#include <asm/arch/spitz.h>
++#include <asm/arch/hardware.h>
++#include <asm/arch/pxa-regs.h>
++#include <asm/hardware/scoop.h>
++#include <asm/arch/sharpsl.h>
++#include <asm/hardware/sharpsl_pm.h>
++
++#define DPRINTK(fmt, args...) dev_dbg(data->dev, fmt "\n", ##args)
++
++struct remote_control_key {
++	unsigned char min;
++	unsigned char max;
++	unsigned char key;
++};
++
++static struct remote_control_key spitz_remote_keys[] = {
++	{ 25, 35, KEY_STOPCD},
++	{ 55, 65, KEY_PLAYPAUSE},
++	{ 85, 95, KEY_NEXTSONG},
++	{ 115, 125, KEY_VOLUMEUP},
++	{ 145, 155, KEY_PREVIOUSSONG},
++	{ 180, 190, KEY_MUTE},
++	{ 215, 225, KEY_VOLUMEDOWN},
++};
++
++#define RELEASE_HI      230
++#define MAX_EARPHONE    6
++#define RC_POLL_MS      10
++#define RC_FINISH_MS    500
++#define WAIT_STATE      3
++#define NOISE_THRESHOLD 100
++
++struct sharpsl_rc {
++	struct input_dev *input;
++	struct device *dev;
++
++	spinlock_t lock;
++	struct timer_list rctimer;
++	struct timer_list rctimer_finish;
++
++	unsigned int handling_press;
++	unsigned int noise;
++	unsigned int state;
++	unsigned int last_key;
++};
++
++static int get_remocon_raw(void)
++{
++	int i, val;
++
++	val = sharpsl_pm_pxa_read_max1111(MAX1111_REMCOM);
++	for (i = 0; i < ARRAY_SIZE(spitz_remote_keys); ++i) {
++		if (val >= spitz_remote_keys[i].min
++			&& val <= spitz_remote_keys[i].max) {
++			printk("get_remocon_raw: VAL=%i, KEY=%i\n", val, spitz_remote_keys[i].key);
++			return spitz_remote_keys[i].key;
++		}
++	}
++	return 0;
++}
++
++static irqreturn_t sharpsl_rc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++{
++	struct sharpsl_rc *data = dev_id;
++	DPRINTK("sharpsl_rc_interrupt %d\n", irq);
++	if (!data->handling_press) {
++		DPRINTK("handling interrupt");
++		data->handling_press = 1;
++		data->noise = 0;
++		data->state = 0;
++		data->last_key = 0;
++
++		reset_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_AKIN_PULLUP);
++
++		mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS));
++	}
++	return IRQ_HANDLED;
++}
++
++static void sharpsl_rc_timer_callback(unsigned long dataPtr)
++{
++	struct sharpsl_rc *data = (struct sharpsl_rc *) dataPtr;
++	int timer = 1;
++	int key = get_remocon_raw();
++	DPRINTK("timer callback, key: %d", key);
++
++	//wait for value to stabilize
++	if (data->state < WAIT_STATE) {
++		if (data->last_key != key) {
++			++data->noise;
++			if (data->noise > NOISE_THRESHOLD) {
++				DPRINTK("too much noise, bailing");
++				timer = 0;
++			}
++			data->state = 0;
++		} else {
++			++data->state;
++		}
++		data->last_key = key;
++
++	//stable value, send event
++	} else if (data->state == WAIT_STATE) {
++		data->noise = 0;
++		//non-key returned, skip the rest of the states and bail now
++		if (data->last_key == 0) {
++			DPRINTK("non-key detected %d, noise: %d", data->last_key, data->noise);
++			timer = 0;
++		//send button press
++		} else {
++			DPRINTK("key press detected %d, noise %d", data->last_key, data->noise);
++			input_report_key(data->input, data->last_key, 1);
++		}
++		++data->state;
++
++	//wait until key is released
++	} else if (data->state < WAIT_STATE * 2) {
++		if (key == data->last_key
++			&& data->noise < NOISE_THRESHOLD) {
++			data->state = WAIT_STATE + 1;
++			++data->noise;
++		} else {
++			++data->state;
++		}
++	//key is released, send event
++	} else {
++		//send button release
++		DPRINTK("release key %d", data->last_key);
++		input_report_key(data->input, data->last_key, 0);
++		timer = 0;
++	}
++	if (timer) {
++		mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS));
++	} else {
++		set_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_AKIN_PULLUP);
++		data->handling_press = 0;
++	}
++}
++
++static int __init sharpsl_rc_probe(struct platform_device *pdev)
++{
++	struct sharpsl_rc *sharpsl_rc;
++	struct input_dev *input_dev;
++	int i, ret;
++
++	dev_dbg(&pdev->dev, "sharpsl_rc_probe\n");
++
++	sharpsl_rc = kzalloc(sizeof(struct sharpsl_rc), GFP_KERNEL);
++	input_dev = input_allocate_device();
++	if (!sharpsl_rc || !input_dev) {
++		kfree(sharpsl_rc);
++		input_free_device(input_dev);
++		return -ENOMEM;
++	}
++
++	platform_set_drvdata(pdev, sharpsl_rc);
++
++	sharpsl_rc->dev = &pdev->dev;
++	sharpsl_rc->input = input_dev;
++	spin_lock_init(&sharpsl_rc->lock);
++
++	/* Init Remote Control Timer */
++	init_timer(&sharpsl_rc->rctimer);
++	sharpsl_rc->rctimer.function = sharpsl_rc_timer_callback;
++	sharpsl_rc->rctimer.data = (unsigned long) sharpsl_rc;
++
++	input_dev->name = "Spitz Remote Control";
++	input_dev->phys = "sharpsl_rc/input0";
++	input_dev->id.bustype = BUS_HOST;
++	input_dev->id.vendor = 0x0001;
++	input_dev->id.product = 0x0001;
++	input_dev->id.version = 0x0100;
++	input_dev->cdev.dev = &pdev->dev;
++	input_dev->private = sharpsl_rc;
++
++	input_dev->evbit[0] = BIT(EV_KEY);
++
++	for (i = 0; i <= ARRAY_SIZE(spitz_remote_keys); i++)
++	  set_bit(spitz_remote_keys[i].key, input_dev->keybit);
++
++	input_register_device(sharpsl_rc->input);
++
++	pxa_gpio_mode(SPITZ_GPIO_AK_INT | GPIO_IN);
++	ret = request_irq(SPITZ_IRQ_GPIO_AK_INT,
++					  sharpsl_rc_interrupt,
++					  IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_SHARED,
++					  "sharpsl_rc",
++					  sharpsl_rc);
++	if (ret < 0) {
++		dev_dbg(&pdev->dev, "Can't get IRQ: %d!\n", i);
++		kfree(sharpsl_rc);
++		input_free_device(input_dev);
++		return ret;
++	}
++
++	return 0;
++}
++
++static int sharpsl_rc_remove(struct platform_device *pdev)
++{
++	struct sharpsl_rc *sharpsl_rc = platform_get_drvdata(pdev);
++
++	dev_dbg(&pdev->dev, "sharpsl_rc_remove\n");
++
++	free_irq(SPITZ_IRQ_GPIO_AK_INT, sharpsl_rc);
++	del_timer_sync(&sharpsl_rc->rctimer);
++	input_unregister_device(sharpsl_rc->input);
++	kfree(sharpsl_rc);
++
++	return 0;
++}
++
++static struct platform_driver sharpsl_rc_driver = {
++	.probe		= sharpsl_rc_probe,
++	.remove		= sharpsl_rc_remove,
++	.suspend	= NULL,
++	.resume		= NULL,
++	.driver		= {
++		.name	= "sharpsl-remote-control",
++	},
++};
++
++static int __devinit sharpsl_rc_init(void)
++{
++	printk("sharpsl_rc_init\n");
++	return platform_driver_register(&sharpsl_rc_driver);
++}
++
++static void __exit sharpsl_rc_exit(void)
++{
++	printk("sharpsl_rc_exit\n");
++	platform_driver_unregister(&sharpsl_rc_driver);
++}
++
++module_init(sharpsl_rc_init);
++module_exit(sharpsl_rc_exit);
++
++MODULE_AUTHOR("Justin Patrin <papercrane@reversefold.com>");
++MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
++MODULE_DESCRIPTION("SharpSL Remote Control Driver");
++MODULE_LICENSE("GPL");
+Index: linux-2.6.20/drivers/input/keyboard/spitzkbd.c
+===================================================================
+--- linux-2.6.20.orig/drivers/input/keyboard/spitzkbd.c
++++ linux-2.6.20/drivers/input/keyboard/spitzkbd.c
+@@ -19,6 +19,7 @@
+ #include <linux/jiffies.h>
+ #include <linux/module.h>
+ #include <linux/slab.h>
++#include <linux/kmod.h>
+ 
+ #include <asm/arch/spitz.h>
+ #include <asm/arch/hardware.h>
+@@ -279,13 +280,21 @@ static irqreturn_t spitzkbd_hinge_isr(in
+ static int sharpsl_hinge_state;
+ static int hinge_count;
+ 
++void spitzkbd_handle_sharpsl_rc(void *arg) {
++	request_module("sharpsl_rc");
++}
++
++DECLARE_WORK(spitzkbd_work, spitzkbd_handle_sharpsl_rc);
++
+ static void spitzkbd_hinge_timer(unsigned long data)
+ {
+ 	struct spitzkbd *spitzkbd_data = (struct spitzkbd *) data;
+ 	unsigned long state;
+ 	unsigned long flags;
++	unsigned int headphone, remote;
+ 
+ 	state = GPLR(SPITZ_GPIO_SWA) & (GPIO_bit(SPITZ_GPIO_SWA)|GPIO_bit(SPITZ_GPIO_SWB));
++	state |= (GPLR(SPITZ_GPIO_HP_IN) & GPIO_bit(SPITZ_GPIO_HP_IN));
+ 	state |= (GPLR(SPITZ_GPIO_AK_INT) & GPIO_bit(SPITZ_GPIO_AK_INT));
+ 	if (state != sharpsl_hinge_state) {
+ 		hinge_count = 0;
+@@ -299,9 +308,18 @@ static void spitzkbd_hinge_timer(unsigne
+ 
+ 		input_report_switch(spitzkbd_data->input, SW_LID, ((GPLR(SPITZ_GPIO_SWA) & GPIO_bit(SPITZ_GPIO_SWA)) != 0));
+ 		input_report_switch(spitzkbd_data->input, SW_TABLET_MODE, ((GPLR(SPITZ_GPIO_SWB) & GPIO_bit(SPITZ_GPIO_SWB)) != 0));
+-		input_report_switch(spitzkbd_data->input, SW_HEADPHONE_INSERT, ((GPLR(SPITZ_GPIO_AK_INT) & GPIO_bit(SPITZ_GPIO_AK_INT)) != 0));
++
++		headphone = ((GPLR(SPITZ_GPIO_HP_IN) & GPIO_bit(SPITZ_GPIO_HP_IN)) != 0);
++		input_report_switch(spitzkbd_data->input, SW_HEADPHONE_INSERT, headphone);
++
++		remote = headphone && ((GPLR(SPITZ_GPIO_AK_INT) & GPIO_bit(SPITZ_GPIO_AK_INT)) == 0);
++		input_report_switch(spitzkbd_data->input, SW_REMOTE_INSERT, remote);
+ 		input_sync(spitzkbd_data->input);
+ 
++		if (remote) {
++			schedule_work(&spitzkbd_work);
++		}
++
+ 		spin_unlock_irqrestore(&spitzkbd_data->lock, flags);
+ 	} else {
+ 		mod_timer(&spitzkbd_data->htimer, jiffies + msecs_to_jiffies(HINGE_SCAN_INTERVAL));
+@@ -394,6 +412,7 @@ static int __init spitzkbd_probe(struct 
+ 	set_bit(SW_LID, input_dev->swbit);
+ 	set_bit(SW_TABLET_MODE, input_dev->swbit);
+ 	set_bit(SW_HEADPHONE_INSERT, input_dev->swbit);
++	set_bit(SW_REMOTE_INSERT, input_dev->swbit);
+ 
+ 	err = input_register_device(input_dev);
+ 	if (err)
+@@ -431,9 +450,12 @@ static int __init spitzkbd_probe(struct 
+ 	request_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd_hinge_isr,
+ 		    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+ 		    "Spitzkbd SWB", spitzkbd);
+-	request_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd_hinge_isr,
++	request_irq(SPITZ_IRQ_GPIO_HP_IN, spitzkbd_hinge_isr,
+ 		    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+ 		    "Spitzkbd HP", spitzkbd);
++  	request_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd_hinge_isr,
++ 		    IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_SHARED,
++            "Spitzkbd HP Type", spitzkbd);
+ 
+ 	return 0;
+ 
+@@ -454,6 +476,7 @@ static int spitzkbd_remove(struct platfo
+ 	free_irq(SPITZ_IRQ_GPIO_ON_KEY, spitzkbd);
+ 	free_irq(SPITZ_IRQ_GPIO_SWA, spitzkbd);
+ 	free_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd);
++	free_irq(SPITZ_IRQ_GPIO_HP_IN, spitzkbd);
+ 	free_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd);
+ 
+ 	del_timer_sync(&spitzkbd->htimer);
+Index: linux-2.6.20/arch/arm/mach-pxa/sharpsl.h
+===================================================================
+--- linux-2.6.20.orig/arch/arm/mach-pxa/sharpsl.h
++++ linux-2.6.20/arch/arm/mach-pxa/sharpsl.h
+@@ -50,15 +50,10 @@ void spitz_wait_hsync(void);
+ 
+ #define READ_GPIO_BIT(x)    (GPLR(x) & GPIO_bit(x))
+ 
+-/* MAX1111 Channel Definitions */
+-#define MAX1111_BATT_VOLT   4u
+-#define MAX1111_BATT_TEMP   2u
+-#define MAX1111_ACIN_VOLT   6u
+-
+ extern struct battery_thresh spitz_battery_levels_acin[];
+ extern struct battery_thresh spitz_battery_levels_noac[];
+ void sharpsl_pm_pxa_init(void);
+ void sharpsl_pm_pxa_remove(void);
+-int sharpsl_pm_pxa_read_max1111(int channel);
++
+ 
+ 
+Index: linux-2.6.20/arch/arm/mach-pxa/sharpsl_pm.c
+===================================================================
+--- linux-2.6.20.orig/arch/arm/mach-pxa/sharpsl_pm.c
++++ linux-2.6.20/arch/arm/mach-pxa/sharpsl_pm.c
+@@ -135,6 +135,8 @@ int sharpsl_pm_pxa_read_max1111(int chan
+ 			| MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
+ }
+ 
++EXPORT_SYMBOL(sharpsl_pm_pxa_read_max1111);
++
+ void sharpsl_pm_pxa_init(void)
+ {
+ 	pxa_gpio_mode(sharpsl_pm.machinfo->gpio_acin | GPIO_IN);
+Index: linux-2.6.20/include/asm-arm/hardware/sharpsl_pm.h
+===================================================================
+--- linux-2.6.20.orig/include/asm-arm/hardware/sharpsl_pm.h
++++ linux-2.6.20/include/asm-arm/hardware/sharpsl_pm.h
+@@ -104,3 +104,10 @@ irqreturn_t sharpsl_ac_isr(int irq, void
+ irqreturn_t sharpsl_chrg_full_isr(int irq, void *dev_id);
+ irqreturn_t sharpsl_fatal_isr(int irq, void *dev_id);
+ 
++/* MAX1111 Channel Definitions */
++#define MAX1111_REMCOM      0u
++#define MAX1111_BATT_VOLT   4u
++#define MAX1111_BATT_TEMP   2u
++#define MAX1111_ACIN_VOLT   6u
++
++int sharpsl_pm_pxa_read_max1111(int channel);
+Index: linux-2.6.20/include/linux/input.h
+===================================================================
+--- linux-2.6.20.orig/include/linux/input.h
++++ linux-2.6.20/include/linux/input.h
+@@ -602,6 +602,7 @@ struct input_absinfo {
+ #define SW_LID			0x00  /* set = lid shut */
+ #define SW_TABLET_MODE		0x01  /* set = tablet mode */
+ #define SW_HEADPHONE_INSERT	0x02  /* set = inserted */
++#define SW_REMOTE_INSERT    0x04  /* set = remote */
+ #define SW_MAX			0x0f
+ 
+ /*
+Index: linux-2.6.20/arch/arm/mach-pxa/spitz_pm.c
+===================================================================
+--- linux-2.6.20.orig/arch/arm/mach-pxa/spitz_pm.c
++++ linux-2.6.20/arch/arm/mach-pxa/spitz_pm.c
+@@ -161,6 +161,13 @@ static int spitz_should_wakeup(unsigned 
+ 	if (resume_on_alarm && (PEDR & PWER_RTC))
+ 		is_resume |= PWER_RTC;
+ 
++	printk("wakeup: PEDR: %x, PKSR: %x, HP_IN: %x, AK_INT: %x\n", PEDR, PKSR, GPIO_bit(SPITZ_GPIO_HP_IN), GPIO_bit(SPITZ_GPIO_AK_INT));
++
++	//remote/headphone interrupt, wakeup
++	if (PEDR == 0 && (PKSR & 0xc0d01) != 0) {
++		is_resume |= PWER_RTC;
++	}
++
+ 	dev_dbg(sharpsl_pm.dev, "is_resume: %x\n",is_resume);
+ 	return is_resume;
+ }
diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb
index 49446a772a..70aa40610a 100644
--- a/packages/linux/linux-rp_2.6.20.bb
+++ b/packages/linux/linux-rp_2.6.20.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r6"
+PR = "r7"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -53,6 +53,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
            file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
            file://squashfs3.0-2.6.15.patch;patch=1;status=external \
            file://vesafb-tng-1.0-rc2-2.6.20-rc2.patch;patch=1;status=external \
+           file://sharpsl-rc-r0.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-hx2000 \
            file://defconfig-collie \
-- 
cgit v1.2.3


From 156e6ceaba33c139b3ed0b44b4052999db124f0e Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 21 Mar 2007 05:18:46 +0000
Subject: angstrom: re-add e-image and tasks without gpe-bootsplash

---
 packages/angstrom/angstrom-e-image.bb | 37 +++++++++++++++++++++++++++++++++++
 packages/angstrom/task-angstrom-e.bb  | 27 +++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 packages/angstrom/angstrom-e-image.bb
 create mode 100644 packages/angstrom/task-angstrom-e.bb

diff --git a/packages/angstrom/angstrom-e-image.bb b/packages/angstrom/angstrom-e-image.bb
new file mode 100644
index 0000000000..da40f7e00c
--- /dev/null
+++ b/packages/angstrom/angstrom-e-image.bb
@@ -0,0 +1,37 @@
+#Angstrom e image
+LICENSE = "MIT"
+PR = "r0"
+
+
+PREFERRED_PROVIDER_virtual/evas   ?= "evas-x11"
+PREFERRED_PROVIDER_virtual/ecore  ?= "ecore-x11"
+PREFERRED_PROVIDER_virtual/imlib2 ?= "imlib2-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+
+PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
+PREFERRED_PROVIDER_tslib 		    ?= "tslib"
+PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
+
+ANGSTROM_EXTRA_INSTALL ?= ""
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "e-image"
+
+DEPENDS = "task-base"
+RDEPENDS = "\
+    ${XSERVER} \
+    task-base-core-default \
+    task-base \
+    angstrom-e-base-depends \
+    angstrom-e-depends \
+    angstrom-gpe-task-settings \
+    ${ANGSTROM_EXTRA_INSTALL}"
+
+
+export PACKAGE_INSTALL = "${RDEPENDS}"
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
diff --git a/packages/angstrom/task-angstrom-e.bb b/packages/angstrom/task-angstrom-e.bb
new file mode 100644
index 0000000000..228c637158
--- /dev/null
+++ b/packages/angstrom/task-angstrom-e.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Task packages for the Angstrom distribution"
+PR = "r0"
+ALLOW_EMPTY = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PACKAGES = "\
+    angstrom-e-base-depends \
+    angstrom-e-depends"
+
+RDEPENDS_angstrom-e-base-depends := "\
+    angstrom-x11-base-depends \
+    rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \
+    ttf-bitstream-vera \
+    entrance e-wm \
+    glibc-charmap-utf-8 glibc-localedata-i18n"
+#xserver-kdrive-fbdev 
+
+RDEPENDS_angstrom-e-depends := "\
+                        pango-module-basic-fc \
+                        gdk-pixbuf-loader-bmp \
+                        gdk-pixbuf-loader-gif \
+                        gdk-pixbuf-loader-jpeg \
+                        gdk-pixbuf-loader-png \
+                        gdk-pixbuf-loader-pnm \
+                        gdk-pixbuf-loader-xbm \
+                        gdk-pixbuf-loader-xpm"
\ No newline at end of file
-- 
cgit v1.2.3


From 36c8a5a94672b5710166d07bc5fcbdd2eaa80162 Mon Sep 17 00:00:00 2001
From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Wed, 21 Mar 2007 09:13:46 +0000
Subject: packages/ipkg/ipkg-collateral.bb: Add dest definitions for oplinux
 and oplinux-uclibc

---
 packages/ipkg/ipkg-collateral.bb                            | 2 +-
 packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty | 0
 packages/ipkg/ipkg-collateral/oplinux-uclibc/dest           | 3 +++
 packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty        | 0
 packages/ipkg/ipkg-collateral/oplinux/dest                  | 3 +++
 5 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty
 create mode 100644 packages/ipkg/ipkg-collateral/oplinux-uclibc/dest
 create mode 100644 packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty
 create mode 100644 packages/ipkg/ipkg-collateral/oplinux/dest

diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb
index ec45a10e2d..cfe7d71c2d 100644
--- a/packages/ipkg/ipkg-collateral.bb
+++ b/packages/ipkg/ipkg-collateral.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "ipkg configuration files"
 SECTION = "base"
 LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
 PACKAGE_ARCH = "all"
 
 SRC_URI = " \
diff --git a/packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty b/packages/ipkg/ipkg-collateral/oplinux-uclibc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ipkg/ipkg-collateral/oplinux-uclibc/dest b/packages/ipkg/ipkg-collateral/oplinux-uclibc/dest
new file mode 100644
index 0000000000..b786746b63
--- /dev/null
+++ b/packages/ipkg/ipkg-collateral/oplinux-uclibc/dest
@@ -0,0 +1,3 @@
+dest root /
+dest ram /tmp
+dest smbfs /tmp/smbfs
diff --git a/packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty b/packages/ipkg/ipkg-collateral/oplinux/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ipkg/ipkg-collateral/oplinux/dest b/packages/ipkg/ipkg-collateral/oplinux/dest
new file mode 100644
index 0000000000..b786746b63
--- /dev/null
+++ b/packages/ipkg/ipkg-collateral/oplinux/dest
@@ -0,0 +1,3 @@
+dest root /
+dest ram /tmp
+dest smbfs /tmp/smbfs
-- 
cgit v1.2.3


From 58171c20855a04126b223d981326a9772032ccce Mon Sep 17 00:00:00 2001
From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Wed, 21 Mar 2007 09:19:25 +0000
Subject: packages/base-files/base-files_3.0.14.bb: Add semi-custom profile for
 oplinux and oplinux-uclibc

---
 .../base-files/base-files/oplinux-uclibc/profile   | 32 ++++++++++++++++++++++
 packages/base-files/base-files/oplinux/profile     | 32 ++++++++++++++++++++++
 packages/base-files/base-files_3.0.14.bb           |  2 +-
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 packages/base-files/base-files/oplinux-uclibc/profile
 create mode 100644 packages/base-files/base-files/oplinux/profile

diff --git a/packages/base-files/base-files/oplinux-uclibc/profile b/packages/base-files/base-files/oplinux-uclibc/profile
new file mode 100644
index 0000000000..f6ae329b57
--- /dev/null
+++ b/packages/base-files/base-files/oplinux-uclibc/profile
@@ -0,0 +1,32 @@
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+
+PATH="/usr/local/bin:/usr/bin:/bin"
+EDITOR="/usr/bin/nano"	# needed for packages like cron
+TERM="linux"		# Basic terminal capab. For screen etc.
+
+if [ ! -e /etc/localtime ]; then
+	TZ="UTC"		# Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
+				# for an explanation of how to set this to your local timezone.
+	export TZ
+fi
+
+if [ "`id -u`" -eq 0 ]; then
+   PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
+fi
+if [ "$PS1" ]; then
+# works for bash and ash (no other shells known to be in use here)
+   PS1='\u@\h:\w\$ '
+fi
+
+if [ -d /etc/profile.d ]; then
+  for i in `ls /etc/profile.d/`; do
+    . /etc/profile.d/$i
+  done
+  unset i
+fi
+
+export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
+
+umask 022
+
diff --git a/packages/base-files/base-files/oplinux/profile b/packages/base-files/base-files/oplinux/profile
new file mode 100644
index 0000000000..f6ae329b57
--- /dev/null
+++ b/packages/base-files/base-files/oplinux/profile
@@ -0,0 +1,32 @@
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+
+PATH="/usr/local/bin:/usr/bin:/bin"
+EDITOR="/usr/bin/nano"	# needed for packages like cron
+TERM="linux"		# Basic terminal capab. For screen etc.
+
+if [ ! -e /etc/localtime ]; then
+	TZ="UTC"		# Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
+				# for an explanation of how to set this to your local timezone.
+	export TZ
+fi
+
+if [ "`id -u`" -eq 0 ]; then
+   PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
+fi
+if [ "$PS1" ]; then
+# works for bash and ash (no other shells known to be in use here)
+   PS1='\u@\h:\w\$ '
+fi
+
+if [ -d /etc/profile.d ]; then
+  for i in `ls /etc/profile.d/`; do
+    . /etc/profile.d/$i
+  done
+  unset i
+fi
+
+export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
+
+umask 022
+
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 1cf58d7ebb..393e0e3ec2 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r63"
+PR = "r64"
 LICENSE = "GPL"
 
 SRC_URI = " \
-- 
cgit v1.2.3


From 7d5283c53da68ede4d5ae2e99f2c27fd50253203 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 21 Mar 2007 09:32:42 +0000
Subject: openmoko-session: start dialer so people can receive phonecalls by
 default :)

---
 packages/openmoko-base/files/session           | 1 +
 packages/openmoko-base/openmoko-session_svn.bb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session
index b2e7fd0a69..1fc2f4d17a 100644
--- a/packages/openmoko-base/files/session
+++ b/packages/openmoko-base/files/session
@@ -14,5 +14,6 @@ matchbox-panel --start-applets=showdesktop,systray,windowselector --end-applets=
 mbinputmgr &
 
 openmoko-footer &
+openmoko-dialer &
 exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@
 
diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb
index 5f0a88cfbf..c085606a7d 100644
--- a/packages/openmoko-base/openmoko-session_svn.bb
+++ b/packages/openmoko-base/openmoko-session_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox session files for OpenMoko"
 SECTION = "openmoko/base"
 RDEPENDS = "matchbox gconf matchbox-applet-startup-monitor gtk-theme-clearlooks"
 PV = "0.0+svn${SRCDATE}"
-PR = "r6"
+PR = "r7"
 
 inherit openmoko-base
 
-- 
cgit v1.2.3


From 895a9b4cabafc642d676732ac26ca6cdabc6b448 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 21 Mar 2007 10:15:15 +0000
Subject: openmoko-image: install a terminal, virtual keyboard and other stuff
 to make it useable

---
 packages/images/openmoko-image.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb
index 0ebddcb276..632963076c 100644
--- a/packages/images/openmoko-image.bb
+++ b/packages/images/openmoko-image.bb
@@ -14,7 +14,9 @@ export PACKAGE_INSTALL = "\
   task-openmoko-phone \
   task-openmoko-finger \
   task-openmoko-pim \
-"
+  task-openmoko-demo \
+  "
+
 DEPENDS = "\
   ${MACHINE_TASK_PROVIDER} \
   task-openmoko \
-- 
cgit v1.2.3


From 9eb4349e80b325143f58c98c929f63497f57b44a Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 21 Mar 2007 10:17:49 +0000
Subject: openmoko-icon-theme-standard: merge from openmoko svn

---
 packages/openmoko-base/openmoko-icon-theme-standard_svn.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 packages/openmoko-base/openmoko-icon-theme-standard_svn.bb

diff --git a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
new file mode 100644
index 0000000000..8be6211d68
--- /dev/null
+++ b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
+SECTION = "openmoko/base"
+PV = "0.0+svn${SRCDATE}"
+PR = "r0"
+
+inherit openmoko-base autotools
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=icons;proto=http"
+S = "${WORKDIR}/icons"
+
+PACKAGE_ARCH = "all"
-- 
cgit v1.2.3


From 7263517b3939ba055d443a0ecbaf5ef9a3e91c38 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Wed, 21 Mar 2007 10:36:45 +0000
Subject: storcenter: Add storcenter-image.bbclass

---
 classes/storcenter-image.bbclass | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 classes/storcenter-image.bbclass

diff --git a/classes/storcenter-image.bbclass b/classes/storcenter-image.bbclass
new file mode 100644
index 0000000000..de77f1b417
--- /dev/null
+++ b/classes/storcenter-image.bbclass
@@ -0,0 +1,30 @@
+storcenter_pack_image() {
+        # find latest kernel
+        KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1`
+        if [ -z "$KERNEL" ]; then
+                oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux-storcenter to create one."
+                exit 1
+        fi
+        ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2
+        OUTPUT=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flash.img
+        PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz
+        HEX_MAX_KERN_SIZE=170000
+        DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc `
+        HEX_MAX_ROOT_SIZE=590000
+        DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc `
+        KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'`
+        if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then
+                oefatal "Kernel too large at $KERNEL_SIZE bytes.  Max is $DEC_MAX_KERN_SIZE."
+                exit 1
+        fi
+        ROOT_SIZE=`ls -l $ROOTFS | awk '{print $5}'`
+        if [ $ROOT_SIZE -gt $DEC_MAX_ROOT_SIZE ]; then
+                oefatal "Rootfs is too large at $ROOT_SIZE bytes.  Max is $DEC_MAX_ROOT_SIZE."
+                exit 1
+        fi
+        PAD_SIZE=`echo "$DEC_MAX_KERN_SIZE - $KERNEL_SIZE" | bc `
+        dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null
+        cat $KERNEL $PADFILE $ROOTFS > $OUTPUT
+        rm -f $PADFILE
+        ls -l $OUTPUT
+}
-- 
cgit v1.2.3


From 33c2929e38f8a4271be33ab99f41ef861f7e6d22 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 21 Mar 2007 11:37:59 +0000
Subject: angstrom: bump some versions apparently "NOTE: consider defining a
 PREFERRED_PROVIDER to match runtime gdk-pixbuf-loader-png" is not clear
 enough, any suggestions for a better message?

---
 conf/distro/angstrom-2007.1.conf | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 4f603f4534..e4951dbf2b 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.3"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "36"
+DISTRO_REVISION = "37"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -107,16 +107,14 @@ PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
 PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
 PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
 PREFERRED_PROVIDER_esound 		?= "pulseaudio"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+"
 
 
 PREFERRED_VERSION_fontconfig = "2.4.1"
 PREFERRED_VERSION_freetype = "2.3.1"
 PREFERRED_VERSION_freetype-native = "2.2.1"
-PREFERRED_VERSION_cairo = "1.4.0"
-
-#work around a segfault in gcc for armv4t
-PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3"
-PREFERRED_VERSION_glib-2.0_h6300  = "2.12.3"
+PREFERRED_VERSION_cairo = "1.4.2"
+PREFERRED_VERSION_glib-2.0 = "2.12.10"
 
 #Small machines prefer kdrive, but we might ship full Xorg in other images
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-- 
cgit v1.2.3


From bc6a2cecfe312c651ec8c643ccc3e730cb8ff18d Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 21 Mar 2007 11:45:28 +0000
Subject: gtk: remove 2.10.x cruft

---
 packages/gtk+/gtk+-2.10.3/.mtn2git_empty          |    0
 packages/gtk+/gtk+-2.10.3/automake-lossage.patch  |   24 -
 packages/gtk+/gtk+-2.10.3/disable-print.patch     |   50 -
 packages/gtk+/gtk+-2.10.3/disable-tooltips.patch  |   11 -
 packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch    |  236 --
 packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch   |   10 -
 packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch |   29 -
 packages/gtk+/gtk+-2.10.3/menu-deactivate.patch   |   51 -
 packages/gtk+/gtk+-2.10.3/migration.patch         |  615 ------
 packages/gtk+/gtk+-2.10.3/no-demos.patch          |   10 -
 packages/gtk+/gtk+-2.10.3/no-xwc.patch            |  151 --
 packages/gtk+/gtk+-2.10.3/run-iconcache.patch     |   19 -
 packages/gtk+/gtk+-2.10.3/scroll-timings.patch    |   11 -
 packages/gtk+/gtk+-2.10.3/single-click.patch      |   54 -
 packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch  |  267 ---
 packages/gtk+/gtk+-2.10.3/spinbutton.patch        |  128 --
 packages/gtk+/gtk+-2.10.3/xsettings.patch         |   16 -
 packages/gtk+/gtk+-2.10.6/.mtn2git_empty          |    0
 packages/gtk+/gtk+-2.10.6/automake-lossage.patch  |   24 -
 packages/gtk+/gtk+-2.10.6/disable-print.patch     |   50 -
 packages/gtk+/gtk+-2.10.6/disable-tooltips.patch  |   11 -
 packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch    |  149 --
 packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch   |   10 -
 packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch |   29 -
 packages/gtk+/gtk+-2.10.6/menu-deactivate.patch   |   51 -
 packages/gtk+/gtk+-2.10.6/migration.patch         |  611 -----
 packages/gtk+/gtk+-2.10.6/no-demos.patch          |   10 -
 packages/gtk+/gtk+-2.10.6/no-xwc.patch            |  151 --
 packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff     | 2456 ---------------------
 packages/gtk+/gtk+-2.10.6/run-iconcache.patch     |   21 -
 packages/gtk+/gtk+-2.10.6/scroll-timings.patch    |   11 -
 packages/gtk+/gtk+-2.10.6/single-click.patch      |   56 -
 packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch  |  267 ---
 packages/gtk+/gtk+-2.10.6/spinbutton.patch        |  130 --
 packages/gtk+/gtk+-2.10.6/xsettings.patch         |   16 -
 packages/gtk+/gtk+-2.10.7/.mtn2git_empty          |    0
 packages/gtk+/gtk+-2.10.7/automake-lossage.patch  |   24 -
 packages/gtk+/gtk+-2.10.7/disable-print.patch     |   50 -
 packages/gtk+/gtk+-2.10.7/disable-tooltips.patch  |   11 -
 packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch  |  217 --
 packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch    |  149 --
 packages/gtk+/gtk+-2.10.7/gtklabel-resize-patch   |   10 -
 packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch |   29 -
 packages/gtk+/gtk+-2.10.7/integer-pixops.patch    |  348 ---
 packages/gtk+/gtk+-2.10.7/menu-deactivate.patch   |   51 -
 packages/gtk+/gtk+-2.10.7/migration.patch         |  611 -----
 packages/gtk+/gtk+-2.10.7/no-demos.patch          |   10 -
 packages/gtk+/gtk+-2.10.7/no-xwc.patch            |  151 --
 packages/gtk+/gtk+-2.10.7/run-iconcache.patch     |   19 -
 packages/gtk+/gtk+-2.10.7/scroll-timings.patch    |   11 -
 packages/gtk+/gtk+-2.10.7/single-click.patch      |   56 -
 packages/gtk+/gtk+-2.10.7/small-gtkfilesel.patch  |  267 ---
 packages/gtk+/gtk+-2.10.7/spinbutton.patch        |  130 --
 packages/gtk+/gtk+-2.10.7/xsettings.patch         |   16 -
 packages/gtk+/gtk+_2.10.3.bb                      |  103 -
 packages/gtk+/gtk+_2.10.6.bb                      |  103 -
 packages/gtk+/gtk+_2.10.7.bb                      |   24 -
 57 files changed, 8125 deletions(-)
 delete mode 100644 packages/gtk+/gtk+-2.10.3/.mtn2git_empty
 delete mode 100644 packages/gtk+/gtk+-2.10.3/automake-lossage.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/disable-print.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/disable-tooltips.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/gtklabel-resize-patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/hardcoded_libtool.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/menu-deactivate.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/migration.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/no-demos.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/no-xwc.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/run-iconcache.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/scroll-timings.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/single-click.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/small-gtkfilesel.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/spinbutton.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.3/xsettings.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/.mtn2git_empty
 delete mode 100644 packages/gtk+/gtk+-2.10.6/automake-lossage.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/disable-print.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/disable-tooltips.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/menu-deactivate.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/migration.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/no-demos.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/no-xwc.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff
 delete mode 100644 packages/gtk+/gtk+-2.10.6/run-iconcache.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/scroll-timings.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/single-click.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/spinbutton.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.6/xsettings.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/.mtn2git_empty
 delete mode 100644 packages/gtk+/gtk+-2.10.7/automake-lossage.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/disable-print.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/disable-tooltips.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/gtk+-handhelds.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/gtklabel-resize-patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/integer-pixops.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/menu-deactivate.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/migration.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/no-demos.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/no-xwc.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/run-iconcache.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/scroll-timings.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/single-click.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/small-gtkfilesel.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/spinbutton.patch
 delete mode 100644 packages/gtk+/gtk+-2.10.7/xsettings.patch
 delete mode 100644 packages/gtk+/gtk+_2.10.3.bb
 delete mode 100644 packages/gtk+/gtk+_2.10.6.bb
 delete mode 100644 packages/gtk+/gtk+_2.10.7.bb

diff --git a/packages/gtk+/gtk+-2.10.3/.mtn2git_empty b/packages/gtk+/gtk+-2.10.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/gtk+/gtk+-2.10.3/automake-lossage.patch b/packages/gtk+/gtk+-2.10.3/automake-lossage.patch
deleted file mode 100644
index 0d423ddbb9..0000000000
--- a/packages/gtk+/gtk+-2.10.3/automake-lossage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtk+-2.4.1/docs/tutorial/Makefile.am~	2003-05-06 22:54:20.000000000 +0100
-+++ gtk+-2.4.1/docs/tutorial/Makefile.am	2004-05-08 12:31:41.000000000 +0100
-@@ -52,21 +52,5 @@
- 
- dist-hook: html
- 	cp -Rp $(srcdir)/html $(distdir)
--else
--html:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--pdf:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--dist-hook:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "*** DISTRIBUTION IS INCOMPLETE"
--	echo "***"
- endif
- 
diff --git a/packages/gtk+/gtk+-2.10.3/disable-print.patch b/packages/gtk+/gtk+-2.10.3/disable-print.patch
deleted file mode 100644
index 1067773f12..0000000000
--- a/packages/gtk+/gtk+-2.10.3/disable-print.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- gtk+-2.10.0/configure.in~	2006-07-05 18:11:44.000000000 +0200
-+++ gtk+-2.10.0/configure.in	2006-07-05 18:11:44.000000000 +0200
-@@ -1539,26 +1539,27 @@
- # Printing system checks
- ################################################################
- 
--AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
--if test "x$CUPS_CONFIG" != "xno"; then
--  CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
--  CUPS_LIBS=`cups-config --libs`
--
--  CUPS_API_VERSION=`cups-config --api-version`
--  CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
--  CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
--
--  if test $CUPS_API_MAJOR -gt 1 -o \
--          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
--    AC_DEFINE(HAVE_CUPS_API_1_2)
--  fi
--
--  AC_SUBST(CUPS_API_MAJOR)
--  AC_SUBST(CUPS_API_MINOR)
--  AC_SUBST(CUPS_CFLAGS)
--  AC_SUBST(CUPS_LIBS)
--fi
--AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-+#AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
-+#if test "x$CUPS_CONFIG" != "xno"; then
-+#  CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
-+#  CUPS_LIBS=`cups-config --libs`
-+#
-+#  CUPS_API_VERSION=`cups-config --api-version`
-+#  CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
-+#  CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
-+#
-+#  if test $CUPS_API_MAJOR -gt 1 -o \
-+#          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
-+#   AC_DEFINE(HAVE_CUPS_API_1_2)
-+# fi
-+#
-+#  AC_SUBST(CUPS_API_MAJOR)
-+#  AC_SUBST(CUPS_API_MINOR)
-+#  AC_SUBST(CUPS_CFLAGS)
-+#  AC_SUBST(CUPS_LIBS)
-+#fi
-+#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-+AM_CONDITIONAL(HAVE_CUPS,false)
- 
- gtk_save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
diff --git a/packages/gtk+/gtk+-2.10.3/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.3/disable-tooltips.patch
deleted file mode 100644
index d71d839c3c..0000000000
--- a/packages/gtk+/gtk+-2.10.3/disable-tooltips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-2.4.3/gtk/gtktooltips.c.old	2004-07-04 18:52:04.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtktooltips.c	2004-07-04 18:52:08.000000000 +0100
-@@ -118,7 +118,7 @@
-   tooltips->tips_data_list = NULL;
-   
-   tooltips->delay = DEFAULT_DELAY;
--  tooltips->enabled = TRUE;
-+  tooltips->enabled = FALSE;
-   tooltips->timer_tag = 0;
-   tooltips->use_sticky_delay = FALSE;
-   tooltips->last_popdown.tv_sec = -1;
diff --git a/packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch b/packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch
deleted file mode 100644
index 20481f059b..0000000000
--- a/packages/gtk+/gtk+-2.10.3/gtk+-handhelds.patch
+++ /dev/null
@@ -1,236 +0,0 @@
---- gtk+-2.4.1/gtk/gtkarrow.c	2004-03-13 09:51:13.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkarrow.c	2004-05-26 14:52:17.000000000 +1000
-@@ -29,7 +29,7 @@
- #include "gtkarrow.h"
- #include "gtkintl.h"
- 
--#define MIN_ARROW_SIZE  15
-+#define MIN_ARROW_SIZE  7
- 
- enum {
-   PROP_0,
-@@ -53,6 +53,8 @@
- 				    guint            prop_id,
- 				    GValue          *value,
- 				    GParamSpec      *pspec);
-+static void gtk_arrow_size_request (GtkWidget *arrow, 
-+				    GtkRequisition *requisition);
- 
- GType
- gtk_arrow_get_type (void)
-@@ -111,6 +113,7 @@
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
-   
-   widget_class->expose_event = gtk_arrow_expose;
-+  widget_class->size_request = gtk_arrow_size_request;
- }
- 
- static void
-@@ -166,13 +169,18 @@
- }
- 
- static void
-+gtk_arrow_size_request (GtkWidget *arrow, 
-+			GtkRequisition *requisition)
-+{
-+  requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
-+  requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
-+}
-+
-+static void
- gtk_arrow_init (GtkArrow *arrow)
- {
-   GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW);
- 
--  GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2;
--  GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2;
--
-   arrow->arrow_type = GTK_ARROW_RIGHT;
-   arrow->shadow_type = GTK_SHADOW_OUT;
- }
---- gtk+-2.4.1/gtk/gtkcalendar.c	2004-03-06 14:37:26.000000000 +1100
-+++ gtk+-2.4.1/gtk/gtkcalendar.c	2004-05-26 14:58:57.000000000 +1000
-@@ -340,6 +340,9 @@
- static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar,
- 					       guint        day);
- 
-+static void gtk_calendar_do_select_day (GtkCalendar *calendar,
-+					guint	      day);
-+
- static void gtk_calendar_paint_arrow	(GtkWidget    *widget,
- 					 guint	       arrow);
- static void gtk_calendar_paint_day_num	(GtkWidget    *widget,
-@@ -861,13 +864,13 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar, month_len);
-     }
-   else
-     {
-       if (calendar->selected_day < 0)
- 	calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
--      gtk_calendar_select_day (calendar, calendar->selected_day);
-+      gtk_calendar_do_select_day (calendar, calendar->selected_day);
-     }
- 
-   gtk_widget_queue_draw (GTK_WIDGET (calendar));
-@@ -908,10 +911,10 @@
-   if (month_len < calendar->selected_day)
-     {
-       calendar->selected_day = 0;
--      gtk_calendar_select_day (calendar, month_len);
-+      gtk_calendar_do_select_day (calendar,