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

Timestamp:

Sep 22, 2016 12:05:35 PM (8 years ago)

Author:

vboxsync

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

110832

Message:

deb/rpm: removed support for ancient distributions; disable VBOX_WITH_PYTHON for el5

File:

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

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

@@ -32 +32 @@
 #  STAGEDISO=<path> don't build the VBoxAdditions, use the precompiled .iso
 #  PKGDIR=<path>    where to store the final package(s)
-#  BLEEDING_EDGE=xyz
 #  svn_revision=xxx do not depend on subversion being available, but use this
 #                   hard-coded revision number instead
@@ -81 +80 @@
 
 ifneq ($(MAKECMDGOALS),clean)
- rpmrel   := $(subst ol,el,$(subst rhel,el,$(shell cat /etc/distname)))
+ rpmrel   := $(subst ol,el,$(subst rhel,el,$(subst centos,el,$(shell cat /etc/distname))))
  ifeq ($(rpmrel),)
  # look for fedora
@@ -88 +87 @@
  ifeq ($(rpmrel),)
  # look for OL
-  rpmrel  := $(shell cat /etc/enterprise-release 2> /dev/null | sed -ne 's/^Enterprise Linux[a-zA-Z ]*\([1-9][0-9]*\).*/ol\1/p')
+  rpmrel  := $(shell cat /etc/enterprise-release 2> /dev/null | sed -ne 's/^Enterprise Linux[a-zA-Z ]*\([1-9][0-9]*\).*/el\1/p')
  endif
  ifeq ($(rpmrel),)
  # look for CentOS
-  rpmrel  := $(shell cat /etc/redhat-release 2> /dev/null | sed -ne 's/^CentOS[a-zA-Z ]*\([1-9][0-9]*\).*/centos\1/p')
+  rpmrel  := $(shell cat /etc/redhat-release 2> /dev/null | sed -ne 's/^CentOS[a-zA-Z ]*\([1-9][0-9]*\).*/el\1/p')
  endif
  ifeq ($(rpmrel),)
  # look for Red Hat
-  rpmrel  := $(shell cat /etc/redhat-release 2> /dev/null | sed -ne 's/^Red Hat[a-zA-Z ]*\([1-9][0-9]*\).*/centos\1/p')
+  rpmrel  := $(shell cat /etc/redhat-release 2> /dev/null | sed -ne 's/^Red Hat[a-zA-Z ]*\([1-9][0-9]*\).*/el\1/p')
  endif
  ifeq ($(rpmrel),)
@@ -107 +106 @@
  endif
 
- ifeq ($(filter-out el5 el6 ol5 ol6 el7 centos5 centos6 fedora18 fedora19 fedora20 fedora21 fedora22 fedora24,$(rpmrel)),)
+ ifeq ($(filter-out el5 el6 el7 fedora18 fedora19 fedora20 fedora21 fedora22 fedora24,$(rpmrel)),)
   rpmspec := rpm_redhat
  endif
- ifeq ($(filter-out openSUSE110 openSUSE111 openSUSE112 openSUSE113 openSUSE114 openSUSE123 openSUSE131 openSUSE132 sles10.1 sles11.0,$(rpmrel)),)
+ ifeq ($(filter-out openSUSE110 openSUSE111 openSUSE112 openSUSE113 openSUSE114 openSUSE123 openSUSE131 openSUSE132,$(rpmrel)),)
   rpmspec := rpm_suse
- endif
- ifeq ($(filter-out mdv2009.1 mdv2010.0 mdv2011.0,$(rpmrel)),)
-  rpmspec := rpm_mdv
  endif
  ifeq ($(rpmspec),)
@@ -128 +124 @@
 
 ver      := $(VBOX_VERSION_STRING)
-rpmver   :=$(ver)$(if $(NOSUBVER),,$(if $(svn_revision),_$(svn_revision),)$(VERSUFFIX)$(if $(HEADLESS),_headless,)$(if $(DEBUG),_dbg,))$(if $(BLEEDING_EDGE),_$(BLEEDING_EDGE),)
+rpmver   :=$(ver)$(if $(NOSUBVER),,$(if $(svn_revision),_$(svn_revision),)$(VERSUFFIX)$(if $(HEADLESS),_headless,)$(if $(DEBUG),_dbg,))
 archdir  := $(current)/rpm/VirtualBox-$(ver)
 rpmname  := $(verpkg)-$(rpmver)_$(rpmrel)
@@ -150 +146 @@
 cfg_flags := $(if $(NOQT),--disable-qt,) \
              $(if $(NOSDL),--disable-vboxsdl,) \
-             $(if $(filter sles10.1,$(rpmrel)),--build-libxml2,) \
-             $(if $(filter el5 ol5 centos5 el6 ol6 centos6 sles10.1 sles11.0 mdv2011.0,$(rpmrel)),--build-libvpx,) \
-             $(if $(filter el5 ol5 centos5 sles10.1 sles11.0,$(rpmrel)),--build-libcurl,) \
-             $(if $(filter el5 ol5 centos5 sles10.1,$(rpmrel)),--disable-sdl-ttf,) \
-             $(if $(filter el5 ol5 centos5 sles10.1,$(rpmrel)),--disable-pulse,) \
+             $(if $(filter el5 el6,$(rpmrel)),--build-libvpx,) \
+             $(if $(filter el5,$(rpmrel)),--build-libcurl,) \
+             $(if $(filter el5,$(rpmrel)),--disable-sdl-ttf,) \
+             $(if $(filter el5,$(rpmrel)),--disable-pulse,) \
+             $(if $(filter el5,$(rpmrel)),--disable-python,) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
              $(if $(HEADLESS),--build-headless,) \
@@ -168 +164 @@
              VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \
              VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \
-             $(if $(filter el5 ol5 centos5 el6 ol6 centos6 sles10.1 sles11.0,$(rpmrel)),,VBOX_WITH_VMSVGA3D=1) \
+             $(if $(filter el5 el6,$(rpmrel)),,VBOX_WITH_VMSVGA3D=1) \
              VBOX_DO_STRIP= \
-             $(if $(filter el5,$(rpmrel)),VBOX_BLD_PYTHON=/usr/bin/python,) \
+             $(if $(filter el5,$(rpmrel)),VBOX_BLD_PYTHON=$(strip $(firstword $(wildcard /usr/local/bin/python2.7) $(wildcard /usr/bin/python))),) \
              VBOX_WITH_MULTIVERSION_PYTHON= \
              $(doc_dir) \
@@ -179 +175 @@
              $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
              $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
-             $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) \
-             $(if $(filter el5 ol5 centos5 sles10.1,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
+             $(if $(filter el5,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
 
 rpm/configure-stamp: