Skip to contentSkip to conversation

LICENSE / README fixes for OE-Core

PATCH In review Paul Eggleton 2 participants 6 messages Dec 23, 2013 – Jan 2, 2014

lore
Share & tools
lore
#0 lore raw

cover LICENSE / README fixes for OE-Core

Note: this is the OE-Core fix; there is an alternative one for Poky.

The following changes since commit 421e927bd453259f4b3cdbd1676f6e12f97bf34f:

openssl: use PACKAGECONFIG to disable perl bits (2013-12-21 09:09:22 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/doc-fixes-oecore
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/doc-fixes-oecore

Paul Eggleton (2):
Fix license notices for OE-Core
README: fix DISTRO = "" reference

 LICENSE                   |  16 +--
 README                    |   2 +-
 meta-skeleton/COPYING.MIT |  17 +++
 meta/COPYING.GPLv2        | 339 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 365 insertions(+), 9 deletions(-)
 create mode 100644 meta-skeleton/COPYING.MIT
 create mode 100644 meta/COPYING.GPLv2
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/2 Fix license notices for OE-Core

* Fix up LICENSE:
- Replace reference to Poky with OpenEmbedded
- Remove reference to bitbake and meta-extras that aren't part of this repository
- Clarify license statements
* Add a COPYING.GPLv2 file in meta/ for the GPLv2 parts
* Add a COPYING.MIT file to meta-skeleton consistent with the other meta-* directories

---
 LICENSE                   |  16 +--
 meta-skeleton/COPYING.MIT |  17 +++
 meta/COPYING.GPLv2        | 339 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 364 insertions(+), 8 deletions(-)
 create mode 100644 meta-skeleton/COPYING.MIT
 create mode 100644 meta/COPYING.GPLv2
LICENSE +8 -8
index 4dc9a31..21fa6e6 100644
@@ -1,14 +1,14 @@
-Different components of Poky are under different licenses (a mix of 
-MIT and GPLv2). Please see:
+Different components of OpenEmbedded are under different licenses (a mix
+of MIT and GPLv2). Please see:
 
-bitbake/COPYING (GPLv2)
+meta/COPYING.GPLv2 (GPLv2)
 meta/COPYING.MIT (MIT)
-meta-extras/COPYING.MIT (MIT)
+meta-selftest/COPYING.MIT (MIT)
+meta-skeleton/COPYING.MIT (MIT)
 
-which cover the components in those subdirectories. This means all 
-metadata is MIT licensed unless otherwise stated. Source code included 
-in tree for individual recipes is under the LICENSE stated in the .bb 
-file for those software projects unless otherwise stated.
+All metadata is MIT licensed unless otherwise stated. Source code
+included in tree for individual recipes is under the LICENSE stated in
+the associated recipe (.bb file) unless otherwise stated.
 
 License information for any other files is either explicitly stated 
 or defaults to GPL version 2.
meta-skeleton/COPYING.MIT new file +17 -0
new file mode 100644
index 0000000..fb950dc
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.
meta/COPYING.GPLv2 new file +339 -0

339 lines not on this page · raw message

Signature · 1 line
1.8.1.2
#5 lore raw

PATCH 2/2 README: fix DISTRO = "" reference

In reply to Paul Eggleton

DISTRO should be set to "nodistro" for distro-less configurations since empty string results in empty items ending up in OVERRIDES leading to unexpected behaviour with FILESPATH.

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
README +1 -1
index 7e6a7cb..665c98f 100644
@@ -3,7 +3,7 @@ OpenEmbedded-Core
 
 OpenEmbedded-Core is a layer containing the core metadata for current versions
 of OpenEmbedded. It is distro-less (can build a functional image with
-DISTRO = "") and contains only emulated machine support.
+DISTRO = "nodistro") and contains only emulated machine support.
 
 For information about OpenEmbedded, see the OpenEmbedded website:
     http://www.openembedded.org/
Signature · 1 line
1.8.1.2
#2 lore raw

Re: [PATCH 1/2] Fix license notices for OE-Core

In reply to Paul Eggleton
Quoted 9 lines · Paul Eggleton

* Fix up LICENSE:
- Replace reference to Poky with OpenEmbedded
- Remove reference to bitbake and meta-extras that aren't part of this repository
- Clarify license statements
* Add a COPYING.GPLv2 file in meta/ for the GPLv2 parts
* Add a COPYING.MIT file to meta-skeleton consistent with the other meta-* directories

Quoted 8 lines
---
 LICENSE                   |  16 +--
 meta-skeleton/COPYING.MIT |  17 +++
 meta/COPYING.GPLv2        | 339 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 364 insertions(+), 8 deletions(-)
 create mode 100644 meta-skeleton/COPYING.MIT
 create mode 100644 meta/COPYING.GPLv2

FWIW this broke everything which depends on the checksum of the LICENSE file. I merged a fix for that and alerted Scott to the issue in the manuals.

Cheers,

Richard

#3 lore raw

Re: [PATCH 1/2] Fix license notices for OE-Core

Quoted 25 lines · On Thursday 02 January 2014 14:25:36 Richard Purdie wrote:
Quoted 16 lines · Paul Eggleton

* Fix up LICENSE:
- Replace reference to Poky with OpenEmbedded
- Remove reference to bitbake and meta-extras that aren't part of this

repository

- Clarify license statements

* Add a COPYING.GPLv2 file in meta/ for the GPLv2 parts
* Add a COPYING.MIT file to meta-skeleton consistent with the other

meta-* directories

---

Quoted 7 lines
 LICENSE                   |  16 +--
 meta-skeleton/COPYING.MIT |  17 +++
 meta/COPYING.GPLv2        | 339
 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 364
 insertions(+), 8 deletions(-)
 create mode 100644 meta-skeleton/COPYING.MIT
 create mode 100644 meta/COPYING.GPLv2
Quoted 3 lines

FWIW this broke everything which depends on the checksum of the LICENSE file. I merged a fix for that and alerted Scott to the issue in the manuals.

Oops, I hadn't anticipated that - thanks for clearing up after me. I do think most of those recipes ought to be pointing at COPYING.MIT and not LICENSE though.

Cheers,
Paul

--

Paul Eggleton
Intel Open Source Technology Centre

#4 lore raw

Re: [PATCH 1/2] Fix license notices for OE-Core

Quoted 26 lines · Paul Eggleton
Quoted 25 lines · On Thursday 02 January 2014 14:25:36 Richard Purdie wrote:
Quoted 23 lines · Paul Eggleton

* Fix up LICENSE:
- Replace reference to Poky with OpenEmbedded
- Remove reference to bitbake and meta-extras that aren't part of this

repository

- Clarify license statements

* Add a COPYING.GPLv2 file in meta/ for the GPLv2 parts
* Add a COPYING.MIT file to meta-skeleton consistent with the other

meta-* directories

---

 LICENSE                   |  16 +--
 meta-skeleton/COPYING.MIT |  17 +++
 meta/COPYING.GPLv2        | 339
 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 364
 insertions(+), 8 deletions(-)
 create mode 100644 meta-skeleton/COPYING.MIT
 create mode 100644 meta/COPYING.GPLv2
Quoted 7 lines
Quoted 3 lines

FWIW this broke everything which depends on the checksum of the LICENSE file. I merged a fix for that and alerted Scott to the issue in the manuals.

Oops, I hadn't anticipated that - thanks for clearing up after me. I do think most of those recipes ought to be pointing at COPYING.MIT and not LICENSE though.

Quite possibly but I'll leave that for a later patch. Right now I just wanted the builds working again...

Cheers,

Richard