[PR #5148] [MERGED] ci: print version after install & fix apparmor support on build_apparmor #5381

New issue

Closed

opened 2026-05-05 10:37:23 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 10:37:23 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/5148
Author: @kmk3
Created: 5/17/2022
Status: ✅ Merged
Merged: 5/18/2022
Merged by: @kmk3

Base: master ← Head: ci-fix-build-apparmor

📝 Commits (3)

6a89ab0 ci: run firejail --version after build/install
428e068 gitlab-ci: check for apparmor support on build_apparmor
1f671ab gitlab-ci: actually link libapparmor on build_apparmor

📊 Changes

3 files changed (+14 additions, -1 deletions)

View changed files

📝 .github/workflows/build-extra.yml (+4 -0)
📝 .github/workflows/build.yml (+2 -0)
📝 .gitlab-ci.yml (+8 -1)

📄 Description

The "build_apparmor" job was added on commit 342e71cd8 ("Add
deb-apparmor build to Gitlab CI", 2019-01-26). It would call
./mkdeb-apparmor.sh, which would run ./configure --enable-apparmor
directly, adding -lapparmor to EXTRA_LDFLAGS and thus passing it to
the linker.

Later, commit 87e7b3139 ("Configure Debian package with AA and SELinux
options", 2020-05-13) / PR #3414 merged mkdeb.sh and mkdeb-apparmor.sh
into mkdeb.sh.in, which does not always pass --enable-apparmor to
./configure directly. Instead, it adds --enable-apparmor depending on
whether the $HAVE_APPARMOR environment variable is set, which would be
done by a previous run of ./configure with --enable-apparmor. Since
on "build_apparmor" ./configure is not run the first time with
--enable-apparmor, neither is it on the second time and thus
-lapparmor is never passed to the linker. This commit adds
--enable-apparmor to the first ./configure run on the ci job, so that
it gets passed to the one being executed on mkdeb.sh as well.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/netblue30/firejail/pull/5148 **Author:** [@kmk3](https://github.com/kmk3) **Created:** 5/17/2022 **Status:** ✅ Merged **Merged:** 5/18/2022 **Merged by:** [@kmk3](https://github.com/kmk3) **Base:** `master` ← **Head:** `ci-fix-build-apparmor` --- ### 📝 Commits (3) - [`6a89ab0`](https://github.com/netblue30/firejail/commit/6a89ab0236ba08b7ea85fc113fa4be995918877f) ci: run firejail --version after build/install - [`428e068`](https://github.com/netblue30/firejail/commit/428e068cdc0d46a6de6859f2b9f8b151f34fd84b) gitlab-ci: check for apparmor support on build_apparmor - [`1f671ab`](https://github.com/netblue30/firejail/commit/1f671ab6cc1473e6d2a3354bced3a25ab4cb34df) gitlab-ci: actually link libapparmor on build_apparmor ### 📊 Changes **3 files changed** (+14 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/build-extra.yml` (+4 -0) 📝 `.github/workflows/build.yml` (+2 -0) 📝 `.gitlab-ci.yml` (+8 -1) </details> ### 📄 Description The "build_apparmor" job was added on commit 342e71cd8 ("Add deb-apparmor build to Gitlab CI", 2019-01-26). It would call `./mkdeb-apparmor.sh`, which would run `./configure --enable-apparmor` directly, adding `-lapparmor` to `EXTRA_LDFLAGS` and thus passing it to the linker. Later, commit 87e7b3139 ("Configure Debian package with AA and SELinux options", 2020-05-13) / PR #3414 merged mkdeb.sh and mkdeb-apparmor.sh into mkdeb.sh.in, which does not always pass `--enable-apparmor` to ./configure directly. Instead, it adds `--enable-apparmor` depending on whether the `$HAVE_APPARMOR` environment variable is set, which would be done by a previous run of ./configure with `--enable-apparmor`. Since on "build_apparmor" ./configure is not run the first time with `--enable-apparmor`, neither is it on the second time and thus `-lapparmor` is never passed to the linker. This commit adds `--enable-apparmor` to the first ./configure run on the ci job, so that it gets passed to the one being executed on mkdeb.sh as well. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

gitea-mirror

2026-05-05 10:37:23 -06:00

closed this issue
added the
pull-request
label

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/firejail#5381

No description provided.

Rows
Columns