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

Timestamp:

Aug 30, 2019 4:14:40 PM (6 years ago)

Author:

vboxsync

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

133018

Message:

Installer/linux: Introduce python3 support in the RPM creation (for building it still uses python2, which is a separate issue). Also use the same debugsource/debuginfo tweak on OL8 as with Fedora 27+.

Location:

trunk/src/VBox/Installer/linux/rpm

Files:

• VirtualBox.tmpl.spec (modified) (3 diffs)
• rules (modified) (2 diffs)

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

@@ -40 +40 @@
 
 %MACROSPYTHON%
+%if %{?__python3:1}%{!?__python3:0}
+%define vbox_python %{__python3}
+%else
+%define vbox_python %{__python}
+%endif
 
 # our Qt5 libs are built on EL5 with ld 2.17 which does not provide --link-id=
@@ -46 +51 @@
 # Remove source code from debuginfo package, needed for Fedora 27 and later
 # as we build the binaries before creating the RPMs.
-
 %if 0%{?fedora} >= 27
+%undefine _debugsource_packages
+%undefine _debuginfo_subpackages
+%endif
+%if 0%{?rhel} >= 8
 %undefine _debugsource_packages
 %undefine _debuginfo_subpackages
@@ -90 +98 @@
 (export VBOX_INSTALL_PATH=/usr/lib/virtualbox && \
   cd ./sdk/installer && \
-  %{__python} ./vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT)
+  %{vbox_python} ./vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT)
 %endif
 rm -rf sdk/installer

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

@@ -164 +164 @@
              VBOX_DO_STRIP= \
              $(if $(filter el5,$(rpmrel)),VBOX_BLD_PYTHON=$(strip \
-                $(firstword $(wildcard /usr/local/bin/python2.7) \
-                $(wildcard /usr/bin/python2.6) $(wildcard /usr/bin/python))),) \
+                $(firstword $(wildcard /usr/local/bin/python2.7) $(wildcard /usr/bin/python2.7) \
+                $(wildcard /usr/bin/python2.6) $(wildcard /usr/bin/python2) $(wildcard /usr/bin/python))),) \
              $(doc_dir) \
              $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \
@@ -222 +222 @@
             -e 's|%SPEC%|$(rpmspec)|g' \
             -e 's|%PYTHON%|$(if $(filter el5,$(rpmrel)),,with_python)|g' \
-            -e 's|%MACROSPYTHON%|$(if $(wildcard /usr/lib/rpm/macros.python),%include /usr/lib/rpm/macros.python,)|g' \
+            -e 's|%MACROSPYTHON%|$(if $(wildcard /usr/lib/rpm/macros.d/macros.python3),,$(if $(wildcard /usr/lib/rpm/macros.python),%include /usr/lib/rpm/macros.python,))|g' \
             -e 's|%INSTMOD%|$(instmod)|g' \
             -e 's|%LIBASOUND%|$(if $(filter lib64,$(rpmlib)),libasound.so.2()(64bit),libasound.so.2)|g' \