Changeset 40390 in vbox for trunk/src/VBox/Installer/linux/debian

Timestamp:

Mar 7, 2012 1:58:08 PM (13 years ago)

Author:

vboxsync

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

76699

Message:

deb/rpm: fix package building, VNC extension pack is integrated if requested, various other cleanups in this area

File:

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

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

@@ -1 +1 @@
 #!/usr/bin/make -f
 #
-# Copyright (C) 2006-2011 Oracle Corporation
+# Copyright (C) 2006-2012 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -32 +32 @@
 #  NOMODS=1         don't build any module
 #  NOQT=1           don't build the Qt GUI
-#  EFI              include the EFI binary from prebuild
+#  EFI=1            include the EFI binary from prebuild
 #  VERSUFFIX=<suffix> set a particular package version suffix (e.g. _customer)
 #  HEADLESS=1       build the headless version
+#  VNC=1            build VNC code
 #  NOWEBSVC=1       don't build the webservice API, default for OSE
 #  STAGEDISO=<path> don't build the VBoxAdditions, use the precompiled .iso
@@ -57 +58 @@
 NOQT     ?= $(HEADLESS)
 NOWEBSVC ?= $(ose)
-NOWINE   := $(if $(NODOCS),$(if $(STAGEDISO),1,),)
+NOWINE   := $(if $(NODOCS),$(if $(STAGEDISO),1,),)$(ose)
 
 ifneq ($(wildcard $(verfile)),)
@@ -94 +95 @@
 
 cfg_flags := $(if $(NOQT),--disable-qt,) \
+             $(if $(filter _Ubuntu_hardy,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
-             $(if $(filter _Ubuntu_hardy,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
              $(if $(HEADLESS),--build-headless,) \
              $(if $(DEBUG),--build-debug,) \
              $(if $(NOWINE),,--setup-wine) \
              $(if $(NOWEBSVC),,--enable-webservice) \
+             $(if $(VNC),--enable-vnc,) \
              --disable-extpack
 
 bld_flags := AUTOCFG=$(current)/debian/AutoConfig.kmk \
              LOCALCFG=$(current)/debian/LocalConfig.kmk \
-             PATH_OUT=$(current)/debian/builddir \
+             PATH_OUT=$(builddir) \
              VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \
+             VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \
              VBOX_DO_STRIP= \
              VBOX_DO_STRIP_MODULES= \
@@ -113 +116 @@
              VBOX_PACKAGE_DIST=$(debdist) \
              VBOX_SVN_REV=$(svnrev) \
-             $(if $(NODOCS),VBOX_WITH_DOCS= ,)\
+             $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
              $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
              $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
@@ -182 +185 @@
         dh_testdir
         dh_testroot
-        rm -f debian/changelog debian/preinst debian/postinst debian/prerm
+        rm -f debian/changelog
+        rm -f debian/preinst debian/postinst debian/prerm
         rm -f debian/$(package).init debian/vboxdrv.init
         rm -f debian/vboxballoonctrl-service.init debian/vboxweb-service.init
@@ -264 +268 @@
             $(if $(NOWEBSVC),,vboxwebsrv webtest); do \
             mv $(archdir)/$$i $(prefix)/usr/lib/$(package); done
+        $(if $(VNC),mv $(archdir)/ExtensionPacks/VNC $(prefix)/usr/lib/$(package)/ExtensionPacks,)
         mv $(archdir)/VBoxTunctl $(prefix)/usr/bin
         $(if $(NOMODS),,for d in $(moddir)/*; do \
@@ -297 +302 @@
 endif
         rmdir $(archdir)/additions
+        $(if $(VNC),rmdir $(archdir)/ExtensionPacks)
         rmdir $(archdir)
         rmdir $(prefix)/opt