[oe-commits] Tom Rini : minimal and minimal-uclibc: Rework order so both work now.

[GIT User account]

Module: openembedded.git
Branch: trini/add-libc-overrides
Commit: 174880c8c8bc1863f9f7350a0106f790711a6e6d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=174880c8c8bc1863f9f7350a0106f790711a6e6d

Author: Tom Rini <trini at embeddedalley.com>
Date:   Mon Apr 27 16:45:47 2009 -0400

minimal and minimal-uclibc: Rework order so both work now.

---

 conf/distro/minimal-uclibc.conf |    4 +---
 conf/distro/minimal.conf        |    4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf
index 62e70e1..4edc9c6 100644
--- a/conf/distro/minimal-uclibc.conf
+++ b/conf/distro/minimal-uclibc.conf
@@ -8,8 +8,6 @@
 #@COMMENT: It bases on conservative settings and should always be buildable.
 #-----------------------------------------------------------------------------
 
-require conf/distro/minimal.conf
-
 #
 # Header
 #
@@ -26,7 +24,6 @@ PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 
 # Override the default virtual/libintl
 PREFERRED_LIBC = "uclibc"
-require conf/distro/include/${PREFERRED_LIBC}.inc
 PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl"
 
 USE_NLS ?= "no"
@@ -37,3 +34,4 @@ USE_NLS_gcc-cross = "no"
 PREFERRED_VERSION_uclibc = "0.9.30"
 PREFERRED_VERSION_uclibc-initial = "0.9.30"
 
+require conf/distro/minimal.conf
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 35c3368..b930ca0 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -10,7 +10,7 @@
 #############################################################################
 # NAME and VERSION
 #############################################################################
-DISTRO_NAME = "minimal"
+DISTRO_NAME ?= "minimal"
 DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
@@ -70,7 +70,7 @@ MACHINE_KERNEL_VERSION = "2.6"
 #############################################################################
 # TOOLCHAIN
 #############################################################################
-PREFERRED_LIBC = "glibc"
+PREFERRED_LIBC ?= "glibc"
 require conf/distro/include/sane-toolchain.inc
 
 #############################################################################