diff options
Diffstat (limited to 'conf/distro/include')
| -rw-r--r-- | conf/distro/include/angstrom-2007-for-openmoko.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index 7a4d498539..34fbc52cfe 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -29,7 +29,7 @@ DISTRO_TYPE ?= "debug" IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' # set feed path variables -FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/" +FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${ANGSTROMLIBC}/" #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 847078b21e..25dee11ff2 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -17,12 +17,12 @@ INHERIT += "src_distribute_local" SRC_DIST_LOCAL ?= "symlink" # Can be "glibc", "eglibc" or "uclibc" -ANGSTROM_MODE ?= "glibc" -PSTAGE_EXTRAPATH = "${ANGSTROM_MODE}" +ANGSTROMLIBC ?= "glibc" +PSTAGE_EXTRAPATH = "${ANGSTROMLIBC}" -CACHE = "${TMPDIR}/cache/${ANGSTROM_MODE}/${MACHINE}" -DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}" -require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc +CACHE = "${TMPDIR}/cache/${ANGSTROMLIBC}/${MACHINE}" +DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROMLIBC}" +require conf/distro/include/angstrom-${ANGSTROMLIBC}.inc # ARM920T and up can use thumb mode to decrease binary size at the expense of speed # (the complete story is a bit more nuanced due to cache starvation) @@ -287,7 +287,7 @@ PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi" #Name the generated images in a sane way -IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${ANGSTROM_MODE}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${ANGSTROMLIBC}-${ANGSTROM_PKG_FORMAT}-${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 @@ -299,7 +299,7 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi # in their local.conf #Name of the client -TINDER_MACHINE = "${MACHINE}-${ANGSTROM_MODE}-build-image" +TINDER_MACHINE = "${MACHINE}-${ANGSTROMLIBC}-build-image" # Which lof file to write to, which tree to report to TINDER_LOG = "${TMPDIR}/tinder.log" |