summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2011-08-23 10:46:42 +0100
committerPhil Blundell <philb@gnu.org>2011-08-23 10:46:42 +0100
commit4442f69effbcdd4adaf1fd58fe8f149b6803e5c0 (patch)
tree829b6bd15c6d2f28807b575a0105aca6052616c6
parentbea936913fcf684c23d36f740050dea118d5caad (diff)
downloadmeta-micro-4442f69effbcdd4adaf1fd58fe8f149b6803e5c0.zip
meta-micro-4442f69effbcdd4adaf1fd58fe8f149b6803e5c0.tar.gz
meta-micro-4442f69effbcdd4adaf1fd58fe8f149b6803e5c0.tar.bz2
micro: override DISTRO_FEATURES rather than appending to it; clear COMMERCIAL_LICENSES to avoid false triggering.
-rw-r--r--conf/distro/micro.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index 75529ca..61e98b6 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -18,7 +18,7 @@ DISTRO_VERSION = "${SRCDATE}"
#############################################################################
# DISTRO FEATURE SELECTION
#############################################################################
-DISTRO_FEATURES += "eabi ipv6 ipv4 largefile thumb-interwork xattr ld-is-gold ${DISTRO_FEATURES_LIBC}"
+DISTRO_FEATURES = "eabi ipv6 ipv4 largefile thumb-interwork xattr ld-is-gold ${DISTRO_FEATURES_LIBC}"
#############################################################################
# LIBRARY NAMES
@@ -101,3 +101,4 @@ ONLINE_PACKAGE_MANAGEMENT = "none"
DISTRO_BLUETOOTH_MANAGER = "bluez4"
+COMMERCIAL_LICENSE_DEPENDEES = ""