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

Timestamp:

Oct 19, 2021 6:06:42 PM (3 years ago)

Author:

vboxsync

Message:

Reverting r147647.

File:

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

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)
@@ -242 +240 @@
         $(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; \
@@ -272 +270 @@
         $(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)
@@ -291 +289 @@
         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; \