Changeset 90354 in vbox

Timestamp:

Jul 27, 2021 11:57:54 AM (3 years ago)

Author:

vboxsync

Message:

configure, debian/rules, rpm/rules: Many bug fixes. Clean up the debian building to use purely the out directory (which needs relocating its files to the out directory, too, because the debhelper utilities can't deal with a separate temp directory structure). This un-breaks the debian package building which was caused by the incomplete previous change.

Location:

trunk

Files:

• configure (modified) (5 diffs)
• debian (modified) (1 prop)
• debian/changelog (modified) (2 diffs)
• debian/compat (modified) (1 diff)
• debian/rules (modified) (14 diffs)
• src/VBox/Installer/linux/debian (modified) (1 prop)
• src/VBox/Installer/linux/debian/compat (modified) (1 diff)
• src/VBox/Installer/linux/debian/rules (modified) (15 diffs)
• src/VBox/Installer/linux/rpm/rules (modified) (10 diffs)

trunk/configure

@@ -82 +82 @@
 WITH_VMMRAW=1
 WITH_LIBIDL=1
-WITH_GSOAP=0
 WITH_QT5=1
 WITH_SDL=1
@@ -2375 +2374 @@
 [ $WITH_OPENGL  -eq 1 ] && echo "  --disable-opengl         disable OpenGL support (2D & 3D)"
 [ $WITH_QT5     -eq 0 ] && echo "  --enable-qt5             enable Qt5 detection"
-[ $WITH_GSOAP   -eq 0 ] && echo "  --enable-webservice      enable the webservice stuff"
 [ $OSE          -eq 1 ] && echo "  --enable-vnc             enable the VNC server"
 [ $OSE          -eq 0 ] && echo "  --disable-extpack        don't build the extpack"
@@ -2410 +2408 @@
 [ "$OS"    = "linux" ] && echo "  --with-linux=DIR         Linux kernel source directory [$LINUX]"
 [ $WITH_QT5    -eq 1 ] && echo "  --with-qt-dir=DIR        directory for Qt headers/libraries [pkgconfig]"
-[ $WITH_GSOAP  -eq 1 ] && echo "  --with-gsoap-dir=PATH    directory for gSOAP compiler/headers/libraries"
-[ $WITH_GSOAP  -eq 1 ] && echo "                           (soapcpp2 and wsdl2h, soapstd2.h, libgsoap++.a/so)"
-[ $WITH_GSOAP  -eq 1 ] && echo "  --with-gsoap-import=PATH directory for gSOAP import files (stlvector.h)"
 cat << EOF
+  --with-gsoap-dir=PATH    directory for gSOAP compiler/headers/libraries
+                           (soapcpp2 and wsdl2h, soapstd2.h, libgsoap++.a/so)
+  --with-gsoap-import=PATH directory for gSOAP import files (stlvector.h)
   --with-openssl-dir=DIR   directory for OpenSSL headers/libraries
   --with-ow-dir=DIR        directory where Open Watcom can be found [$WATCOM]
@@ -2592 +2590 @@
       ;;
     --enable-webservice)
-      [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1
       ;;
     --enable-vnc)
@@ -2909 +2906 @@
 [ -n "$SETUP_WINE" ] && setup_wine
 
-if [ $ONLY_ADDITIONS -eq 0 -a $WITH_GSOAP -eq 1 ]; then
+if [ $ONLY_ADDITIONS -eq 0 ]; then
   check_gsoap
 else
-  if [ $OSE -ge 1 ]; then
-    cnf_append "VBOX_WITH_WEBSERVICES" ""
-  fi
+  cnf_append "VBOX_WITH_WEBSERVICES" ""
 fi
 

trunk/debian/changelog

@@ +1 @@
+virtualbox-ose (6.1.97) unstable; urgency=low
+
+  * rebuild Debian package.
+
+ -- Oracle Corporation <info@virtualbox.org>  Tue, 21 Jul 2021 12:00:00 +0200
+
 virtualbox-ose (6.1.4) unstable; urgency=low
 
@@ -11 +17 @@
  -- Oracle Corporation <info@virtualbox.org>  Tue, 14 Jan 2020 12:00:00 +0200
 
-
 virtualbox-ose (6.1.0) unstable; urgency=low
 

trunk/debian/compat

@@ -1 @@
-5
+9

trunk/debian/rules

@@ -18 +18 @@
 
 #export DH_VERBOSE=1
-export DH_COMPAT=5
 
 # possible overrides:
@@ -28 +27 @@
 #  NOSUBVER=1       disable generation of the sub-version field (which is
 #                   either the subversion rev [if available] or the build date)
-#  NODOCS=1         don't build docs, use precompiled UserManual.pdf and
-#                   maybe VirtualBox.qch and VirtualBox.qhc from $(vboxroot)/prebuild
+#  NODOCS=1         don't build docs, use precompiled UserManual*.pdf and
+#                   maybe UserManual*.qch and UserManual*.qhc from $(vboxroot)/prebuild
 #  NOMODS=1         don't build any module
 #  NOQT=1           don't build the Qt GUI
@@ -36 +35 @@
 #  HEADLESS=1       build the headless version
 #  VNC=1            build VNC code
-#  NOWEBSVC=1       don't build the webservice API, default for OSE
+#  NOWEBSVC=1       don't build the webservice API
 #  STAGEDISO=<path> don't build the VBoxAdditions, use the precompiled .iso
-#  STAGEDQHELP=<path> use VirtualBox*.qch and VirtualBox*.qhc from this directory
 #  PKGDIR=<path>    where to store the final package(s)
-#
-# NODOCS will be set if UserManual*.pdf is placed in $(vboxroot)/prebuild.
+#  svn_revision=xxx do not depend on subversion being available, but use this
+#                   hard-coded revision number instead
+#
+# NODOCS will be set if UserManual*.pdf, UserManual*.qch and UserManual*.qhc are
+# placed in $(vboxroot)/prebuild.
 # STAGEDISO will be set if VBoxGuestAdditions.iso is placed there.
-# STAGEDQHELP will be set if VirtualBox*.qch and VirtualBox*.qhc is placed there.
-# VirtualBox*.qch and VirtualBox*.qhc are used if they are provided, but never
-# attempted to be built.
-#
-# Wine will not be required if either NODOCS or STAGEDISO are set.
+#
+# Wine will not be required if STAGEDISO is set.
 
 package  := virtualbox
 verpkg   := virtualbox-ose
-current  := $(shell pwd)
-vboxroot := $(shell pwd)
-pkgdir   := $(if $(PKGDIR),$(PKGDIR),$(shell cd ..; pwd))
-bldbase  := $(if $(PATH_OUT_BASE),$(PATH_OUT_BASE),$(vboxroot))/out/debian
+vboxroot := $(shell while ! test -r configure && ! test "$$PWD" = "/"; do cd ..; done; pwd)
+debroot  := $(vboxroot)
+instlin  := $(vboxroot)/src/VBox/Installer/linux
+pkgdir   := $(if $(PKGDIR),$(PKGDIR),$(shell cd $(vboxroot)/..; pwd))
+outdir   := $(if $(PATH_OUT_BASE),$(PATH_OUT_BASE),$(vboxroot))/out
+bldbase  := $(outdir)/debian
 builddir := $(bldbase)/builddir
 moddir   := $(bldbase)/modules
-prefix   := $(current)/debian/$(verpkg)
+prefix   := $(bldbase)/$(verpkg)
 arch     := $(shell dpkg --print-architecture)
 verfile  := $(builddir)/version-generated.mk
@@ -65 +65 @@
 NOQT     ?= $(HEADLESS)
 NOSDL    ?= $(HEADLESS)
-NOWEBSVC ?= $(ose)
-NODOCS   ?= $(if $(wildcard $(vboxroot)/prebuild/UserManual*.pdf),1,)
+NOWEBSVC ?=
+EFI      ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxEFI32.fd $(vboxroot)/prebuild/VBoxEFI64.fd),1,)
+NODOCS   ?= $(if $(wildcard $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual.qhc)),1,)
 STAGEDISO ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxGuestAdditions.iso),$(vboxroot)/prebuild,)
-STAGEDQHELP ?= $(if $(and $(wildcard $(vboxroot)/prebuild/VirtualBox*.qch),$(wildcard $(vboxroot)/prebuild/VirtualBox*.qhc)),$(vboxroot)/prebuild,)
-NOWINE   := $(if $(NODOCS),1,$(if $(STAGEDISO),1,$(ose)))
-PYTHON   := $(firstword $(shell which python) $(shell which python3))
-
-ifneq ($(wildcard $(verfile)),)
-include $(verfile)
-ver      := $(VBOX_VERSION_STRING)
-archdir  := $(prefix)/opt/VirtualBox-$(ver)
-endif
+NOWINE   := $(if $(STAGEDISO),1,$(ose))
+PYTHON   := $(firstword $(shell which python3) $(shell which python))
+
+DEBPKGFILES := changelog compat control dirs postinst postrm preinst prerm rules templates
 
 ifneq ($(STAGEDISO),)
@@ -84 +80 @@
 endif
 
-debrel  := $(if $(shell which lsb_release),_$(shell lsb_release -si)_$(shell lsb_release -sc),unknown)
+# Replicate debian package buildfiles to $(bldbase)
+ifneq ($(shell pwd),$(outdir))
+cmd := $(filter-out all Makefile,$(MAKECMDGOALS))
+all:
+        mkdir -p $(bldbase)
+        ln -sf $(addprefix $(debroot)/debian/,$(DEBPKGFILES)) $(bldbase)
+        +$(MAKE) -C $(outdir) -f debian/rules $(cmd)
+
+Makefile:
+
+$(cmd): all
+
+.PHONY: all $(MAKECMDGOALS)
+
+else
+ ifneq ($(wildcard $(verfile)),)
+include $(verfile)
+ver      := $(VBOX_VERSION_STRING)
+archdir  := $(prefix)/opt/VirtualBox-$(ver)
+ endif
 
 cfg_flags := $(if $(NOQT),--disable-qt,) \
-             $(if $(NOSDL),--disable-vboxsdl,) \
-             $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
-             $(if $(HEADLESS),--build-headless,) \
-             $(if $(DEBUG),--build-debug,) \
-             $(if $(NOWINE),,--setup-wine) \
-             $(if $(NOWEBSVC),,$(if $(ose),--enable-webservice,)) \
-             $(if $(VNC),--enable-vnc,) \
-             $(if $(PATH_OUT_BASE),--out-base-dir=$(PATH_OUT_BASE),) \
-             --disable-extpack
-
-bld_flags := AUTOCFG=$(current)/debian/AutoConfig.kmk \
-             LOCALCFG=$(current)/debian/LocalConfig.kmk \
-             PATH_OUT=$(builddir) \
-             VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \
-             VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \
-             VBOX_WITH_VMSVGA3D=1 \
-             VBOX_DO_STRIP= \
-             VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\"" \
-             $(if $(STAGEDQHELP),VBOX_WITH_DOCS_QHELP=1,) \
-             $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
-             $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
-             $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
-             $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,)
-
-configure: debian/configure-stamp
-debian/configure-stamp:
+    $(if $(NOSDL),--disable-vboxsdl,) \
+    $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
+    $(if $(HEADLESS),--build-headless,) \
+    $(if $(DEBUG),--build-debug,) \
+    $(if $(NOWINE),,--setup-wine) \
+    $(if $(VNC),--enable-vnc,) \
+    $(if $(PATH_OUT_BASE),--out-base-dir=$(PATH_OUT_BASE),) \
+    --disable-extpack
+
+bld_flags := AUTOCFG=$(bldbase)/AutoConfig.kmk \
+    LOCALCFG=$(debroot)/debian/LocalConfig.kmk \
+    PATH_OUT=$(builddir) \
+    VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \
+    VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \
+    VBOX_WITH_VMSVGA3D=1 \
+    VBOX_DO_STRIP= \
+    VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\"" \
+    $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
+    $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
+    $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
+    $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,)
+
+configure: $(bldbase)/configure-stamp
+$(bldbase)/configure-stamp:
         dh_testdir
+        mkdir -p $(bldbase)
         cd $(vboxroot) && ./configure --odir=$(bldbase) $(cfg_flags)
-        touch debian/configure-stamp
-
-build: debian/configure-stamp debian/build-stamp
-debian/build-stamp $(verfile):
+        touch $@
+
+build: $(bldbase)/configure-stamp $(bldbase)/build-stamp
+$(bldbase)/build-stamp $(verfile): $(bldbase)/configure-stamp
         dh_testdir
-        . debian/env.sh && kmk -C $(vboxroot) $(bld_flags) $(if $(NOPARALLEL),-j1,) all
-        $(if $(NODOCS),cp $(vboxroot)/prebuild/UserManual*.pdf $(builddir)/bin,)
-        $(if $(STAGEDQHELP),cp $(STAGEDQHELP)/VirtualBox*.qch $(STAGEDQHELP)/VirtualBox*.qhc $(builddir)/bin,)
+        . $(bldbase)/env.sh && kmk -C $(vboxroot) $(bld_flags) $(if $(NOPARALLEL),-j1,) all
+        # Files from prebuild go to (builddir)/bin to be used during the
+        # packing stage, overriding what the build did/would produce.
+        $(if $(NODOCS),cp $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual.qhc) $(builddir)/bin,)
         $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI32.fd $(builddir)/bin,)
         $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI64.fd $(builddir)/bin,)
         mkdir -p $(builddir)/bin/additions
         $(if $(STAGEDISO),cp $(STAGEDISO)/VBoxGuestAdditions.iso $(builddir)/bin/additions,)
-        . debian/env.sh && kmk -C $(vboxroot) $(bld_flags) \
+        . $(bldbase)/env.sh && kmk -C $(vboxroot) $(bld_flags) \
             VBOX_NO_LINUX_RUN_INSTALLER=1 \
             VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86.tar.bz2 \
@@ -134 +149 @@
             VBOX_PATH_ADDITIONS.linux.amd64=$(builddir)/bin/additions \
             packing
-        touch debian/build-stamp
+        touch $(bldbase)/build-stamp
 
 # Build modules for every kernel we find in /lib/modules/*
-modules: debian/build-stamp debian/modules-stamp
-debian/modules-stamp: debian/build-stamp
+$(bldbase)/modules-stamp: $(bldbase)/build-stamp
         rm -rf $(moddir)
         mkdir $(moddir)
@@ -157 +171 @@
             fi; \
         done
-        touch debian/modules-stamp
+        touch $@
 
 clean:
         dh_testdir
         dh_testroot
-        rm -f debian/AutoConfig.kmk debian/configure.log debian/env.sh
-        rm -f debian/modules-stamp debian/build-stamp debian/configure-stamp
-        rm -f debian/virtualbox-*.substvars debian/virtualbox*.debhelper
-        rm -f debian/$(verpkg).mime
-        rm -rf $(builddir) $(moddir)
-        rm -rf debian/wine.*
         dh_clean
-
-ifeq ($(VBOX_VERSION_MAJOR),)
-binary binary-arch binary-indep: build $(verfile)
-        $(MAKE) -f debian/rules binary
-else
+        rm -rf $(archdir)
+        rm -rf $(builddir)
+        rm -rf $(moddir)
+        rm -rf $(bldbase)/wine.*
+        rm -rf $(bldbase)/VirtualBox-*
+        rm -f $(bldbase)/VirtualBox.tar $(bldbase)/VirtualBox.tar.bz2
+        rm -f $(bldbase)/virtualbox-*.substvars $(bldbase)/virtualbox*.debhelper
+        rm -f $(bldbase)/$(verpkg).mime $(bldbase)/$(verpkg).sharedmimeinfo
+        rm -f $(bldbase)/modules-stamp $(bldbase)/build-stamp $(bldbase)/configure-stamp
+        rm -f $(bldbase)/AutoConfig.kmk $(bldbase)/configure.log $(bldbase)/env.sh
+        rm -f $(addprefix $(bldbase)/,$(DEBPKGFILES))
+        if [ -d $(bldbase) ]; then rmdir $(bldbase); fi
+
+ ifeq ($(VBOX_VERSION_MAJOR),)
+binary: build $(verfile)
+        +$(MAKE) -f debian/rules binary
+
+ else
 # Build architecture-dependent files here.
-binary binary-arch binary-indep: build $(if $(NOMODS),,modules)
+binary: build $(if $(NOMODS),,$(bldbase)/modules-stamp)
         dh_testdir
         dh_testroot
-        dh_clean -k
+        dh_prep
         dh_installdirs
         tar -xC $(prefix)/opt -f $(builddir)/bin/VirtualBox.tar
@@ -207 +228 @@
         done)
         $(if $(NOQT),,rmdir $(archdir)/icons)
-        $(if $(NOQT),,mv $(archdir)/virtualbox.xml debian/$(verpkg).sharedmimeinfo)
+        $(if $(NOQT),,mv $(archdir)/virtualbox.xml $(bldbase)/$(verpkg).sharedmimeinfo)
         install -d -g 0 -o 0 $(prefix)/usr/share/lintian/overrides
         sed \
             -e 's|%VERPKG%|$(verpkg)|g' \
-            debian/lintian-override.in > \
+            $(vboxroot)/debian/lintian-override.in > \
            $(prefix)/usr/share/lintian/overrides/$(verpkg)
         mv $(archdir)/VBox.png \
@@ -217 +238 @@
         mv $(archdir)/src  $(prefix)/usr/share/$(package)
         rm $(archdir)/VBox.sh
-        install -D -g 0 -o 0 -m 644 $(vboxroot)/src/VBox/Installer/linux/VBox.sh $(prefix)/usr/bin/VBox
+        install -D -g 0 -o 0 -m 644 $(instlin)/VBox.sh $(prefix)/usr/bin/VBox
         mv $(archdir)/VBoxSysInfo.sh $(prefix)/usr/share/$(package)
         if [ -r $(archdir)/VBoxDTrace ]; then \
@@ -237 +258 @@
             fi \
             done)
-ifeq ($(ose),)
-        dh_installdocs \
-            $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.qch VirtualBox*.qhc \
-            LICENSE)
-        rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.qch VirtualBox*.qhc \
-            LICENSE)
-        for i in rdesktop-vrdp.tar.gz additions/VBoxGuestAdditions.iso; do \
-            mv $(archdir)/$$i $(prefix)/usr/share/$(package); done
+        dh_installdocs $(addprefix $(archdir)/,UserManual*.pdf LICENSE)
+        mv $(addprefix $(archdir)/,$(if $(HEADLESS),,rdesktop-vrdp.tar.gz) additions/VBoxGuestAdditions.iso) $(prefix)/usr/share/$(package)
         $(if $(HEADLESS),,mv $(archdir)/rdesktop-vrdp $(prefix)/usr/bin)
         $(if $(HEADLESS),,mv $(archdir)/rdesktop-vrdp-keymaps $(prefix)/usr/share/$(package))
-else
-        dh_installdocs \
-            $(archdir)/UserManual*.pdf
-        rm $(addprefix $(archdir)/,UserManual*.pdf)
-        for i in additions/VBoxGuestAdditions.iso; do \
-            mv $(archdir)/$$i $(prefix)/usr/share/$(package); done
-endif
         mv $(archdir) $(prefix)/usr/lib/$(package)
         if [ -f $(prefix)/usr/lib/$(package)/libQt5CoreVBox.so.5 ]; then \
@@ -260 +268 @@
                 $(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; \
@@ -279 +290 @@
             $(if $(NOSDL),,usr/bin/VBox         usr/bin/VBoxSDL) \
             $(if $(NOSDL),,usr/bin/VBox         usr/bin/vboxsdl) \
-            $(if $(ose),,usr/bin/VBox           usr/bin/VBoxVRDP) \
             usr/bin/VBox                        usr/bin/VBoxHeadless \
             usr/bin/VBox                        usr/bin/vboxheadless \
@@ -298 +308 @@
         dh_installmime
         dh_link
-ifeq ($(DEBUG),)
+  ifeq ($(DEBUG),)
         dh_strip --keep-debug \
             $(addprefix --exclude=lib,$(addsuffix VBox.so.5,\
-              Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport Qt5OpenGL Qt5DBus Qt5XcbQpa Qt5X11Extras)) \
-            --exclude=libqxcb.so --exclude=libqxcb-glx-integration.so
-endif
-        mkdir -p $(current)/debian/$(verpkg)-dbg/usr/lib/$(package)
-        mv $(prefix)/usr/lib/$(package)/*.debug $(current)/debian/$(verpkg)-dbg/usr/lib/$(package)
-ifeq ($(DEBUG),)
-        mv $(prefix)/usr/lib/debug $(current)/debian/$(verpkg)-dbg/usr/lib
-endif
-        $(firstword $(shell which dh_python2) $(shell which dh_python3))
-        dh_compress -X.pdf -X LICENSE -X.py
+              Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport Qt5OpenGL Qt5DBus Qt5XcbQpa Qt5X11Extras))
+  endif
+        mkdir -p $(bldbase)/$(verpkg)-dbg/usr/lib/$(package)
+        mv $(prefix)/usr/lib/$(package)/*.debug $(bldbase)/$(verpkg)-dbg/usr/lib/$(package)
+  ifeq ($(DEBUG),)
+        mv $(prefix)/usr/lib/debug $(bldbase)/$(verpkg)-dbg/usr/lib
+  endif
+        $(firstword $(shell which dh_python3) $(shell which dh_python2))
+        dh_compress -X.pdf -X.qch -X.qhc -X LICENSE -X.py
         dh_fixperms
         dh_makeshlibs
@@ -323 +332 @@
         dh_md5sums
         dh_builddeb --destdir $(pkgdir) -- -Zxz
+ endif
+
+.PHONY: binary configure build clean
 endif
-
-.PHONY: binary modules binary-arch binary-indep clean checkroot

trunk/src/VBox/Installer/linux/debian/compat

@@ -1 @@
-5
+9

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

@@ -23 +23 @@
 
 #export DH_VERBOSE=1
-export DH_COMPAT=5
 
 # possible overrides:
@@ -33 +32 @@
 #  NOSUBVER=1       disable generation of the sub-version field (which is
 #                   either the subversion rev [if available] or the build date)
-#  NODOCS=1         don't build docs, use precompiled UserManual.pdf and
-#                   maybe VirtualBox.qch and VirtualBox.qhc from $(vboxroot)/prebuild
+#  NODOCS=1         don't build docs, use precompiled UserManual*.pdf and
+#                   maybe UserManual*.qch and UserManual*.qhc from $(vboxroot)/prebuild
 #  NOMODS=1         don't build any module
 #  NOQT=1           don't build the Qt GUI
@@ -42 +41 @@
 #  HEADLESS=1       build the headless version
 #  VNC=1            build VNC code
-#  NOWEBSVC=1       don't build the webservice API, default for OSE
+#  NOWEBSVC=1       don't build the webservice API
 #  STAGEDISO=<path> don't build the VBoxAdditions, use the precompiled .iso
-#  STAGEDQHELP=<path> use VirtualBox*.qch and VirtualBox*.qhc from this directory
 #  PKGDIR=<path>    where to store the final package(s)
-#
-# NODOCS will be set if UserManual*.pdf is placed in $(vboxroot)/prebuild.
+#  svn_revision=xxx do not depend on subversion being available, but use this
+#                   hard-coded revision number instead
+#
+# NODOCS will be set if UserManual*.pdf, UserManual*.qch and UserManual*.qhc are
+# placed in $(vboxroot)/prebuild.
 # STAGEDISO will be set if VBoxGuestAdditions.iso is placed there.
-# STAGEDQHELP will be set if VirtualBox*.qch and VirtualBox*.qhc is placed there.
-# VirtualBox*.qch and VirtualBox*.qhc are used if they are provided, but never
-# attempted to be built.
-#
-# Wine will not be required if either NODOCS or STAGEDISO are set.
+#
+# Wine will not be required if STAGEDISO is set.
 
 package  := virtualbox
 verpkg   := virtualbox-6.1
-current  := $(shell pwd)
-vboxroot := $(shell while ! test -r configure && ! test "$PWD" = "/"; do cd ..; done; pwd)
+vboxroot := $(shell while ! test -r configure && ! test "$$PWD" = "/"; do cd ..; done; pwd)
+debroot  := $(vboxroot)/src/VBox/Installer/linux
+instlin  := $(vboxroot)/src/VBox/Installer/linux
 pkgdir   := $(if $(PKGDIR),$(PKGDIR),$(shell cd $(vboxroot)/..; pwd))
-bldbase  := $(if $(PATH_OUT_BASE),$(PATH_OUT_BASE),$(vboxroot))/out/debian
+outdir   := $(if $(PATH_OUT_BASE),$(PATH_OUT_BASE),$(vboxroot))/out
+bldbase  := $(outdir)/debian
 builddir := $(bldbase)/builddir
 moddir   := $(bldbase)/modules
-prefix   := $(current)/debian/$(verpkg)
+prefix   := $(bldbase)/$(verpkg)
 arch     := $(shell dpkg --print-architecture)
 verfile  := $(builddir)/version-generated.mk
@@ -69 +69 @@
 chrarch  := $(shell if [ `uname -m` = "x86_64" ]; then echo "amd64"; else echo "x86"; fi)
 -include $(vboxroot)/SVN_REVISION
-svnrev   :=$(if $(svn_revision),$(svn_revision),)
+svnrev   := $(if $(svn_revision),$(svn_revision),)
 
 NOMODS   ?= $(ose)
 NOQT     ?= $(HEADLESS)
 NOSDL    ?= $(HEADLESS)
-NOWEBSVC ?= $(ose)
-NODOCS   ?= $(if $(wildcard $(vboxroot)/prebuild/UserManual*.pdf),1,)
+NOWEBSVC ?=
+EFI      ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxEFI32.fd $(vboxroot)/prebuild/VBoxEFI64.fd),1,)
+NODOCS   ?= $(if $(wildcard $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual.qhc)),1,)
 STAGEDISO ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxGuestAdditions.iso),$(vboxroot)/prebuild,)
-STAGEDQHELP ?= $(if $(and $(wildcard $(vboxroot)/prebuild/VirtualBox*.qch),$(wildcard $(vboxroot)/prebuild/VirtualBox*.qhc)),$(vboxroot)/prebuild,)
-NOWINE   := $(if $(NODOCS),1,$(if $(STAGEDISO),1,$(ose)))
-PYTHON   := $(firstword $(shell which python) $(shell which python3))
-
-ifneq ($(wildcard $(verfile)),)
-include $(verfile)
-ver      := $(VBOX_VERSION_STRING)
-svnver   := $(if $(NOSUBVER),,$(if $(svn_revision),-$(svn_revision),$(shell if \
-                svn info > /dev/null 2>&1; then \
-                svn info|sed -e "s/^Revision: \(.*\)/-\1/;t;d"; else \
-                date +"-%Y%m%d"; fi)))
-debver   :=$(subst _ALPHA,~alpha,$(subst _BETA,~beta,$(subst _RC,~rc,$(subst _OSE,~ose,$(ver)))))$(svnver)$(VERSUFFIX)$(if $(HEADLESS),~headless,)$(if $(DEBUG),~dbg,)
-archdir  := $(prefix)/opt/VirtualBox-$(ver)
-endif
+NOWINE   := $(if $(STAGEDISO),1,$(ose))
+PYTHON   := $(firstword $(shell which python3) $(shell which python))
+
+DEBPKGFILES := changelog compat control dirs postinst postrm preinst prerm rules templates
 
 ifneq ($(STAGEDISO),)
@@ -98 +89 @@
 endif
 
-debrel  := $(if $(shell which lsb_release),_$(shell lsb_release -si)_$(shell lsb_release -sc),unknown)
+# Replicate debian package buildfiles to $(bldbase)
+ifneq ($(shell pwd),$(outdir))
+cmd := $(filter-out all Makefile,$(MAKECMDGOALS))
+all:
+        mkdir -p $(bldbase)
+        ln -sf $(addprefix $(debroot)/debian/,$(DEBPKGFILES)) $(bldbase)
+        +$(MAKE) -C $(outdir) -f debian/rules $(cmd)
+
+Makefile:
+
+$(cmd): all
+
+.PHONY: all $(MAKECMDGOALS)
+
+else
+ ifneq ($(wildcard $(verfile)),)
+include $(verfile)
+ver      := $(VBOX_VERSION_STRING)
+svnver   := $(if $(NOSUBVER),,$(if $(svn_revision),-$(svn_revision),$(shell if \
+                svn info $(vboxroot) > /dev/null 2>&1; then \
+                svn info $(vboxroot)|sed -e "s/^Revision: \(.*\)/-\1/;t;d"; else \
+                date +"-%Y%m%d"; fi)))
+debver   := $(subst _ALPHA,~alpha,$(subst _BETA,~beta,$(subst _RC,~rc,$(subst _OSE,~ose,$(ver)))))$(svnver)$(VERSUFFIX)$(if $(HEADLESS),~headless,)$(if $(DEBUG),~dbg,)
+archdir  := $(prefix)/opt/VirtualBox-$(ver)
+ endif
+
 
 ifneq ($(MAKECMDGOALS),clean)
- debdist  := $(strip $(shell grep $(debrel) $(current)/distributions_deb | cut -d'=' -f2))
+ debrel  := $(if $(shell which lsb_release),_$(shell lsb_release -si)_$(shell lsb_release -sc),unknown)
+ debdist  := $(strip $(shell grep $(debrel) $(debroot)/distributions_deb | cut -d'=' -f2))
  ifeq ($(debdist),)
   debdist := $(if $(shell which lsb_release),_$(shell lsb_release -si | tr a-z A-Z)_$(shell lsb_release -sr | sed -e 's/\./_/g' -e 's/\([^_]*\)\(_[^_]*\).*/\1\2/'),unknown)
@@ -109 +126 @@
 
 cfg_flags := $(if $(NOQT),--disable-qt,) \
-             $(if $(NOSDL),--disable-vboxsdl,) \
-             $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
-             $(if $(HEADLESS),--build-headless,) \
-             $(if $(DEBUG),--build-debug,) \
-             $(if $(NOWINE),,--setup-wine) \
-             $(if $(NOWEBSVC),,$(if $(ose),--enable-webservice,)) \
-             $(if $(VNC),--enable-vnc,) \
-             $(if $(PATH_OUT_BASE),--out-base-dir=$(PATH_OUT_BASE),) \
-             --disable-extpack
-
-bld_flags := AUTOCFG=$(current)/debian/AutoConfig.kmk \
-             LOCALCFG=$(current)/debian/LocalConfig.kmk \
-             PATH_OUT=$(builddir) \
-             VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \
-             VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \
-             VBOX_WITH_VMSVGA3D=1 \
-             VBOX_DO_STRIP= \
-             VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\"" \
-             $(if $(STAGEDQHELP),VBOX_WITH_DOCS_QHELP=1,) \
-             VBOX_PACKAGE_DIST=$(debdist) \
-             $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
-             $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
-             $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
-             $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,)
-
-configure: debian/configure-stamp
-debian/configure-stamp:
+    $(if $(NOSDL),--disable-vboxsdl,) \
+    $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
+    $(if $(HEADLESS),--build-headless,) \
+    $(if $(DEBUG),--build-debug,) \
+    $(if $(NOWINE),,--setup-wine) \
+    $(if $(VNC),--enable-vnc,) \
+    $(if $(PATH_OUT_BASE),--out-base-dir=$(PATH_OUT_BASE),) \
+    --disable-extpack
+
+bld_flags := AUTOCFG=$(bldbase)/AutoConfig.kmk \
+    LOCALCFG=$(debroot)/debian/LocalConfig.kmk \
+    PATH_OUT=$(builddir) \
+    VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \
+    VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \
+    VBOX_WITH_VMSVGA3D=1 \
+    VBOX_DO_STRIP= \
+    VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\"" \
+    VBOX_PACKAGE_DIST=$(debdist) \
+    $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
+    $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
+    $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
+    $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,)
+
+configure: $(bldbase)/configure-stamp
+$(bldbase)/configure-stamp:
         dh_testdir
+        mkdir -p $(bldbase)
         cd $(vboxroot) && ./configure --odir=$(bldbase) $(cfg_flags)
-        touch debian/configure-stamp
-
-build: debian/configure-stamp debian/build-stamp
-debian/build-stamp $(verfile):
+        touch $@
+
+build: $(bldbase)/configure-stamp $(bldbase)/build-stamp
+$(bldbase)/build-stamp $(verfile): $(bldbase)/configure-stamp
         dh_testdir
-        . debian/env.sh && kmk -C $(vboxroot) $(bld_flags) $(if $(NOPARALLEL),-j1,) all
-        $(if $(NODOCS),cp $(vboxroot)/prebuild/UserManual*.pdf $(builddir)/bin,)
-        $(if $(STAGEDQHELP),cp $(STAGEDQHELP)/VirtualBox*.qch $(STAGEDQHELP)/VirtualBox*.qhc $(builddir)/bin,)
+        . $(bldbase)/env.sh && kmk -C $(vboxroot) $(bld_flags) $(if $(NOPARALLEL),-j1,) all
+        # Files from prebuild go to (builddir)/bin to be used during the
+        # packing stage, overriding what the build did/would produce.
+        $(if $(NODOCS),cp $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual.qhc) $(builddir)/bin,)
         $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI32.fd $(builddir)/bin,)
         $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI64.fd $(builddir)/bin,)
         mkdir -p $(builddir)/bin/additions
         $(if $(STAGEDISO),cp $(STAGEDISO)/VBoxGuestAdditions.iso $(builddir)/bin/additions,)
-        . debian/env.sh && kmk -C $(vboxroot) $(bld_flags) \
+        . $(bldbase)/env.sh && kmk -C $(vboxroot) $(bld_flags) \
             VBOX_NO_LINUX_RUN_INSTALLER=1 \
             VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86.tar.bz2 \
@@ -157 +174 @@
             VBOX_PATH_ADDITIONS.linux.amd64=$(builddir)/bin/additions \
             packing
-        touch debian/build-stamp
+        touch $(bldbase)/build-stamp
 
 # Build modules for every kernel we find in /lib/modules/*
-modules: debian/build-stamp debian/modules-stamp
-debian/modules-stamp: debian/build-stamp
+$(bldbase)/modules-stamp: $(bldbase)/build-stamp
         rm -rf $(moddir)
         mkdir $(moddir)
@@ -180 +196 @@
             fi; \
         done
-        touch debian/modules-stamp
+        touch $@
 
 clean:
         dh_testdir
         dh_testroot
-        rm -f debian/changelog
-        rm -f debian/AutoConfig.kmk debian/configure.log debian/env.sh
-        rm -f debian/modules-stamp debian/build-stamp debian/configure-stamp
-        rm -f debian/virtualbox-*.substvars debian/virtualbox*.debhelper
-        rm -f debian/$(verpkg).mime
-        rm -rf $(builddir) $(moddir)
-        rm -rf debian/wine.*
         dh_clean
-
-ifeq ($(VBOX_VERSION_MAJOR),)
-binary binary-arch binary-indep: build $(verfile)
-        $(MAKE) -f debian/rules binary
-else
+        rm -rf $(archdir)
+        rm -rf $(builddir)
+        rm -rf $(moddir)
+        rm -rf $(bldbase)/wine.*
+        rm -rf $(bldbase)/VirtualBox-*
+        rm -f $(bldbase)/VirtualBox.tar $(bldbase)/VirtualBox.tar.bz2
+        rm -f $(bldbase)/virtualbox-*.substvars $(bldbase)/virtualbox*.debhelper
+        rm -f $(bldbase)/$(verpkg).mime $(bldbase)/$(verpkg).sharedmimeinfo
+        rm -f $(bldbase)/modules-stamp $(bldbase)/build-stamp $(bldbase)/configure-stamp
+        rm -f $(bldbase)/AutoConfig.kmk $(bldbase)/configure.log $(bldbase)/env.sh
+        rm -f $(addprefix $(bldbase)/,$(DEBPKGFILES))
+        if [ -d $(bldbase) ]; then rmdir $(bldbase); fi
+
+ ifeq ($(VBOX_VERSION_MAJOR),)
+binary: build $(verfile)
+        +$(MAKE) -f debian/rules binary
+
+ else
 # Build architecture-dependent files here.
-binary binary-arch binary-indep: build $(if $(NOMODS),,modules)
+binary: build $(if $(NOMODS),,$(bldbase)/modules-stamp)
         dh_testdir
         dh_testroot
-        dh_clean -k
+        dh_prep
         dh_installdirs
         tar -xC $(prefix)/opt -f $(builddir)/bin/VirtualBox.tar
@@ -231 +253 @@
         done)
         $(if $(NOQT),,rmdir $(archdir)/icons)
-        $(if $(NOQT),,mv $(archdir)/virtualbox.xml debian/$(verpkg).sharedmimeinfo)
+        $(if $(NOQT),,mv $(archdir)/virtualbox.xml $(bldbase)/$(verpkg).sharedmimeinfo)
         install -d -g 0 -o 0 $(prefix)/usr/share/lintian/overrides
         sed \
             -e 's|%VERPKG%|$(verpkg)|g' \
-            debian/lintian-override.in > \
+            $(vboxroot)/debian/lintian-override.in > \
            $(prefix)/usr/share/lintian/overrides/$(verpkg)
         mv $(archdir)/VBox.png \
@@ -241 +263 @@
         mv $(archdir)/src  $(prefix)/usr/share/$(package)
         rm $(archdir)/VBox.sh
-        install -D -g 0 -o 0 -m 644 $(vboxroot)/src/VBox/Installer/linux/VBox.sh $(prefix)/usr/bin/VBox
+        install -D -g 0 -o 0 -m 644 $(instlin)/VBox.sh $(prefix)/usr/bin/VBox
         mv $(archdir)/VBoxSysInfo.sh $(prefix)/usr/share/$(package)
         if [ -r $(archdir)/VBoxDTrace ]; then \
@@ -261 +283 @@
             fi \
             done)
-ifeq ($(ose),)
-        dh_installdocs \
-            $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.qch VirtualBox*.qhc \
-            LICENSE)
-        rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.qch VirtualBox*.qhc \
-            LICENSE)
-        for i in rdesktop-vrdp.tar.gz additions/VBoxGuestAdditions.iso; do \
-            mv $(archdir)/$$i $(prefix)/usr/share/$(package); done
+        dh_installdocs $(addprefix $(archdir)/,UserManual*.pdf LICENSE)
+        mv $(addprefix $(archdir)/,$(if $(HEADLESS),,rdesktop-vrdp.tar.gz) additions/VBoxGuestAdditions.iso) $(prefix)/usr/share/$(package)
         $(if $(HEADLESS),,mv $(archdir)/rdesktop-vrdp $(prefix)/usr/bin)
         $(if $(HEADLESS),,mv $(archdir)/rdesktop-vrdp-keymaps $(prefix)/usr/share/$(package))
-else
-        dh_installdocs \
-            $(archdir)/UserManual*.pdf
-        rm $(addprefix $(archdir)/,UserManual*.pdf)
-        for i in additions/VBoxGuestAdditions.iso; do \
-            mv $(archdir)/$$i $(prefix)/usr/share/$(package); done
-endif
         mv $(archdir) $(prefix)/usr/lib/$(package)
         if [ -f $(prefix)/usr/lib/$(package)/libQt5CoreVBox.so.5 ]; then \
@@ -306 +315 @@
             $(if $(NOSDL),,usr/bin/VBox         usr/bin/VBoxSDL) \
             $(if $(NOSDL),,usr/bin/VBox         usr/bin/vboxsdl) \
-            $(if $(ose),,usr/bin/VBox           usr/bin/VBoxVRDP) \
             usr/bin/VBox                        usr/bin/VBoxHeadless \
             usr/bin/VBox                        usr/bin/vboxheadless \
@@ -320 +328 @@
             usr/share/virtualbox/src/vboxhost   usr/src/vboxhost-$(ver)
         $(if $(NOMODS),,dh_installmodules)
+        rm -f $(bldbase)/changelog
         sed -e 's|%VER%|$(debver)|g' \
             -e 's|%DATE%|$(shell date -R)|g' \
             -e 's|%DEBREL%|$(subst _,~,$(debrel))|g' \
             -e 's|%VERPKG%|$(verpkg)|g' \
-            debian/changelog.in > debian/changelog
+            $(debroot)/debian/changelog.in > $(bldbase)/changelog
         dh_installdebconf
         dh_installchangelogs
@@ -330 +339 @@
         dh_installmime
         dh_link
-ifeq ($(DEBUG),)
+  ifeq ($(DEBUG),)
         dh_strip --keep-debug \
             $(addprefix --exclude=lib,$(addsuffix VBox.so.5,\
-              Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport Qt5OpenGL Qt5DBus Qt5XcbQpa Qt5X11Extras)) \
-            --exclude=libqxcb.so --exclude=libqsqlite.so --exclude=libqxcb-glx-integration.so
-endif
-        mkdir -p $(current)/debian/$(verpkg)-dbg/usr/lib/$(package)
-        mv $(prefix)/usr/lib/$(package)/*.debug $(current)/debian/$(verpkg)-dbg/usr/lib/$(package)
-ifeq ($(DEBUG),)
-        mv $(prefix)/usr/lib/debug $(current)/debian/$(verpkg)-dbg/usr/lib
-endif
-        $(firstword $(shell which dh_python2) $(shell which dh_python3))
-        dh_compress -X.pdf -X LICENSE -X.py
+              Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport Qt5OpenGL Qt5DBus Qt5XcbQpa Qt5X11Extras))
+  endif
+        mkdir -p $(bldbase)/$(verpkg)-dbg/usr/lib/$(package)
+        mv $(prefix)/usr/lib/$(package)/*.debug $(bldbase)/$(verpkg)-dbg/usr/lib/$(package)
+  ifeq ($(DEBUG),)
+        mv $(prefix)/usr/lib/debug $(bldbase)/$(verpkg)-dbg/usr/lib
+  endif
+        $(firstword $(shell which dh_python3) $(shell which dh_python2))
+        dh_compress -X.pdf -X.qch -X.qhc -X LICENSE -X.py
         dh_fixperms
         dh_makeshlibs
@@ -355 +363 @@
         dh_md5sums
         dh_builddeb --destdir $(pkgdir) -- -Zxz
+ endif
+
+.PHONY: binary configure build clean
 endif
-
-.PHONY: binary modules binary-arch binary-indep clean checkroot

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

@@ -25 +25 @@
 #  NOSUBVER=1       disable generation of the sub-version field (which is
 #                   either the subversion rev [if available] or the build date)
-#  NODOCS=1         don't build docs, use precompiled UserManual.pdf and
-#                   maybe VirtualBox.qch and VirtualBox.qhc from $(vboxroot)/prebuild
+#  NODOCS=1         don't build docs, use precompiled UserManual*.pdf and
+#                   maybe UserManual*.qch and UserManual*.qhc from $(vboxroot)/prebuild
 #  NOMODS=1         don't build any module
 #  NOQT=1           don't build the Qt GUI
@@ -34 +34 @@
 #  HEADLESS=1       build the headless version
 #  VNC=1            build VNC code
-#  NOWEBSVC=1       don't build the webservice API, default for OSE
+#  NOWEBSVC=1       don't build the webservice API
 #  STAGEDISO=<path> don't build the VBoxAdditions, use the precompiled .iso
-#  STAGEDQHELP=<path> use VirtualBox*.qch and VirtualBox*.qhc from this directory
 #  PKGDIR=<path>    where to store the final package(s)
 #  svn_revision=xxx do not depend on subversion being available, but use this
 #                   hard-coded revision number instead
 #
-# NODOCS will be set if UserManual*.pdf is placed in $(vboxroot)/prebuild.
+# NODOCS will be set if UserManual*.pdf, UserManual*.qch and UserManual*.qhc are
+# placed in $(vboxroot)/prebuild.
 # STAGEDISO will be set if VBoxGuestAdditions.iso is placed there.
-# STAGEDQHELP will be set if VirtualBox*.qch and VirtualBox*.qhc is placed there.
-# VirtualBox*.qch and VirtualBox*.qhc are used if they are provided, but never
-# attempted to be built.
-#
-# Wine will not be required if either NODOCS or STAGEDISO are set.
-
-ifeq ($(wildcard rpm/rules),)
-$(error call rpm/rules from src/VBox/Installer/linux)
-endif
+#
+# Wine will not be required if STAGEDISO is set.
 
 verpkg   := VirtualBox-6.1
-current  := $(shell pwd)
-vboxroot := $(shell while ! test -r configure && ! test "$PWD" = "/"; do cd ..; done; pwd)
+vboxroot := $(shell while ! test -r configure && ! test "$$PWD" = "/"; do cd ..; done; pwd)
+instlin  := $(vboxroot)/src/VBox/Installer/linux
 pkgdir   := $(if $(PKGDIR),$(PKGDIR),$(shell cd $(vboxroot)/..; pwd))
-bldbase  := $(if $(PATH_OUT_BASE),$(PATH_OUT_BASE),$(vboxroot))/out/rpm
+outdir   := $(if $(PATH_OUT_BASE),$(PATH_OUT_BASE),$(vboxroot))/out
+bldbase  := $(outdir)/rpm
 builddir := $(bldbase)/builddir
 stagedir := $(bldbase)/rpmbuild
 rpmlib   := $(shell if [ `uname -m` = "x86_64" ]; then echo "lib64"; else echo "lib"; fi)
-chrarch  := $(shell if [ `uname -m` = "x86_64" ]; then echo "amd64"; else echo "x86"; fi)
 verfile  := $(builddir)/version-generated.mk
 ose      := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1))
+chrarch  := $(shell if [ `uname -m` = "x86_64" ]; then echo "amd64"; else echo "x86"; fi)
 -include $(vboxroot)/SVN_REVISION
-svnrev   :=$(if $(svn_revision),$(svn_revision),)
+svnrev   := $(if $(svn_revision),$(svn_revision),)
 
 NOMODS   ?= $(ose)
 NOQT     ?= $(HEADLESS)
-NOWEBSVC ?= $(ose)
-NODOCS   ?= $(if $(wildcard $(vboxroot)/prebuild/UserManual*.pdf),1,)
+NOSDL    ?= $(HEADLESS)
+NOWEBSVC ?=
+EFI      ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxEFI32.fd $(vboxroot)/prebuild/VBoxEFI64.fd),1,)
+NODOCS   ?= $(if $(wildcard $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual.qhc)),1,)
 STAGEDISO ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxGuestAdditions.iso),$(vboxroot)/prebuild,)
-STAGEDQHELP ?= $(if $(and $(wildcard $(vboxroot)/prebuild/VirtualBox*.qch),$(wildcard $(vboxroot)/prebuild/VirtualBox*.qhc)),$(vboxroot)/prebuild,)
-NOWINE   := $(if $(NODOCS),1,$(if $(STAGEDISO),1,$(ose)))
+NOWINE   := $(if $(STAGEDISO),1,$(ose))
+
+ifneq ($(STAGEDISO),)
+ ifeq ($(wildcard $(STAGEDISO)/VBoxGuestAdditions.iso),)
+  $(error STAGEDISO='$(STAGEDISO)/VBoxGuestAdditions.iso' not found)
+ endif
+endif
+
+ifeq ($(wildcard rpm/rules),)
+$(error call rpm/rules from src/VBox/Installer/linux)
+endif
 
 ifneq ($(MAKECMDGOALS),clean)
@@ -106 +111 @@
  endif
 
- rpmdist := $(strip $(shell grep $(rpmrel) $(current)/distributions_rpm | cut -d'=' -f2))
+ rpmdist := $(strip $(shell grep $(rpmrel) $(instlin)/distributions_rpm | cut -d'=' -f2))
  ifeq ($(rpmdist),)
   $(error Cannot detect package distribution (rpmrel=$(rpmrel)))
@@ -120 +125 @@
   $(error failed to detect the .spec file (rpmrel=$(rpmrel)))
  endif
-
- # contrary to debian we need the verfile earlier to get the correct rpmname into the bld_flags
- include $(verfile)
-$(verfile): $(bldbase)/configure-stamp
-        . $(bldbase)/env.sh && kmk -C $(vboxroot) $(verfile) $(bld_flags)
-
-endif
-
+endif
+
+ifneq ($(wildcard $(verfile)),)
+include $(verfile)
 ver      := $(VBOX_VERSION_STRING)
-rpmver   :=$(ver)$(if $(NOSUBVER),,$(if $(svn_revision),_$(svn_revision),)$(VERSUFFIX)$(if $(HEADLESS),_headless,)$(if $(DEBUG),_dbg,))
+svnver   := $(if $(NOSUBVER),,$(if $(svn_revision),-$(svn_revision),$(shell if \
+                svn info $(vboxroot) > /dev/null 2>&1; then \
+                svn info $(vboxroot)|sed -e "s/^Revision: \(.*\)/-\1/;t;d"; else \
+                date +"-%Y%m%d"; fi)))
+rpmver   := $(ver)$(subst -,_,$(svnver))$(VERSUFFIX)$(if $(HEADLESS),_headless,)$(if $(DEBUG),_dbg,)
 archdir  := $(bldbase)/VirtualBox-$(ver)
 rpmname  := $(verpkg)-$(rpmver)_$(rpmrel)
+endif
 
 # never ship any modules
 instmod  :=
-
-ifneq ($(STAGEDISO),)
- ifeq ($(wildcard $(STAGEDISO)/VBoxGuestAdditions.iso),)
-  $(error STAGEDISO='$(STAGEDISO)/VBoxGuestAdditions.iso' not found)
- endif
-endif
 
 ifeq ($(wildcard /usr/share/doc/packages/bash),)
@@ -157 +157 @@
 # EL5 ships Python 2.4 while our Python support requires Python 2.6 or later
 cfg_flags := $(if $(NOQT),--disable-qt,) \
-             $(if $(NOSDL),--disable-vboxsdl,) \
-             $(if $(filter el5 el6,$(rpmrel)),--build-libvpx,) \
-             $(if $(filter el5 el6,$(rpmrel)),--build-libopus,) \
-             $(if $(filter el5 el6,$(rpmrel)),--build-libssl,) \
-             $(if $(filter el5,$(rpmrel)),--build-libcurl,) \
-             $(if $(filter el5,$(rpmrel)),--disable-sdl-ttf,) \
-             $(if $(filter el5,$(rpmrel)),--disable-pulse,) \
-             $(if $(filter el5,$(rpmrel)),--disable-python,) \
-             $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
-             $(if $(HEADLESS),--build-headless,) \
-             $(if $(DEBUG),--build-debug,) \
-             $(if $(NOWINE),,--setup-wine) \
-             $(if $(NOWEBSVC),,$(if $(ose),--enable-webservice,)) \
-             $(if $(VNC),--enable-vnc,) \
-             $(if $(PATH_OUT_BASE),--out-base-dir=$(PATH_OUT_BASE),) \
-             --disable-extpack
+    $(if $(NOSDL),--disable-vboxsdl,) \
+    $(if $(filter el5 el6,$(rpmrel)),--build-libvpx,) \
+    $(if $(filter el5 el6,$(rpmrel)),--build-libopus,) \
+    $(if $(filter el5 el6,$(rpmrel)),--build-libssl,) \
+    $(if $(filter el5,$(rpmrel)),--build-libcurl,) \
+    $(if $(filter el5,$(rpmrel)),--disable-sdl-ttf,) \
+    $(if $(filter el5,$(rpmrel)),--disable-pulse,) \
+    $(if $(filter el5,$(rpmrel)),--disable-python,) \
+    $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
+    $(if $(HEADLESS),--build-headless,) \
+    $(if $(DEBUG),--build-debug,) \
+    $(if $(NOWINE),,--setup-wine) \
+    $(if $(VNC),--enable-vnc,) \
+    $(if $(PATH_OUT_BASE),--out-base-dir=$(PATH_OUT_BASE),) \
+    --disable-extpack
 
 bld_flags := AUTOCFG=$(bldbase)/AutoConfig.kmk \
-             LOCALCFG=$(current)/rpm/LocalConfig.kmk \
-             PATH_OUT=$(builddir) \
-             VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \
-             VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \
-             $(if $(filter el5 el6,$(rpmrel)),,VBOX_WITH_VMSVGA3D=1) \
-             VBOX_DO_STRIP= \
-             $(if $(filter el5,$(rpmrel)),VBOX_BLD_PYTHON=$(strip \
-                $(firstword $(wildcard /usr/local/bin/python2.7) $(wildcard /usr/bin/python2.7) \
-                $(wildcard /usr/bin/python2.6) $(wildcard /usr/bin/python2) $(wildcard /usr/bin/python))),) \
-             $(doc_dir) \
-             $(if $(STAGEDQHELP),VBOX_WITH_DOCS_QHELP=1,) \
-             VBOX_PACKAGE_DIST=$(rpmdist) \
-             $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
-             $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
-             $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
-             $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
-             $(if $(filter el5,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
-
+    LOCALCFG=$(instlin)/rpm/LocalConfig.kmk \
+    PATH_OUT=$(builddir) \
+    VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \
+    VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \
+    $(if $(filter el5 el6,$(rpmrel)),,VBOX_WITH_VMSVGA3D=1) \
+    VBOX_DO_STRIP= \
+    $(if $(filter el5,$(rpmrel)),VBOX_BLD_PYTHON=$(firstword $(wildcard \
+      /usr/local/bin/python2.7 /usr/bin/python2.7 /usr/bin/python2.6 /usr/bin/python2 /usr/bin/python)),) \
+    $(if $(filter el5,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1) \
+    $(doc_dir) \
+    VBOX_PACKAGE_DIST=$(rpmdist) \
+    $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
+    $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
+    $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
+    $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,)
+
+configure: $(bldbase)/configure-stamp
 $(bldbase)/configure-stamp:
         mkdir -p $(bldbase)
@@ -198 +196 @@
         touch $@
 
-$(bldbase)/build-stamp: $(bldbase)/configure-stamp
+build: $(bldbase)/configure-stamp $(bldbase)/build-stamp
+$(bldbase)/build-stamp $(verfile): $(bldbase)/configure-stamp
         . $(bldbase)/env.sh && kmk -C $(vboxroot) $(bld_flags) $(if $(NOPARALLEL),-j1,) all
-        $(if $(NODOCS),cp $(vboxroot)/prebuild/UserManual*.pdf $(builddir)/bin,)
-        $(if $(STAGEDQHELP),cp $(STAGEDQHELP)/VirtualBox*.qch $(STAGEDQHELP)/VirtualBox*.qhc $(builddir)/bin,)
+        # Files from prebuild go to (builddir)/bin to be used during the
+        # packing stage, overriding what the build did/would produce.
+        $(if $(NODOCS),cp $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual.qhc) $(builddir)/bin,)
         $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI32.fd $(builddir)/bin,)
         $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI64.fd $(builddir)/bin,)
@@ -213 +213 @@
             VBOX_PATH_ADDITIONS.linux.amd64=$(builddir)/bin/additions \
             packing
-        touch $@
+        touch $(bldbase)/build-stamp
 
 clean:
@@ -219 +219 @@
         rm -rf $(stagedir)
         rm -rf $(builddir)
+        rm -rf $(bldbase)/wine.*
         rm -rf $(bldbase)/VirtualBox-*
         rm -f $(bldbase)/VirtualBox.tar $(bldbase)/VirtualBox.tar.bz2
+        rm -f $(bldbase)/build-stamp $(bldbase)/configure-stamp
+        rm -f $(bldbase)/AutoConfig.kmk $(bldbase)/configure.log $(bldbase)/env.sh
         rm -f $(bldbase)/VirtualBox.spec
-        rm -f $(bldbase)/build-stamp $(bldbase)/configure-stamp $(bldbase)/configure.log
-        rm -f $(bldbase)/AutoConfig.kmk $(bldbase)/env.sh
         if [ -d $(bldbase) ]; then rmdir $(bldbase); fi
 
 ifeq ($(VBOX_VERSION_MAJOR),)
-binary: $(bldbase)/build-stamp $(verfile)
-        $(MAKE) -f rpm/rules binary
+binary: build $(verfile)
+        +$(MAKE) -f rpm/rules binary
+
 else
-binary: $(bldbase)/build-stamp
+binary: build
         rm -rf $(bldbase)/VirtualBox-*
         tar -xf $(builddir)/bin/VirtualBox.tar -C $(bldbase)
@@ -248 +250 @@
             -e 's|%INITSCRIPTS%|$(if $(filter fedora,$(rpmspec)),initscripts,)|g' \
             -e 's|%NETTOOLS%|$(if $(filter fedora18 fedora19 fedora20 fedora21 el5 openSUSE110 openSUSE111 openSUSE112 openSUSE113 openSUSE114,$(rpmrel)),net-tools,iproute)|g' \
-            $(current)/rpm/VirtualBox.tmpl.spec > $(archdir)/VirtualBox.spec
+            $(instlin)/rpm/VirtualBox.tmpl.spec > $(archdir)/VirtualBox.spec
         mv $(bldbase)/VirtualBox-$(ver) $(bldbase)/$(rpmname)
         cp ../../../../tools/linux.$(chrarch)/bin/chrpath $(bldbase)/$(rpmname) || true
@@ -263 +265 @@
 endif
 
-.PHONY: binary clean
+.PHONY: binary configure build clean