]> glassweightruler.freedombox.rocks Git - waydroid.git/commitdiff
Makefile: Don't enable the apparmor profiles if packaging
authorAlessandro Astone <ales.astone@gmail.com>
Sat, 12 Nov 2022 22:07:06 +0000 (23:07 +0100)
committerAlessandro Astone <ales.astone@gmail.com>
Fri, 18 Nov 2022 14:19:17 +0000 (15:19 +0100)
Makefile

index 59b8c328d3495a1fb9f97f530edcbb7a4842e155..b128ef5a8580e9450e8a949fe489a1ef0e4130ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,11 +37,13 @@ install:
 install_apparmor:
        install -d $(INSTALL_APPARMOR_DIR) $(INSTALL_APPARMOR_DIR)/lxc
        cp -f data/configs/apparmor_profiles/adbd $(INSTALL_APPARMOR_DIR)/adbd
-       apparmor_parser -r $(INSTALL_APPARMOR_DIR)/adbd
        cp -f data/configs/apparmor_profiles/android_app $(INSTALL_APPARMOR_DIR)/android_app
-       apparmor_parser -r $(INSTALL_APPARMOR_DIR)/android_app
        cp -f data/configs/apparmor_profiles/lxc-waydroid $(INSTALL_APPARMOR_DIR)/lxc/lxc-waydroid
-       apparmor_parser -r $(INSTALL_APPARMOR_DIR)/lxc/lxc-waydroid
        sed --sandbox -i "/lxc.aa_profile/ s/unconfined/lxc-waydroid/g" $(DESTDIR)$(WAYDROID_DIR)/data/configs/config_1
        sed --sandbox -i "/lxc.apparmor.profile/ s/unconfined/lxc-waydroid/g" $(DESTDIR)$(WAYDROID_DIR)/data/configs/config_2
-
+       # Load the profiles if not just packaging
+       if [ -z $(DESTDIR) ] && aa-enabled --quiet 2>/dev/null; then \
+               apparmor_parser -r -T -W "$(INSTALL_APPARMOR_DIR)/adbd"; \
+               apparmor_parser -r -T -W "$(INSTALL_APPARMOR_DIR)/android_app"; \
+               apparmor_parser -r -T -W "$(INSTALL_APPARMOR_DIR)/lxc/lxc-waydroid"; \
+       fi