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/xorg-font/font-alias_1.0.3.bb | 4 ++-- meta/recipes-graphics/xorg-font/font-util_1.2.0.bb | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'meta/recipes-graphics/xorg-font') 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