merge of '0b92f5db2f95d0c6de41c8d1e583c2c82e14b488'

     and '637a94bb7567a04d1efd6676dc5f5661b57465a3'

2 files changed, 72 insertions, 1 deletions

diff --git a/packages/linux/mainstone-kernel_2.6.18.bb b/packages/linux/mainstone-kernel_2.6.18.bb
new file mode 100644
index 0000000000..6b90f73f3e
--- /dev/null
+++ b/packages/linux/mainstone-kernel_2.6.18.bb
@@ -0,0 +1,39 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)"
+LICENSE = "GPL"
+MAINTAINER = "Cliff Brake <cliff.brake@gmail.com>"
+PR = "r0
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
+           file://mainstone_defconfig"
+
+S = "${WORKDIR}/linux-2.6.18
+
+COMPATIBLE_HOST = 'arm.*-linux'
+
+inherit kernel
+inherit package
+
+ARCH = "arm"
+KERNEL_IMAGETYPE = "zImage"
+#CMDLINE_CONSOLE ?= "ttyS0,115200n8"
+#CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000"
+#CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000"
+#CMDLINE_ROOT = "root=/dev/ram0 rw rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000"
+#CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config
+#	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
+
+COMPATIBLE_MACHINE = "mainstone"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 61b8744105..0ad82bcc5b 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -3,7 +3,9 @@ MAINTAINER = "Richard Purdie <richard@openedhand.com>"
 PR = "r0"
 
 PACKAGES = "task-base \
-            task-base-oh-minimal"
+            task-base-minimal \
+            task-base-oh-minimal \
+            task-base-core-default"
 
 ALLOW_EMPTY = "1"
 
@@ -37,6 +39,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 MACHINE_FEATURES ?= "kernel26"
 DISTRO_FEATURES ?= ""
+DISTRO_CORE_PACKAGE ?= "task-base-core-default"
 
 DISTRO_EXTRA_RDEPENDS ?= ""
 DISTRO_EXTRA_RRECOMMENDS ?= ""
@@ -60,6 +63,7 @@ COMBINED_FEATURES = "\
 # task-base 
 #
 RDEPENDS_task-base = "\
+    ${DISTRO_CORE_PACKAGE} \
     kernel \
     ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
@@ -105,6 +109,33 @@ RDEPENDS_task-base-oh-minimal = "\
 RRECOMMENDS_task-base-minimal = "\
     ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
 
+
+
+HOTPLUG ?= "linux-hotplug"
+
+RDEPENDS_task-base-core-default = '\
+    base-files \
+    base-passwd \
+    busybox \
+    initscripts \
+    netbase \
+    sysvinit \
+    sysvinit-pidof \
+    tinylogin \
+    modutils-initscripts 
+    fuser 
+    setserial'
+# Lets see if we can kill off hotplug...
+#    ${HOTPLUG} 
+#    ${@bootstrap_modutils_rdepends(d)}
+
+
+RRECOMMENDS_task-base-core-default = '\
+    dropbear \
+    portmap'
+
+
+
 task-base-kernel26-rdepends = "\
     udev \
     keymaps \
@@ -253,3 +284,4 @@ task-distro-nfs-rrecommends = "\
 # kernel-module-md5
 # kernel-module-8250
 # Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz 
+