Changeset 40390 in vbox for trunk/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/debian/rules (modified) (11 diffs)

trunk/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
@@ -27 +27 @@
 #  NOMODS=1         don't build any module
 #  NOQT=1           don't build the Qt GUI
+#  EFI=1            include the EFI binary from prebuild
 #  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
+#  PKGDIR=<path>    where to store the final package(s)
 #  BLEEDING_EDGE=xyz
 
@@ -36 +39 @@
 current  := $(shell pwd)
 vboxroot := $(shell pwd)
-pkgdir   := ..
+pkgdir   := $(if $(PKGDIR),$(PKGDIR),$(shell cd ..; pwd))
 builddir := $(current)/debian/builddir
 moddir   := $(current)/debian/modules
@@ -70 +73 @@
 
 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= \
@@ -88 +93 @@
              $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \
              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,) \
@@ -106 +111 @@
         $(if $(NODOCS),cp $(vboxroot)/prebuild/UserManual*.pdf $(builddir)/bin,)
         $(if $(NODOCS),cp $(vboxroot)/prebuild/VirtualBox*.chm $(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,)
@@ -163 +170 @@
         rm -f debian/$(verpkg).mime
         rm -rf $(builddir) $(moddir)
+        rm -rf debian/wine.*
         dh_clean
 
@@ -236 +244 @@
             $(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 \
@@ -269 +278 @@
 endif
         rmdir $(archdir)/additions
+        $(if $(VNC),rmdir $(archdir)/ExtensionPacks)
         rmdir $(archdir)
         rmdir $(prefix)/opt
@@ -291 +301 @@
             -e 's|%DEBIAN%|yes|g' \
             -e 's|%PACKAGE%|virtualbox|g' \
+            -e "s|%VERSION%|$(VBOX_VERSION_STRING)|g" \
             -e "s|%GROUP%|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)|g" \
             $(vboxroot)/src/VBox/Installer/linux/vboxdrv.sh.in > debian/vboxdrv.init
@@ -343 +354 @@
         dh_installdeb
         dh_perl
-        dh_shlibdeps
+        LD_LIBRARY_PATH=$(prefix)/usr/lib/virtualbox dh_shlibdeps
         dh_gencontrol -- \
           -Valsa=$(if $(HEADLESS),,libasound2) \