summaryrefslogtreecommitdiffstats
path: root/lib/libzfs
diff options
context:
space:
mode:
authorNeal Gompa (ニール・ゴンパ) <[email protected]>2019-01-08 12:29:34 -0500
committerBrian Behlendorf <[email protected]>2019-01-08 09:29:34 -0800
commit53b5fcd36592140a6d2f10d1d4ffd8bb743a9379 (patch)
treee5f19a3002bbceb643190b03ade4684f15163ff4 /lib/libzfs
parent21e000ad3f5331a1c549905480e19d5ecbac0db3 (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 <[email protected]> Signed-off-by: Neal Gompa <[email protected]> Closes #8242
Diffstat (limited to 'lib/libzfs')
-rw-r--r--lib/libzfs/Makefile.am3
1 files changed, 3 insertions, 0 deletions
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