Refactor debugdir fixup

This commit modify CI to synchronize strip.yml

Author: tytan652

.github/workflows/bst-maintainance.yaml

@@ -60,7 +60,7 @@ jobs:
         run: |
           python .github/scripts/parse-bst-git-tag-ref.py elements/${{ env.ELEMENT }}
 
-      - name: Sync common BuildStream plugins
+      - name: Sync shared files
         id: sync
         if: ${{ fromJSON(steps.check.outputs.changed) }}
         shell: bash
@@ -75,6 +75,9 @@ jobs:
             fi
           done
 
+          cp freedesktop-sdk/include/strip.yml include/strip.yml
+          sed -i "s/strip-binaries/strip-binaries-base/g" include/strip.yml
+
           tag="${{ steps.parse-ref.outputs.tag }}"
           prefix="freedesktop-sdk-"
           version="${tag#$prefix}"

elements/components/luajit.bst

@@ -16,8 +16,8 @@ public:
       exec-blocklist:
         - "%{bindir}"
         - "%{bindir}/**"
-        - "%{debugdir}%{bindir}"
-        - "%{debugdir}%{bindir}/**"
+        - "%{debugdir}/bin"
+        - "%{debugdir}/bin/**"
 
       runtime:
         (>):

elements/components/srt.bst

@@ -20,8 +20,8 @@ public:
       exec-blocklist:
       - "%{bindir}"
       - "%{bindir}/**"
-      - "%{debugdir}%{bindir}"
-      - "%{debugdir}%{bindir}/**"
+      - "%{debugdir}/bin"
+      - "%{debugdir}/bin/**"
 
 sources:
 - kind: git_repo

elements/components/swig.bst

@@ -23,8 +23,8 @@ public:
       devtools:
         - "%{bindir}"
         - "%{bindir}/**"
-        - "%{debugdir}%{bindir}"
-        - "%{debugdir}%{bindir}/**"
+        - "%{debugdir}"
+        - "%{debugdir}/**"
         - "%{datadir}"
         - "%{datadir}/**"
 

elements/flatpak-modules/base-compose.bst

@@ -12,4 +12,3 @@ config:
 build-depends:
 - deps.bst
 - manifests/deps.bst
-- flatpak-modules/fixup-debugdir.bst

elements/flatpak-modules/fixup-debugdir.bst

@@ -0,0 +1,33 @@
+# Arguments for tooling and script used when stripping debug symbols
+
+variables:
+  optimize-debug: "true"
+  compress-debug: "true"
+  debugdatadir: "%{debugdir}"
+  sourcedir: "%{debugdatadir}/source"
+  stripdir-suffix: "%{element-name}"
+
+  toolchain-prefixes: >-
+    /usr
+    %{prefix}
+
+  strip-binaries-base: |
+    OPTS=()
+    if ! "%{optimize-debug}"; then
+      OPTS+=("-n")
+    fi
+    if ! "%{compress-debug}"; then
+      OPTS+=("-p")
+    fi
+    for p in %{toolchain-prefixes}; do
+      OPTS+=("-t" "${p}")
+    done
+    if [ -x "$(command -v freedesktop-sdk-stripper)" ]; then
+      freedesktop-sdk-stripper \
+        "${OPTS[@]}" \
+        "%{build-root}" \
+        "%{sourcedir}/%{stripdir-suffix}" \
+        "%{debugdatadir}/dwz/%{stripdir-suffix}" \
+        "%{debugdir}" \
+        "%{install-root}"
+    fi

include/strip.yml

@@ -14,6 +14,7 @@ fatal-warnings:
 (@):
 - freedesktop-sdk.bst:include/runtime.yml
 - include/aliases.yml
+- include/strip.yml
 
 options:
   target_arch:
@@ -38,6 +39,14 @@ variables:
   # Modify Freedesktop SDK stripping options to be closer to Flatpak behavior
   optimize-debug: "false" # No dwz optimization
 
+  # Move debug symbols files to the same place as a Flatpak build
+  strip-binaries: |
+    %{strip-binaries-base}
+    if [ -d "%{install-root}%{debugdir}%{appdir}" ]; then
+      mv %{install-root}%{debugdir}%{appdir}/* %{install-root}%{debugdir}/.
+      rmdir %{install-root}%{debugdir}%{appdir}
+    fi
+
 environment:
   LC_ALL: en_US.UTF-8
   # Set Flatpak application and runtime paths