Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add patch to be compatible with Rockchip Linux Kernel #2

Merged
merged 1 commit into from
Sep 4, 2024
Merged

fix: add patch to be compatible with Rockchip Linux Kernel #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions debian/patches/fix-DKMS-compilation-error-when-using-Rockchip-kernel.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Description: Fix DKMS compilation error when using Rockchip kernel
Patch source: https://github.com/radxa/kernel/issues/54#issuecomment-1788453183 @linnaea
RadxaYuntian marked this conversation as resolved.
Show resolved Hide resolved
Author: Chen Jiali <chenjiali@radxa.com>
Bug: https://github.com/radxa/kernel/issues/54
Last-Update: 2024-08-30

Index: zfs-linux/config/kernel.m4
Index: zfs-linux/module/os/linux/spl/spl-generic.c
Index: zfs-linux/module/os/linux/zfs/zfs_ioctl_os.c
===================================================================
diff --git a/config/kernel.m4 b/config/kernel.m4
index b51477b6..bfd57736 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -679,6 +679,7 @@ $2
MODULE_DESCRIPTION("conftest");
MODULE_AUTHOR(ZFS_META_AUTHOR);
MODULE_VERSION(ZFS_META_VERSION "-" ZFS_META_RELEASE);
+MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver);
MODULE_LICENSE($3);
])

diff --git a/module/os/linux/spl/spl-generic.c b/module/os/linux/spl/spl-generic.c
index 986db151..13b38acb 100644
--- a/module/os/linux/spl/spl-generic.c
+++ b/module/os/linux/spl/spl-generic.c
@@ -929,3 +929,4 @@ MODULE_DESCRIPTION("Solaris Porting Layer");
MODULE_AUTHOR(ZFS_META_AUTHOR);
MODULE_LICENSE("GPL");
MODULE_VERSION(ZFS_META_VERSION "-" ZFS_META_RELEASE);
+MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver);
diff --git a/module/os/linux/zfs/zfs_ioctl_os.c b/module/os/linux/zfs/zfs_ioctl_os.c
index 663474ea..197d9364 100644
--- a/module/os/linux/zfs/zfs_ioctl_os.c
+++ b/module/os/linux/zfs/zfs_ioctl_os.c
@@ -377,3 +377,4 @@ MODULE_LICENSE("Dual MIT/GPL"); /* lua */
MODULE_LICENSE("Dual BSD/GPL"); /* zstd / misc */
MODULE_LICENSE(ZFS_META_LICENSE);
MODULE_VERSION(ZFS_META_VERSION "-" ZFS_META_RELEASE);
+MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver);
1 change: 1 addition & 0 deletions debian/patches/series
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ ubuntu/zfs-mount-container-start.patch
#ubuntu/4751-suppress-types.patch
fix-icp-sha2-on-armel.patch
bump-linux-maximum.patch
fix-DKMS-compilation-error-when-using-Rockchip-kernel.patch