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 7B4AA43CAD for ; Thu, 14 Mar 2024 01:12:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7453242E6F; Thu, 14 Mar 2024 01:12:52 +0100 (CET) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mails.dpdk.org (Postfix) with ESMTP id 6897340297 for ; Thu, 14 Mar 2024 01:12:50 +0100 (CET) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-413eede49dbso2625575e9.0 for ; Wed, 13 Mar 2024 17:12:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375170; x=1710979970; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EQH9EPYSA3yKxnk2S91kFjLCwm9Jb8r5o5AA4vCIEM4=; b=Oley7b7uM3KRMJ2yFyxXL3+QIzmVZTZxnp1q0HkqMsgm28c5eJgnOA9LyyN9PG9uuk 3YbJCqGnsLo9ZXuq1Uf0MQnHahV5VGdeSwMkgUe6s6wl+uhKmn0HbtJmEerMDal/vgbV n1wmdnjCIruOZUnCt5jHBMm0WhozGhtHcqwScIHqmAnMMLOP4JDeRJGumThgbfSMkm9d 7Fm78SJHTnZJ0RwEEvfJVZWHKkJK0YyDz9M/no3CVZdCSXBLhAZrK6IGb6xX26metGWE qejQhWnVuHg7h1hAnGGBLsge96/hl04vdJX4P4gct2p3cipN70iGzt1DaPAN3LS2zd5N CgzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375170; x=1710979970; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EQH9EPYSA3yKxnk2S91kFjLCwm9Jb8r5o5AA4vCIEM4=; b=V4e1RbL9Y9AXwONSV4S9NEWzrO9gdFQ4b6x8hGAqWERLJLJelS9RnY4KeSOjnfdXAi f0m+w33GGQq06HiFs2D4DnYpELsR9ePS1oTk/e4gfT/KzxMwn3VnBTar8BaG61TT18Ic zWDxL9TK0zl7Yn+bgstXpkxgKv62jnFBD1Y/MjBE3bO8I0eIrpSByfV8WPIGB8KMr6oC 0T6R/EYl8MHNU4w8GwS/94BeArKd2z6t75cUrgTjFUsLMu6P5SSrjQGuJln9t9si2QD/ 0ub9bzrdgW0oyIVltUFR11SAGjJRq7XKe2tLyDsbPa0dUbPkEXqC9Zw8eFawT9CHV2ys aEpQ== X-Forwarded-Encrypted: i=1; AJvYcCV3HTbPdURFHtmkxg+mIbBUNqSTT3Ni6QfNtHQf5OJ8Ub6gexAWCLmt6TVSZTSkcPdLLsXBl15+SrzpUilkoU8= X-Gm-Message-State: AOJu0Ywv0litVmkcMCuX1nj6ylRs2dPQaG8zTuZ3XNQtpbj17Ak5EWKA pdg0qbZFLSUZxVytC/TL4VDIPUl4se92r6WptflzV1RxIhj4KRl7 X-Google-Smtp-Source: AGHT+IFOwjk2TJ1mveVcrNu7IIH5E1gZBw9+Z48H/6uBauZATdw78FFS7Gu4Gfm9DFVFteLOgFfNAw== X-Received: by 2002:a05:600c:3583:b0:413:ef90:6caf with SMTP id p3-20020a05600c358300b00413ef906cafmr181543wmq.5.1710375170057; Wed, 13 Mar 2024 17:12:50 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id f7-20020a05600c154700b004131035d28csm3808152wmg.23.2024.03.13.17.12.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:12:49 -0700 (PDT) From: luca.boccassi@gmail.com To: Joyce Kong Cc: Ruifeng Wang , Stephen Hemminger , Pavan Nikhilesh , dpdk stable Subject: patch 'config: fix CPU instruction set for cross-build' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:49 +0000 Message-Id: <20240314000957.2810803-53-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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, FYI, your patch has been queued to stable release 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/16/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/0426b179f3f425dd5cc43bbe10f3524cd6db17a8 Thanks. Luca Boccassi --- >From 0426b179f3f425dd5cc43bbe10f3524cd6db17a8 Mon Sep 17 00:00:00 2001 From: Joyce Kong Date: Tue, 5 Dec 2023 03:52:58 +0000 Subject: [PATCH] config: fix CPU instruction set for cross-build [ upstream commit d74543f8ad30db164c08ec69910b05d6811b1b89 ] The platform value would be 'native' only when not cross build. Move the operation about modifying cpu_instruction_set while platform equals 'native' to the not cross build branch. Fixes: bf66003b51ec ("build: use platform for generic and native builds") Signed-off-by: Joyce Kong Reviewed-by: Ruifeng Wang Acked-by: Stephen Hemminger Tested-by: Pavan Nikhilesh --- config/meson.build | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/config/meson.build b/config/meson.build index 25e41b57d6..c755083db0 100644 --- a/config/meson.build +++ b/config/meson.build @@ -91,13 +91,14 @@ else cpu_instruction_set = 'generic' endif endif + if platform == 'native' + if cpu_instruction_set == 'auto' + cpu_instruction_set = 'native' + endif + endif endif -if platform == 'native' - if cpu_instruction_set == 'auto' - cpu_instruction_set = 'native' - endif -elif platform == 'generic' +if platform == 'generic' if cpu_instruction_set == 'auto' cpu_instruction_set = 'generic' endif -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:23.128009776 +0000 +++ 0053-config-fix-CPU-instruction-set-for-cross-build.patch 2024-03-14 00:09:20.705617048 +0000 @@ -1 +1 @@ -From d74543f8ad30db164c08ec69910b05d6811b1b89 Mon Sep 17 00:00:00 2001 +From 0426b179f3f425dd5cc43bbe10f3524cd6db17a8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d74543f8ad30db164c08ec69910b05d6811b1b89 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 8cb6429313..bbb931a457 100644 +index 25e41b57d6..c755083db0 100644 @@ -25 +26 @@ -@@ -128,13 +128,14 @@ else +@@ -91,13 +91,14 @@ else