From cb246505cfa50050ab2055e7ed571edcc7add287 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Aug 30 2022 19:50:25 +0000
Subject: tar-up.sh: Include kernel signature in OBS upload.


It is not clear that OBS can handle uncompressed tar signatures but it
can still be verified manually.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>

---

diff --git a/scripts/tar-up-old.sh b/scripts/tar-up-old.sh
index 2c5539c..a34a75a 100755
--- a/scripts/tar-up-old.sh
+++ b/scripts/tar-up-old.sh
@@ -152,6 +152,9 @@ for f in "$build_dir"/*; do
 	"$build_dir/linux-$SRCVERSION.tar.bz2")
 		continue
 		;;
+	"$build_dir/linux-$SRCVERSION.tar.sign")
+		continue
+		;;
 	"$build_dir"/patches.*)
 		rm -rf "$f"
 	esac
diff --git a/scripts/tar-up.sh b/scripts/tar-up.sh
index 5c4c801..2ea9a1a 100755
--- a/scripts/tar-up.sh
+++ b/scripts/tar-up.sh
@@ -129,6 +129,9 @@ for f in "$build_dir"/*; do
 	"linux-$SRCVERSION.$suffix")
 		continue
 		;;
+	"linux-$SRCVERSION.tar.sign")
+		continue
+		;;
 	patches.*)
 		rm -rf "$f"
 	esac
diff --git a/scripts/wd-functions.sh b/scripts/wd-functions.sh
index 574c26e..3111d40 100644
--- a/scripts/wd-functions.sh
+++ b/scripts/wd-functions.sh
@@ -39,6 +39,10 @@ get_branch_name()
     fi
 }
 
+get_kernel_sig(){
+    echo "${1%.*}.sign"
+}
+
 _find_tarball()
 {
     local version=$1 suffixes=$2 dir subdir major suffix tarball sig dc
@@ -61,7 +65,7 @@ _find_tarball()
             for suffix in $suffixes; do
                 tarball="$dir$subdir/linux-$version.$suffix"
                 if test -r "$tarball"; then
-                    sig="${tarball%.*}.sign"
+                    sig="$(get_kernel_sig "$tarball")"
                     if ! [ -r "$sig" ] ; then
                         echo "Missing signature $sig for tarball $tarball" >&2
                         continue
@@ -123,18 +127,27 @@ _get_tarball_from_git()
 
 get_tarball()
 {
-    local version=$1 suffix=$2 dest=$3 url=$4 tarball compress
+    local version=$1 suffix=$2 dest=$3 url=$4 tarball compress sig
 
     tarball=$(_find_tarball "$version" "$suffix")
     if test -n "$tarball"; then
+        sig="$(get_kernel_sig "$dest/linux-$version.$suffix")"
         cp -p "$tarball" "$dest/linux-$version.$suffix.part" || exit
+        cp -p "$(get_kernel_sig "$tarball")" "$sig.part" || exit
         mv "$dest/linux-$version.$suffix.part" "$dest/linux-$version.$suffix"
+        mv "$sig.part" "$sig"
+        cp -p "$scripts_dir/linux.keyring" "$dest"
         return
     fi
     # Reuse the locally generated tarball if already there
     tarball="$dest/linux-$version.$suffix"
     if test -e "$tarball"; then
         echo "Reusing $tarball" >&2
+        sig="$(get_kernel_sig "$tarball")"
+        if [ -e $sig ] ; then
+            echo "Reusing $sig" >&2
+            cp -p "$scripts_dir/linux.keyring" "$dest"
+        fi
         return
     fi
     echo "Warning: could not find linux-$version.$suffix, trying to create it from git" >&2