From 7fa3d42b68cd3bf628b0dcecf62a04df39816fdb Mon Sep 17 00:00:00 2001 From: Erwan Leboucher Date: Thu, 13 Aug 2026 13:05:15 +0200 Subject: [PATCH] fix(linux): package AppArmor profile in CEF deb --- .github/workflows/tauri-build.yml | 5 +++++ nfpm.yaml | 8 ++++++++ src-tauri/packaging/deb/postrm | 5 ----- src-tauri/packaging/deb/prerm | 5 +++++ src-tauri/tauri.conf.json | 5 ----- 5 files changed, 18 insertions(+), 10 deletions(-) delete mode 100755 src-tauri/packaging/deb/postrm create mode 100755 src-tauri/packaging/deb/prerm diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml index 70bf6f0a0..eec38f9e3 100644 --- a/.github/workflows/tauri-build.yml +++ b/.github/workflows/tauri-build.yml @@ -715,6 +715,11 @@ jobs: mise run cef:package "$VERSION" \ src-tauri/target/release/sable "$DISPLAY_NAME" + DEB="src-tauri/target/release/bundle/deb/Sable-${VERSION}-linux-x86_64.deb" + dpkg-deb --contents "$DEB" | grep -q 'etc/apparmor.d/sable$' + dpkg-deb --ctrl-tarfile "$DEB" | tar -t | grep -qx './postinst' + dpkg-deb --ctrl-tarfile "$DEB" | tar -t | grep -qx './prerm' + RELEASE_DIR="src-tauri/target/release/cef-pkg/release" mkdir -p "$RELEASE_DIR" cp src-tauri/target/release/sable "$RELEASE_DIR/sable" diff --git a/nfpm.yaml b/nfpm.yaml index 06f2c9e47..b342f5e38 100644 --- a/nfpm.yaml +++ b/nfpm.yaml @@ -20,10 +20,18 @@ contents: dst: /usr type: tree expand: true + - src: src-tauri/packaging/deb/apparmor/sable + dst: /etc/apparmor.d/sable + type: config + packager: deb overrides: deb: + scripts: + postinstall: src-tauri/packaging/deb/postinst + preremove: src-tauri/packaging/deb/prerm depends: + - apparmor - libgtk-3-0 - libnss3 - libnspr4 diff --git a/src-tauri/packaging/deb/postrm b/src-tauri/packaging/deb/postrm deleted file mode 100755 index 586ef791e..000000000 --- a/src-tauri/packaging/deb/postrm +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if [ "$1" = purge ] && command -v apparmor_parser >/dev/null 2>&1; then - apparmor_parser -R /etc/apparmor.d/sable || true -fi diff --git a/src-tauri/packaging/deb/prerm b/src-tauri/packaging/deb/prerm new file mode 100755 index 000000000..d04c00b56 --- /dev/null +++ b/src-tauri/packaging/deb/prerm @@ -0,0 +1,5 @@ +#!/bin/sh + +if command -v apparmor_parser >/dev/null 2>&1; then + apparmor_parser -R /etc/apparmor.d/sable || true +fi diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 384878ce0..bccd176b9 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -34,11 +34,6 @@ }, "linux": { "deb": { - "files": { - "/etc/apparmor.d/sable": "packaging/deb/apparmor/sable" - }, - "postInstallScript": "packaging/deb/postinst", - "postRemoveScript": "packaging/deb/postrm", "depends": [ "xwayland", "gstreamer1.0-plugins-good",