From 325476d19b821623dbe151d7026c20dfd3754432 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 8 Dec 2008 11:32:37 +0100 Subject: angstrom: rename ANGSTROM_MODE to ANGSTROMLIBC to make it work with bitbake env filtering (>1.8.10) * http://www.angstrom-distribution.org/files/source-me.txt has been adjusted as well --- packages/images/liveramdisk-image.bb | 2 +- packages/linux/linux-handhelds-2.6.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/images/liveramdisk-image.bb b/packages/images/liveramdisk-image.bb index 49af33c4ed..5caa4baa11 100644 --- a/packages/images/liveramdisk-image.bb +++ b/packages/images/liveramdisk-image.bb @@ -1,5 +1,5 @@ # LiveRamdisk image -# Building with ANGSTROM_MODE=uclibc is recommended +# Building with ANGSTROMLIBC=uclibc is recommended # # LiveRamdisk concept/implementation by Paul Sokolovsky LICENSE = "MIT" diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index c9edbf301e..5270c1465b 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -35,7 +35,7 @@ do_configure() { die "No default configuration for ${MACHINE} available." fi - if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" = "glibc" ]; then + if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROMLIBC}" = "glibc" ]; then if [ ! -f ${KERNEL_INITRAMFS_PATH} ]; then echo "Kernel is requested to be built with internal initramfs." echo "The initramfs image must exist prior to building the kernel, but it does not" @@ -74,7 +74,7 @@ do_deploy_append() { echo "${MACHINE}-kernel-${DATETIME} ${KERNEL_IMAGE_BASE_NAME} - kernel" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl gen_haret_startup - if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" == "glibc" ]; then + if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROMLIBC}" == "glibc" ]; then cp ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-$(basename ${KERNEL_INITRAMFS_PATH} | awk -F. '{print $1}')-${PV}-${PR}-${MACHINE}.bin fi } -- cgit v1.2.3