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 5C2DA43EC3; Tue, 16 Jul 2024 17:54:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 47C97402D6; Tue, 16 Jul 2024 17:54:32 +0200 (CEST) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by mails.dpdk.org (Postfix) with ESMTP id 3CF04406B4 for ; Tue, 16 Jul 2024 10:44:15 +0200 (CEST) Received: from kunlun.arch.suse.cz (unknown [10.100.128.76]) by smtp-out2.suse.de (Postfix) with ESMTP id A67D71F8AB; Tue, 16 Jul 2024 08:44:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1721119454; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=g79iRGPtqUEP3CD1vC+7ZAaET17K9KVlt+fUICkGcXs=; b=rekH2FJXowcxML9YwksYSaipKfUh/62yafSueabTnjqSEMeNbfUryTmjq/CmkESPNKKK9j n9MG4ZUVtevNQsFoO8KrxuXrBCV6VIYRLt+m4qmCT70BaxkpGO6FoDKS93D6HyiLEJsNDc jp0R95dB+a5bwTzINNXOJUP+NkgKlUA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1721119454; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=g79iRGPtqUEP3CD1vC+7ZAaET17K9KVlt+fUICkGcXs=; b=KmFZUs4cLd8XyK5DzPcjL9TbgfaCt0VKYBGiBppoSnOwTDFeyDbKk0nFd8/TCkzCFdn8Rz 7mkyCt/vO54TxFDQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1721119454; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=g79iRGPtqUEP3CD1vC+7ZAaET17K9KVlt+fUICkGcXs=; b=rekH2FJXowcxML9YwksYSaipKfUh/62yafSueabTnjqSEMeNbfUryTmjq/CmkESPNKKK9j n9MG4ZUVtevNQsFoO8KrxuXrBCV6VIYRLt+m4qmCT70BaxkpGO6FoDKS93D6HyiLEJsNDc jp0R95dB+a5bwTzINNXOJUP+NkgKlUA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1721119454; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=g79iRGPtqUEP3CD1vC+7ZAaET17K9KVlt+fUICkGcXs=; b=KmFZUs4cLd8XyK5DzPcjL9TbgfaCt0VKYBGiBppoSnOwTDFeyDbKk0nFd8/TCkzCFdn8Rz 7mkyCt/vO54TxFDQ== From: Jiri Slaby To: dev@dpdk.org Cc: Jiri Slaby Subject: [PATCH] kni: fix build with Linux 6.10 Date: Tue, 16 Jul 2024 10:44:14 +0200 Message-ID: <20240716084414.115852-1-jslaby@suse.cz> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Flag: NO X-Spam-Score: 1.22 X-Spamd-Result: default: False [1.22 / 50.00]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.18)[-0.913]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; TO_DN_SOME(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:email] X-Spam-Level: * X-Mailman-Approved-At: Tue, 16 Jul 2024 17:54:31 +0200 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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')) -- 2.45.2