Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: move dbutils to packaging ......................................................................
packaging: move dbutils to packaging Change-Id: I5ccbb956fd78ab6e891dcc2bf2e04eb9ea69552b Signed-off-by: Alon Bar-Lev <[email protected]> --- M Makefile M ovirt-engine.spec.in M packaging/fedora/setup/basedefs.py R packaging/setup/dbutils/common.sh R packaging/setup/dbutils/encodingvalidator.sh R packaging/setup/dbutils/fkvalidator.sh R packaging/setup/dbutils/fkvalidator_sp.sql R packaging/setup/dbutils/taskcleaner.sh R packaging/setup/dbutils/taskcleaner_sp.sql R packaging/setup/dbutils/validatedb.sh 10 files changed, 1 insertion(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/16613/1 diff --git a/Makefile b/Makefile index a56fabd..ca6ccb6 100644 --- a/Makefile +++ b/Makefile @@ -378,7 +378,6 @@ install_setup: install -dm 755 "$(DESTDIR)$(DATA_DIR)/scripts" install -dm 755 "$(DESTDIR)$(DATA_DIR)/scripts/plugins" - install -dm 755 "$(DESTDIR)$(DATA_DIR)/scripts/dbutils" install -m 644 packaging/fedora/setup/nfsutils.py "$(DESTDIR)$(DATA_DIR)/scripts" install -m 644 packaging/fedora/setup/basedefs.py "$(DESTDIR)$(DATA_DIR)/scripts" @@ -404,15 +403,6 @@ install -m 755 packaging/fedora/setup/engine-upgrade.py "$(DESTDIR)$(DATA_DIR)/scripts" ln -sf "$(DATA_DIR)/scripts/engine-upgrade.py" "$(DESTDIR)$(BIN_DIR)/engine-upgrade" install -m 755 packaging/fedora/setup/engine-check-update "$(DESTDIR)$(BIN_DIR)" - - # Task cleaner - install -dm 750 "$(DESTDIR)$(DATA_DIR)/scripts/dbutils" - install -m 750 backend/manager/tools/dbutils/common.sh "$(DESTDIR)$(DATA_DIR)/scripts/dbutils" - install -m 750 backend/manager/tools/dbutils/taskcleaner.sh "$(DESTDIR)$(DATA_DIR)/scripts/dbutils" - install -m 640 backend/manager/tools/dbutils/taskcleaner_sp.sql "$(DESTDIR)$(DATA_DIR)/scripts/dbutils" - install -m 750 backend/manager/tools/dbutils/fkvalidator.sh "$(DESTDIR)$(DATA_DIR)/scripts/dbutils" - install -m 640 backend/manager/tools/dbutils/fkvalidator_sp.sql "$(DESTDIR)$(DATA_DIR)/scripts/dbutils" - install -m 750 backend/manager/tools/dbutils/validatedb.sh "$(DESTDIR)$(DATA_DIR)/scripts/dbutils" # Create a version file echo "$(DISPLAY_VERSION)" > "$(DESTDIR)$(DATA_DIR)/conf/version" diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index dad69ca..1358eea 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -790,9 +790,6 @@ # Log setup event script %{engine_data}/bin/ovirt-engine-log-setup-event.sh -# DB-related tools -%{engine_data}/scripts/dbutils - # Setup %{engine_data}/setup/bin/ovirt-engine-setup %{engine_data}/setup/bin/ovirt-engine-remove diff --git a/packaging/fedora/setup/basedefs.py b/packaging/fedora/setup/basedefs.py index 77ef5b9..d1b136f 100644 --- a/packaging/fedora/setup/basedefs.py +++ b/packaging/fedora/setup/basedefs.py @@ -214,7 +214,7 @@ EXEC_FIREWALL_CMD = '/usr/bin/firewall-cmd' # DBUtils -DIR_DBUTILS = "%s/ovirt-engine/scripts/dbutils" % DIR_USR_SHARE +DIR_DBUTILS = "%s/ovirt-engine/setup/dbutils" % DIR_USR_SHARE EXEC_TASK_CLEANER = "%s/taskcleaner.sh" % DIR_DBUTILS EXEC_DBVALIDATOR = "%s/validatedb.sh" % DIR_DBUTILS diff --git a/backend/manager/tools/dbutils/common.sh b/packaging/setup/dbutils/common.sh similarity index 100% rename from backend/manager/tools/dbutils/common.sh rename to packaging/setup/dbutils/common.sh diff --git a/backend/manager/tools/dbutils/encodingvalidator.sh b/packaging/setup/dbutils/encodingvalidator.sh similarity index 100% rename from backend/manager/tools/dbutils/encodingvalidator.sh rename to packaging/setup/dbutils/encodingvalidator.sh diff --git a/backend/manager/tools/dbutils/fkvalidator.sh b/packaging/setup/dbutils/fkvalidator.sh similarity index 100% rename from backend/manager/tools/dbutils/fkvalidator.sh rename to packaging/setup/dbutils/fkvalidator.sh diff --git a/backend/manager/tools/dbutils/fkvalidator_sp.sql b/packaging/setup/dbutils/fkvalidator_sp.sql similarity index 100% rename from backend/manager/tools/dbutils/fkvalidator_sp.sql rename to packaging/setup/dbutils/fkvalidator_sp.sql diff --git a/backend/manager/tools/dbutils/taskcleaner.sh b/packaging/setup/dbutils/taskcleaner.sh similarity index 100% rename from backend/manager/tools/dbutils/taskcleaner.sh rename to packaging/setup/dbutils/taskcleaner.sh diff --git a/backend/manager/tools/dbutils/taskcleaner_sp.sql b/packaging/setup/dbutils/taskcleaner_sp.sql similarity index 100% rename from backend/manager/tools/dbutils/taskcleaner_sp.sql rename to packaging/setup/dbutils/taskcleaner_sp.sql diff --git a/backend/manager/tools/dbutils/validatedb.sh b/packaging/setup/dbutils/validatedb.sh similarity index 100% rename from backend/manager/tools/dbutils/validatedb.sh rename to packaging/setup/dbutils/validatedb.sh -- To view, visit http://gerrit.ovirt.org/16613 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ccbb956fd78ab6e891dcc2bf2e04eb9ea69552b 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
