diff options
| author | Phil Blundell <philb@gnu.org> | 2009-06-20 10:43:47 +0100 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2009-06-20 10:43:47 +0100 |
| commit | 1b460b4e284436b141e49237274899702604d240 (patch) | |
| tree | d45e133f6b636748032f52f5fee76ba1c4f648d1 | |
| parent | 4926fc282489d6dcd8c618100a74f6f24897dbfe (diff) | |
micro{-uclibc}: use ${LIBC} instead of PREFERRED_LIBC, per suggestion from Tom Rini
| -rw-r--r-- | conf/distro/micro-uclibc.conf | 2 | ||||
| -rw-r--r-- | conf/distro/micro.conf | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/conf/distro/micro-uclibc.conf b/conf/distro/micro-uclibc.conf index 08d8e303cf..f793d4a3c1 100644 --- a/conf/distro/micro-uclibc.conf +++ b/conf/distro/micro-uclibc.conf @@ -28,7 +28,7 @@ TARGET_OS_armeb = "linux-uclibcgnueabi" ############################################################################# # TOOLCHAIN ############################################################################# -PREFERRED_LIBC = "uclibc" +LIBC = "uclibc" ############################################################################# # PREFERRED PROVIDERS diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf index f8b293de28..c566d7502d 100644 --- a/conf/distro/micro.conf +++ b/conf/distro/micro.conf @@ -47,11 +47,11 @@ require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc # IMAGES ############################################################################# # Name generated images -IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-\ +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-\ ${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" -CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}" -DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_LIBC}" +CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}" +DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" # Image output types @@ -66,7 +66,7 @@ MACHINE_KERNEL_VERSION = "2.6" ############################################################################# # TOOLCHAIN ############################################################################# -PREFERRED_LIBC = "glibc" +LIBC = "glibc" require conf/distro/include/sane-toolchain.inc ############################################################################# @@ -110,3 +110,4 @@ USE_LDCONFIG = "0" # Disable online package management ONLINE_PACKAGE_MANAGEMENT = "none" + |