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

Timestamp:

Feb 11, 2011 8:06:56 AM (14 years ago)

Author:

vboxsync

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

69977

Message:

deb/rpm: allow to overwrite pkgdir

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/rules (modified) (2 diffs)
• rpm/rules (modified) (2 diffs)

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

@@ -37 +37 @@
 #  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
 
@@ -43 +44 @@
 current  := $(shell pwd)
 vboxroot := $(shell cd ../../../..; pwd)
-pkgdir   := $(shell cd ../../../../..; pwd)
+pkgdir   := $(if $(PKGDIR),$(PKGDIR),$(shell cd ../../../../..; pwd))
 builddir := $(current)/debian/builddir
 moddir   := $(current)/debian/modules

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

@@ -33 +33 @@
 current  := $(shell pwd)
 vboxroot := $(shell cd ../../../../; pwd)
-pkgdir   := $(shell cd ../../../../..; pwd)
+pkgdir   := $(if $(PKGDIR),$(PKGDIR),$(shell cd ../../../../..; pwd))
 builddir := $(current)/rpm/builddir
 rpmlib   := $(shell if [ `uname -m` = "x86_64" ]; then echo "lib64"; else echo "lib"; fi)
@@ -188 +188 @@
         rm -f /usr/src/packages/SPECS/*
         rpmbuild -tb --clean rpm/VirtualBox.tar.bz2
-        mv /usr/src/packages/RPMS/*/$(verpkg)-debug* $(vboxroot)/.. || true
+        mv /usr/src/packages/RPMS/*/$(verpkg)-debug* $(pkgdir) || true
         file=`find /usr/src/packages/RPMS -name $(verpkg)*rpm -print`; \
             mv $$file $(pkgdir)