UBUNTU: [Packaging] resync update-dkms-versions helper

BugLink: https://bugs.launchpad.net/bugs/1786013
Signed-off-by: Brad Figg <bfigg@nvidia.com>

Author: nvidia-bfigg

update-dkms-versions

@@ -1,18 +1,13 @@
 #!/bin/bash
 
 remote_repo=''
-remote_branch='main'
 sru_cycle=
 while :
 do
 	if [ "$1" = "--remote-repo" ]; then
 		remote_repo="$2"
 		shift 2
 
-	elif [ "$1" = "--remote-branch" ]; then
-		remote_branch="$2"
-		shift 2
-
 	elif [ "$1" = "--sru-cycle" ]; then
 		sru_cycle="$2"
 		shift 2
@@ -82,6 +77,7 @@ esac
 #  https://git.launchpad.net/~canonical-kernel/+git/kernel-versions/plain/README
 #
 kv_repo="$HOME/.cache/kernel-versions-bare"
+git_base="$remote_name/$sru_cycle"
 
 # Now we know where our repo is and what it called update it.
 # We maintain "persistent" remotes for main and security, but assume
@@ -104,24 +100,13 @@ cat_file()
 	(cd "$kv_repo" && git cat-file "$@") || exit 1
 }
 
-# Determine if this is merge format (main branch exists).
-present=$(cat_file -t "$remote_name/main" 2>/dev/null)
-if [ "$present" ]; then
-	git_base="$remote_name/$remote_branch:$sru_cycle/"
-	git_base_devel="$remote_name/$remote_branch:tip/"
-else
-	git_base="$remote_name/$sru_cycle:"
-	git_base_devel="$remote_name/master:"
-fi
-git_human="$remote_name/$sru_cycle"
-
 # Determine if we have this cycle.
 present=$(cat_file -t "$git_base" 2>/dev/null)
 if [ "$present" = "" ]; then
 	# If we don't have the cycle in the development cycle then
 	# fall back to master.
 	case "$sru_cycle" in
-	d*)	git_base="$git_base_devel" ;;
+	d*)	git_base="$remote_name/master" ;;
 	*)	echo "$sru_cycle: cycle not found in $remote_repo" 2>&1
 		exit 1
 		;;
@@ -161,7 +146,7 @@ for versions_path_tail in \
 	"$our_mainline"
 do
 	echo "II: trying $versions_path_tail ..."
-	versions_paths=$(echo $(cat_file -p "${git_base}map/dkms-versions/$versions_path_tail" 2>/dev/null))
+	versions_paths=$(echo $(cat_file -p "$git_base:map/dkms-versions/$versions_path_tail" 2>/dev/null))
 	[ -n "$versions_paths" ] && break
 done
 
@@ -176,7 +161,7 @@ echo "II: grabbing dkms-versions from $sru_cycle $versions_paths"
 : ">debian/dkms-versions.new"
 for versions_path in $versions_paths
 do
-	cat_file -p "$git_base$versions_path" >>"debian/dkms-versions.new"
+	cat_file -p "$git_base:$versions_path" >>"debian/dkms-versions.new"
 	if [ "$?" -ne 0 ]; then
 		echo "$0: unable to download an updated dkms-versions file" 1>&2
 		exit 1
@@ -186,7 +171,7 @@ mv "debian/dkms-versions.new" "debian/dkms-versions"
 
 thing="debian/dkms-versions"
 if ! git diff --exit-code -- "$thing" >/dev/null; then
-	git commit -m "UBUNTU: $thing -- update from kernel-versions ($git_human)" \
+	git commit -m "UBUNTU: $thing -- update from kernel-versions ($git_base)" \
 		-m "BugLink: https://bugs.launchpad.net/bugs/1786013" \
 		-s -- "$thing"
 else