merge of '288504c0e005ddaf483f67c32ceb9648a94cc671'

     and '3388a823662072c321fa2858d30420bd4ce65421'

14 files changed, 145 insertions, 4 deletions

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 0670da678d..b25275e702 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -179,7 +179,9 @@ FILES = ""
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 FILES_kernel-dev = "/boot/System.map* /boot/config*"
 RDEPENDS_kernel = "kernel-base"
-RDEPENDS_kernel-base = "kernel-image"
+# Allow machines to override this dependency if kernel image files are 
+# not wanted in images as standard
+RDEPENDS_kernel-base ?= "kernel-image"
 PKG_kernel-image = "kernel-image-${KERNEL_VERSION}"
 PKG_kernel-base = "kernel-${KERNEL_VERSION}"
 ALLOW_EMPTY_kernel = "1"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 6862a8095f..20fc2fb873 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -10,5 +10,5 @@ IMAGE_FSTYPES ?= "jffs2"
 ROOT_FLASH_SIZE = "25"
 # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
 
-XSERVER = "xserver-kdrive-w100"
+XSERVER = "xserver-kdrive-imageon"
 
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index 0ca65b79a9..146ecf9495 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -8,6 +8,7 @@ TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppc405"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+UBOOT_ENTRYPOINT = "0"
 
 MACHINE_FEATURES = "kernel26 ext2"
 MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index cc604a0ada..f3c70c56a7 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -8,6 +8,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-gta01"
+UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone"
 
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index c9e1e73814..d18e5e8b8b 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -8,6 +8,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-gta02"
+UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
 
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index a9702cfce2..aa9046ee5d 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -67,3 +67,6 @@ zaurus_make_installkit () {
     md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
     rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/     
 }
+
+# Don't include kernels in standard images for Zaurus machines
+RDEPENDS_kernel-base = ""
\ No newline at end of file
diff --git a/conf/machine/smdk2443.conf b/conf/machine/smdk2443.conf
index 0f7419f80b..199adb515f 100644
--- a/conf/machine/smdk2443.conf
+++ b/conf/machine/smdk2443.conf
@@ -7,6 +7,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-smdk2443"
+UBOOT_ENTRYPOINT = "30008000"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttySAC0"
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
+
+
+