debian: Upver to 1.3.4

[waydroid.git] / Makefile

diff --git a/Makefile b/Makefile
index 7c58571e6d3a13e20e7204a74371168190085467..c70814d34f2e6f29bc538192a63b292093ddb5d3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,14 @@ BIN_DIR := $(PREFIX)/bin
 APPS_DIR := $(PREFIX)/share/applications
 METAINFO_DIR := $(PREFIX)/share/metainfo
 SYSD_DIR := $(PREFIX)/lib/systemd/system
 APPS_DIR := $(PREFIX)/share/applications
 METAINFO_DIR := $(PREFIX)/share/metainfo
 SYSD_DIR := $(PREFIX)/lib/systemd/system

+APPARMOR_DIR := /etc/apparmor.d

 
 INSTALL_WAYDROID_DIR := $(DESTDIR)$(WAYDROID_DIR)
 INSTALL_BIN_DIR := $(DESTDIR)$(BIN_DIR)
 INSTALL_APPS_DIR := $(DESTDIR)$(APPS_DIR)
 INSTALL_METAINFO_DIR := $(DESTDIR)$(METAINFO_DIR)
 INSTALL_SYSD_DIR := $(DESTDIR)$(SYSD_DIR)
 
 INSTALL_WAYDROID_DIR := $(DESTDIR)$(WAYDROID_DIR)
 INSTALL_BIN_DIR := $(DESTDIR)$(BIN_DIR)
 INSTALL_APPS_DIR := $(DESTDIR)$(APPS_DIR)
 INSTALL_METAINFO_DIR := $(DESTDIR)$(METAINFO_DIR)
 INSTALL_SYSD_DIR := $(DESTDIR)$(SYSD_DIR)

+INSTALL_APPARMOR_DIR := $(DESTDIR)$(APPARMOR_DIR)

 
 build:
        @echo "Nothing to build, run 'make install' to copy the files!"
 
 build:
        @echo "Nothing to build, run 'make install' to copy the files!"


@@ -21,7 +23,7 @@ build:
 install:
        install -d $(INSTALL_WAYDROID_DIR) $(INSTALL_BIN_DIR) $(INSTALL_APPS_DIR) $(INSTALL_METAINFO_DIR)
        cp -a data tools waydroid.py $(INSTALL_WAYDROID_DIR)
 install:
        install -d $(INSTALL_WAYDROID_DIR) $(INSTALL_BIN_DIR) $(INSTALL_APPS_DIR) $(INSTALL_METAINFO_DIR)
        cp -a data tools waydroid.py $(INSTALL_WAYDROID_DIR)

-       ln -srf $(INSTALL_WAYDROID_DIR)/waydroid.py $(INSTALL_BIN_DIR)/waydroid
+       ln -sf $(WAYDROID_DIR)/waydroid.py $(INSTALL_BIN_DIR)/waydroid

        mv $(INSTALL_WAYDROID_DIR)/data/*.desktop $(INSTALL_APPS_DIR)
        mv $(INSTALL_WAYDROID_DIR)/data/*.metainfo.xml $(INSTALL_METAINFO_DIR)
        if [ $(USE_SYSTEMD) = 1 ]; then \
        mv $(INSTALL_WAYDROID_DIR)/data/*.desktop $(INSTALL_APPS_DIR)
        mv $(INSTALL_WAYDROID_DIR)/data/*.metainfo.xml $(INSTALL_METAINFO_DIR)
        if [ $(USE_SYSTEMD) = 1 ]; then \


@@ -31,3 +33,15 @@ install:
        if [ $(USE_NFTABLES) = 1 ]; then \
                sed '/LXC_USE_NFT=/ s/false/true/' -i $(INSTALL_WAYDROID_DIR)/data/scripts/waydroid-net.sh; \
        fi
        if [ $(USE_NFTABLES) = 1 ]; then \
                sed '/LXC_USE_NFT=/ s/false/true/' -i $(INSTALL_WAYDROID_DIR)/data/scripts/waydroid-net.sh; \
        fi

+
+install_apparmor:
+       install -d $(INSTALL_APPARMOR_DIR) $(INSTALL_APPARMOR_DIR)/lxc
+       cp -f data/configs/apparmor_profiles/adbd $(INSTALL_APPARMOR_DIR)/adbd
+       cp -f data/configs/apparmor_profiles/android_app $(INSTALL_APPARMOR_DIR)/android_app
+       cp -f data/configs/apparmor_profiles/lxc-waydroid $(INSTALL_APPARMOR_DIR)/lxc/lxc-waydroid
+       # Load the profiles if not just packaging
+       if [ -z $(DESTDIR) ] && { aa-enabled --quiet || systemctl is-active -q apparmor; } 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