Changeset 61512 in vbox for trunk/src/VBox

Timestamp:

Jun 7, 2016 5:54:37 AM (9 years ago)

Author:

vboxsync

Message:

deb/rpm: fix for 32-bit

Location:

trunk/src/VBox/Installer/linux

Files:

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

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

@@ -57 +57 @@
 verfile  := $(builddir)/version-generated.mk
 ose      := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1))
-arch     := $(shell if [ `uname -m` = "x86_64" ]; then echo "amd64"; else echo "i386"; fi)
+chrarch  := $(shell if [ `uname -m` = "x86_64" ]; then echo "amd64"; else echo "x86"; fi)
 -include $(vboxroot)/SVN_REVISION
 svnrev   :=$(if $(svn_revision),$(svn_revision),)
@@ -284 +284 @@
         mv $(archdir) $(prefix)/usr/lib/$(package)
         if [ -f $(prefix)/usr/lib/$(package)/libQt5CoreVBox.so.5 ]; then \
-            ../../../../tools/linux.$(arch)/bin/chrpath rpm/$(rpmname)chrpath \
+            ../../../../tools/linux.$(chrarch)/bin/chrpath rpm/$(rpmname)chrpath \
                 --keepgoing --replace /usr/lib/$(package) \
                 $(prefix)/usr/lib/$(package)/*.so.5 \

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

@@ -67 +67 @@
 builddir := $(current)/rpm/builddir
 rpmlib   := $(shell if [ `uname -m` = "x86_64" ]; then echo "lib64"; else echo "lib"; fi)
-arch     := $(shell if [ `uname -m` = "x86_64" ]; then echo "amd64"; else echo "i386"; fi)
+chrarch  := $(shell if [ `uname -m` = "x86_64" ]; then echo "amd64"; else echo "x86"; fi)
 verfile  := $(builddir)/version-generated.mk
 ose      := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1))
@@ -241 +241 @@
             rpm/VirtualBox.tmpl.spec > $(archdir)/VirtualBox.spec
         mv rpm/VirtualBox-$(ver) rpm/$(rpmname)
-        cp ../../../../tools/linux.$(arch)/bin/chrpath rpm/$(rpmname)
+        cp ../../../../tools/linux.$(chrarch)/bin/chrpath rpm/$(rpmname)
         tar -cf rpm/VirtualBox.tar -C rpm $(rpmname)
         rm -f rpmbuild/RPMS/*/VirtualBox*rpm