From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 73865A0093
for <public@inbox.dpdk.org>; Tue, 19 May 2020 15:12:23 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 6CBEF1D731;
Tue, 19 May 2020 15:12:23 +0200 (CEST)
Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com
[209.85.221.42]) by dpdk.org (Postfix) with ESMTP id AFD571D729
for <stable@dpdk.org>; Tue, 19 May 2020 15:12:21 +0200 (CEST)
Received: by mail-wr1-f42.google.com with SMTP id l18so15860848wrn.6
for <stable@dpdk.org>; Tue, 19 May 2020 06:12:21 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=So0BpaTmhlBhAjtA46qD4hBE/eSWblWC8PaOUfd3IJQ=;
b=FjwTl5ZQ64M+nrJgEpp6u4m8JGEkasP1nwiKkVzV18nY/meNC30C88yzGuEMyXbzIM
0YTJGHf/Q4dTj/MocD4jP3jAGgC4LboHiyP5eqiGq+OIJ2jLqwRNNmhDLqKCusCe8ZOr
faSu+/HXB2e9W6PVHySa2s67yN7nqWbJz3xgaGS+25qaDfJcaxcW5gGUyoJKOioJv3vh
owSpM/Hy5d1sy6mbEhLl7SoME7eCja+MiI8Bpr5BdScvrXEs4HyRM22wBBFITMlan9AU
GKHQSxKL9LK4FbGUqzuPEDjxqLk4Rm2EZ16UWnJ19cTO9u0GcDQ3kCmhyzLjl50nO0r+
sg5Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=So0BpaTmhlBhAjtA46qD4hBE/eSWblWC8PaOUfd3IJQ=;
b=cFtBv7iq9Me+dBEbYZVfGnDVlqLT+yLLQj5/TbhR7FYri7xj0qMW5mtA6fAnNUhxYH
InYN3KgMfzy4HptVGkAJkwP1bSGTzf2jGthG9fTXiy9Ut7d3dqFSvohgkAUs3txBUmQT
OStv9nS/pZCoE/ecKdxa8Yv9aw/t7OTSdDvRFJwZLFFHQNCyo8uPnmOarjHhoNGNNqsm
E/9YZw/l5IW23JkHcN1CnUyyPTSD+OUmJ5Phr2zbz5a7Dr7dSw90iykhif2odrb51YvP
U0p3lnz7YKDNaHU0EGCr2J6AGaxGasKgLSEOcbB1iiBcaUXlcah/fXCKybW7lU1/wl6K
QWRw==
X-Gm-Message-State: AOAM530eesTRzKG9JBNOCHk7SHnij76oVMzRjbwML5sjfC0hRYxkgNTO
RxQhZuDoGfCf2EOoeUOMgoE=
X-Google-Smtp-Source: ABdhPJxcFtie/N6eDVD8FP/GOOXeGzCEC6tl1LeycsFn50QuRpwbGn81duE5W7wJWJcGwKiHKMwSlg==
X-Received: by 2002:adf:ec45:: with SMTP id w5mr26175638wrn.96.1589893941443;
Tue, 19 May 2020 06:12:21 -0700 (PDT)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id b19sm4240077wmd.26.2020.05.19.06.12.20
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 19 May 2020 06:12:20 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Thomas Monjalon <thomas@monjalon.net>
Cc: Bruce Richardson <bruce.richardson@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Tue, 19 May 2020 14:04:18 +0100
Message-Id: <20200519130549.112823-123-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com>
References: <20200519125804.104349-1-luca.boccassi@gmail.com>
<20200519130549.112823-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'app: fix usage help of options separated by
dashes' has been queued to stable release 19.11.3
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 19.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. 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.
Thanks.
Luca Boccassi
---
>From a8e6e27b007bb7ac737b07bdcdf290b380efc1b5 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Tue, 21 Apr 2020 01:25:31 +0200
Subject: [PATCH] app: fix usage help of options separated by dashes
[ upstream commit a658775c57947a50847c1ca01d39de0b81400678 ]
The EAL options and app-specific options are separated
with double dashes.
The help of testpmd, test-acl and pdump were missing
the dashes after EAL options.
Note: testpmd was completely missing the EAL options.
Fixes: af75078fece3 ("first public release")
Fixes: 26c057ab6c45 ("acl: new test-acl application")
Fixes: b2854d5317e8 ("app/pdump: support multi-core capture")
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/pdump/main.c | 2 +-
app/test-acl/main.c | 2 +-
app/test-pmd/parameters.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/pdump/main.c b/app/pdump/main.c
index d05a023667..c38c53719e 100644
--- a/app/pdump/main.c
+++ b/app/pdump/main.c
@@ -151,7 +151,7 @@ static uint8_t multiple_core_capture;
static void
pdump_usage(const char *prgname)
{
- printf("usage: %s [EAL options]"
+ printf("usage: %s [EAL options] --"
" --["CMD_LINE_OPT_MULTI"]\n"
" --"CMD_LINE_OPT_PDUMP" "
"'(port=<port id> | device_id=<pci id or vdev name>),"
diff --git a/app/test-acl/main.c b/app/test-acl/main.c
index 57f23942eb..08f06c1fa3 100644
--- a/app/test-acl/main.c
+++ b/app/test-acl/main.c
@@ -12,7 +12,7 @@
#include <rte_lcore.h>
#include <rte_ip.h>
-#define PRINT_USAGE_START "%s [EAL options]\n"
+#define PRINT_USAGE_START "%s [EAL options] --\n"
#define RTE_LOGTYPE_TESTACL RTE_LOGTYPE_USER1
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 2e7a504415..0eb7844783 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -49,7 +49,7 @@
static void
usage(char* progname)
{
- printf("usage: %s "
+ printf("usage: %s [EAL options] -- "
#ifdef RTE_LIBRTE_CMDLINE
"[--interactive|-i] "
"[--cmdline-file=FILENAME] "
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-05-19 14:04:49.509041741 +0100
+++ 0123-app-fix-usage-help-of-options-separated-by-dashes.patch 2020-05-19 14:04:44.432652287 +0100
@@ -1,8 +1,10 @@
-From a658775c57947a50847c1ca01d39de0b81400678 Mon Sep 17 00:00:00 2001
+From a8e6e27b007bb7ac737b07bdcdf290b380efc1b5 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Tue, 21 Apr 2020 01:25:31 +0200
Subject: [PATCH] app: fix usage help of options separated by dashes
+[ upstream commit a658775c57947a50847c1ca01d39de0b81400678 ]
+
The EAL options and app-specific options are separated
with double dashes.
@@ -13,7 +15,6 @@
Fixes: af75078fece3 ("first public release")
Fixes: 26c057ab6c45 ("acl: new test-acl application")
Fixes: b2854d5317e8 ("app/pdump: support multi-core capture")
-Cc: stable@dpdk.org
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
@@ -37,7 +38,7 @@
" --"CMD_LINE_OPT_PDUMP" "
"'(port=<port id> | device_id=<pci id or vdev name>),"
diff --git a/app/test-acl/main.c b/app/test-acl/main.c
-index 4bc00272f4..0a5dfb621d 100644
+index 57f23942eb..08f06c1fa3 100644
--- a/app/test-acl/main.c
+++ b/app/test-acl/main.c
@@ -12,7 +12,7 @@
@@ -50,7 +51,7 @@
#define RTE_LOGTYPE_TESTACL RTE_LOGTYPE_USER1
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
-index 404dba2b20..30c1753c32 100644
+index 2e7a504415..0eb7844783 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -49,7 +49,7 @@