Changeset 61488 in vbox for trunk/src/VBox/Installer/linux/rpm

Timestamp:

Jun 6, 2016 11:51:30 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

107820

Message:

deb/rpm: more fixes for chrpath

Location:

trunk/src/VBox/Installer/linux/rpm

Files:

• VirtualBox.tmpl.spec (modified) (1 diff)
• rules (modified) (1 diff)

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -166 +166 @@
 mv * $RPM_BUILD_ROOT/usr/lib/virtualbox
 if [ -f $RPM_BUILD_ROOT/usr/lib/virtualbox/libQt5CoreVBox.so.5 ]; then
-  chrpath --keepgoing --replace /usr/lib/virtualbox \
+  $RPM_BUILD_ROOT/usr/lib/virtualbox/chrpath --keepgoing --replace /usr/lib/virtualbox \
     $RPM_BUILD_ROOT/usr/lib/virtualbox/*.so.5 \
-    $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/platforms/*.so
+    $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/platforms/*.so || true
   echo "[Paths]" > $RPM_BUILD_ROOT/usr/lib/virtualbox/qt.conf
   echo "Plugins = /usr/lib/virtualbox/plugins" >> $RPM_BUILD_ROOT/usr/lib/virtualbox/qt.conf
+  rm $RPM_BUILD_ROOT/usr/lib/virtualbox/chrpath
 fi
 ln -s ../VBoxVMM.so $RPM_BUILD_ROOT/usr/lib/virtualbox/components/VBoxVMM.so

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

@@ -241 +241 @@
             rpm/VirtualBox.tmpl.spec > $(archdir)/VirtualBox.spec
         mv rpm/VirtualBox-$(ver) rpm/$(rpmname)
+        cp ../../../../tools/linux.amd64/bin/chrpath rpm/$(rpmname)
         tar -cf rpm/VirtualBox.tar -C rpm $(rpmname)
         rm -f rpmbuild/RPMS/*/VirtualBox*rpm