From: Bruno Randolf Date: Tue, 7 Dec 2004 16:34:22 +0000 (+0000) Subject: small ntp license and prism54 updates X-Git-Tag: Release-2010-05/1~15751 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c18d42cd19fb7da25d82361591739171b0c2003;p=openembedded.git small ntp license and prism54 updates BKrev: 41b5db8e0TzVvO2BRROxro5uHygauA --- diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 89c3b332cc..4b651ff8af 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -30,6 +30,8 @@ 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-firmware = "1.0.3.0" + # 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 1ba1e2eace..a72d9b8af7 100644 --- a/conf/licenses.conf +++ b/conf/licenses.conf @@ -1,4 +1,4 @@ -SRC_DISTRIBUTE_LICENSES = "GPL GPLv2 BSD LGPL Apache-2.0 QPL AFL" +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 openssl" diff --git a/misc-binary-only/prism2-firmware-update_1.7.4.oe b/misc-binary-only/prism2-firmware-update_1.7.4.oe index bf6442a073..54af2fab41 100644 --- a/misc-binary-only/prism2-firmware-update_1.7.4.oe +++ b/misc-binary-only/prism2-firmware-update_1.7.4.oe @@ -3,7 +3,7 @@ RDEPENDS = "hostap-modules-pci hostap-utils" SECTION = "base" PRIORITY = "optional" MAINTAINER = "Bruno Randolf " -LICENSE = "GPL" +LICENSE = "unknown" SRC_URI = "http://www.red-bean.com/~proski/firmware/1.7.4.tar.gz" @@ -41,4 +41,4 @@ pkg_postinst() { done; } -FILES_${PN} += "/tmp" \ No newline at end of file +FILES_${PN} += "/tmp" diff --git a/ntp/ntp_4.1.2.oe b/ntp/ntp_4.1.2.oe index 525264a53b..86ef804dd7 100644 --- a/ntp/ntp_4.1.2.oe +++ b/ntp/ntp_4.1.2.oe @@ -5,7 +5,7 @@ or satellite receiver or modem." HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome" SECTION = "console/network" PRIORITY = "optional" -LICENSE = "NTP" +LICENSE = "ntp" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV}.tar.gz \ file://configure.patch;patch=1 \ diff --git a/prism54/prism54-module_1.2.oe b/prism54/prism54-module_1.2.oe index 8f9613067c..8db1c630ba 100644 --- a/prism54/prism54-module_1.2.oe +++ b/prism54/prism54-module_1.2.oe @@ -5,7 +5,7 @@ MAINTAINER = "Bruno Randolf " HOMEPAGE = "http://prism54.org" LICENSE = "GPL" RDEPENDS = "kernel (${KERNEL_VERSION}) kernel-module-firmware-class prism54-firmware (1.0.3.0) hotplug" -DEPENDS = "virtual/kernel" +DEPENDS = "virtual/kernel prism54-firmware" SRC_URI = "http://prism54.org/pub/linux/testing/tars/2004-06/prism54-1.2.tar.bz2"