Skip to contentSkip to conversation

Koen Kooi : guile: fix licensing and gettext inherit

oe-commits Martin Jansa 3 participants 3 messages Oct 11, 2011 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 68 lines · git version control
Module: meta-openembedded.git
Branch: master
Commit: 8fcf92fed89557683a08f67667acc77a8f73dc0a
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=8fcf92fed89557683a08f67667acc77a8f73dc0a
Author: Koen Kooi <[email protected]>
Date:   Tue Oct 11 16:40:25 2011 +0200

guile: fix licensing and gettext inherit

Reported by Philip Balister

---

 meta-oe/recipes-support/guile/guile-native.inc     |    1 -
 .../recipes-support/guile/guile-native_1.8.7.bb    |    2 ++
 meta-oe/recipes-support/guile/guile.inc            |    5 ++---
 meta-oe/recipes-support/guile/guile_1.8.7.bb       |    2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)
meta-oe/recipes-support/guile/guile-native.inc +0 -1
index 20ff541..dfa126a 100644
@@ -2,7 +2,6 @@ SECTION = "unknown"
 DEPENDS = "gettext-native gmp-native"
 
 LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa"
 
 inherit autotools native
 
meta-oe/recipes-support/guile/guile-native_1.8.7.bb +2 -0
index f8fd4c7..2b2707a 100644
@@ -1,5 +1,7 @@
 require guile-native.inc
 
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa"
+
 PR = "r1"
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
            file://configure-fix.patch \
meta-oe/recipes-support/guile/guile.inc +2 -3
index 918ce33..842e8d7 100644
@@ -7,10 +7,9 @@ PACKAGES =+ "${PN}-el"
 FILES_${PN}-el = "${datadir}/emacs"
 DESCRIPTION_${PN}-el = "Emacs lisp files for Guile"
 
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa"
+LICENSE = "LGPLv2.1+"
 
-inherit autotools
+inherit autotools gettext
 
 acpaths = "-I ${S}/guile-config"
 
meta-oe/recipes-support/guile/guile_1.8.7.bb +0 -0
index 8b3a80d..d02fe42 100644

meta-oe/recipes-support/guile/guile_1.8.7.bb line 7

Quoted 7 lines
meta-oe/recipes-support/guile/guile_1.8.7.bb +2 -0
@@ -1,5 +1,7 @@
 require guile.inc
 
+LIC_FILES_CHKSUM = "file://LICENSE;md5=5711ae313ffd140741e741b88d9d4007"
+
 PR = "r1"
 
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \

Is there some special reason why
guile-1.8.7/18.diff is applied only in target recipe? I've noticed only because different LIC_FILES_CHKSUM look strange..

Regards,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 11-10-11 16:46, Martin Jansa schreef:

Quoted 7 lines · git version control
Quoted 6 lines

Module: meta-openembedded.git Branch: master Commit:
8fcf92fed89557683a08f67667acc77a8f73dc0a URL:
http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=8fcf92fed89557683a08f67667acc77a8f73dc0a

Author: Koen Kooi <[email protected]>

Quoted 59 lines
Quoted 59 lines

Date: Tue Oct 11 16:40:25 2011 +0200

guile: fix licensing and gettext inherit

Reported by Philip Balister

---

meta-oe/recipes-support/guile/guile-native.inc     |    1 - 
.../recipes-support/guile/guile-native_1.8.7.bb    |    2 ++ 
meta-oe/recipes-support/guile/guile.inc            |    5 ++--- 
meta-oe/recipes-support/guile/guile_1.8.7.bb       |    2 ++ 4 files

changed, 6 insertions(+), 4 deletions(-)

(quoted diff) +0 -0

b/meta-oe/recipes-support/guile/guile-native.inc index 20ff541..dfa126a 100644 --- a/meta-oe/recipes-support/guile/guile-native.inc +++ b/meta-oe/recipes-support/guile/guile-native.inc @@ -2,7 +2,6 @@ SECTION = "unknown" DEPENDS = "gettext-native gmp-native"

LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa"

inherit autotools native

(quoted diff) +0 -0

b/meta-oe/recipes-support/guile/guile-native_1.8.7.bb index f8fd4c7..2b2707a 100644 --- a/meta-oe/recipes-support/guile/guile-native_1.8.7.bb +++ b/meta-oe/recipes-support/guile/guile-native_1.8.7.bb @@ -1,5 +1,7 @@ require guile-native.inc

+LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa" + PR = "r1" SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
file://configure-fix.patch \ diff --git a/meta-oe/recipes-support/guile/guile.inc b/meta-oe/recipes-support/guile/guile.inc index 918ce33..842e8d7 100644 --- a/meta-oe/recipes-support/guile/guile.inc +++ b/meta-oe/recipes-support/guile/guile.inc @@ -7,10 +7,9 @@ PACKAGES =+ "${PN}-el" FILES_${PN}-el = "${datadir}/emacs" DESCRIPTION_${PN}-el = "Emacs lisp files for Guile"

-LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa" +LICENSE = "LGPLv2.1+"

-inherit autotools +inherit autotools gettext

acpaths = "-I ${S}/guile-config"

(quoted diff) +0 -0

b/meta-oe/recipes-support/guile/guile_1.8.7.bb index 8b3a80d..d02fe42 100644 --- a/meta-oe/recipes-support/guile/guile_1.8.7.bb +++ b/meta-oe/recipes-support/guile/guile_1.8.7.bb @@ -1,5 +1,7 @@ require guile.inc

Quoted 8 lines
Quoted 4 lines

+LIC_FILES_CHKSUM = "file://LICENSE;md5=5711ae313ffd140741e741b88d9d4007" + PR = "r1"

SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \

Is there some special reason why guile-1.8.7/18.diff is applied only in target recipe? I've noticed only because different LIC_FILES_CHKSUM look strange..

Not that I know of, but I didn't feel like fixing that right now :) Philip also mentioned it should be converted to BBCLASSEXTEND.... -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFOlFtoMkyGM64RGpERAuvVAKCFkKK5d+J0zM4AHI6oO4eDUgeGzgCdFtqJ EZBDB1U3RaqZDVEUsfbfWNQ=
=zNP3
-----END PGP SIGNATURE-----

#3 lore raw
Quoted 71 lines · Koen Kooi

Op 11-10-11 16:46, Martin Jansa schreef:

Quoted 7 lines · git version control
Quoted 6 lines

Module: meta-openembedded.git Branch: master Commit:
8fcf92fed89557683a08f67667acc77a8f73dc0a URL:
http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=8fcf92fed89557683a08f67667acc77a8f73dc0a

Author: Koen Kooi <[email protected]>

Quoted 62 lines
Quoted 62 lines

Date: Tue Oct 11 16:40:25 2011 +0200

guile: fix licensing and gettext inherit

Reported by Philip Balister

---

meta-oe/recipes-support/guile/guile-native.inc     |    1 - 
.../recipes-support/guile/guile-native_1.8.7.bb    |    2 ++ 
meta-oe/recipes-support/guile/guile.inc            |    5 ++--- 
meta-oe/recipes-support/guile/guile_1.8.7.bb       |    2 ++ 4 files

changed, 6 insertions(+), 4 deletions(-)

(quoted diff) +0 -0

b/meta-oe/recipes-support/guile/guile-native.inc index 20ff541..dfa126a 100644 --- a/meta-oe/recipes-support/guile/guile-native.inc +++ b/meta-oe/recipes-support/guile/guile-native.inc @@ -2,7 +2,6 @@ SECTION = "unknown" DEPENDS = "gettext-native gmp-native"

LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa"

inherit autotools native

(quoted diff) +0 -0

b/meta-oe/recipes-support/guile/guile-native_1.8.7.bb index f8fd4c7..2b2707a 100644 --- a/meta-oe/recipes-support/guile/guile-native_1.8.7.bb +++ b/meta-oe/recipes-support/guile/guile-native_1.8.7.bb @@ -1,5 +1,7 @@ require guile-native.inc

+LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa" + PR = "r1" SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
file://configure-fix.patch \ diff --git a/meta-oe/recipes-support/guile/guile.inc b/meta-oe/recipes-support/guile/guile.inc index 918ce33..842e8d7 100644 --- a/meta-oe/recipes-support/guile/guile.inc +++ b/meta-oe/recipes-support/guile/guile.inc @@ -7,10 +7,9 @@ PACKAGES =+ "${PN}-el" FILES_${PN}-el = "${datadir}/emacs" DESCRIPTION_${PN}-el = "Emacs lisp files for Guile"

-LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c9ba0d76ca3ef2a1d15a2ac839ef01fa" +LICENSE = "LGPLv2.1+"

-inherit autotools +inherit autotools gettext

acpaths = "-I ${S}/guile-config"

(quoted diff) +0 -0

b/meta-oe/recipes-support/guile/guile_1.8.7.bb index 8b3a80d..d02fe42 100644 --- a/meta-oe/recipes-support/guile/guile_1.8.7.bb +++ b/meta-oe/recipes-support/guile/guile_1.8.7.bb @@ -1,5 +1,7 @@ require guile.inc

+LIC_FILES_CHKSUM = "file://LICENSE;md5=5711ae313ffd140741e741b88d9d4007" + PR = "r1"

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \

Is there some special reason why guile-1.8.7/18.diff is applied only in target recipe? I've noticed only because different LIC_FILES_CHKSUM look strange..

Not that I know of, but I didn't feel like fixing that right now :) Philip also mentioned it should be converted to BBCLASSEXTEND....

We need way to collect a TODO list of things that need reviewing.

Philip