From 680722f95c2e12f4a6c86917cf9630ac71c75d66 Mon Sep 17 00:00:00 2001 From: Hook25 Date: Fri, 26 Apr 2024 10:45:00 +0200 Subject: [PATCH] Use for cycle to clear exestack --- .github/workflows/core24-builds.yml | 2 +- checkbox-core-snap/series24/snap/snapcraft.yaml | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/core24-builds.yml b/.github/workflows/core24-builds.yml index 9f48c0aba..35b25d9a1 100644 --- a/.github/workflows/core24-builds.yml +++ b/.github/workflows/core24-builds.yml @@ -19,7 +19,7 @@ jobs: tag: X64 runs-on: group: "Canonical self-hosted runners" - lables: + labels: - self-hosted - linux - jammy diff --git a/checkbox-core-snap/series24/snap/snapcraft.yaml b/checkbox-core-snap/series24/snap/snapcraft.yaml index 4047a57a9..d13d3d7bf 100644 --- a/checkbox-core-snap/series24/snap/snapcraft.yaml +++ b/checkbox-core-snap/series24/snap/snapcraft.yaml @@ -222,12 +222,15 @@ parts: python3 manage.py build python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-base --root="$CRAFT_PART_INSTALL" override-prime: | - craftctl default # needed because else this will trigger the store autoreviewer and be autorejected # cleaning this bit should not cause any issue but if it does do not only remove this line # contact also the store/update the package because else this will always trigger # a manual review - [ -f usr/lib/x86_64-linux-gnu/libamdhip64.so.5* ] && execstack --clear-execstack usr/lib/x86_64-linux-gnu/libamdhip64.so.5* || true + export LIBAMDHIP64=$(find usr/lib -name "libamdhip64.so.5*") + for libamd_path in $LIBAMDHIP64; do + execstack --clear-execstack "$libamd_path" + done + craftctl default stage-packages: - execstack # needed to clear the execstack - python3-opencv