diff -Nru s390-tools-2.31.0/debian/changelog s390-tools-2.31.0/debian/changelog --- s390-tools-2.31.0/debian/changelog 2024-03-16 07:59:43.000000000 +0100 +++ s390-tools-2.31.0/debian/changelog 2024-03-25 19:31:59.000000000 +0100 @@ -1,3 +1,10 @@ +s390-tools (2.31.0-0ubuntu4) noble; urgency=medium + + * Add d/p/lp-2058944-dbginfo.sh-dash-compatible-copy-sequence.patch + to fix dash incompatibility in dbginfo.sh. LP: #2058944 + + -- Frank Heimes Mon, 25 Mar 2024 19:31:59 +0100 + s390-tools (2.31.0-0ubuntu3) noble; urgency=medium * No-change rebuild against libcurl4t64 diff -Nru s390-tools-2.31.0/debian/patches/lp-2058944-dbginfo.sh-dash-compatible-copy-sequence.patch s390-tools-2.31.0/debian/patches/lp-2058944-dbginfo.sh-dash-compatible-copy-sequence.patch --- s390-tools-2.31.0/debian/patches/lp-2058944-dbginfo.sh-dash-compatible-copy-sequence.patch 1970-01-01 01:00:00.000000000 +0100 +++ s390-tools-2.31.0/debian/patches/lp-2058944-dbginfo.sh-dash-compatible-copy-sequence.patch 2024-03-25 19:31:45.000000000 +0100 @@ -0,0 +1,61 @@ +From 1c128c0d11f23f9cf4bb9f4cf89a48b3011c4a99 Mon Sep 17 00:00:00 2001 +From: Joern Siglen +Date: Tue, 12 Mar 2024 11:34:37 +0100 +Subject: [PATCH] dbginfo.sh: dash compatible copy sequence + +rewrite the copy of dbginfo.sh for dash compatibility + +Reviewed-by: Mike Storzer +Reviewed-by: Mario Held +Signed-off-by: Joern Siglen +Signed-off-by: Steffen Eiden + +Origin: upstream, https://github.com/ibm-s390-linux/s390-tools/commit/1c128c0d11f23f9cf4bb9f4cf89a48b3011c4a99 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/2058944 +Last-Update: 2024-03-25 + +--- + CHANGELOG.md | 1 + + scripts/dbginfo.sh | 7 +++---- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CHANGELOG.md b/CHANGELOG.md +index 0424611a..b8792daa 100644 +--- a/CHANGELOG.md ++++ b/CHANGELOG.md +@@ -1,6 +1,7 @@ Release history for s390-tools (MIT version) + Release history for s390-tools (MIT version) + -------------------------------------------- + ++ - dbginfo.sh: dash compatible copy sequence + * __v2.31.0 (2024-02-02)__ + + For Linux kernel version: 6.7 +diff --git a/scripts/dbginfo.sh b/scripts/dbginfo.sh +index 7763067a..e363c128 100755 +--- a/scripts/dbginfo.sh ++++ b/scripts/dbginfo.sh +@@ -15,7 +15,7 @@ export LC_ALL + ######################################## + # Global used variables + readonly SCRIPTNAME="${0##*/}" # general name of this script +-readonly STARTDIR="$(pwd)" # save calling directory ++readonly FULLPATHSCRIPT="$(readlink -f "${0}")" + # + readonly DATETIME="$(date +%Y-%m-%d-%H-%M-%S 2>/dev/null)" + readonly DOCKER=$(if type docker >/dev/null 2>&1; then echo "YES"; else echo "NO"; fi) +@@ -1420,9 +1420,8 @@ environment_setup() { + create_package() { + local rc_tar + pr_syslog_stdout ${step_num} "Finalizing: Creating archive with collected data" +- # get a copy of the script used - enabled for relative path calls +- cd "${STARTDIR}" +- cp -p "${BASH_SOURCE[0]}" "${WORKPATH}" ++ # get a copy of the script used ++ cp -p "${FULLPATHSCRIPT}" "${WORKPATH}" + # create the archive + cd "${WORKDIR_BASE}" + touch "${WORKARCHIVE}" +-- +2.25.1 + diff -Nru s390-tools-2.31.0/debian/patches/series s390-tools-2.31.0/debian/patches/series --- s390-tools-2.31.0/debian/patches/series 2024-02-06 11:33:18.000000000 +0100 +++ s390-tools-2.31.0/debian/patches/series 2024-03-25 19:29:08.000000000 +0100 @@ -3,3 +3,4 @@ rust_paths.patch vendor-remove-unused-deps.patch gzip-files-without-timestamps-or-names.patch +lp-2058944-dbginfo.sh-dash-compatible-copy-sequence.patch