From a11d7da5cf3f6a57ff01a15173a5bfa99f74c382 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 23 Apr 2006 12:18:59 +0000
Subject: angstrom-2006.9: add some safeguards * select kernel 2.6 for zaurus
 and iPAQs (KERNEL and ZKERNEL_VERSION) * zap contents of GPE_EXTRA_INSTALL

---
 conf/distro/angstrom-2006.9.conf | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'conf')

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 4cfea8e3da..c91437f54f 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -23,6 +23,9 @@ include conf/distro/preferred-opie-versions.inc
 # GPE
 include conf/distro/preferred-gpe-versions-2.8.inc
 
+#zap extra stuff taking place in $MACHINE.conf 
+GPE_EXTRA_INSTALL = ""
+
 # E
 include conf/distro/preferred-e-versions.inc
 
@@ -31,6 +34,10 @@ PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
 PREFERRED_PROVIDER_libx11 = "diet-x11"
 
 
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+ZKERNEL_VERSION = "2.6"
+
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
-- 
cgit v1.2.3


From 2c30d428f51c8bb65ecc2906b4fade1cb602d318 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 23 Apr 2006 15:09:41 +0000
Subject: zaurus-clamshell.conf: add support for adding jffs2 summaries to
 improve mount times * adapted from ipaq-pxa270.conf - Thanks Philipp!

---
 conf/machine/include/zaurus-clamshell.conf | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'conf')

diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
index 2a174288b1..35579dde7a 100644
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -11,6 +11,11 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 		   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
 		   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
 
+#add a summary to the jffs2 file to make it mount a lot faster
+EXTRA_IMAGECMD_jffs2 = "&& sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img \
+                          -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.img \
+                          --eraseblock=0x4000 -p"
+
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_INSTALL += "gaim sylpheed"
 
-- 
cgit v1.2.3


From 43b0c26db18fbceb32189326253fca41b5ef787d Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Sun, 23 Apr 2006 15:21:43 +0000
Subject: conf: Update documentation.conf to include SYSVINIT_ENABLED_GETTYS

---
 conf/documentation.conf | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'conf')

diff --git a/conf/documentation.conf b/conf/documentation.conf
index cd189b6f2b..d85ccdb0db 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -92,5 +92,7 @@ ENABLE_BINARY_LOCALE_GENERATION[doc] = "Enable the use of qemu to generate local
 
 PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slots (usually pcmcia-cs or pcmciautils)."
 
+SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
+
 # palmtop build class
 PALMTOP_USE_MULTITHREADED_QT[doc] = "Set to yes, if you want to build qt apps with CONFIG+=thread"
-- 
cgit v1.2.3