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

Timestamp:

Jul 27, 2021 3:20:22 PM (3 years ago)

Author:

vboxsync

Message:

debian/rules, rpm/rules: Fix svn_revision variable use.

Location:

trunk/src/VBox/Installer/linux

Files:

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

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

@@ -69 +69 @@
 chrarch  := $(shell if [ `uname -m` = "x86_64" ]; then echo "amd64"; else echo "x86"; fi)
 -include $(vboxroot)/SVN_REVISION
-svnrev   := $(if $(svn_revision),$(svn_revision),)
 
 NOMODS   ?= $(ose)
@@ -144 +143 @@
     VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\"" \
     VBOX_PACKAGE_DIST=$(debdist) \
-    $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
-    $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
+    $(if $(svn_revision),VBOX_SVN_REV=$(svn_revision),) \
+    $(if $(NODOCS),VBOX_WITH_DOCS=,) \
     $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
     $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,)

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

@@ -59 +59 @@
 chrarch  := $(shell if [ `uname -m` = "x86_64" ]; then echo "amd64"; else echo "x86"; fi)
 -include $(vboxroot)/SVN_REVISION
-svnrev   := $(if $(svn_revision),$(svn_revision),)
 
 NOMODS   ?= $(ose)
@@ -185 +184 @@
     $(doc_dir) \
     VBOX_PACKAGE_DIST=$(rpmdist) \
-    $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
-    $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
+    $(if $(svn_revision),VBOX_SVN_REV=$(svn_revision),) \
+    $(if $(NODOCS),VBOX_WITH_DOCS=,) \
     $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
     $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,)