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 5BD1E45643 for ; Thu, 18 Jul 2024 11:28:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4E4DB42E4E; Thu, 18 Jul 2024 11:28:31 +0200 (CEST) Received: from mail-yw1-f178.google.com (mail-yw1-f178.google.com [209.85.128.178]) by mails.dpdk.org (Postfix) with ESMTP id 092C6402CA; Thu, 18 Jul 2024 11:28:28 +0200 (CEST) Received: by mail-yw1-f178.google.com with SMTP id 00721157ae682-65f8626780aso5280327b3.3; Thu, 18 Jul 2024 02:28:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721294907; x=1721899707; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oVfhIRkqU2r6fWB1R3ttRe0CPsds2Fx4JSB2oTAD1VI=; b=qoJ5stBWdo2GnHURkVdFaYpkyEylFf3UO0GploVQcHtYHXw8YNwUda+f4bLKDPtqQi ICPwP65Cz5jC1c28G8TIQ+wmdHokC2FpSVMpZbYuP0yNdwj0HgcsUuRCtaOAfosbIUXq v9lMX0n7iewIIT8QqUegJ38nu3YVENiZekv51Mx+NpuYYM3xzX/1NTpg9xvFsq2MJZpk wZ16/VFQ8/jn7TNKgUI4a+rvZjoBRwYEgEDQgIBpLk8ri7WThs2k70C9yryAcqhJc4Q1 mx0v6YdWFRPPrtZR/T8uRkAYEZ9TyG7MjL0+zlpn0Nqg3jNl+FIyCYgedqMVPjEL4X8s yeXw== X-Forwarded-Encrypted: i=1; AJvYcCVQWnnrgGM9FO3soDioe5h0fIAhnaVuJ6SeL2/t5o8iFuRa8GbmdURM2z0/afBAIMpUWgBcOKXNKHxtgqeal11w1t6fmFhsSeK45rqawg== X-Gm-Message-State: AOJu0YzOc/Te3VTx5mgPgpS2WnVPhqdZLA4EBzaaChRNYtfODqVMXQe9 7RIkTXm0Ns2apEXhmYj/FnHy+tCvd5TFv7eWeIvUw631FpkabXVxOmJn4j8M X-Google-Smtp-Source: AGHT+IErBM86JxPHLkkRUlS+CV+pnvYa5YFl7IIc+JvSHPzZX7ggJFHRsvBxf/97JdevkDcH+PcMng== X-Received: by 2002:a05:690c:ec8:b0:64b:3e44:e4f4 with SMTP id 00721157ae682-666016fd79emr30101487b3.7.1721294907202; Thu, 18 Jul 2024 02:28:27 -0700 (PDT) Received: from mail-yb1-f182.google.com (mail-yb1-f182.google.com. [209.85.219.182]) by smtp.gmail.com with ESMTPSA id 00721157ae682-666038f5e2dsm2577227b3.77.2024.07.18.02.28.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 18 Jul 2024 02:28:26 -0700 (PDT) Received: by mail-yb1-f182.google.com with SMTP id 3f1490d57ef6-e05ebd3d607so576177276.3; Thu, 18 Jul 2024 02:28:26 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCXsjve2h/c0KU/F0KTuTBT7P/aL0qiKmlsHb9WlKjeGzGxwknlDrRL8RyMiw+37fbOd67ixbWoUxhsMnEfnMQDzWytAFHh8riaErtoiKg== X-Received: by 2002:a05:6902:1606:b0:e05:f63d:280e with SMTP id 3f1490d57ef6-e05fec201d4mr2967512276.40.1721294906530; Thu, 18 Jul 2024 02:28:26 -0700 (PDT) MIME-Version: 1.0 References: <20240716084414.115852-1-jslaby@suse.cz> <2273498.iZASKD2KPV@thomas> In-Reply-To: <2273498.iZASKD2KPV@thomas> From: Luca Boccassi Date: Thu, 18 Jul 2024 10:28:13 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH] kni: fix build with Linux 6.10 To: Thomas Monjalon Cc: Jiri Slaby , dev@dpdk.org, xuemingl@nvidia.com, ktraynor@redhat.com, stable@dpdk.org 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 Hi Jiri, Please follow the process described in the "stable release" paragraph at: https://core.dpdk.org/contribute/ ie, one patch per affected LTS branch must be prepared, tested and sent individually, and then we'll apply it. Thanks. On Thu, 18 Jul 2024 at 10:16, Thomas Monjalon wrote: > > 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')) > > > >