summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorBruno Randolf <br1@subnet.at>2004-12-02 18:05:45 +0000
committerBruno Randolf <br1@subnet.at>2004-12-02 18:05:45 +0000
commit8503fbded7f04b1abf0b01886a278ad999f4ab5b (patch)
treed7ac1657ed1ef727b99eb5fd8b131eb6fe8e20f6 /conf
parent8f8ce3d7ee813c5b2e9950ab160a7935715658a5 (diff)
Merge oe-devel@oe-devel.bkbits.net:packages
into null.(none):/data/mtx/oe/packages 2004/12/02 19:05:10+01:00 (none)!br1 added some more licenses to SRC_DISTRIBUTE_LICENSES. replaced as-is licenses with packagename. made packagname licenses lowercase 2004/12/02 18:30:48+01:00 (none)!br1 little nylon updates 2004/12/02 18:29:36+01:00 (none)!br1 added CONFFILES for nylon. once CONFFILES should be used in all oe, the "_nylon" part can be removed 2004/12/02 17:19:19+01:00 (none)!br1 src_distribute: better output when LICENSE is not valid BKrev: 41af59791fZQQgIzG_GWbh0227Ar0w
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"
+