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

Timestamp:

Feb 14, 2011 8:22:51 PM (14 years ago)

Author:

vboxsync

Message:

rpm: ol fixes

File:

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

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

@@ -56 +56 @@
  endif
 
- ifeq ($(filter-out rhel4 rhel5 rhel6 fedora9 fedora11 fedora12 fedora13 fedora14 pclinuxos2007 turbolinux11,$(rpmrel)),)
+ ifeq ($(filter-out rhel4 rhel5 rhel6 ol4 ol5 ol6 centos4 centos5 centos6 fedora9 fedora11 fedora12 fedora13 fedora14 pclinuxos2007 turbolinux11,$(rpmrel)),)
   rpmspec := rpm_redhat
  endif
@@ -80 +80 @@
 
 # Fedora13/14 is bleeding edge, the other jails have outdated kernel headers
-instmod  := $(if $(filter rhel4 rhel5 rhel6 sles10.1 sles11.0 pclinuxos2007 fedora13 fedora14,$(rpmrel)),,install_rpm)
+instmod  := $(if $(filter rhel4 rhel5 rhel6 ol4 ol5 ol6 centos4 centos5 centos6 sles10.1 sles11.0 pclinuxos2007 fedora13 fedora14,$(rpmrel)),,install_rpm)
 
 ifneq ($(STAGEDISO),)
@@ -104 +104 @@
              $(if $(filter rhel4 sles10.1,$(rpmrel)),--build-libxslt,) \
              $(if $(filter rhel4,$(rpmrel)),--build-libssl,) \
-             $(if $(filter rhel4 rhel5 sles10.1,$(rpmrel)),--build-libcurl,) \
-             $(if $(filter rhel5 sles10.1,$(rpmrel)),--disable-sdl-ttf,) \
+             $(if $(filter rhel4 rhel5 ol4 ol5 centos4 centos5 sles10.1,$(rpmrel)),--build-libcurl,) \
+             $(if $(filter rhel5 centos5 sles10.1,$(rpmrel)),--disable-sdl-ttf,) \
              $(if $(filter sles10.1 turbolinux11,$(rpmrel)),--disable-pulse,) \
-             $(if $(filter rhel4 rhel5,$(rpmrel)),--enable-pulse,) \
-             $(if $(filter rhel4 rhel5 sles10.1 turbolinux11,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.4.3-stdc++6-$(arch)) \
+             $(if $(filter rhel4 rhel5 ol4 ol5 centos4 centos5,$(rpmrel)),--enable-pulse,) \
+             $(if $(filter rhel4 rhel5 ol4 ol5 centos4 centos5 sles10.1 turbolinux11,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.4.3-stdc++6-$(arch)) \
              $(if $(DEBUG),--build-debug,)
 
@@ -124 +124 @@
              $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
              $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) \
-             $(if $(filter rhel4 rhel5 fedora9 fedora10 sles10.1 turbolinux11,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
+             $(if $(filter rhel4 rhel5 ol4 ol5 centos4 centos5 fedora9 fedora10 sles10.1 turbolinux11,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
 
 rpm/configure-stamp: