From 5eeea9e17013c65f3a4dab1b8215ddf2785adb06 Mon Sep 17 00:00:00 2001 From: Elizabeth Flanagan Date: Sat, 3 Dec 2011 15:48:29 -0800 Subject: OECore license fixes: meta/* This is a quick audit of only the most obviously wrong licenses found within OECore. These fixes fall into four areas: - LICENSE field had incorrect format so that the parser choked - LICENSE field has a license with no version - LICENSE field was actually incorrect - LICENSE field has an imaginary license that didn't exist This fixes most of the LICENSE warnings thrown, along with my prior commit adding additional licenses to common-licenses and additional SPDXLICENSEMAP entries. HOWEVER..... there is much to be done on the license front. For a list of recipes with licenses that need obvious fixing see: https://wiki.yoctoproject.org/wiki/License_Audit That said, I would suggest another license audit as I've found enough inconsistencies. A good suggestion is when in doubt, look at how openSuse or Gentoo or Debian license the package. (From OE-Core rev: 3083dd70b3a9fa01fcc3cf00373b05502505996e) Signed-off-by: Elizabeth Flanagan Signed-off-by: Richard Purdie --- meta/recipes-graphics/clutter/clutter-box2d.inc | 2 +- meta/recipes-graphics/clutter/clutter-box2d_git.bb | 2 +- meta/recipes-graphics/freetype/freetype_2.4.6.bb | 4 ++-- meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb | 4 ++-- meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb | 4 ++-- meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb | 4 ++-- meta/recipes-graphics/xorg-font/font-util_1.2.0.bb | 5 +++-- 7 files changed, 13 insertions(+), 12 deletions(-) (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/clutter/clutter-box2d.inc b/meta/recipes-graphics/clutter/clutter-box2d.inc index 599b4678cd..056b091847 100644 --- a/meta/recipes-graphics/clutter/clutter-box2d.inc +++ b/meta/recipes-graphics/clutter/clutter-box2d.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Clutter Box2D" HOMEPAGE = "http://www.clutter-project.org/" -LICENSE = "LGPL-2.1" +LICENSE = "LGPLv2.1+" # The main clutter lib is machine specific so we need to be too PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta/recipes-graphics/clutter/clutter-box2d_git.bb b/meta/recipes-graphics/clutter/clutter-box2d_git.bb index 554ce81d8e..d256a285cc 100644 --- a/meta/recipes-graphics/clutter/clutter-box2d_git.bb +++ b/meta/recipes-graphics/clutter/clutter-box2d_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://box2d/License.txt;md5=e5d39ad91f7dc4692dcdb1d85139ec6 SRCREV = "de5452e56b537a11fd7f9453d048ff4b4793b5a2" PV = "0.12.1+git${SRCPV}" -PR = "r0" +PR = "r1" SRC_URI = "git://git.gnome.org/clutter-box2d.git" diff --git a/meta/recipes-graphics/freetype/freetype_2.4.6.bb b/meta/recipes-graphics/freetype/freetype_2.4.6.bb index 94a389ab42..f002103183 100644 --- a/meta/recipes-graphics/freetype/freetype_2.4.6.bb +++ b/meta/recipes-graphics/freetype/freetype_2.4.6.bb @@ -6,14 +6,14 @@ image generation tools, and many other products as well." HOMEPAGE = "http://www.freetype.org/" BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype" -LICENSE = "FreeTypeLicense | GPLv2+" +LICENSE = "FreeType | GPLv2+" LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=28d5381b1bef2649c59f20c20bae4f39 \ file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \ file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" SECTION = "libs" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ file://no-hardcode.patch" diff --git a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb index 682184a95d..6214c16278 100644 --- a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb +++ b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb @@ -5,9 +5,9 @@ and bold). In addition Fontconfig/Xft2 can artificially oblique the \ serif faces for you: this loses hinting and distorts the faces slightly, \ but is visibly different than normal and bold, and reasonably pleasing." SECTION = "x11/fonts" -LICENSE = "Bitstream_Vera" +LICENSE = "BitstreamVera" LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be" -PR = "r5" +PR = "r6" RDEPENDS_${PN} = "fontconfig-utils" inherit allarch diff --git a/meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb b/meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb index afb45cbce0..4410865ec9 100644 --- a/meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb +++ b/meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb @@ -6,11 +6,11 @@ DESCRIPTION = "Xrandr is used to set the size, orientation and/or \ reflection of the outputs for a screen. It can also set the screen \ size." -LICENSE= "BSD-X" +LICENSE= "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3" DEPENDS += "libxrandr libxrender" PE = "1" -PR = "r0" +PR = "r1" SRC_URI[md5sum] = "9735173a84dca9b05e06fd4686196b07" SRC_URI[sha256sum] = "1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e" diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb index 700529190e..a212f1964a 100644 --- a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "X font aliases." require xorg-font-common.inc -LICENSE = "Font-Alias" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ file://cyrillic/fonts.alias;md5=f40795b0640d6785826aecd3b16f6124 \ file://75dpi/fonts.alias;md5=6bc48023f2ae7f3bfc105db7b0ee6b49 \ @@ -18,7 +18,7 @@ RDEPENDS_${PN}_virtclass-native = "font-util-native" inherit allarch PE = "1" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a" diff --git a/meta/recipes-graphics/xorg-font/font-util_1.2.0.bb b/meta/recipes-graphics/xorg-font/font-util_1.2.0.bb index 8834708644..2c5ba413ab 100644 --- a/meta/recipes-graphics/xorg-font/font-util_1.2.0.bb +++ b/meta/recipes-graphics/xorg-font/font-util_1.2.0.bb @@ -2,7 +2,8 @@ DESCRIPTION = "X.Org font package creation/installation utilities" require xorg-font-common.inc -LICENSE = "BSD & MIT-style & Unicode" +#Unicode is MIT +LICENSE = "BSD & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c0067273d90f6336008cb2504e14bd32 \ file://ucs2any.c;endline=28;md5=8357dc567fc628bd12696f15b2a33bcb \ file://bdftruncate.c;endline=26;md5=4f82ffc101a1b165eae9c6998abff937 \ @@ -13,7 +14,7 @@ DEPENDS_virtclass-native = "util-macros-native" RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" RDEPENDS_${PN}_virtclass-native = "mkfontdir-native mkfontscale-native" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" do_configure_prepend() { sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in -- cgit v1.2.3-54-g00ecf