From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 24 Feb 2025 16:53:26 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tmalq-006Ozn-27 for lore@lore.pengutronix.de; Mon, 24 Feb 2025 16:53:26 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tmalp-0007EL-Al; Mon, 24 Feb 2025 16:53:25 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tmalT-0006uJ-Sd; Mon, 24 Feb 2025 16:53:03 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tmalT-002cUD-2H; Mon, 24 Feb 2025 16:53:03 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1tmalT-001Ycn-28; Mon, 24 Feb 2025 16:53:03 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 24 Feb 2025 16:53:03 +0100 Message-Id: <20250224155303.371360-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250223192215.1957788-2-christian.melki@t2data.com> References: <20250223192215.1957788-2-christian.melki@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] host-libkmod: Follow target libkmod v33 -> v34 bump. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 644753c124fc2bac5e4f43e7d0894817564cba07. Michael [sent from post-receive hook] On Mon, 24 Feb 2025 16:53:03 +0100, Christian Melki wrote: > * Convert from autotools to meson. > > * Drop special install rule. Should be ok now if I understood it right. > > Signed-off-by: Christian Melki > Message-Id: <20250223192215.1957788-2-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > 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