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 BC13842ECF for ; Thu, 20 Jul 2023 17:20:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B660640685; Thu, 20 Jul 2023 17:20:51 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id EB43A400D6 for ; Thu, 20 Jul 2023 17:20:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866450; 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=gnIxeToUkek1S3JrzaoClb3inXm7/aeCOk39Z7y7n8o=; b=J83SVhtYGFrtDppUmVMSiNN438ddCp26C/FGRWmxDIE4qDZztQoberZX6kXqw4YAG6jdzx 8eXtkeRqnv0uaADrBuprOWEnb0HHDroyCgeM/tZrgdX8LAkGJode+GfAAQB+QNKhRVnqDw iLpSD51IqUILN4A32wAuK82mDai+zwU= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-163-lOKHFgunOcOqHxLEqmjYQQ-1; Thu, 20 Jul 2023 11:20:35 -0400 X-MC-Unique: lOKHFgunOcOqHxLEqmjYQQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3C03A1C03DAB; Thu, 20 Jul 2023 15:20:05 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35A81492C13; Thu, 20 Jul 2023 15:20:03 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Tyler Retzlaff , dpdk stable Subject: patch 'build: fix case of project language name' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:18 +0100 Message-ID: <20230720151942.262154-7-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.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 07/25/23. 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/16e1d054e4be0cbc98a0bcb00b77ee04a1758422 Thanks. Kevin --- >From 16e1d054e4be0cbc98a0bcb00b77ee04a1758422 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 10 Mar 2023 11:11:37 +0000 Subject: [PATCH] build: fix case of project language name [ upstream commit f6da046a1528895a96e1fbb7deef2c668efd0a56 ] According to the meson manual [1], the project language should be given as 'c', rather than 'C' in the initial "project" function call. While meson itself does not complain about this, the "muon" project, which attempts to re-implement meson in C, does complain. /home/bruce/dpdk/meson.build:4:17: error 'C' is not a valid language 4 | project('DPDK', 'C', ^ [1] https://mesonbuild.com/Reference-manual_functions.html#project Fixes: a25a650be5f0 ("build: add infrastructure for meson and ninja builds") Signed-off-by: Bruce Richardson Reviewed-by: Tyler Retzlaff --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index dff7cff4aa..19234656fb 100644 --- a/meson.build +++ b/meson.build @@ -2,5 +2,5 @@ # Copyright(c) 2017-2019 Intel Corporation -project('DPDK', 'C', +project('DPDK', 'c', # Get version number from file. # Fallback to "more" for Windows compatibility. -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:56.070261612 +0100 +++ 0007-build-fix-case-of-project-language-name.patch 2023-07-20 16:17:54.428749556 +0100 @@ -1 +1 @@ -From f6da046a1528895a96e1fbb7deef2c668efd0a56 Mon Sep 17 00:00:00 2001 +From 16e1d054e4be0cbc98a0bcb00b77ee04a1758422 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f6da046a1528895a96e1fbb7deef2c668efd0a56 ] + @@ -26 +28 @@ -index f91d652bc5..992ca91e88 100644 +index dff7cff4aa..19234656fb 100644