xz: switch from public domain to BSD Zero Clause License (0BSD)

Remove the public domain notices and add SPDX license identifiers. Change MODULE_LICENSE from "GPL" to "Dual BSD/GPL" because 0BSD should count as a BSD license variant here. The switch to 0BSD was done in the upstream XZ Embedded project because public domain has (real or perceived) legal issues in some jurisdictions.

Lasse Collin committed 2 years ago

Commit 836d13a1 parent c1ccbba13 files · +27 −52Browse files

Unified · Split

13 files

include/linux/decompress/unxz.h +2 −3
include/linux/xz.h +2 −3
lib/decompress_unxz.c +2 −3
lib/xz/xz_crc32.c +2 −3
lib/xz/xz_dec_bcj.c +2 −3
lib/xz/xz_dec_lzma2.c +2 −3
lib/xz/xz_dec_stream.c +2 −3
lib/xz/xz_dec_syms.c +3 −9
lib/xz/xz_dec_test.c +3 −9
lib/xz/xz_lzma2.h +2 −3
lib/xz/xz_private.h +2 −3
lib/xz/xz_stream.h +2 −3
scripts/xz_wrap.sh +1 −4

include/linux/decompress/unxz.h+2−3

@@ -1,10 +1,9 @@
	1	+/* SPDX-License-Identifier: 0BSD */
	2	+
1	3	/*
2	4	* Wrapper for decompressing XZ-compressed kernel, initramfs, and initrd
3	5	*
4	6	* Author: Lasse Collin <lasse.collin@tukaani.org>
5		− *
6		− * This file has been put into the public domain.
7		− * You can do whatever you want with this file.
8	7	*/
9	8
10	9	#ifndef DECOMPRESS_UNXZ_H

include/linux/xz.h+2−3

@@ -1,11 +1,10 @@
	1	+/* SPDX-License-Identifier: 0BSD */
	2	+
1	3	/*
2	4	* XZ decompressor
3	5	*
4	6	* Authors: Lasse Collin <lasse.collin@tukaani.org>
5	7	* Igor Pavlov <https://7-zip.org/>
6		− *
7		− * This file has been put into the public domain.
8		− * You can do whatever you want with this file.
9	8	*/
10	9
11	10	#ifndef XZ_H

lib/decompress_unxz.c+2−3

@@ -1,10 +1,9 @@
	1	+// SPDX-License-Identifier: 0BSD
	2	+
1	3	/*
2	4	* Wrapper for decompressing XZ-compressed kernel, initramfs, and initrd
3	5	*
4	6	* Author: Lasse Collin <lasse.collin@tukaani.org>
5		− *
6		− * This file has been put into the public domain.
7		− * You can do whatever you want with this file.
8	7	*/
9	8
10	9	/*

lib/xz/xz_crc32.c+2−3

@@ -1,11 +1,10 @@
	1	+// SPDX-License-Identifier: 0BSD
	2	+
1	3	/*
2	4	* CRC32 using the polynomial from IEEE-802.3
3	5	*
4	6	* Authors: Lasse Collin <lasse.collin@tukaani.org>
5	7	* Igor Pavlov <https://7-zip.org/>
6		− *
7		− * This file has been put into the public domain.
8		− * You can do whatever you want with this file.
9	8	*/
10	9
11	10	/*

lib/xz/xz_dec_bcj.c+2−3

@@ -1,11 +1,10 @@
	1	+// SPDX-License-Identifier: 0BSD
	2	+
1	3	/*
2	4	* Branch/Call/Jump (BCJ) filter decoders
3	5	*
4	6	* Authors: Lasse Collin <lasse.collin@tukaani.org>
5	7	* Igor Pavlov <https://7-zip.org/>
6		− *
7		− * This file has been put into the public domain.
8		− * You can do whatever you want with this file.
9	8	*/
10	9
11	10	#include "xz_private.h"

lib/xz/xz_dec_lzma2.c+2−3

@@ -1,11 +1,10 @@
	1	+// SPDX-License-Identifier: 0BSD
	2	+
1	3	/*
2	4	* LZMA2 decoder
3	5	*
4	6	* Authors: Lasse Collin <lasse.collin@tukaani.org>
5	7	* Igor Pavlov <https://7-zip.org/>
6		− *
7		− * This file has been put into the public domain.
8		− * You can do whatever you want with this file.
9	8	*/
10	9
11	10	#include "xz_private.h"

lib/xz/xz_dec_stream.c+2−3

@@ -1,10 +1,9 @@
	1	+// SPDX-License-Identifier: 0BSD
	2	+
1	3	/*
2	4	* .xz Stream decoder
3	5	*
4	6	* Author: Lasse Collin <lasse.collin@tukaani.org>
5		− *
6		− * This file has been put into the public domain.
7		− * You can do whatever you want with this file.
8	7	*/
9	8
10	9	#include "xz_private.h"

lib/xz/xz_dec_syms.c+3−9

@@ -1,10 +1,9 @@
	1	+// SPDX-License-Identifier: 0BSD
	2	+
1	3	/*
2	4	* XZ decoder module information
3	5	*
4	6	* Author: Lasse Collin <lasse.collin@tukaani.org>
5		− *
6		− * This file has been put into the public domain.
7		− * You can do whatever you want with this file.
8	7	*/
9	8
10	9	#include <linux/module.h>
@@ -25,9 +24,4 @@ EXPORT_SYMBOL(xz_dec_microlzma_end); · 14 unmodified lines
25	24	MODULE_DESCRIPTION("XZ decompressor");
26	25	MODULE_VERSION("1.1");
27	26	MODULE_AUTHOR("Lasse Collin <lasse.collin@tukaani.org> and Igor Pavlov");
28		−
29		−/*
30		− * This code is in the public domain, but in Linux it's simplest to just
31		− * say it's GPL and consider the authors as the copyright holders.
32		− */
33		−MODULE_LICENSE("GPL");
	27	+MODULE_LICENSE("Dual BSD/GPL");

lib/xz/xz_dec_test.c+3−9

@@ -1,10 +1,9 @@
	1	+// SPDX-License-Identifier: 0BSD
	2	+
1	3	/*
2	4	* XZ decoder tester
3	5	*
4	6	* Author: Lasse Collin <lasse.collin@tukaani.org>
5		− *
6		− * This file has been put into the public domain.
7		− * You can do whatever you want with this file.
8	7	*/
9	8
10	9	#include <linux/kernel.h>
@@ -212,9 +211,4 @@ module_exit(xz_dec_test_exit); · 201 unmodified lines
212	211	MODULE_DESCRIPTION("XZ decompressor tester");
213	212	MODULE_VERSION("1.0");
214	213	MODULE_AUTHOR("Lasse Collin <lasse.collin@tukaani.org>");
215		−
216		−/*
217		− * This code is in the public domain, but in Linux it's simplest to just
218		− * say it's GPL and consider the authors as the copyright holders.
219		− */
220		−MODULE_LICENSE("GPL");
	214	+MODULE_LICENSE("Dual BSD/GPL");

lib/xz/xz_lzma2.h+2−3

@@ -1,11 +1,10 @@
	1	+/* SPDX-License-Identifier: 0BSD */
	2	+
1	3	/*
2	4	* LZMA2 definitions
3	5	*
4	6	* Authors: Lasse Collin <lasse.collin@tukaani.org>
5	7	* Igor Pavlov <https://7-zip.org/>
6		− *
7		− * This file has been put into the public domain.
8		− * You can do whatever you want with this file.
9	8	*/
10	9
11	10	#ifndef XZ_LZMA2_H

lib/xz/xz_private.h+2−3

@@ -1,10 +1,9 @@
	1	+/* SPDX-License-Identifier: 0BSD */
	2	+
1	3	/*
2	4	* Private includes and definitions
3	5	*
4	6	* Author: Lasse Collin <lasse.collin@tukaani.org>
5		− *
6		− * This file has been put into the public domain.
7		− * You can do whatever you want with this file.
8	7	*/
9	8
10	9	#ifndef XZ_PRIVATE_H

lib/xz/xz_stream.h+2−3

@@ -1,10 +1,9 @@
	1	+/* SPDX-License-Identifier: 0BSD */
	2	+
1	3	/*
2	4	* Definitions for handling the .xz file format
3	5	*
4	6	* Author: Lasse Collin <lasse.collin@tukaani.org>
5		− *
6		− * This file has been put into the public domain.
7		− * You can do whatever you want with this file.
8	7	*/
9	8
10	9	#ifndef XZ_STREAM_H

scripts/xz_wrap.sh+1−4

@@ -1,13 +1,10 @@
1	1	#!/bin/sh
	2	+# SPDX-License-Identifier: 0BSD
2	3	#
3	4	# This is a wrapper for xz to compress the kernel image using appropriate
4	5	# compression options depending on the architecture.
5	6	#
6	7	# Author: Lasse Collin <lasse.collin@tukaani.org>
7		−#
8		−# This file has been put into the public domain.
9		−# You can do whatever you want with this file.
10		−#
11	8
12	9	BCJ=
13	10	LZMA2OPTS=