Thanks, applied as 644753c124fc2bac5e4f43e7d0894817564cba07. Michael
[sent from post-receive hook] On Mon, 24 Feb 2025 16:53:03 +0100, Christian Melki <[email protected]> wrote: > * Convert from autotools to meson. > > * Drop special install rule. Should be ok now if I understood it right. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/host-libkmod.in b/rules/host-libkmod.in > index 29b01e9dbebd..d73ccf52557b 100644 > --- a/rules/host-libkmod.in > +++ b/rules/host-libkmod.in > @@ -2,6 +2,7 @@ > > config HOST_LIBKMOD > tristate > + select HOST_MESON > select HOST_ZLIB if HOST_LIBKMOD_ZLIB > select HOST_ZSTD if HOST_LIBKMOD_ZSTD > default y if ALLYES > diff --git a/rules/host-libkmod.make b/rules/host-libkmod.make > index adb42a33af9d..766d8be26f2a 100644 > --- a/rules/host-libkmod.make > +++ b/rules/host-libkmod.make > @@ -16,33 +16,20 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBKMOD) += host-libkmod > # > ---------------------------------------------------------------------------- > > # > -# autoconf > +# meson > # > -HOST_LIBKMOD_CONF_TOOL := autoconf > +HOST_LIBKMOD_CONF_TOOL := meson > HOST_LIBKMOD_CONF_OPT := \ > - $(HOST_AUTOCONF) \ > - --disable-static \ > - --enable-shared \ > - --enable-tools \ > - --disable-manpages \ > - --disable-test-modules \ > - --disable-logging \ > - --disable-debug \ > - --disable-coverage \ > - --enable-year2038 \ > - --$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZSTD)-zstd \ > - --without-xz \ > - --$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZLIB)-zlib \ > - --without-openssl > - > -# > ---------------------------------------------------------------------------- > -# Install > -# > ---------------------------------------------------------------------------- > - > -$(STATEDIR)/host-libkmod.install: > - @$(call targetinfo) > - @$(call world/install, HOST_LIBKMOD) > - @ln -s ../bin/kmod $(HOST_LIBKMOD_PKGDIR)/usr/sbin/depmod > - @$(call touch) > + $(HOST_MESON_OPT) \ > + -Dbuild-tests=false \ > + -Ddebug-messages=false \ > + -Ddocs=false \ > + -Dlogging=false \ > + -Dmanpages=false \ > + -Dopenssl=disabled \ > + -Dtools=true \ > + -Dzstd=$(call ptx/endis,PTXCONF_HOST_LIBKMOD_ZSTD)d \ > + -Dxz=disabled \ > + -Dzlib=$(call ptx/endis,PTXCONF_HOST_LIBKMOD_ZLIB)d > > # vim: syntax=make
