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 A2D6E43829 for ; Fri, 8 Mar 2024 15:33:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9DF7B42F0D; Fri, 8 Mar 2024 15:33:00 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 1069540E2D for ; Fri, 8 Mar 2024 15:32:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709908378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EQd9U/n4hELzpRzGO8qR47SFqQbV9sWi7CNkPYoIzC0=; b=eePRS/CPZLi1EDSOPpOlGJzQGW/+KdBT4GwmMS+cJThNy1WIe+QSJGwYWNAt3UbyS1YE8+ aKpstZ57xhTkykB+6Dt5Sb326rwlKLJm+LpeWasGJAblBbtlUULUcwxzntZW4I9XytX2CP j4iJyHchl3ZU15AJtumJ+hnVe/4hahQ= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-482-l1KS_qD0PUqFlBkmtu6JbQ-1; Fri, 08 Mar 2024 09:32:55 -0500 X-MC-Unique: l1KS_qD0PUqFlBkmtu6JbQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 15FAF2800095; Fri, 8 Mar 2024 14:32:55 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5484637F6; Fri, 8 Mar 2024 14:32:50 +0000 (UTC) From: Kevin Traynor 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 21.11.7 Date: Fri, 8 Mar 2024 14:28:18 +0000 Message-ID: <20240308142824.528417-30-ktraynor@redhat.com> In-Reply-To: <20240308142824.528417-1-ktraynor@redhat.com> References: <20240308142824.528417-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.7 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/13/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/6640c76706902be41edb6e85ac169adab459a4bf Thanks. Kevin --- >From 6640c76706902be41edb6e85ac169adab459a4bf 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 63a4eb9f7e..e4b19db323 100644 --- a/config/meson.build +++ b/config/meson.build @@ -92,11 +92,12 @@ else 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' -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-08 13:47:49.906352433 +0000 +++ 0030-config-fix-CPU-instruction-set-for-cross-build.patch 2024-03-08 13:47:49.037686720 +0000 @@ -1 +1 @@ -From d74543f8ad30db164c08ec69910b05d6811b1b89 Mon Sep 17 00:00:00 2001 +From 6640c76706902be41edb6e85ac169adab459a4bf 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 63a4eb9f7e..e4b19db323 100644 @@ -25 +26 @@ -@@ -129,11 +129,12 @@ else +@@ -92,11 +92,12 @@ else