7 files changed, 134 insertions, 2 deletions
diff --git a/packages/angstrom/angstrom-x11-gpe-image.bb b/packages/angstrom/angstrom-x11-gpe-image.bb
new file mode 100644
index 0000000000..bb5e3c66be
--- /dev/null
+++ b/packages/angstrom/angstrom-x11-gpe-image.bb
@@ -0,0 +1,36 @@
+#Angstrom X11 image, with apps and kernel modules included
+LICENSE = "MIT"
+PR = "r0"
+
+PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
+PREFERRED_PROVIDER_tslib 		?= "tslib"
+PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
+PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
+
+ANGSTROM_EXTRA_INSTALL += " \
+                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
+			  " 
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "x11-image"
+
+DEPENDS = "task-base"
+RDEPENDS = "\
+    ${XSERVER} \
+    task-base-extended \
+    angstrom-x11-base-depends \
+    angstrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    kernel-modules \
+    hal \
+    angstrom-gpe-task-pim \
+    ${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/angstrom-x11-office-image.bb b/packages/angstrom/angstrom-x11-office-image.bb
new file mode 100644
index 0000000000..cfe8220291
--- /dev/null
+++ b/packages/angstrom/angstrom-x11-office-image.bb
@@ -0,0 +1,41 @@
+#Angstrom X11 image, with apps and kernel modules included
+LICENSE = "MIT"
+PR = "r1"
+
+PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
+PREFERRED_PROVIDER_tslib 		?= "tslib"
+PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
+PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
+
+ANGSTROM_EXTRA_INSTALL += " \
+                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
+			  " 
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "x11-image"
+
+DEPENDS = "task-base"
+RDEPENDS = "\
+    ${XSERVER} \
+    task-base-extended \
+    angstrom-x11-base-depends \
+    angstrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    kernel-modules \
+    hal \
+    abiword \
+    gnumeric \
+    cups \
+    claws-mail claws-mail claws-plugin-maildir claws-plugin-mailmbox claws-plugin-rssyl \
+    midori minimo \
+    gphoto2 \
+    ${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/angstrom-x11-pimlico-image.bb b/packages/angstrom/angstrom-x11-pimlico-image.bb
new file mode 100644
index 0000000000..0ddaeae12b
--- /dev/null
+++ b/packages/angstrom/angstrom-x11-pimlico-image.bb
@@ -0,0 +1,36 @@
+#Angstrom X11 image, with apps and kernel modules included
+LICENSE = "MIT"
+PR = "r0"
+
+PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
+PREFERRED_PROVIDER_tslib 		?= "tslib"
+PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
+PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
+
+ANGSTROM_EXTRA_INSTALL += " \
+                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
+			  " 
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "x11-image"
+
+DEPENDS = "task-base"
+RDEPENDS = "\
+    ${XSERVER} \
+    task-base-extended \
+    angstrom-x11-base-depends \
+    angstrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    kernel-modules \
+    hal \
+    angstrom-ohand-task-pim \
+    ${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/blktool/blktool_4.bb b/packages/blktool/blktool_4.bb
new file mode 100644
index 0000000000..e658e3256f
--- /dev/null
+++ b/packages/blktool/blktool_4.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Display or change block device settings"
+LICENSE = "GPLv2"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz"
+
+S = "${WORKDIR}/${PN}-${PV}.orig"
+
+inherit autotools
+\ No newline at end of file
diff --git a/packages/linux/linux-gta01.inc b/packages/linux/linux-gta01.inc
index 11729553ab..4ee117ea90 100644
--- a/packages/linux/linux-gta01.inc
+++ b/packages/linux/linux-gta01.inc
@@ -12,7 +12,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-gta01"
 ##############################################################
 # source and patches
 #
-SRC_URI = "http://ftp.de.kernel.org/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
            file://defconfig-${VANILLA_VERSION}-${MACHINE} \
            file://logo_linux_clut224.ppm"
 S = "${WORKDIR}/linux-${VANILLA_VERSION}"
@@ -51,7 +51,7 @@ module_autoload_s3cmci = "s3cmci"
 
 do_prepatch() {
 	mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
-	mv patches patches.old
+	mv patches patches.openmoko
 	mv .pc .pc.old
 }
 
diff --git a/packages/squid/.mtn2git_empty b/packages/squid/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/squid/.mtn2git_empty
diff --git a/packages/squid/squid_2.6.STABLE14.bb b/packages/squid/squid_2.6.STABLE14.bb
new file mode 100644
index 0000000000..580ec52ac6
--- /dev/null
+++ b/packages/squid/squid_2.6.STABLE14.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"
+LICENSE = "GPLv2"
+
+DEPENDS = "aio"
+
+SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-2.6.STABLE14.tar.bz2"
+
+inherit autotools
+
+
+