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

Timestamp:

May 7, 2013 12:22:10 PM (12 years ago)

Author:

vboxsync

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

85571

Message:

VPX: support 0.9.5 or higher; removed some obsolete Linux distributions for deb/rpm

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/rules (modified) (3 diffs)
• rpm/rules (modified) (3 diffs)

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

@@ -95 +95 @@
 
 cfg_flags := $(if $(NOQT),--disable-qt,) \
-             $(if $(filter _Ubuntu_hardy _Debian_lenny,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
-             $(if $(filter _Ubuntu_hardy,$(debrel)),--build-libcurl,) \
-             $(if $(filter _Ubuntu_hardy,$(debrel)),--build-libvpx,) \
+             $(if $(filter _Debian_squeeze,$(debrel)),--build-libvpx,) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
              $(if $(HEADLESS),--build-headless,) \
@@ -121 +119 @@
              $(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 _Ubuntu_hardy,$(debrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
+             $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),)
 
 configure: debian/configure-stamp
@@ -313 +310 @@
         dh_md5sums
         dh_builddeb --destdir $(pkgdir) -- \
-          $(if $(filter _Ubuntu_hardy _Ubuntu_lucid,$(debrel)),,-Zxz)
+          $(if $(filter _Ubuntu_lucid,$(debrel)),,-Zxz)
 endif
 

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

@@ -85 +85 @@
  endif
 
- ifeq ($(filter-out el4 el5 el6 ol4 ol5 ol6 centos4 centos5 centos6 fedora9 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 turbolinux11,$(rpmrel)),)
+ ifeq ($(filter-out el4 el5 el6 ol4 ol5 ol6 centos4 centos5 centos6 fedora15 fedora16 fedora17 fedora18,$(rpmrel)),)
   rpmspec := rpm_redhat
  endif
@@ -134 +134 @@
 cfg_flags := $(if $(NOQT),--disable-qt,) \
              $(if $(filter el4 sles10.1,$(rpmrel)),--build-libxml2,) \
-             $(if $(filter el4 el5 el6,$(rpmrel)),--build-libvpx,) \
+             $(if $(filter el4 el5 el6 sles10.1 sles11.0 mdv2011.0,$(rpmrel)),--build-libvpx,) \
              $(if $(filter el4,$(rpmrel)),--build-libssl,) \
              $(if $(filter el4 el5 ol4 ol5 centos4 centos5 sles10.1 sles11.0,$(rpmrel)),--build-libcurl,) \
              $(if $(filter el5 centos5 sles10.1,$(rpmrel)),--disable-sdl-ttf,) \
-             $(if $(filter sles10.1 turbolinux11,$(rpmrel)),--disable-pulse,) \
+             $(if $(filter sles10.1,$(rpmrel)),--disable-pulse,) \
              $(if $(filter el4 el5 ol4 ol5 centos4 centos5,$(rpmrel)),--enable-pulse,) \
-             $(if $(filter el4 el5 ol4 ol5 centos4 centos5 mdv2010.0 sles10.1 sles11.0 turbolinux11,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.7.4-stdc++6-$(arch)) \
+             $(if $(filter el4 el5 ol4 ol5 centos4 centos5 sles10.1 sles11.0,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.7.4-stdc++6-$(arch)) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
              $(if $(HEADLESS),--build-headless,) \
@@ -165 +165 @@
              $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
              $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) \
-             $(if $(filter el4 el5 ol4 ol5 centos4 centos5 fedora9 fedora10 sles10.1 turbolinux11,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
+             $(if $(filter el4 el5 ol4 ol5 centos4 centos5 sles10.1,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
 
 rpm/configure-stamp: