Changeset 58386 in vbox for trunk/src/VBox/Installer/linux/debian/rules

Timestamp:

Oct 23, 2015 10:52:35 AM (9 years ago)

Author:

vboxsync

Message:

Installer/linux (host): simplify putting files in place in the deb and RPM packages. Now /usr/lib/virtualbox mirrors the contents of VirtualBox.tar and the spec/rules files only take care of exceptions. This should simplify adding new files to all packages.

File:

• trunk/src/VBox/Installer/linux/debian/rules (modified) (6 diffs)

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

@@ -213 +213 @@
         install -d -g 0 -o 0 $(prefix)/usr/lib
         install -d -g 0 -o 0 $(prefix)/usr/bin
-        install -d -g 0 -o 0 $(prefix)/usr/lib/$(package)
         install -d -g 0 -o 0 $(prefix)/usr/share/$(package)
         install -d -g 0 -o 0 $(prefix)/usr/share/doc/$(verpkg)
@@ -236 +235 @@
         done)
         $(if $(NOQT),,rmdir $(archdir)/icons)
-        install -d -g 0 -o 0 $(prefix)/usr/lib/$(package)/ExtensionPacks
         $(if $(NOQT),,mv $(archdir)/virtualbox.xml debian/$(verpkg).sharedmimeinfo)
         install -d -g 0 -o 0 $(prefix)/usr/share/lintian/overrides
@@ -243 +241 @@
             debian/lintian-override.in > \
            $(prefix)/usr/share/lintian/overrides/$(verpkg)
-        mv $(archdir)/VBoxEFI32.fd $(prefix)/usr/lib/$(package)
-        mv $(archdir)/VBoxEFI64.fd $(prefix)/usr/lib/$(package)
         mv $(archdir)/VBox.png \
            $(prefix)/usr/share/pixmaps/VBox.png
-        mv $(archdir)/*.rc $(prefix)/usr/lib/$(package)
-        mv $(archdir)/*.r0 $(prefix)/usr/lib/$(package)
-        mv $(archdir)/*.rel $(prefix)/usr/lib/$(package) || true
-        mv $(archdir)/VBoxNetDHCP $(prefix)/usr/lib/$(package)
-        mv $(archdir)/VBoxNetAdpCtl $(prefix)/usr/lib/$(package)
-        if [ -f $(archdir)/VBoxVolInfo ]; then \
-            mv $(archdir)/VBoxVolInfo $(prefix)/usr/lib/$(package); \
-        fi
-        mv $(archdir)/VBoxXPCOMIPCD $(prefix)/usr/lib/$(package)
-        mv $(archdir)/components $(prefix)/usr/lib/$(package)/components
-        mv $(archdir)/*.so $(prefix)/usr/lib/$(package)
-        mv $(archdir)/*.so.4 $(prefix)/usr/lib/$(package) || true
-        $(if $(NOQT),,mv $(archdir)/VBoxTestOGL $(prefix)/usr/lib/$(package))
-        $(if $(NOQT),,mv $(archdir)/nls $(prefix)/usr/share/$(package))
         mv $(archdir)/src  $(prefix)/usr/share/$(package)
         rm $(archdir)/VBox.sh
-        export VBOX_INSTALL_PATH=/usr/lib/$(package) && \
-            cd $(builddir)/bin/sdk/installer && \
-            python ./vboxapisetup.py install --root $(prefix)
-        rm -rf $(archdir)/sdk/installer
-        mv $(archdir)/vboxshell.py $(prefix)/usr/lib/$(package)
-        mv $(archdir)/sdk $(prefix)/usr/lib/$(package)
         install -D -g 0 -o 0 -m 644 VBox.sh $(prefix)/usr/bin/VBox
         mv $(archdir)/VBoxSysInfo.sh $(prefix)/usr/share/$(package)
-        for i in VBoxManage VBoxSVC $(if $(HEADLESS),,VBoxSDL) \
-            $(if $(NOQT),,VirtualBox) VBoxHeadless \
-            VBoxExtPackHelperApp VBoxBalloonCtrl VBoxAutostart \
-            $(if $(NOWEBSVC),,vboxwebsrv webtest) \
-        $(if $(NOVBOXIMG),,vbox-img) VBoxNetNAT; do \
-            mv $(archdir)/$$i $(prefix)/usr/lib/$(package); done
-        $(if $(VNC),mv $(archdir)/ExtensionPacks/VNC $(prefix)/usr/lib/$(package)/ExtensionPacks,)
         if [ -r $(archdir)/VBoxDTrace ]; then \
             mv $(archdir)/VBoxDTrace $(prefix)/usr/bin; \
-            mv $(archdir)/dtrace $(prefix)/usr/lib/$(package); \
         fi
         mv $(archdir)/VBoxTunctl $(prefix)/usr/bin
@@ -296 +264 @@
             done)
 ifeq ($(ose),)
-        $(if $(NOQT),,mv $(archdir)/kchmviewer $(prefix)/usr/lib/$(package))
         dh_installdocs \
             $(archdir)/UserManual*.pdf $(archdir)/VirtualBox*.chm \
@@ -306 +273 @@
         $(if $(HEADLESS),,mv $(archdir)/rdesktop-vrdp $(prefix)/usr/bin)
         $(if $(HEADLESS),,mv $(archdir)/rdesktop-vrdp-keymaps $(prefix)/usr/share/$(package))
-        if [ -d $(archdir)/accessible ]; then mv $(archdir)/accessible $(prefix)/usr/lib/virtualbox; fi
 else
         dh_installdocs \
@@ -314 +280 @@
             mv $(archdir)/$$i $(prefix)/usr/share/$(package); done
 endif
-        for i in vboxdrv.sh vboxballoonctrl-service.sh vboxautostart-service.sh \
-            vboxweb-service.sh postinst-common.sh prerm-common.sh routines.sh \
-            VBoxCreateUSBNode.sh; do \
-            mv $(archdir)/$$i $(prefix)/usr/lib/$(package); \
-        done
-        rmdir $(archdir)/additions
-        $(if $(VNC),rmdir $(archdir)/ExtensionPacks)
         rm -r $(archdir)/helpers
         rm -r $(archdir)/scripts
-        rmdir $(archdir)
+        mv $(archdir) $(prefix)/usr/lib/$(package)
+        export VBOX_INSTALL_PATH=/usr/lib/$(package) && \
+            cd $(builddir)/bin/sdk/installer && \
+            python ./vboxapisetup.py install --root $(prefix)
+        rm -rf $(prefix)/usr/lib/$(package)/sdk/installer
         ln -s ../VBoxVMM.so $(prefix)/usr/lib/$(package)/components/VBoxVMM.so
         rmdir $(prefix)/opt