Changeset 40407 in vbox

Timestamp:

Mar 9, 2012 9:43:13 AM (13 years ago)

Author:

vboxsync

Message:

rpm/rules: fix building without STAGEDISO, and decrease differences to debian code further

File:

• trunk/src/VBox/Installer/linux/rpm/rules (modified) (2 diffs)

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

@@ -111 +111 @@
 
 ifneq ($(STAGEDISO),)
-ifeq ($(wildcard $(STAGEDISO)/VBoxGuestAdditions.iso),)
-$(error STAGEDISO='$(STAGEDISO)/VBoxGuestAdditions.iso' not found)
-endif
+ ifeq ($(wildcard $(STAGEDISO)/VBoxGuestAdditions.iso),)
+  $(error STAGEDISO='$(STAGEDISO)/VBoxGuestAdditions.iso' not found)
+ endif
 endif
 
@@ -177 +177 @@
         . 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_PATH_ADDITIONS.linux.x86=$(builddir)/bin/additions \
+            VBOX_PATH_ADDITIONS.linux.amd64=$(builddir)/bin/additions \
             packing
         touch rpm/build-stamp