The "enable_kmods" meson option was deprecated back in 2023[1], so can now be removed from DPDK.
[1] https://doc.dpdk.org/guides-23.11/rel_notes/deprecation.html Signed-off-by: Bruce Richardson <[email protected]> Acked-by: David Marchand <[email protected]> --- v3: add release note update. v2: remove missed references in DTS and in freebsd meson.build --- doc/guides/rel_notes/deprecation.rst | 7 ------- doc/guides/rel_notes/release_25_11.rst | 7 +++++++ dts/framework/remote_session/dpdk.py | 2 +- dts/framework/utils.py | 2 +- kernel/freebsd/meson.build | 4 ++-- meson_options.txt | 2 -- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 5aaeb1052a..bdcd2775b6 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -17,13 +17,6 @@ Other API and ABI deprecation notices are to be posted below. Deprecation Notices ------------------- -* build: The ``enable_kmods`` option is deprecated and will be removed in a future release. - Setting/clearing the option has no impact on the build. - Instead, kernel modules will be always built for OS's where out-of-tree kernel modules - are required for DPDK operation. - Currently, this means that modules will only be built for FreeBSD. - No modules are shipped with DPDK for either Linux or Windows. - * kvargs: The function ``rte_kvargs_process`` will get a new parameter for returning key match count. It will ease handling of no-match case. diff --git a/doc/guides/rel_notes/release_25_11.rst b/doc/guides/rel_notes/release_25_11.rst index efb88bbbb0..bce8e9f563 100644 --- a/doc/guides/rel_notes/release_25_11.rst +++ b/doc/guides/rel_notes/release_25_11.rst @@ -89,6 +89,13 @@ Removed Items Also, make sure to start the actual text at the margin. ======================================================= +* build: as previously announced in the deprecation notices, + the ``enable_kmods`` build option has been removed. + Kernel modules will now automatically be built for OS's where out-of-tree kernel modules + are required for DPDK operation. + Currently, this means that modules will only be built for FreeBSD. + No modules are shipped with DPDK for either Linux or Windows. + API Changes ----------- diff --git a/dts/framework/remote_session/dpdk.py b/dts/framework/remote_session/dpdk.py index 606d6e22fe..2dc8dab642 100644 --- a/dts/framework/remote_session/dpdk.py +++ b/dts/framework/remote_session/dpdk.py @@ -262,7 +262,7 @@ def _build_dpdk(self) -> None: """ self._session.build_dpdk( self._env_vars, - MesonArgs(default_library="static", enable_kmods=True, libdir="lib"), + MesonArgs(default_library="static", libdir="lib"), self.remote_dpdk_tree_path, self.remote_dpdk_build_dir, ) diff --git a/dts/framework/utils.py b/dts/framework/utils.py index 0c81ab1b95..9f7201c888 100644 --- a/dts/framework/utils.py +++ b/dts/framework/utils.py @@ -111,7 +111,7 @@ def __init__(self, default_library: str | None = None, **dpdk_args: str | bool): Example: :: - meson_args = MesonArgs(enable_kmods=True). + meson_args = MesonArgs(check_includes=True). """ self._default_library = f"--default-library={default_library}" if default_library else "" self._dpdk_args = " ".join( diff --git a/kernel/freebsd/meson.build b/kernel/freebsd/meson.build index 1f612711be..862e19e766 100644 --- a/kernel/freebsd/meson.build +++ b/kernel/freebsd/meson.build @@ -29,7 +29,7 @@ foreach k:kmods 'KMOD_CFLAGS=' + ' '.join(kmod_cflags), 'CC=clang'], depends: built_kmods, # make each module depend on prev - build_by_default: get_option('enable_kmods'), - install: get_option('enable_kmods'), + build_by_default: true, + install: true, install_dir: '/boot/modules/') endforeach diff --git a/meson_options.txt b/meson_options.txt index e49b2fc089..e28d24054c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -24,8 +24,6 @@ option('enable_drivers', type: 'string', value: '', description: 'Comma-separated list of drivers to build. If unspecified, build all drivers.') option('enable_driver_sdk', type: 'boolean', value: false, description: 'Install headers to build drivers.') -option('enable_kmods', type: 'boolean', value: true, description: - '[Deprecated - will be removed in future release] build kernel modules') option('enable_libs', type: 'string', value: '', description: 'Comma-separated list of optional libraries to explicitly enable. [NOTE: mandatory libs are always enabled]') option('examples', type: 'string', value: '', description: -- 2.48.1
