From 61934b95c45cffee4c03c291c2daaef989b200b0 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Thu, 1 Feb 2018 14:39:22 +0000
Subject: [PATCH 103/110] fixup! UBUNTU: [Packaging] retpoline -- add call site
 validation

---
 debian/scripts/retpoline-check | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/debian/scripts/retpoline-check b/debian/scripts/retpoline-check
index 05a2b259b93d..3e70a9314cd0 100755
--- a/debian/scripts/retpoline-check
+++ b/debian/scripts/retpoline-check
@@ -2,32 +2,38 @@
 
 flavour="$1"
 prev_abidir="$2"
-abidir="$3"
+curr_abidir="$3"
 skipretpoline="$4"
 
 echo "II: Checking retpoline indirections for $flavour...";
 
+if [ "$skipretpoline" = 'true' ]; then
+	echo "manual request ignoring retpoline delta"
+fi
+
 if [ -f "$prev_abidir/ignore.retpoline" -o \
      -f "$prev_abidir/$flavour.ignore.retpoline" ]; then
-	echo "explicitly ignoring retpoline"
-	exit 0
+	echo "explicitly ignoring retpoline delta"
+	skipretpoline='true'
 fi
 
-if [ ! -f "$abidir/$flavour.retpoline" -o \
-     ! -f "$prev_abidir/$flavour.retpoline" ]; then
-	echo "previous or current retpoline file missing!"
-	echo "   $abidir/$flavour.retpoline"
-	echo "   $prev_abidir/$flavour.retpoline"
-
-	[ "$skipretpoline" = 'true' ] && exit 0
-	exit 1
+prev="$prev_abidir/$flavour.retpoline"
+curr="$curr_abidir/$flavour.retpoline"
+if [ ! -f "$prev" ]; then
+	echo "previous retpoline file missing!"
+	echo "   $prev"
+	prev="/dev/null"
+fi
+if [ ! -f "$curr" ]; then
+	echo "current retpoline file missing!"
+	echo "   $curr"
+	curr="/dev/null"
 fi
 
 echo "II: retpoline delta in this package..."
-diff -u "$prev_abidir/$flavour.retpoline" "$abidir/$flavour.retpoline"
+diff -u "$prev" "$curr"
 rc="$?"
 
 echo "II: Done";
-
 [ "$skipretpoline" = 'true' ] && exit 0
 exit "$rc"
-- 
2.15.1