VirtualBox

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


Ignore:
Timestamp:
Mar 11, 2013 4:14:29 PM (12 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
84216
Message:

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

Location:
trunk/src/VBox/Installer/linux
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Installer/linux/debian/rules

    r44969 r44993  
    5353ose      := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1))
    5454-include $(vboxroot)/SVN_REVISION
    55 svnrev   :=$(if $(svn_revision),$(svn_revision),0)
     55svnrev   :=$(if $(svn_revision),$(svn_revision),)
    5656
    5757NOMODS   ?= $(ose)
     
    116116             $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \
    117117             VBOX_PACKAGE_DIST=$(debdist) \
    118              VBOX_SVN_REV=$(svnrev) \
     118             $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
    119119             $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
    120120             $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
     
    141141        . debian/env.sh && kmk -C $(vboxroot) $(bld_flags) \
    142142            VBOX_NO_LINUX_RUN_INSTALLER=1 \
    143             VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86-r$(svnrev).tar.bz2 \
    144             VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64-r$(svnrev).tar.bz2 \
     143            VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86.tar.bz2 \
     144            VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64.tar.bz2 \
    145145            VBOX_PATH_ADDITIONS.linux.x86=$(builddir)/bin/additions \
    146146            VBOX_PATH_ADDITIONS.linux.amd64=$(builddir)/bin/additions \
  • trunk/src/VBox/Installer/linux/rpm/rules

    r44675 r44993  
    6363ose      := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1))
    6464-include $(vboxroot)/SVN_REVISION
    65 svnrev   :=$(if $(svn_revision),$(svn_revision),0)
     65svnrev   :=$(if $(svn_revision),$(svn_revision),)
    6666
    6767NOMODS   ?= $(ose)
     
    159159             $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \
    160160             VBOX_PACKAGE_DIST=$(rpmdist) \
    161              VBOX_SVN_REV=$(svnrev) \
     161             $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
    162162             $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
    163163             $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
     
    180180        . rpm/env.sh && kmk -C $(vboxroot) $(bld_flags) \
    181181            VBOX_NO_LINUX_RUN_INSTALLER=1 \
    182             VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86-r$(svnrev).tar.bz2 \
    183             VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64-r$(svnrev).tar.bz2 \
     182            VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86.tar.bz2 \
     183            VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64.tar.bz2 \
    184184            VBOX_PATH_ADDITIONS.linux.x86=$(builddir)/bin/additions \
    185185            VBOX_PATH_ADDITIONS.linux.amd64=$(builddir)/bin/additions \
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette