Changeset 44092 in vbox

Timestamp:

Dec 11, 2012 2:43:49 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

82616

Message:

Installer/linux: clean up install_service.sh to put all scripts into bin/scripts and add a pattern rule to the installer for that directory.

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (5 diffs)
• install_service/Makefile.kmk (modified) (2 diffs)
• install_service/install_service.sh (modified) (2 diffs)

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -170 +170 @@
                 ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNC.so \
                 ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNCMain.so,) \
-        VBoxTunctl
+        VBoxTunctl \
+        helpers/generate_service_file
 
 # Do not remove relocation information of these binaries
@@ -201 +202 @@
         VBox.sh \
         VBox.png \
-        helpers \
         scripts
 
@@ -398 +398 @@
         $(wildcard $(PATH_STAGE_BIN)/src/*/*) \
         $(wildcard $(PATH_STAGE_BIN)/src/*/*/*) \
-        $(wildcard $(PATH_STAGE_BIN)/src/*/*/*/*)
+        $(wildcard $(PATH_STAGE_BIN)/src/*/*/*/*) \
+        $(wildcard $(PATH_STAGE_BIN)/scripts/*)
 
 
@@ -478 +479 @@
         archive \
         archive/components \
+        archive/helpers \
         archive/nls \
         $(if $(VBOX_WITH_QT4_SUN),archive/accessible,) \
@@ -524 +526 @@
         $(VBOX_LNX_DBG_PATH) \
         $(VBOX_LNX_DBG_PATH)/components \
+        $(VBOX_LNX_DBG_PATH)/helpers \
 ,$(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(d)/)
 

trunk/src/VBox/Installer/linux/install_service/Makefile.kmk

@@ -35 +35 @@
 
 INSTALLS.linux += linux-install-service-bin
-linux-install-service-bin_INST =    bin/helpers/
+linux-install-service-bin_INST =    bin/scripts/
 linux-install-service-bin_MODE =    a+rx,u+w
 linux-install-service-bin_SOURCES = \
@@ -41 +41 @@
 
 INSTALLS.linux += linux-install-service-nobin
-linux-install-service-nobin_INST =    bin/helpers/
+linux-install-service-nobin_INST =    bin/scripts/
 linux-install-service-nobin_MODE =    a+r,u+w
 linux-install-service-nobin_SOURCES = \

trunk/src/VBox/Installer/linux/install_service/install_service.sh

@@ -80 +80 @@
 
 EOF
-    "${script_folder}/generate_service_file" --list-options
+    "${script_folder}/../helpers/generate_service_file" --list-options
 }
 
@@ -186 +186 @@
         test -f "${path}/${SERVICE_NAME}" && update="${UPDATE}"
         if test -n "${INSTALL}"; then
-            "${script_folder}/generate_service_file" --format shell --command "${COMMAND}" --arguments "${ARGUMENTS}" --description "${DESCRIPTION}" --service-name "${SERVICE_NAME}" < "${script_folder}/init_template.sh" > "${path}/${SERVICE_NAME}"
+            "${script_folder}/../helpers/generate_service_file" --format shell --command "${COMMAND}" --arguments "${ARGUMENTS}" --description "${DESCRIPTION}" --service-name "${SERVICE_NAME}" < "${script_folder}/init_template.sh" > "${path}/${SERVICE_NAME}"
             chmod a+x "${path}/${SERVICE_NAME}"
         else