From 7eddd5262a768729267ef9a112fe9e024d9abd5b Mon Sep 17 00:00:00 2001 From: Pierce Lopez Date: Tue, 20 Feb 2024 07:56:24 +0100 Subject: [PATCH] Patch abi-compliance-checker to avoid endless loop --- .github/workflows/build.yml | 3 +++ .github/workflows/master.yml | 4 ++++ extra/abi-check/debian.patch | 15 +++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 extra/abi-check/debian.patch diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7cc89f9b..49e033c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -991,6 +991,9 @@ jobs: abi-compliance-checker pkgdiff vtable-dumper + # FIXME: clone git repo or report to debian + - name: Patch abi-compliance-checker to avoid endless loop + run: sudo patch /usr/bin/abi-compliance-checker < extra/abi-check/debian.patch - name: Generate shell: bash run: | diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 4596ddfb..4583170a 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -80,6 +80,10 @@ jobs: pkgdiff vtable-dumper + # FIXME: clone git repo or report to debian + - name: Patch abi-compliance-checker to avoid endless loop + run: sudo patch /usr/bin/abi-compliance-checker < extra/abi-check/debian.patch + - name: Generate shell: bash run: | diff --git a/extra/abi-check/debian.patch b/extra/abi-check/debian.patch new file mode 100644 index 00000000..ffb95377 --- /dev/null +++ b/extra/abi-check/debian.patch @@ -0,0 +1,15 @@ +--- /usr/bin/abi-compliance-checker 2024-02-20 03:34:20.805679599 +0000 ++++ /usr/bin/abi-compliance-checker 2024-02-20 03:34:32.095652901 +0000 +@@ -9343,9 +9343,9 @@ + exitStatus("Not_Found", "can't find \"tar\" command"); + } + chdir($UnpackDir); +- my @res = child_exec("$TarCmd -xvzf \"$Path\" >\"$TmpDir/null\""); +- if($res[0]) { +- exitStatus("Error", "can't extract \'$Path\' ($res[0]): $res[1]"); ++ system("$TarCmd -xvzf \"$Path\" >\"$TmpDir/null\""); ++ if($?) { ++ exitStatus("Error", "can't extract \'$Path\' ($?): $!"); + } + chdir($In::Opt{"OrigDir"}); + my @Contents = cmdFind($UnpackDir, "f");