UBUNTU: [Packaging] resync retpoline extraction

BugLink: http://bugs.launchpad.net/bugs/1786013
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/debian/scripts/retpoline-extract b/debian/scripts/retpoline-extract
index 53d81847c7f4d3073a0d42b037c99f1573c3cd41..a4bff5f65c248bfc915a94b4baea8ba78426680f 100755 (executable)
--- a/debian/scripts/retpoline-extract
+++ b/debian/scripts/retpoline-extract
@@ -5,17 +5,19 @@ cd "$1" || exit 1
 # Find all valid retpoline information, collate the detected and
 # safe information together.  Join the result to find the detected
 # but non-safe elements.  These are our concern.
-tmp="/tmp/retpoline-check.$$"
+ur_detected=$(mktemp --tmpdir "retpoline-check-XXXXXX.ur-detected")
+ur_safe=$(mktemp --tmpdir "retpoline-check-XXXXXX.ur-safe")
+
 find "." -path './drivers/firmware/efi/libstub' -prune -o \
         -path './arch/x86/boot' -prune -o \
         -path './arch/x86/purgatory' -prune -o \
         -name \*.ur-detected | xargs cat | \
        sed -e "s@^$1@@" -e "s@ $2/@ @" -e "s@^/@@" | \
-       sort -k 1b,1 >"$tmp.ur-detected"
+       sort -k 1b,1 >"$ur_detected"
 find "." -name \*.ur-safe | xargs cat | \
        sed -e "s@^$1@@" -e "s@^/@@" | \
-       sort -k 1b,1 >"$tmp.ur-safe"
+       sort -k 1b,1 >"$ur_safe"
 
-join -v 1 -j 1 "$tmp.ur-detected" "$tmp.ur-safe" | sed -s 's/[^ ]*  *//'
+join -v 1 -j 1 "$ur_detected" "$ur_safe" | sed -s 's/[^ ]*  *//'
 
-rm -f "$tmp".*
+rm -f "$ur_detected" "$ur_safe"

diff --git a/debian/scripts/retpoline-extract-one b/debian/scripts/retpoline-extract-one
index e8c450a6eb25c7373815f771c3f4ca48afb0a788..b203bfbf8df5c737351c9970976c047a54bf9e38 100755 (executable)
--- a/debian/scripts/retpoline-extract-one
+++ b/debian/scripts/retpoline-extract-one
@@ -146,7 +146,7 @@ rela()
 # Uses 8 character 0 expanded hexadecimal key for ease of consumption.
 contentmap_init()
 {
-       raw32 "$1" "$2" >"$tmp.cm"
+       raw32 "$1" "$2" >"$tmp"
        let offset=0
        while read value
        do
@@ -154,8 +154,8 @@ contentmap_init()
                eval contentmap_$offset_hex=\'$value\'
 
                let offset="$offset + 4"
-       done <"$tmp.cm"
-       rm -f "$tmp.cm"
+       done <"$tmp"
+       rm -f "$tmp"
 }
 contentmap()
 {
@@ -209,7 +209,7 @@ rel()
        } | sed -e 's/-00*\([0-9a-f]\)/-\1/'
 }
 
-tmp="/tmp/retpoline-extract.$$"
+tmp=$(mktemp --tmpdir "retpoline-extract-XXXXXX")
 
 disassemble()
 {
@@ -267,4 +267,4 @@ esac | sort -k 1b,1 >"$object.ur-safe"
 # formed above.  This is performed in retpoline-check.
 #join -v 1 -j 1 "$tmp.extracted" "$tmp.safe" | sed -s 's/[^ ]*  *//'
 
-rm -f "$tmp".*
+rm -f "$tmp"