Changeset 44993 in vbox

Timestamp:

Mar 11, 2013 4:14:29 PM (12 years ago)

Author:

vboxsync

Message:

Linux OSE builds: don't pass SVN revision = 0

Location:

trunk

Files:

• debian/rules (modified) (3 diffs)
• src/VBox/Additions/linux/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/linux/debian/rules (modified) (3 diffs)
• src/VBox/Installer/linux/rpm/rules (modified) (3 diffs)

trunk/debian/rules

@@ -46 +46 @@
 verfile  := $(builddir)/version-generated.mk
 ose      := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1))
-svnrev   := 0
 NOMODS   ?= $(ose)
 NOQT     ?= $(HEADLESS)
@@ -92 +91 @@
              VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\"" \
              $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \
-             VBOX_SVN_REV=$(svnrev) \
+             $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
              $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
              $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
@@ -117 +116 @@
         . debian/env.sh && kmk -C $(vboxroot) $(bld_flags) \
             VBOX_NO_LINUX_RUN_INSTALLER=1 \
-            VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86-r$(svnrev).tar.bz2 \
-            VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64-r$(svnrev).tar.bz2 \
+            VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86.tar.bz2 \
+            VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64.tar.bz2 \
             VBOX_PATH_ADDITIONS.linux.x86=$(builddir)/bin/additions \
             VBOX_PATH_ADDITIONS.linux.amd64=$(builddir)/bin/additions \

trunk/src/VBox/Additions/linux/Makefile.kmk

@@ -88 +88 @@
 #
 VBOX_SELINUX_CMPLD := $(PATH_SUB_CURRENT)/selinux-fedora/vbox_x11.pp
-VBOX_LNX_ADD_ARCHIVE.x86   := $(PATH_OUT_BASE)/linux.x86/$(KBUILD_TYPE)/bin/additions/VBoxGuestAdditions-x86-r$(VBOX_SVN_REV).tar.bz2
-VBOX_LNX_ADD_ARCHIVE.amd64 := $(PATH_OUT_BASE)/linux.amd64/$(KBUILD_TYPE)/bin/additions/VBoxGuestAdditions-amd64-r$(VBOX_SVN_REV).tar.bz2
+VBOX_LNX_ADD_ARCHIVE.x86   := $(PATH_OUT_BASE)/linux.x86/$(KBUILD_TYPE)/bin/additions/VBoxGuestAdditions-x86.tar.bz2
+VBOX_LNX_ADD_ARCHIVE.amd64 := $(PATH_OUT_BASE)/linux.amd64/$(KBUILD_TYPE)/bin/additions/VBoxGuestAdditions-amd64.tar.bz2
 ifndef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE
- VBOX_LNX_ADD_ARCHIVES := $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions-$(KBUILD_TARGET_ARCH)-r$(VBOX_SVN_REV).tar.bz2
+ VBOX_LNX_ADD_ARCHIVES := $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions-$(KBUILD_TARGET_ARCH).tar.bz2
 else
  VBOX_LNX_ADD_ARCHIVES := \

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

@@ -53 +53 @@
 ose      := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1))
 -include $(vboxroot)/SVN_REVISION
-svnrev   :=$(if $(svn_revision),$(svn_revision),0)
+svnrev   :=$(if $(svn_revision),$(svn_revision),)
 
 NOMODS   ?= $(ose)
@@ -116 +116 @@
              $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \
              VBOX_PACKAGE_DIST=$(debdist) \
-             VBOX_SVN_REV=$(svnrev) \
+             $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
              $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
              $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
@@ -141 +141 @@
         . debian/env.sh && kmk -C $(vboxroot) $(bld_flags) \
             VBOX_NO_LINUX_RUN_INSTALLER=1 \
-            VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86-r$(svnrev).tar.bz2 \
-            VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64-r$(svnrev).tar.bz2 \
+            VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86.tar.bz2 \
+            VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64.tar.bz2 \
             VBOX_PATH_ADDITIONS.linux.x86=$(builddir)/bin/additions \
             VBOX_PATH_ADDITIONS.linux.amd64=$(builddir)/bin/additions \

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

@@ -63 +63 @@
 ose      := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1))
 -include $(vboxroot)/SVN_REVISION
-svnrev   :=$(if $(svn_revision),$(svn_revision),0)
+svnrev   :=$(if $(svn_revision),$(svn_revision),)
 
 NOMODS   ?= $(ose)
@@ -159 +159 @@
              $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \
              VBOX_PACKAGE_DIST=$(rpmdist) \
-             VBOX_SVN_REV=$(svnrev) \
+             $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
              $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
              $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
@@ -180 +180 @@
         . rpm/env.sh && kmk -C $(vboxroot) $(bld_flags) \
             VBOX_NO_LINUX_RUN_INSTALLER=1 \
-            VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86-r$(svnrev).tar.bz2 \
-            VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64-r$(svnrev).tar.bz2 \
+            VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86.tar.bz2 \
+            VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64.tar.bz2 \
             VBOX_PATH_ADDITIONS.linux.x86=$(builddir)/bin/additions \
             VBOX_PATH_ADDITIONS.linux.amd64=$(builddir)/bin/additions \