diff options
| author |   Michael Lauer <mickey@vanille-media.de> | 2006-04-23 16:29:33 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-23 16:29:33 +0000 |
| commit | e99fa15bdf99ddef110d2ed419e3f67fd47c94de (patch) | |
| tree | 2a3690502be250dfe49147ed1cd020e7b7b24b06 /conf | |
| parent | 4aeb84024a17e85836869b257b682fabedee1917 (diff) | |
| parent | 43a499b782367210547e21c1f3e8aabdbcd2d29c (diff) | |
| download | openembedded-e99fa15bdf99ddef110d2ed419e3f67fd47c94de.tar.gz | |
merge of d23a51fd3de55ab7bd14228f1701651fb28530e6
and e399d3faf8861b253531bf4ec2dbec4e5ea1af2b
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 7 | ||||
| -rw-r--r-- | conf/documentation.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell.conf | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 4506881018..5d77335a86 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -25,6 +25,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 @@ -33,6 +36,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" 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" 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" |