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

Timestamp:

Oct 19, 2021 6:01:00 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10127. Adding virtualboxvm.desktop to installer. First draft.

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (4 diffs)
• debian/rules (modified) (5 diffs)
• deffiles (modified) (1 diff)
• install.sh (modified) (1 diff)
• rpm/VirtualBox.tmpl.spec (modified) (1 diff)
• uninstall.sh (modified) (1 diff)

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

@@ -105 +105 @@
         $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
         $(linux-misc_0_OUTDIR)/generated.sh=>scripts/generated.sh \
-        $(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualbox.desktop,)
+        $(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualbox.desktop,) \
+        $(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualboxvm.desktop,)
 ifeq ($(KBUILD_TYPE),asan)
 linux-misc_SOURCES += $(foreach lib,$(VBOX_GCC_SANITIZER_SO_FILES) \
@@ -112 +113 @@
 linux-misc_CLEAN = \
         $(linux-misc_0_OUTDIR)/generated.sh \
-        $(linux-misc_0_OUTDIR)/virtualbox.desktop
+        $(linux-misc_0_OUTDIR)/virtualbox.desktop \
+        $(linux-misc_0_OUTDIR)/virtualboxvm.desktop
 
 $$(linux-misc_0_OUTDIR)/generated.sh: $(VBOX_VERSION_STAMP) $(VBOX_LNX_INST_DEP_ON_MAKEFILE) | $$(dir $$@)
@@ -123 +125 @@
 
 $$(linux-misc_0_OUTDIR)/virtualbox.desktop: $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@)
+        $(call MSG_GENERATE,,$@,$<)
+        $(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+$(VBOX_LNX_APP_DOCS)+" \
+                -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
+                --output $@ $<
+$$(linux-misc_0_OUTDIR)/virtualboxvm.desktop: $(VBOX_PATH_INST_COMMON_SRC)/virtualboxvm.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@)
         $(call MSG_GENERATE,,$@,$<)
         $(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+$(VBOX_LNX_APP_DOCS)+" \
@@ -254 +261 @@
  VBOX_LNX_NO_STRIP += \
         virtualbox.desktop \
+        virtualboxvm.desktop \
         virtualbox.xml \
         $(VBOX_LICENSE_FILES) \

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

@@ -181 +181 @@
         for d in $(wildcard /lib/modules/*); do \
             if [ -L $$d/build ]; then \
-                make -C $(builddir)/bin/src/vboxdrv KERN_VER=$$(basename $$d) clean && \
-                make -C $(builddir)/bin/src/vboxdrv KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all; \
-                make -C $(builddir)/bin/src/vboxnetflt KERN_VER=$$(basename $$d) clean && \
-                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetflt || true) && \
-                make -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetflt/Module.symvers all; \
-                make -C $(builddir)/bin/src/vboxnetadp KERN_VER=$$(basename $$d) clean && \
-                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetadp || true) && \
-                make -C $(builddir)/bin/src/vboxnetadp KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetadp/Module.symvers all; \
-                [ -d $(builddir)/bin/src/vboxpci ] && make -C $(builddir)/bin/src/vboxpci KERN_VER=$$(basename $$d) clean && \
-                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxpci || true) && \
-                make -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxpci/Module.symvers all; \
-                true; \
+                make -C $(builddir)/bin/src/vboxdrv KERN_VER=$$(basename $$d) clean && \
+                make -C $(builddir)/bin/src/vboxdrv KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all; \
+                make -C $(builddir)/bin/src/vboxnetflt KERN_VER=$$(basename $$d) clean && \
+                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetflt || true) && \
+                make -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetflt/Module.symvers all; \
+                make -C $(builddir)/bin/src/vboxnetadp KERN_VER=$$(basename $$d) clean && \
+                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetadp || true) && \
+                make -C $(builddir)/bin/src/vboxnetadp KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetadp/Module.symvers all; \
+                [ -d $(builddir)/bin/src/vboxpci ] && make -C $(builddir)/bin/src/vboxpci KERN_VER=$$(basename $$d) clean && \
+                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxpci || true) && \
+                make -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxpci/Module.symvers all; \
+                true; \
             fi; \
         done
@@ -233 +233 @@
         $(if $(NOQT),,mv $(archdir)/virtualbox.desktop \
            $(prefix)/usr/share/applications/virtualbox.desktop)
+        $(if $(NOQT),,mv $(archdir)/virtualboxvm.desktop \
+           $(prefix)/usr/share/applications/virtualboxvm.desktop)
         install -d -g 0 -o 0 $(prefix)/usr/share/pixmaps
         $(if $(NOQT),,install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor)
@@ -240 +242 @@
         $(if $(NOQT),,cd $(archdir)/icons; for i in *; do \
             for j in $$i/virtualbox.*; do \
-                if [ -f $$j ]; then \
-                    if [ ! -d $(prefix)/usr/share/icons/hicolor/$$i/apps ]; then \
-                        install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/apps; \
-                    fi; \
-                    mv $$j $(prefix)/usr/share/icons/hicolor/$$i/apps; \
-                fi; \
+                if [ -f $$j ]; then \
+                    if [ ! -d $(prefix)/usr/share/icons/hicolor/$$i/apps ]; then \
+                        install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/apps; \
+                    fi; \
+                    mv $$j $(prefix)/usr/share/icons/hicolor/$$i/apps; \
+                fi; \
             done; \
             install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/mimetypes; \
@@ -270 +272 @@
         $(if $(NOMODS),,for d in $(moddir)/*; do \
             if [ -f $$d/vboxdrv.ko -a -f $$d/vboxnetflt.ko -a -f $$d/vboxnetadp.ko ]; then \
-                install -D -g 0 -o 0 -m 0644 \
+                install -D -g 0 -o 0 -m 0644 \
                     $$d/vboxdrv.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxdrv.ko; \
-                install -D -g 0 -o 0 -m 0644 \
+                install -D -g 0 -o 0 -m 0644 \
                     $$d/vboxnetflt.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxnetflt.ko; \
-                install -D -g 0 -o 0 -m 0644 \
+                install -D -g 0 -o 0 -m 0644 \
                     $$d/vboxnetadp.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxnetadp.ko; \
-                if [ -f $$d/vboxpci.ko ]; then \
-                    install -D -g 0 -o 0 -m 0644 \
-                        $$d/vboxpci.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxpci.ko; \
-                fi \
+                if [ -f $$d/vboxpci.ko ]; then \
+                    install -D -g 0 -o 0 -m 0644 \
+                        $$d/vboxpci.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxpci.ko; \
+                fi \
             fi \
             done)
@@ -289 +291 @@
         if [ -f $(prefix)/usr/lib/$(package)/libQt5CoreVBox.so.5 ]; then \
             $(vboxroot)/tools/linux.$(chrarch)/bin/chrpath \
-                --keepgoing --replace /usr/lib/$(package) \
-                $(prefix)/usr/lib/$(package)/*.so.5 \
-                $(prefix)/usr/lib/$(package)/plugins/platforms/*.so; \
-                $(prefix)/usr/lib/$(package)/plugins/platformthemes/*.so; \
-                $(prefix)/usr/lib/$(package)/plugins/sqldrivers/*.so; \
-                $(prefix)/usr/lib/$(package)/plugins/styles/*.so; \
-                $(prefix)/usr/lib/$(package)/plugins/xcbglintegrations/*.so; \
+                --keepgoing --replace /usr/lib/$(package) \
+                $(prefix)/usr/lib/$(package)/*.so.5 \
+                $(prefix)/usr/lib/$(package)/plugins/platforms/*.so; \
+                $(prefix)/usr/lib/$(package)/plugins/platformthemes/*.so; \
+                $(prefix)/usr/lib/$(package)/plugins/sqldrivers/*.so; \
+                $(prefix)/usr/lib/$(package)/plugins/styles/*.so; \
+                $(prefix)/usr/lib/$(package)/plugins/xcbglintegrations/*.so; \
             echo "[Paths]" > $(prefix)/usr/lib/$(package)/qt.conf; \
             echo "Plugins = /usr/lib/$(package)/plugins" >> $(prefix)/usr/lib/$(package)/qt.conf; \

trunk/src/VBox/Installer/linux/deffiles

@@ -103 +103 @@
     VBox.png \
     virtualbox.desktop \
+    virtualboxvm.desktop \
     src/ \
     src/include/ \

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

@@ -339 +339 @@
     ln -sf $INSTALLATION_DIR/icons/128x128/virtualbox.png /usr/share/pixmaps/virtualbox.png
     ln -sf $INSTALLATION_DIR/virtualbox.desktop /usr/share/applications/virtualbox.desktop
+    ln -sf $INSTALLATION_DIR/virtualboxvm.desktop /usr/share/applications/virtualboxvm.desktop
     ln -sf $INSTALLATION_DIR/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
     ln -sf $INSTALLATION_DIR/rdesktop-vrdp /usr/bin/rdesktop-vrdp

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -197 +197 @@
 ln -s /usr/share/virtualbox/src/vboxhost $RPM_BUILD_ROOT/usr/src/vboxhost-%VER%
 mv virtualbox.desktop $RPM_BUILD_ROOT/usr/share/applications/virtualbox.desktop
+mv virtualboxvm.desktop $RPM_BUILD_ROOT/usr/share/applications/virtualboxvm.desktop
 mv VBox.png $RPM_BUILD_ROOT/usr/share/pixmaps/VBox.png
 %{!?is_ose: mv LICENSE $RPM_BUILD_ROOT%{VBOXDOCDIR}}

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

@@ -89 +89 @@
   /usr/share/pixmaps/virtualbox.png \
   /usr/share/applications/virtualbox.desktop \
+  /usr/share/applications/virtualboxvm.desktop \
   /usr/share/mime/packages/virtualbox.xml \
   /usr/bin/rdesktop-vrdp \