diff mbox series

package/zfs: not using kernel-module infra

Message ID 20230608175016.1341416-1-salvador.joseluis@gmail.com
State Accepted
Headers show
Series package/zfs: not using kernel-module infra | expand

Commit Message

José Luis Salvador Rufo June 8, 2023, 5:50 p.m. UTC 
zfs already builds the kernel module from the autotools infrastructure.

Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
---
 package/zfs/Config.in | 1 +
 package/zfs/zfs.mk    | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

Comments

Thomas Petazzoni July 27, 2023, 7:13 a.m. UTC | #1 
On Thu,  8 Jun 2023 19:50:16 +0200
José Luis Salvador Rufo <salvador.joseluis@gmail.com> wrote:

> zfs already builds the kernel module from the autotools infrastructure.
> 
> Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
> ---
>  package/zfs/Config.in | 1 +
>  package/zfs/zfs.mk    | 5 +++--
>  2 files changed, 4 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/zfs/Config.in b/package/zfs/Config.in
index 6209c5865b..3bd9f8ab02 100644
--- a/package/zfs/Config.in
+++ b/package/zfs/Config.in
@@ -11,6 +11,7 @@  config BR2_PACKAGE_ZFS
 	depends on BR2_PACKAGE_HAS_UDEV
 	depends on BR2_USE_MMU  # util-linux (libblkid)
 	depends on BR2_TOOLCHAIN_HAS_THREADS  # libtirpc
+	select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk
index e99413e611..50c1866045 100644
--- a/package/zfs/zfs.mk
+++ b/package/zfs/zfs.mk
@@ -15,7 +15,7 @@  ZFS_CPE_ID_PRODUCT = openzfs
 # 0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch
 ZFS_AUTORECONF = YES
 
-ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl
+ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl linux
 
 # sysvinit installs only a commented-out modules-load.d/ config file
 ZFS_CONF_OPTS = \
@@ -87,5 +87,6 @@  define ZFS_LINUX_CONFIG_FIXUPS
 	$(call KCONFIG_ENABLE_OPT,CONFIG_ZLIB_INFLATE)
 endef
 
-$(eval $(kernel-module))
+# ZFS autotools will compile the kernel modules, so there is not needed to execute
+# $(eval $(kernel-module))
 $(eval $(autotools-package))