Changeset 58012 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Oct 2, 2015 2:41:12 PM (9 years ago)

Author:

vboxsync

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

103043

Message:

Installer/linux: get rid of build time generation for vboxdrv.sh.

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (5 diffs)
• debian/rules (modified) (1 diff)
• rpm/rules (modified) (1 diff)
• vboxdrv.sh (moved) (moved from trunk/src/VBox/Installer/linux/vboxdrv.sh.in ) (3 diffs)

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

@@ -53 +53 @@
         $(addprefix $(VBOX_LNX_INST_STAGE_DIR)/,\
                 install.sh \
-                vboxdrv.sh \
                 VirtualBox.tar.bz2 \
                 LICENSE) \
         $(wildcard $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-*) \
-        $(addprefix $(VBOX_LNX_INST_OUT_DIR)/,\
-                vboxdrv.sh \
-                install.sh)
+        $(VBOX_LNX_INST_OUT_DIR)/install.sh
 
 #
@@ -77 +74 @@
         vboxballoonctrl-service.sh \
         VBoxCreateUSBNode.sh \
+        vboxdrv.sh \
         vboxweb-service.sh \
         VBox.sh=>VBox.sh \
@@ -92 +90 @@
         vboxautostart-service.sh \
         vboxballoonctrl-service.sh \
+        vboxdrv.sh \
         vboxweb-service.sh
 
@@ -364 +363 @@
                 $(VBOX_VERSION_STAMP) \
                 $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)) \
-                $(VBOX_LNX_INST_OUT_DIR)/vboxdrv.sh \
                 $(VBOX_LNX_INST_OUT_DIR)/install.sh \
                 $(VBOX_PATH_LNX_INST_SRC)/installer-common.sh \
@@ -371 +369 @@
         $(QUIET)$(RM) -f $(wildcard $(PATH_STAGE_BIN)/VirtualBox-*.run)
         $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(VBOX_BRAND_LICENSE_TXT)    $(VBOX_LNX_INST_STAGE_DIR)/LICENSE)
-        $(QUIET)$(INSTALL) -m 0755 $(VBOX_LNX_INST_OUT_DIR)/vboxdrv.sh            $(VBOX_LNX_INST_STAGE_DIR)/
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_LNX_INST_OUT_DIR)/install.sh            $(VBOX_LNX_INST_STAGE_DIR)/
         $(QUIET)$(RM) -f $@
         $(QUIET)$(VBOX_MAKESELF) --follow --nocomp $(VBOX_LNX_INST_STAGE_DIR) $@ \
                 "VirtualBox for Linux installation" ./install.sh "\$$0 1> /dev/null"
-
-# files that needs editing before they can be included in the generic installer.
-$(VBOX_LNX_INST_OUT_DIR)/vboxdrv.sh: $(VBOX_PATH_LNX_INST_SRC)/vboxdrv.sh.in | $$(dir $$@)
-        $(QUIET)$(SED_EXT) \
-                -e "s|%NOLSB%|yes|g" \
-                -e "s|%DEBIAN%||g" \
-                -e "s|%PACKAGE%|virtualbox|g" \
-                -e "s|%VERSION%|$(VBOX_VERSION_STRING)|g" \
-                -e "s|%GROUP%|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)|g" \
-                --output $@ \
-                $<
-
-$(PATH_STAGE_BIN)/vboxdrv.sh: $(VBOX_PATH_LNX_INST_SRC)/vboxdrv.sh.in | $$(dir $$@)
-        $(QUIET)$(SED_EXT) \
-                -e "s|%VERSION%|$(VBOX_VERSION_STRING)|g" \
-                -e "s|%GROUP%|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)|g" \
-                --output $@ \
-                $<
-        $(QUIET)$(CHMOD) 0755 $@
 
 $(VBOX_LNX_INST_OUT_DIR)/install.sh: $(VBOX_PATH_LNX_INST_SRC)/install.sh $(VBOX_PATH_LNX_INST_SRC)/installer-common.sh $(VBOX_VERSION_STAMP) $(VBOX_SVN_REV_KMK).ts | $$(dir $$@)

trunk/src/VBox/Installer/linux/debian/rules

@@ -245 +245 @@
         dh_desktop
         $(if $(NOMODS),,dh_installmodules)
-        sed \
-            -e 's|%NOLSB%||g' \
-            -e 's|%DEBIAN%|yes|g' \
-            -e 's|%PACKAGE%|virtualbox|g' \
-            -e "s|%VERSION%|$(VBOX_VERSION_STRING)|g" \
-            -e "s|%GROUP%|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)|g" \
-            $(vboxroot)/src/VBox/Installer/linux/vboxdrv.sh.in > $(prefix)/usr/lib/$(package)/vboxdrv.sh
+        cp $(vboxroot)/src/VBox/Installer/linux/vboxdrv.sh $(prefix)/usr/lib/$(package)
         cp $(vboxroot)/src/VBox/Installer/linux/vboxballoonctrl-service.sh $(prefix)/usr/lib/$(package)
         cp $(vboxroot)/src/VBox/Installer/linux/vboxautostart-service.sh $(prefix)/usr/lib/$(package)

trunk/src/VBox/Installer/linux/rpm/rules

@@ -243 +243 @@
             -e '}' \
             rpm/VirtualBox.tmpl.spec > $(archdir)/VirtualBox.spec
-        sed \
-            -e 's|%NOLSB%|yes|g' \
-            -e 's|%DEBIAN%||g' \
-            -e 's|%PACKAGE%|virtualbox|g' \
-            -e "s|%VERSION%|$(VBOX_VERSION_STRING)|g" \
-            -e "s|%GROUP%|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)|g" \
-            vboxdrv.sh.in > $(archdir)/vboxdrv.sh
+        cp vboxdrv.sh $(archdir)
         cp vboxballoonctrl-service.sh $(archdir)
         cp vboxautostart-service.sh $(archdir)

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

@@ -27 +27 @@
 ### END INIT INFO
 
-## @todo get rid of the autogeneration, perhaps write "group" to
-##       a configuration file in /etc
-
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
 DEVICE=/dev/vboxdrv
@@ -46 +43 @@
 
 if [ -n "$INSTALL_DIR" ]; then
+    VIRTUALBOX="$INSTALL_DIR/VirtualBox"
     VBOXMANAGE="$INSTALL_DIR/VBoxManage"
     MODULE_SRC="$INSTALL_DIR/src/vboxhost"
 else
+    VIRTUALBOX="/usr/lib/virtualbox/VirtualBox"
     VBOXMANAGE="/usr/lib/virtualbox/VBoxManage"
     MODULE_SRC="/usr/share/virtualbox/src/vboxhost"
 fi
 BUILDINTMP="$MODULE_SRC/build_in_tmp"
+if test -u "${VIRTUALBOX}"; then
+    GROUP=root
+else
+    GROUP=vboxusers
+fi
 
 # silently exit if the package was uninstalled but not purged,
@@ -132 +136 @@
     fi
     # ensure permissions
-    if ! chown :%GROUP% $DEVICE 2>/dev/null; then
+    if ! chown :"${GROUP}" $DEVICE 2>/dev/null; then
         rmmod vboxpci 2>/dev/null
         rmmod vboxnetadp 2>/dev/null
         rmmod vboxnetflt 2>/dev/null
         rmmod vboxdrv 2>/dev/null
-        failure "Cannot change group %GROUP% for device $DEVICE"
+        failure "Cannot change group ${GROUP} for device $DEVICE"
     fi
     if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then