Skip to content

Commit

Permalink
linux: module: zfs: list out all authors, licences, and versions
Browse files Browse the repository at this point in the history
Only the last stanza is used for determining the licence (and version),
so this still TAINT_NON_GPLs

Signed-off-by: Ahelenia Ziemiańska <[email protected]>
  • Loading branch information
nabijaczleweli committed Apr 1, 2022
1 parent d19a704 commit ee07114
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions module/Kbuild.in
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@ zfs-$(CONFIG_PPC64) += $(addprefix zfs/,$(ZFS_OBJS_PPC_PPC64))
OBJECT_FILES_NON_STANDARD_vdev_raidz_math_avx512bw.o := y
OBJECT_FILES_NON_STANDARD_vdev_raidz_math_avx512f.o := y

$(obj)/os/linux/zfs/zfs_ioctl_os.o : ccflags-y += -I$(zstd_include)

ifeq ($(CONFIG_ALTIVEC),y)
$(obj)/zfs/vdev_raidz_math_powerpc_altivec.o : c_flags += -maltivec
endif
9 changes: 9 additions & 0 deletions module/os/linux/zfs/zfs_ioctl_os.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
#include <sys/dsl_crypt.h>
#include <sys/crypto/icp.h>
#include <sys/zstd/zstd.h>
#include <sys/lua/lua.h>
#include "../../../zstd/lib/zstd.h"

#include <sys/zfs_ioctl_impl.h>

Expand Down Expand Up @@ -312,6 +314,13 @@ MODULE_ALIAS("zunicode");
MODULE_ALIAS("zcommon");
MODULE_ALIAS("zzstd");
MODULE_DESCRIPTION("ZFS");
MODULE_AUTHOR("Lua: Lua.org, PUC-Rio");
MODULE_AUTHOR("zstd: Facebook, Inc.");
MODULE_AUTHOR(ZFS_META_AUTHOR);
MODULE_LICENSE("Lua: MIT");
MODULE_LICENSE("zstd: Dual BSD/GPL");
MODULE_LICENSE("Dual BSD/GPL");
MODULE_LICENSE(ZFS_META_LICENSE);
MODULE_VERSION(LUA_RELEASE);
MODULE_VERSION("zstd " ZSTD_VERSION_STRING);
MODULE_VERSION(ZFS_META_VERSION "-" ZFS_META_RELEASE);

0 comments on commit ee07114

Please sign in to comment.