aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-12-20 10:02:08 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-12-21 06:32:26 -0300
commit3a368e58ee63d3aaa18d869cf3838cb857ba8c72 (patch)
tree609660519de2a98e59fc7502603d7440e95765bf /Makefile
parentaudacity: networking updates (#5540) (diff)
downloadfirejail-3a368e58ee63d3aaa18d869cf3838cb857ba8c72.tar.gz
firejail-3a368e58ee63d3aaa18d869cf3838cb857ba8c72.tar.zst
firejail-3a368e58ee63d3aaa18d869cf3838cb857ba8c72.zip
Revert "remove make deb and use make deb-apparmor to build packages"
This reverts commit 82299440533f54bd45bd5ec69136233c04028c15. The idea is to later enable building the .deb package with AppArmor by default with `make deb` and to then remove `make deb-apparmor` (though note that some ci changes might also be needed in tandem[1]). This could potentially allow building a .deb package for all firejail versions (including past and future ones) with just `make deb`. Also, note that other options can be added/removed to the default `deb` target (besides AppArmor-related ones), so ideally there would be only a single `deb` target with all the desired options applied. So instead of releasing a version without `make deb` and then potentially adding it back and removing `make deb-apparmor`, just leave the targets as is (considering the current release, 0.9.70) for now. [1] https://github.com/netblue30/firejail/pull/5176#issuecomment-1146855467
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index cf84b2af1..c5d823cac 100644
--- a/Makefile
+++ b/Makefile
@@ -242,6 +242,9 @@ dist: config.mk
242asc: config.mk 242asc: config.mk
243 ./mkasc.sh $(VERSION) 243 ./mkasc.sh $(VERSION)
244 244
245deb: dist config.sh
246 ./mkdeb.sh
247
245deb-apparmor: dist config.sh 248deb-apparmor: dist config.sh
246 ./mkdeb.sh -apparmor --enable-apparmor 249 ./mkdeb.sh -apparmor --enable-apparmor
247 250