Patchwork bzip license: bzip2 not bzip.

login
register
mail settings
Submitter Elizabeth Flanagan
Date Oct. 9, 2012, 7:28 p.m.
Message ID <CAPhnLPAojmKQkympwaPL4Co5srBSzUfJd+7eB4YU3Fv665Q6gw@mail.gmail.com>
Download mbox | patch
Permalink /patch/38029/
State Accepted
Commit 566c6101cc7a8d90973eb22478ffc77eac23f81c
Headers show

Comments

Elizabeth Flanagan - Oct. 9, 2012, 7:28 p.m.
The name of the license for bzip2 is wrong causing warnings
to be thrown.

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
---
 meta/files/common-licenses/bzip  |   41 --------------------------------------
 meta/files/common-licenses/bzip2 |   41 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 41 deletions(-)
 delete mode 100644 meta/files/common-licenses/bzip
 create mode 100644 meta/files/common-licenses/bzip2
Martin Jansa - Oct. 9, 2012, 10:50 p.m.
On Tue, Oct 09, 2012 at 12:28:54PM -0700, Flanagan, Elizabeth wrote:
> The name of the license for bzip2 is wrong causing warnings
> to be thrown.

Can you resend with -M?

Cheers,

> 
> Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
> ---
>  meta/files/common-licenses/bzip  |   41 --------------------------------------
>  meta/files/common-licenses/bzip2 |   41 ++++++++++++++++++++++++++++++++++++++
>  2 files changed, 41 insertions(+), 41 deletions(-)
>  delete mode 100644 meta/files/common-licenses/bzip
>  create mode 100644 meta/files/common-licenses/bzip2
> 
> diff --git a/meta/files/common-licenses/bzip b/meta/files/common-licenses/bzip
> deleted file mode 100644
> index 8ec599d..0000000
> --- a/meta/files/common-licenses/bzip
> +++ /dev/null
> @@ -1,41 +0,0 @@
> ---------------------------------------------------------------------------
> -
> -This program, "bzip2", the associated library "libbzip2", and all
> -documentation, are copyright (C) 1996-2010 Julian R Seward.  All
> -rights reserved.
> -
> -Redistribution and use in source and binary forms, with or without
> -modification, are permitted provided that the following conditions
> -are met:
> -
> -1. Redistributions of source code must retain the above copyright
> -   notice, this list of conditions and the following disclaimer.
> -
> -2. The origin of this software must not be misrepresented; you must
> -   not claim that you wrote the original software.  If you use this
> -   software in a product, an acknowledgment in the product
> -   documentation would be appreciated but is not required.
> -
> -3. Altered source versions must be plainly marked as such, and must
> -   not be misrepresented as being the original software.
> -
> -4. The name of the author may not be used to endorse or promote
> -   products derived from this software without specific prior written
> -   permission.
> -
> -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
> -OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
> -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> -ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
> -GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
> -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> -
> -Julian Seward, jseward@bzip.org
> -bzip2/libbzip2 version 1.0.6 of 6 September 2010
> -
> ---------------------------------------------------------------------------
> diff --git a/meta/files/common-licenses/bzip2 b/meta/files/common-licenses/bzip2
> new file mode 100644
> index 0000000..8ec599d
> --- /dev/null
> +++ b/meta/files/common-licenses/bzip2
> @@ -0,0 +1,41 @@
> +--------------------------------------------------------------------------
> +
> +This program, "bzip2", the associated library "libbzip2", and all
> +documentation, are copyright (C) 1996-2010 Julian R Seward.  All
> +rights reserved.
> +
> +Redistribution and use in source and binary forms, with or without
> +modification, are permitted provided that the following conditions
> +are met:
> +
> +1. Redistributions of source code must retain the above copyright
> +   notice, this list of conditions and the following disclaimer.
> +
> +2. The origin of this software must not be misrepresented; you must
> +   not claim that you wrote the original software.  If you use this
> +   software in a product, an acknowledgment in the product
> +   documentation would be appreciated but is not required.
> +
> +3. Altered source versions must be plainly marked as such, and must
> +   not be misrepresented as being the original software.
> +
> +4. The name of the author may not be used to endorse or promote
> +   products derived from this software without specific prior written
> +   permission.
> +
> +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
> +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
> +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> +ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
> +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
> +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +
> +Julian Seward, jseward@bzip.org
> +bzip2/libbzip2 version 1.0.6 of 6 September 2010
> +
> +--------------------------------------------------------------------------
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/files/common-licenses/bzip b/meta/files/common-licenses/bzip
deleted file mode 100644
index 8ec599d..0000000
--- a/meta/files/common-licenses/bzip
+++ /dev/null
@@ -1,41 +0,0 @@ 
---------------------------------------------------------------------------
-
-This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2010 Julian R Seward.  All
-rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. The origin of this software must not be misrepresented; you must
-   not claim that you wrote the original software.  If you use this
-   software in a product, an acknowledgment in the product
-   documentation would be appreciated but is not required.
-
-3. Altered source versions must be plainly marked as such, and must
-   not be misrepresented as being the original software.
-
-4. The name of the author may not be used to endorse or promote
-   products derived from this software without specific prior written
-   permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Julian Seward, jseward@bzip.org
-bzip2/libbzip2 version 1.0.6 of 6 September 2010
-
---------------------------------------------------------------------------
diff --git a/meta/files/common-licenses/bzip2 b/meta/files/common-licenses/bzip2
new file mode 100644
index 0000000..8ec599d
--- /dev/null
+++ b/meta/files/common-licenses/bzip2
@@ -0,0 +1,41 @@ 
+--------------------------------------------------------------------------
+
+This program, "bzip2", the associated library "libbzip2", and all
+documentation, are copyright (C) 1996-2010 Julian R Seward.  All
+rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. The origin of this software must not be misrepresented; you must
+   not claim that you wrote the original software.  If you use this
+   software in a product, an acknowledgment in the product
+   documentation would be appreciated but is not required.
+
+3. Altered source versions must be plainly marked as such, and must
+   not be misrepresented as being the original software.
+
+4. The name of the author may not be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Julian Seward, jseward@bzip.org
+bzip2/libbzip2 version 1.0.6 of 6 September 2010
+
+--------------------------------------------------------------------------