From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 19 Dec 2009 22:22:12 +0000 (-0800)
Subject: minimal: Add 'mplt' to DISTRO_FEATURES.
X-Git-Tag: Release-2010-05/1~1235
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c3fc5bbcd4ec69396b08b1f570df8a1f05a2259;p=openembedded.git

minimal: Add 'mplt' to DISTRO_FEATURES.

* As minimal-uclibc includes minimal conf the
  distro features get inherited. mplt is not
  supported on uclibc yet. So we should disable
  it for uclibc/mips based distros.

* Add a note about overriding DISTRO_FEATURES.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Holger Hans Peter Freyther <zecke@selfish.org>
---

diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf
index 9594622bed..df727697e2 100644
--- a/conf/distro/minimal-uclibc.conf
+++ b/conf/distro/minimal-uclibc.conf
@@ -19,3 +19,23 @@ TARGET_FPU_armeb = "soft"
 LIBC = "uclibc"
 
 require conf/distro/minimal.conf
+
+# NOTE:
+#
+# We get the DISTRO_FEATURES defined in minimal.conf here but
+# however there are some features like mips -mplt support which
+# is not supported on uclibc yet so we need to disable that
+# feature for uclibc based distributions, therefore we redefine
+# the DISTRO_FEATURES for minimal-uclibc and notably leave mplt
+# out. Make sure that if there is a new DISTRO_FEATURE thats added
+# to minimal.conf will not get included in minimal-uclibc.conf
+# it has to be added to the below selection if it should also be
+# enabled for minimal-uclibc
+
+# FEATURE SELECTION
+#############################################################################
+# We want images supporting the following features (for task-base)
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci"
+# Following features are for ARM and E500 based machines
+DISTRO_FEATURES += "eabi"
+
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 1e9eec20f4..00397db047 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -28,6 +28,12 @@ DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pc
 # Following features are for ARM and E500 based machines
 DISTRO_FEATURES += "eabi"
 
+# The following feature enables the MIPS ABI PLT extensions
+# This feature needs GCC 4.4 binutils 2.19 or glibc/eglibc 2.9
+# or higher
+
+DISTRO_FEATURES += "mplt"
+
 #############################################################################
 # LIBRARY NAMES
 #############################################################################