diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-05-27 22:48:50 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-05-27 22:48:50 +0000 |
| commit | 8574ff41bb04dbc68624c491f45a336ffd27e81e (patch) | |
| tree | 31927dc8ed8c941c1de00365fb8157bfc6abe4db /conf | |
| parent | adcf47ee2b1d194d04faab31d13ee2c98d7306f6 (diff) | |
| parent | 607585307faff650f3cbcc2d9cc3d9930e6562f0 (diff) | |
merge of '80e89ea6e10ab76e3aac0f79be7b3fdfba71e2b7'
and 'e35c79c0e44e6a58add42e2dc50ecfaad4e02c0e'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 1 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index cdca2b6383..a86e806fe1 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -348,7 +348,6 @@ KERNELORG_MIRROR = "http://kernel.org/" # You can use the mirror of your country to get faster downloads by putting # export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool" -# export SOURCEFORGE_MIRROR = "http://belnet.dl.sourceforge.net/sourceforge" # into your local.conf FETCHCOMMAND = "ERROR, this must be a BitBake bug" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 6605fff3e8..3d4be081fb 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -37,7 +37,7 @@ TARGET_FPU_armeb ?= "soft" TARGET_FPU_ixp4xx ?= "soft" #Name the generated images in a sane way -IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${ANGSTROM_MODE}-${DISTRO_VERSION}-${MACHINE}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" # Angstrom *always* has some form of release config, so error out if someone thinks he knows better |