VirtualBox

Changeset 63946 in vbox for trunk/src/VBox


Ignore:
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

Location:
trunk/src/VBox/Installer/linux
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r63571 r63946  
    3939#  STAGEDISO=<path> don't build the VBoxAdditions, use the precompiled .iso
    4040#  PKGDIR=<path>    where to store the final package(s)
    41 #  BLEEDING_EDGE=xyz
    4241#
    4342# NODOCS will also be set if UserManual*.pdf and VirtualBox*.chm are placed in
    … …  
    7574                svn info|sed -e "s/^Revision: \(.*\)/-\1/;t;d"; else \
    7675                date +"-%Y%m%d"; fi)))
    77 debver   :=$(subst _ALPHA,~alpha,$(subst _BETA,~beta,$(subst _RC,~rc,$(subst _OSE,~ose,$(ver)))))$(svnver)$(if \
    78                 $(BLEEDING_EDGE),-$(BLEEDING_EDGE),)$(VERSUFFIX)$(if \
    79                 $(HEADLESS),~headless,)$(if $(DEBUG),~dbg,)
     76debver   :=$(subst _ALPHA,~alpha,$(subst _BETA,~beta,$(subst _RC,~rc,$(subst _OSE,~ose,$(ver)))))$(svnver)$(VERSUFFIX)$(if $(HEADLESS),~headless,)$(if $(DEBUG),~dbg,)
    8077archdir  := $(prefix)/opt/VirtualBox-$(ver)
    8178endif
    … …  
    120117             $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
    121118             $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
    122              $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
    123              $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),)
     119             $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,)
    124120
    125121configure: debian/configure-stamp
    … …  
    158154                make -C $(builddir)/bin/src/vboxdrv KERN_DIR=$$d/build MODULE_DIR=$$d clean && \
    159155                make -j4 -C $(builddir)/bin/src/vboxdrv KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all \
    160                 $(if $(instmod),&& install -D -m 0644 -g 0 -o 0 \
    161                     $(builddir)/bin/src/vboxdrv/vboxdrv.ko $(moddir)/$$(basename $$d)/vboxdrv.ko); \
    162156                make -C $(builddir)/bin/src/vboxnetflt KERN_DIR=$$d/build MODULE_DIR=$$d clean && \
    163157                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetflt || true) && \
    164158                make -j4 -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all \
    165                 $(if $(instmod),&& install -D -m 0644 -g 0 -o 0 \
    166                     $(builddir)/bin/src/vboxnetflt/vboxnetflt.ko $(moddir)/$$(basename $$d)/vboxnetflt.ko); \
    167159                make -C $(builddir)/bin/src/vboxnetadp KERN_DIR=$$d/build MODULE_DIR=$$d clean && \
    168160                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetadp || true) && \
    169161                make -j4 -C $(builddir)/bin/src/vboxnetadp KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all \
    170                 $(if $(instmod),&& install -D -m 0644 -g 0 -o 0 \
    171                     $(builddir)/bin/src/vboxnetadp/vboxnetadp.ko $(moddir)/$$(basename $$d)/vboxnetadp.ko); \
    172162                make -C $(builddir)/bin/src/vboxpci KERN_DIR=$$d/build MODULE_DIR=$$d clean && \
    173163                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxpci || true) && \
    174164                make -j4 -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all \
    175                 $(if $(instmod),&& install -D -m 0644 -g 0 -o 0 \
    176                     $(builddir)/bin/src/vboxpci/vboxpci.ko $(moddir)/$$(basename $$d)/vboxpci.ko); \
    177165            fi; \
    178166        done
    … …  
    333321        mv $(prefix)/usr/lib/debug $(current)/debian/$(verpkg)-dbg/usr/lib
    334322endif
    335         $(if $(filter _Ubuntu_hardy _Ubuntu_lucid,$(debrel)),dh_pycentral,dh_python2)
     323        dh_python2
    336324        dh_compress -X.pdf -X.chm -X LICENSE -X.py
    337325        dh_fixperms
    … …  
    346334          -Vsdlttf=$(if $(HEADLESS),,libsdl-ttf2.0-0)
    347335        dh_md5sums
    348         dh_builddeb --destdir $(pkgdir) -- \
    349           $(if $(filter _Ubuntu_lucid,$(debrel)),,-Zxz)
     336        dh_builddeb --destdir $(pkgdir) -- -Zxz
    350337endif
    351338

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

    r63631 r63946  
    3232#  STAGEDISO=<path> don't build the VBoxAdditions, use the precompiled .iso
    3333#  PKGDIR=<path>    where to store the final package(s)
    34 #  BLEEDING_EDGE=xyz
    3534#  svn_revision=xxx do not depend on subversion being available, but use this
    3635#                   hard-coded revision number instead
    … …  
    8180
    8281ifneq ($(MAKECMDGOALS),clean)
    83  rpmrel   := $(subst ol,el,$(subst rhel,el,$(shell cat /etc/distname)))
     82 rpmrel   := $(subst ol,el,$(subst rhel,el,$(subst centos,el,$(shell cat /etc/distname))))
    8483 ifeq ($(rpmrel),)
    8584 # look for fedora
    … …  
    8887 ifeq ($(rpmrel),)
    8988 # look for OL
    90   rpmrel  := $(shell cat /etc/enterprise-release 2> /dev/null | sed -ne 's/^Enterprise Linux[a-zA-Z ]*\([1-9][0-9]*\).*/ol\1/p')
     89  rpmrel  := $(shell cat /etc/enterprise-release 2> /dev/null | sed -ne 's/^Enterprise Linux[a-zA-Z ]*\([1-9][0-9]*\).*/el\1/p')
    9190 endif
    9291 ifeq ($(rpmrel),)
    9392 # look for CentOS
    94   rpmrel  := $(shell cat /etc/redhat-release 2> /dev/null | sed -ne 's/^CentOS[a-zA-Z ]*\([1-9][0-9]*\).*/centos\1/p')
     93  rpmrel  := $(shell cat /etc/redhat-release 2> /dev/null | sed -ne 's/^CentOS[a-zA-Z ]*\([1-9][0-9]*\).*/el\1/p')
    9594 endif
    9695 ifeq ($(rpmrel),)
    9796 # look for Red Hat
    98   rpmrel  := $(shell cat /etc/redhat-release 2> /dev/null | sed -ne 's/^Red Hat[a-zA-Z ]*\([1-9][0-9]*\).*/centos\1/p')
     97  rpmrel  := $(shell cat /etc/redhat-release 2> /dev/null | sed -ne 's/^Red Hat[a-zA-Z ]*\([1-9][0-9]*\).*/el\1/p')
    9998 endif
    10099 ifeq ($(rpmrel),)
    … …  
    107106 endif
    108107
    109  ifeq ($(filter-out el5 el6 ol5 ol6 el7 centos5 centos6 fedora18 fedora19 fedora20 fedora21 fedora22 fedora24,$(rpmrel)),)
     108 ifeq ($(filter-out el5 el6 el7 fedora18 fedora19 fedora20 fedora21 fedora22 fedora24,$(rpmrel)),)
    110109  rpmspec := rpm_redhat
    111110 endif
    112  ifeq ($(filter-out openSUSE110 openSUSE111 openSUSE112 openSUSE113 openSUSE114 openSUSE123 openSUSE131 openSUSE132 sles10.1 sles11.0,$(rpmrel)),)
     111 ifeq ($(filter-out openSUSE110 openSUSE111 openSUSE112 openSUSE113 openSUSE114 openSUSE123 openSUSE131 openSUSE132,$(rpmrel)),)
    113112  rpmspec := rpm_suse
    114  endif
    115  ifeq ($(filter-out mdv2009.1 mdv2010.0 mdv2011.0,$(rpmrel)),)
    116   rpmspec := rpm_mdv
    117113 endif
    118114 ifeq ($(rpmspec),)
    … …  
    128124
    129125ver      := $(VBOX_VERSION_STRING)
    130 rpmver   :=$(ver)$(if $(NOSUBVER),,$(if $(svn_revision),_$(svn_revision),)$(VERSUFFIX)$(if $(HEADLESS),_headless,)$(if $(DEBUG),_dbg,))$(if $(BLEEDING_EDGE),_$(BLEEDING_EDGE),)
     126rpmver   :=$(ver)$(if $(NOSUBVER),,$(if $(svn_revision),_$(svn_revision),)$(VERSUFFIX)$(if $(HEADLESS),_headless,)$(if $(DEBUG),_dbg,))
    131127archdir  := $(current)/rpm/VirtualBox-$(ver)
    132128rpmname  := $(verpkg)-$(rpmver)_$(rpmrel)
    … …  
    150146cfg_flags := $(if $(NOQT),--disable-qt,) \
    151147             $(if $(NOSDL),--disable-vboxsdl,) \
    152              $(if $(filter sles10.1,$(rpmrel)),--build-libxml2,) \
    153              $(if $(filter el5 ol5 centos5 el6 ol6 centos6 sles10.1 sles11.0 mdv2011.0,$(rpmrel)),--build-libvpx,) \
    154              $(if $(filter el5 ol5 centos5 sles10.1 sles11.0,$(rpmrel)),--build-libcurl,) \
    155              $(if $(filter el5 ol5 centos5 sles10.1,$(rpmrel)),--disable-sdl-ttf,) \
    156              $(if $(filter el5 ol5 centos5 sles10.1,$(rpmrel)),--disable-pulse,) \
     148             $(if $(filter el5 el6,$(rpmrel)),--build-libvpx,) \
     149             $(if $(filter el5,$(rpmrel)),--build-libcurl,) \
     150             $(if $(filter el5,$(rpmrel)),--disable-sdl-ttf,) \
     151             $(if $(filter el5,$(rpmrel)),--disable-pulse,) \
     152             $(if $(filter el5,$(rpmrel)),--disable-python,) \
    157153             $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
    158154             $(if $(HEADLESS),--build-headless,) \
    … …  
    168164             VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \
    169165             VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \
    170              $(if $(filter el5 ol5 centos5 el6 ol6 centos6 sles10.1 sles11.0,$(rpmrel)),,VBOX_WITH_VMSVGA3D=1) \
     166             $(if $(filter el5 el6,$(rpmrel)),,VBOX_WITH_VMSVGA3D=1) \
    171167             VBOX_DO_STRIP= \
    172              $(if $(filter el5,$(rpmrel)),VBOX_BLD_PYTHON=/usr/bin/python,) \
     168             $(if $(filter el5,$(rpmrel)),VBOX_BLD_PYTHON=$(strip $(firstword $(wildcard /usr/local/bin/python2.7) $(wildcard /usr/bin/python))),) \
    173169             VBOX_WITH_MULTIVERSION_PYTHON= \
    174170             $(doc_dir) \
    … …  
    179175             $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \
    180176             $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
    181              $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) \
    182              $(if $(filter el5 ol5 centos5 sles10.1,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
     177             $(if $(filter el5,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
    183178
    184179rpm/configure-stamp:
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette