container: Make "waydroid-net.sh start" failure fatal

[waydroid.git] / Makefile

diff --git a/Makefile b/Makefile
index c70814d34f2e6f29bc538192a63b292093ddb5d3..67e74fa9045e1c8aa5cf17b55dea12a08fefcf52 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 PREFIX := /usr
 
 USE_SYSTEMD ?= 1
+USE_DBUS_ACTIVATION ?= 1
 USE_NFTABLES ?= 0
 
 WAYDROID_DIR := $(PREFIX)/lib/waydroid
@@ -8,6 +9,8 @@ BIN_DIR := $(PREFIX)/bin
 APPS_DIR := $(PREFIX)/share/applications
 METAINFO_DIR := $(PREFIX)/share/metainfo
 SYSD_DIR := $(PREFIX)/lib/systemd/system
+DBUS_DIR := $(PREFIX)/share/dbus-1
+POLKIT_DIR := $(PREFIX)/share/polkit-1
 APPARMOR_DIR := /etc/apparmor.d
 
 INSTALL_WAYDROID_DIR := $(DESTDIR)$(WAYDROID_DIR)
@@ -15,17 +18,25 @@ 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_DBUS_DIR := $(DESTDIR)$(DBUS_DIR)
+INSTALL_POLKIT_DIR := $(DESTDIR)$(POLKIT_DIR)
 INSTALL_APPARMOR_DIR := $(DESTDIR)$(APPARMOR_DIR)
 
 build:
        @echo "Nothing to build, run 'make install' to copy the files!"
 
 install:
-       install -d $(INSTALL_WAYDROID_DIR) $(INSTALL_BIN_DIR) $(INSTALL_APPS_DIR) $(INSTALL_METAINFO_DIR)
+       install -d $(INSTALL_WAYDROID_DIR) $(INSTALL_BIN_DIR) $(INSTALL_APPS_DIR) $(INSTALL_METAINFO_DIR) $(INSTALL_DBUS_DIR)/system.d $(INSTALL_POLKIT_DIR)/actions
        cp -a data tools waydroid.py $(INSTALL_WAYDROID_DIR)
        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)
+       cp dbus/id.waydro.Container.conf $(INSTALL_DBUS_DIR)/system.d/
+       cp dbus/id.waydro.Container.policy $(INSTALL_POLKIT_DIR)/actions/
+       if [ $(USE_DBUS_ACTIVATION) = 1 ]; then \
+               install -d $(INSTALL_DBUS_DIR)/system-services; \
+               cp dbus/id.waydro.Container.service $(INSTALL_DBUS_DIR)/system-services/; \
+       fi
        if [ $(USE_SYSTEMD) = 1 ]; then \
                install -d $(INSTALL_SYSD_DIR); \
                cp systemd/waydroid-container.service $(INSTALL_SYSD_DIR); \