diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-02-13 11:15:20 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-02-13 11:15:20 +0000 |
| commit | 784e9e1768bfef0341ec13b7d17b32d98dafaef3 (patch) | |
| tree | 42aeafee932d81641e82de922bcdc71b66e9f5b8 /conf | |
| parent | 403333e2d7c0ff87a0a449d7f2d014d941a20d8a (diff) | |
| parent | 32e690935379493f478d1b7a1cd43fce486083da (diff) | |
merge of '054216fcb27d4211cd8948d7407878afe1bbf15c'
and 'f26d3059129388297f1542283ce17d100f8c8acc'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 6 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 2 | ||||
| -rw-r--r-- | conf/machine/davinci-sffsdr.conf | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index ac2d281123..27a04a028c 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -529,6 +529,10 @@ OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUIL include conf/site.conf include conf/auto.conf include conf/local.conf +# USERDISTRO should always contain original DISTRO value as set by user +# If a distro config overrides DISTRO for whatever reason (e.g. to get +# overrides like it wants), USERDISTRO must be reassigned with := first +USERDISTRO = "${DISTRO}" include conf/build/${BUILD_SYS}.conf include conf/target/${TARGET_SYS}.conf include conf/machine/${MACHINE}.conf @@ -541,7 +545,7 @@ require conf/sanity.conf ################################################################## DL_DIR ?= "${TMPDIR}/downloads" -IMAGE_FSTYPES ?= "jffs2" +IMAGE_FSTYPES ?= "tar.gz" PCMCIA_MANAGER ?= "pcmcia-cs" DEFAULT_TASK_PROVIDER ?= "task-base" MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index fe216800c3..6ba20c4830 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -2,6 +2,8 @@ #@NAME: Angstrom #@DESCRIPTION: Release independent distribution configuration for Angstrom +# Preserve original DISTRO value +USERDISTRO := "${DISTRO}" DISTRO = "angstrom" DISTRO_NAME = "Angstrom" diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf index ecff6fae13..faf86c5ed0 100644 --- a/conf/machine/davinci-sffsdr.conf +++ b/conf/machine/davinci-sffsdr.conf @@ -19,7 +19,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" #ROOT_FLASH_SIZE = "29" -MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa" +MACHINE_FEATURES = "kernel26 serial" require conf/machine/include/tune-arm926ejs.inc |