diff options
author | Neal Gompa (ニール・ゴンパ) <ngompa13@gmail.com> | 2019-01-08 12:29:34 -0500 |
---|---|---|
committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2019-01-08 09:29:34 -0800 |
commit | 53b5fcd36592140a6d2f10d1d4ffd8bb743a9379 (patch) | |
tree | e5f19a3002bbceb643190b03ade4684f15163ff4 | |
parent | 21e000ad3f5331a1c549905480e19d5ecbac0db3 (diff) |
Include third party licenses in dist tarballs
Since the merge of the Linux Solaris Porting Layer source tree into
the ZFS codebase, ZFS is now a double-licensed codebase, with the
former SPL codebase retaining its license (GPLv2+) within the ZFS
source tree.
However, the license files for SPL were not being included in the
tarballs generated by autotools. This change corrects that.
In addition, all the other third party licenses in the codebase are
now properly declared to be included in the dist tarballs.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Neal Gompa <ngompa@datto.com>
Closes #8242
-rw-r--r-- | Makefile.am | 7 | ||||
-rw-r--r-- | lib/libzfs/Makefile.am | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 01ddc388c..43891af71 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,6 +23,13 @@ EXTRA_DIST = autogen.sh copy-builtin EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am EXTRA_DIST += META AUTHORS COPYRIGHT LICENSE NEWS NOTICE README.md +# Include all the extra licensing information for modules +EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE module/icp/algs/skein/THIRDPARTYLICENSE.descrip +EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman.descrip +EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl.descrip +EXTRA_DIST += module/spl/THIRDPARTYLICENSE.gplv2 module/spl/THIRDPARTYLICENSE.gplv2.descrip +EXTRA_DIST += module/zfs/THIRDPARTYLICENSE.cityhash module/zfs/THIRDPARTYLICENSE.cityhash.descrip + @CODE_COVERAGE_RULES@ .PHONY: gitrev diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am index 34933e627..421970413 100644 --- a/lib/libzfs/Makefile.am +++ b/lib/libzfs/Makefile.am @@ -65,3 +65,6 @@ libzfs_la_LIBADD += -lm $(LIBSSL) libzfs_la_LDFLAGS = -version-info 2:0:0 EXTRA_DIST = $(libzfs_pc_DATA) $(USER_C) + +# Licensing data +EXTRA_DIST += THIRDPARTYLICENSE.openssl THIRDPARTYLICENSE.openssl.descrip |