[dpdk-stable] patch 'doc: fix ABI check script examples' has been queued to LTS release 18.11.2

Kevin Traynor ktraynor at redhat.com
Thu Apr 25 17:40:31 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.2

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/01/19. 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 can be viewed on the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From 620972b4608ae388edde1deed5c9603958fb50fa Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 19 Mar 2019 15:05:18 +0100
Subject: [PATCH] doc: fix ABI check script examples

[ upstream commit 560a3580ba72c306f32168d29490f6f918090d76 ]

The doc examples are not aligned on the script following the
incriminated commit.

Fixes: c4a5fe3bf832 ("devtools: rework ABI checker script")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Neil Horman <nhorman at tuxdriver.com>
---
 doc/guides/contributing/versioning.rst | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/doc/guides/contributing/versioning.rst b/doc/guides/contributing/versioning.rst
index 01b36247e..fe17c7f13 100644
--- a/doc/guides/contributing/versioning.rst
+++ b/doc/guides/contributing/versioning.rst
@@ -549,25 +549,28 @@ utilities which can be installed via a package manager. For example::
 The syntax of the ``validate-abi.sh`` utility is::
 
-   ./devtools/validate-abi.sh <REV1> <REV2> <TARGET>
+   ./devtools/validate-abi.sh <REV1> <REV2>
 
 Where ``REV1`` and ``REV2`` are valid gitrevisions(7)
 https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html
-on the local repo and target is the usual DPDK compilation target.
+on the local repo.
 
 For example::
 
    # Check between the previous and latest commit:
-   ./devtools/validate-abi.sh HEAD~1 HEAD x86_64-native-linuxapp-gcc
+   ./devtools/validate-abi.sh HEAD~1 HEAD
+
+   # Check on a specific compilation target:
+   ./devtools/validate-abi.sh -t x86_64-native-linux-gcc HEAD~1 HEAD
 
    # Check between two tags:
-   ./devtools/validate-abi.sh v2.0.0 v2.1.0 x86_64-native-linuxapp-gcc
+   ./devtools/validate-abi.sh v2.0.0 v2.1.0
 
    # Check between git master and local topic-branch "vhost-hacking":
-   ./devtools/validate-abi.sh master vhost-hacking x86_64-native-linuxapp-gcc
+   ./devtools/validate-abi.sh master vhost-hacking
 
 After the validation script completes (it can take a while since it need to
 compile both tags) it will create compatibility reports in the
-``./compat_report`` directory. Listed incompatibilities can be found as
-follows::
+``./abi-check/compat_report`` directory. Listed incompatibilities can be found
+as follows::
 
-  grep -lr Incompatible compat_reports/
+  grep -lr Incompatible abi-check/compat_reports/
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:49.157846299 +0100
+++ 0056-doc-fix-ABI-check-script-examples.patch	2019-04-25 16:37:46.772294332 +0100
@@ -1 +1 @@
-From 560a3580ba72c306f32168d29490f6f918090d76 Mon Sep 17 00:00:00 2001
+From 620972b4608ae388edde1deed5c9603958fb50fa Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 560a3580ba72c306f32168d29490f6f918090d76 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 988c1f628..5d93b1810 100644
+index 01b36247e..fe17c7f13 100644
@@ -22 +23 @@
-@@ -564,25 +564,28 @@ utilities which can be installed via a package manager. For example::
+@@ -549,25 +549,28 @@ utilities which can be installed via a package manager. For example::
@@ -36 +37 @@
--   ./devtools/validate-abi.sh HEAD~1 HEAD x86_64-native-linux-gcc
+-   ./devtools/validate-abi.sh HEAD~1 HEAD x86_64-native-linuxapp-gcc
@@ -43 +44 @@
--   ./devtools/validate-abi.sh v2.0.0 v2.1.0 x86_64-native-linux-gcc
+-   ./devtools/validate-abi.sh v2.0.0 v2.1.0 x86_64-native-linuxapp-gcc
@@ -47 +48 @@
--   ./devtools/validate-abi.sh master vhost-hacking x86_64-native-linux-gcc
+-   ./devtools/validate-abi.sh master vhost-hacking x86_64-native-linuxapp-gcc


More information about the stable mailing list