Alon Bar-Lev has uploaded a new change for review.

Change subject: packaging: build: fix install file modes
......................................................................

packaging: build: fix install file modes

missing executable and extra executable.

Change-Id: I9beea5ea263c31d16148737e22274c113ab8d953
Signed-off-by: Alon Bar-Lev <[email protected]>
---
M Makefile
M packaging/services/service.py
2 files changed, 7 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/15739/1

diff --git a/Makefile b/Makefile
index 89a9fdc..f988834 100644
--- a/Makefile
+++ b/Makefile
@@ -198,6 +198,7 @@
 
 generated-files:       $(GENERATED)
        chmod a+x packaging/services/ovirt-engine.sysv
+       chmod a+x packaging/services/ovirt-engine-notifier.sysv
        chmod a+x packaging/services/ovirt-websocket-proxy.sysv
 
 $(BUILD_FILE):
@@ -420,7 +421,7 @@
        install -m 644 packaging/etc/engine-config/log4j.xml 
"$(DESTDIR)$(PKG_SYSCONF_DIR)/engine-config/log4j.xml"
 
        # Main program for the configuration tool:
-       install -m 750 packaging/bin/engine-config.sh 
"$(DESTDIR)$(DATA_DIR)/bin"
+       install -m 755 packaging/bin/engine-config.sh 
"$(DESTDIR)$(DATA_DIR)/bin"
        ln -sf "$(DATA_DIR)/bin/engine-config.sh" 
"$(DESTDIR)$(BIN_DIR)/engine-config"
 
        # Configuration files for the domain management tool:
@@ -428,7 +429,7 @@
        install -m 644 packaging/etc/engine-manage-domains/log4j.xml 
"$(DESTDIR)$(PKG_SYSCONF_DIR)/engine-manage-domains"
 
        # Main program for the domain management tool:
-       install -m 750 packaging/bin/engine-manage-domains.sh 
"$(DESTDIR)$(DATA_DIR)/bin"
+       install -m 755 packaging/bin/engine-manage-domains.sh 
"$(DESTDIR)$(DATA_DIR)/bin"
        ln -sf "$(DATA_DIR)/bin/engine-manage-domains.sh" 
"$(DESTDIR)$(BIN_DIR)/engine-manage-domains"
 
        # Install man pages
@@ -449,7 +450,7 @@
        install -d -m 755 
"$(DESTDIR)$(PKG_SYSCONF_DIR)/notifier/notifier.conf.d"
        install -m 644 packaging/conf/notifier.conf.defaults 
"$(DESTDIR)$(DATA_DIR)/conf/notifier.conf.defaults"
        install -m 755 packaging/services/ovirt-engine-notifier.py 
"$(DESTDIR)$(DATA_DIR)/services"
-       install -m 755 packaging/services/ovirt-engine-notifier.systemd 
"$(DESTDIR)$(DATA_DIR)/services"
+       install -m 644 packaging/services/ovirt-engine-notifier.systemd 
"$(DESTDIR)$(DATA_DIR)/services"
        install -m 755 packaging/services/ovirt-engine-notifier.sysv 
"$(DESTDIR)$(DATA_DIR)/services"
 
 install_db_scripts:
@@ -464,7 +465,7 @@
        @echo "*** Copying additional files"
 
        # Shell scripts used by several programs:
-       install -m 755 packaging/bin/engine-prolog.sh 
"$(DESTDIR)$(DATA_DIR)/bin"
+       install -m 644 packaging/bin/engine-prolog.sh 
"$(DESTDIR)$(DATA_DIR)/bin"
 
        # Other misc things:
        install -m 644 packaging/conf/jaas.conf "$(DESTDIR)$(DATA_DIR)/conf"
@@ -482,7 +483,7 @@
        install -m 644 packaging/services/config.py 
"$(DESTDIR)$(DATA_DIR)/services"
        install -m 644 packaging/services/service.py 
"$(DESTDIR)$(DATA_DIR)/services"
        install -m 755 packaging/services/ovirt-websocket-proxy.py 
"$(DESTDIR)$(DATA_DIR)/services"
-       install -m 755 packaging/services/ovirt-websocket-proxy.systemd 
"$(DESTDIR)$(DATA_DIR)/services"
+       install -m 644 packaging/services/ovirt-websocket-proxy.systemd 
"$(DESTDIR)$(DATA_DIR)/services"
        install -m 755 packaging/services/ovirt-websocket-proxy.sysv 
"$(DESTDIR)$(DATA_DIR)/services"
 
        # USB filter:
@@ -514,7 +515,7 @@
        install -m 644 packaging/services/ovirt-engine.xml.in 
"$(DESTDIR)$(DATA_DIR)/services"
        install -m 644 packaging/services/ovirt-engine-logging.properties.in 
"$(DESTDIR)$(DATA_DIR)/services"
        install -m 755 packaging/services/ovirt-engine.py 
"$(DESTDIR)$(DATA_DIR)/services"
-       install -m 755 packaging/services/ovirt-engine.systemd 
"$(DESTDIR)$(DATA_DIR)/services"
+       install -m 644 packaging/services/ovirt-engine.systemd 
"$(DESTDIR)$(DATA_DIR)/services"
        install -m 755 packaging/services/ovirt-engine.sysv 
"$(DESTDIR)$(DATA_DIR)/services"
 
 gwt-debug:
diff --git a/packaging/services/service.py b/packaging/services/service.py
old mode 100755
new mode 100644


-- 
To view, visit http://gerrit.ovirt.org/15739
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9beea5ea263c31d16148737e22274c113ab8d953
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to