From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0BA5645644 for ; Thu, 18 Jul 2024 11:16:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0148E402CA; Thu, 18 Jul 2024 11:16:21 +0200 (CEST) Received: from fhigh8-smtp.messagingengine.com (fhigh8-smtp.messagingengine.com [103.168.172.159]) by mails.dpdk.org (Postfix) with ESMTP id 985A2402C5; Thu, 18 Jul 2024 11:16:19 +0200 (CEST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 2BB3811400A1; Thu, 18 Jul 2024 05:16:19 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 18 Jul 2024 05:16:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1721294179; x=1721380579; bh=LZkttB+Q+0MTlCY6hxG2FnasnyFZNSsKn5mMPolg09U=; b= Y3viND3sMSpZHTWL+mVqlvFiIiz0I6yPxKYUA6fPMZAbYtCjvKCJpVvz7lql0kDJ 1/6GGndGocA6z3s1dSgBdjkdUEOI7y8IDmjnAY4+U4DfdRGOFGcRh+uIbMNqamSe S4VexDBR3POoziWFv2EHS4ewod+LFPtXEp/LWXcn13uo2byBG5LvAXhkF8xUAGl9 0pyYUtsb65b7uGeDVQAZOj5c9lGJO2oFQI0OoGFUj3eYbhjTad3j40Tp/xPDQ2xi R9P2ggOlvEtE5wYOTmHXFL3nAHkREjA3ir73/Bhuotb0XPKHA5XVwfwMwYnc+PYe tEsgkLdXQyxVvsOD8jWjYg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1721294179; x= 1721380579; bh=LZkttB+Q+0MTlCY6hxG2FnasnyFZNSsKn5mMPolg09U=; b=u wBFVRy0Dgdr4yDCXmfKne0mtPUzoDK8o1/z82S1IcHb8ur431KvnPogdpYLMkBcf r4IhB5sBS/GIi7b/zst0R6eID9dZB9pKOQkFz2U/voU7mj9PKlTnfd9yzRN2/weN vCZ0+79d//kIjmlTZsFsaZWaNncHom32vvlyAALFmoL8DxTxLudsJk2zKfBSTBY0 IBO+bnPl3XnlCk85MbRObclPtuyDQtsurV4SBE1NgPlBREac7DtolN+DA2U6+WqK 7V6olPhCq8wgndaNgFh/gRKvfyDh9MoOMQcLnDm56SLRNq6UchkRgpckgMzE9p40 F6fojyvdVps7aGHfQeEOQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrgeelgddugecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkfgjfhgggfgtsehtufertddttdejnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepjedvieelieeghfegleekvdeludffjeefueeuudeivdevgedufeev ieeugeeftdeinecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghl ohhnrdhnvght X-ME-Proxy: Feedback-ID: i47234305:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 18 Jul 2024 05:16:16 -0400 (EDT) From: Thomas Monjalon To: Jiri Slaby Cc: dev@dpdk.org, bluca@debian.org, xuemingl@nvidia.com, ktraynor@redhat.com, stable@dpdk.org Subject: Re: [PATCH] kni: fix build with Linux 6.10 Date: Thu, 18 Jul 2024 11:16:14 +0200 Message-ID: <2273498.iZASKD2KPV@thomas> In-Reply-To: <20240716084414.115852-1-jslaby@suse.cz> References: <20240716084414.115852-1-jslaby@suse.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Adding stable@dpdk.org and LTS maintainers as Cc. It must be merged directly in LTS branches. 16/07/2024 10:44, Jiri Slaby: > 6.10 removed the "support" (it was never supported [1]) of separate > source and build dirs for out of tree modules. > > KNI uses "src=" hack for that purpose. > > Instead, copy sources to the build dir and don't rely upon the > unsupported... > > Intended esp. for stable/22.11. It should go wherever kni is still in > the tree. > > [1] https://lore.kernel.org/all/CAK7LNAQ47bZpE6c6Yoz-jQS78uU611oZwU8bH+7e=p5zSyADJw@mail.gmail.com/ > > Signed-off-by: Jiri Slaby > --- > kernel/linux/kni/meson.build | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build > index 4c90069e..39ca2ade 100644 > --- a/kernel/linux/kni/meson.build > +++ b/kernel/linux/kni/meson.build > @@ -11,8 +11,8 @@ if run_cmd.stdout().contains('txqueue') == true > kmod_cflags = '-DHAVE_ARG_TX_QUEUE' > endif > > - > -kni_mkfile = custom_target('rte_kni_makefile', > +kni_deps = [] > +kni_deps += custom_target('rte_kni_makefile', > output: 'Makefile', > command: ['touch', '@OUTPUT@']) > > @@ -22,12 +22,15 @@ kni_sources = files( > 'Kbuild', > ) > > +foreach file : kni_sources > + kni_deps += fs.copyfile(file) > +endforeach > + > custom_target('rte_kni', > input: kni_sources, > output: 'rte_kni.ko', > command: ['make', '-j4', '-C', kernel_build_dir, > 'M=' + meson.current_build_dir(), > - 'src=' + meson.current_source_dir(), > ' '.join(['MODULE_CFLAGS=', kmod_cflags,'-include ']) > + dpdk_source_root + '/config/rte_config.h' + > ' -I' + dpdk_source_root + '/lib/eal/include' + > @@ -35,7 +38,7 @@ custom_target('rte_kni', > ' -I' + dpdk_build_root + > ' -I' + meson.current_source_dir(), > 'modules'] + cross_args, > - depends: kni_mkfile, > + depends: kni_deps, > install: install, > install_dir: kernel_install_dir, > build_by_default: get_option('enable_kmods'))