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 67E2142CBF for ; Thu, 15 Jun 2023 03:33:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6366C42D16; Thu, 15 Jun 2023 03:33:20 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id D863A40DDA for ; Thu, 15 Jun 2023 03:33:19 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-31109cd8d8cso1071981f8f.2 for ; Wed, 14 Jun 2023 18:33:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792799; x=1689384799; 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=fmyrj35y4uiusrX0DPq32j0mc6lwix13oQ/s4l34kDk=; b=NJuNP2qBIWUmPs2G9DaFLVOsuJgzCvpGB3x3/Ced7NMlW3w9ihPJkLWYKU8c4311Lc 3VkXpInaR2PBG+Z/nupiyKkkKiU7Pn9W0y3ahX4gkIInNcZm5rMxtxd50F8Q6rpPBqfK ge4Ee4CE851NynERXbs/XdOOeXlcGtEemXaK9xvs+2rTWqbS5kreaB4Ka3qkSIAe5TDs r6BT3kqu7hxXTSqCENALDKdsuTSE0OBtWNr8ETJP22F5IbtP1ZSs5vI2TXwu3ZdE7Hxk +/WQDSCyOZeBO5I93SyQR6XFjswd5R1FK5IlfQh7uYS0a6OX4Wf7pKP+PqVQSS3klwkI WlXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792799; x=1689384799; 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=fmyrj35y4uiusrX0DPq32j0mc6lwix13oQ/s4l34kDk=; b=Wp/A2+D8Te65uCqyrRTELrIR77AY7hy6Cf7xZJIxtxXfS4ZxXmqfIrqpDzaqKDZ5ay wAvMdw3pNtPuSIagz4EuSyEaLVtbaALpuBV2Uribp7G2dHEiqhu1uSlopi8N8WpIRJxE Jj7/Rs28bVHzXbhq2wwctZLxBb2hXRTgcP0nwNBgYE6X+/bco4WPIIaUfIkbU4KFz76V pJWIBOVjVknz9AqHlDLBz4BulVO9UqP24pMj5JWZfoM0cSpgRnMWnf8XXRhlRSC35ro/ aS7Vc2A7ALYdv2pYcEZYoplsfIcYvSeZwmxuFSG7ULfls8uQt7Pg6jS5sE48SNXokL6H 6gWA== X-Gm-Message-State: AC+VfDyxxPZA2Jp7AWCqLDlL8Vm3JbxO4/6R5HSHZToGM2Mj62WEEVTa k5eN5nNS+/MJH/47xq2G4Dp5k/g+e8kTIg== X-Google-Smtp-Source: ACHHUZ7G0pcJCnEvxS0HxpZiQm1uujvR7CYk3L0W6HUvisF1GLl7tdlKjMX3PUevH5bc+HIRBDyNww== X-Received: by 2002:a5d:4d8b:0:b0:30f:bcfd:ff9e with SMTP id b11-20020a5d4d8b000000b0030fbcfdff9emr8106405wru.12.1686792799438; Wed, 14 Jun 2023 18:33:19 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id a4-20020a056000050400b0030ae3a6be4asm19763808wrf.72.2023.06.14.18.33.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:33:18 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Tyler Retzlaff , dpdk stable Subject: patch 'build: fix case of project language name' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:02 +0100 Message-Id: <20230615013258.1439718-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-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 20.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/b998c77e8b65ce51d98e25be83ada7120c8b66b9 Thanks. Luca Boccassi --- >From b998c77e8b65ce51d98e25be83ada7120c8b66b9 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 514b5c51b6..cc3be0019a 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation -project('DPDK', 'C', +project('DPDK', 'c', # Get version number from file. # Fallback to "more" for Windows compatibility. version: run_command(find_program('cat', 'more'), -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:35.124136941 +0100 +++ 0007-build-fix-case-of-project-language-name.patch 2023-06-15 01:56:34.499539817 +0100 @@ -1 +1 @@ -From f6da046a1528895a96e1fbb7deef2c668efd0a56 Mon Sep 17 00:00:00 2001 +From b998c77e8b65ce51d98e25be83ada7120c8b66b9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f6da046a1528895a96e1fbb7deef2c668efd0a56 ] + @@ -26 +28 @@ -index f91d652bc5..992ca91e88 100644 +index 514b5c51b6..cc3be0019a 100644 @@ -35,3 +37,3 @@ - # Get version number from file. - # Fallback to "more" for Windows compatibility. - version: run_command(find_program('cat', 'more'), + # Get version number from file. + # Fallback to "more" for Windows compatibility. + version: run_command(find_program('cat', 'more'),