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

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+.

File:

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

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' \