diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-03-19 14:08:04 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-03-19 14:08:44 +0100 |
| commit | b884b02725367ec1ba3281b157d085ba70d81bbf (patch) | |
| tree | 4818a611d16a74aa0ba26629317e268dcce6c236 /conf/distro | |
| parent | a0169ba0655e09c373f599c310e415c147c8c665 (diff) | |
sane-toolchain.inc: move non-weak assignments for CACHE and DEPLOY_DIR to minimal.conf; make them weak
You can override DEPLOY_DIR now in your local.conf.
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/sane-toolchain.inc | 3 | ||||
| -rw-r--r-- | conf/distro/minimal.conf | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index b261d635af..f70e98ee17 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -117,9 +117,6 @@ TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t" # Can be "glibc", "eglibc" or "uclibc" PREFERRED_LIBC ?= "glibc" PSTAGE_EXTRAPATH = "${PREFERRED_LIBC}" - -CACHE = "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}" -DEPLOY_DIR = "${TMPDIR}/deploy/${PREFERRED_LIBC}" require conf/distro/include/sane-toolchain-${PREFERRED_LIBC}.inc # Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index f7c33d4ed6..56724446cf 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -57,6 +57,8 @@ IPKG_VARIANT = "opkg-nogpg" ############################################################################# # Name the generated images in a sane way IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" +CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}" +DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_LIBC}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" ############################################################################# |