aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/nylon.conf3
-rw-r--r--conf/licenses.conf6
2 files changed, 4 insertions, 5 deletions
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index a72e639f64..89c3b332cc 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -30,9 +30,6 @@ PREFERRED_VERSION_binutils-cross = "2.14.90.0.7"
PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7"
PREFERRED_VERSION_binutils = "2.14.90.0.7"
-#PREFERRED_VERSION_prism54-module = "1.2"
-PREFERRED_VERSION_unik-olsrd = "0.4.7"
-
# use meshcub.org mirrors
CVS_TARBALL_STASH = "http://meshcube.org/nylon/unstable/sources/"
INHERIT += "nylon-mirrors"
diff --git a/conf/licenses.conf b/conf/licenses.conf
index 247c668943..db3f78e10f 100644
--- a/conf/licenses.conf
+++ b/conf/licenses.conf
@@ -1,2 +1,4 @@
-SRC_DISTRIBUTE_LICENSES = "GPL GPLv2 BSD LGPL Apache-2.0 BZIP2 QPL AFL"
-SRC_DISTRIBUTE_LICENSES += "NTP MIT Sleepycat Classpath"
+SRC_DISTRIBUTE_LICENSES = "GPL GPLv2 BSD LGPL Apache-2.0 QPL AFL"
+SRC_DISTRIBUTE_LICENSES += "MIT Sleepycat Classpath Perl PSF PD Artistic"
+SRC_DISTRIBUTE_LICENSES += "bzip2 zlib ntp cron libpng netperf"
+