diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-10-07 10:36:57 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-14 13:18:12 +0100 |
commit | 8f2f209b08a9f5397522a19c0dcf74a5116babdf (patch) | |
tree | 4dc563f7c1ba9446bade37ca58e860f5c7625079 | |
parent | 4fad3275bf19559f8e02ba3f27c91e8535ca415b (diff) | |
download | poky-8f2f209b08a9f5397522a19c0dcf74a5116babdf.tar.gz |
farsight2, ldconfig-native, gnutls: There is no GPLv2.1, correct the fields
The licenses were either LGPLv2.1 or GPLv2
make the changes appropriately
(From OE-Core rev: ffb48c7b9dfbcf56c61d10f2663df245bc396496)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-support/gnutls/gnutls.inc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb b/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb index a7bdc97088..ee0ce8a45c 100644 --- a/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb +++ b/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb | |||
@@ -1,12 +1,12 @@ | |||
1 | DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers." | 1 | DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers." |
2 | HOMEPAGE = "http://farsight.sf.net" | 2 | HOMEPAGE = "http://farsight.sf.net" |
3 | SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${BPN}-${PV}.tar.gz" | 3 | SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${BPN}-${PV}.tar.gz" |
4 | LICENSE = "GPLv2.1" | 4 | LICENSE = "LGPLv2.1" |
5 | DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base" | 5 | DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base" |
6 | 6 | ||
7 | inherit autotools | 7 | inherit autotools |
8 | 8 | ||
9 | PR = "r1" | 9 | PR = "r2" |
10 | 10 | ||
11 | EXTRA_OECONF = " \ | 11 | EXTRA_OECONF = " \ |
12 | --disable-debug \ | 12 | --disable-debug \ |
diff --git a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb index 00edb6e875..2a939132b8 100644 --- a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb +++ b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | DESCRIPTION = "A standalone native ldconfig build" | 1 | DESCRIPTION = "A standalone native ldconfig build" |
2 | 2 | ||
3 | LICENSE = "GPLv2.1" | 3 | LICENSE = "GPLv2+" |
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://${S}/ldconfig.c;endline=17;md5=1d15f20937c055cb5de2329a4c054399" | 5 | LIC_FILES_CHKSUM = "file://${S}/ldconfig.c;endline=17;md5=1d15f20937c055cb5de2329a4c054399" |
6 | 6 | ||
@@ -12,7 +12,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \ | |||
12 | file://flag_fix.patch \ | 12 | file://flag_fix.patch \ |
13 | file://endianess-header.patch" | 13 | file://endianess-header.patch" |
14 | 14 | ||
15 | PR = "r1" | 15 | PR = "r2" |
16 | 16 | ||
17 | inherit native | 17 | inherit native |
18 | 18 | ||
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 3569648c51..cdcf85b251 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc | |||
@@ -3,11 +3,11 @@ HOMEPAGE = "http://www.gnu.org/software/gnutls/" | |||
3 | BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" | 3 | BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" |
4 | DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap" | 4 | DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap" |
5 | 5 | ||
6 | INC_PR = "r2" | 6 | INC_PR = "r3" |
7 | 7 | ||
8 | LICENSE = "GPLv3+ & LGPLv2.1+" | 8 | LICENSE = "GPLv3+ & LGPLv2.1+" |
9 | LICENSE_${PN} = "LGPLv2.1+" | 9 | LICENSE_${PN} = "LGPLv2.1+" |
10 | LICENSE_${PN}-xx = "GPLv2.1+" | 10 | LICENSE_${PN}-xx = "LGPLv2.1+" |
11 | LICENSE_${PN}-bin = "GPLv3+" | 11 | LICENSE_${PN}-bin = "GPLv3+" |
12 | LICENSE_${PN}-extra = "GPLv3+" | 12 | LICENSE_${PN}-extra = "GPLv3+" |
13 | LICENSE_${PN}-openssl = "GPLv3+" | 13 | LICENSE_${PN}-openssl = "GPLv3+" |