From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 67EADA05D3 for ; Thu, 25 Apr 2019 17:42:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 60113374; Thu, 25 Apr 2019 17:42:11 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 36E8D1B5FF for ; Thu, 25 Apr 2019 17:42:10 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 95D35C049E23; Thu, 25 Apr 2019 15:42:09 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 832845DE6B; Thu, 25 Apr 2019 15:42:07 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Neil Horman , dpdk stable Date: Thu, 25 Apr 2019 16:40:31 +0100 Message-Id: <20190425154037.28778-56-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 25 Apr 2019 15:42:09 +0000 (UTC) Subject: [dpdk-stable] patch 'doc: fix ABI check script examples' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" 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 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 Acked-by: Neil Horman --- 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 + ./devtools/validate-abi.sh 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@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