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

Timestamp:

Jul 9, 2012 8:34:27 AM (13 years ago)

Author:

vboxsync

Message:

linux/rpm: more neutral pkg names

File:

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

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

@@ -71 +71 @@
 
 ifneq ($(MAKECMDGOALS),clean)
- rpmrel   := $(shell cat /etc/distname)
+ rpmrel   := $(subst rhel,el,$(shell cat /etc/distname))
  ifeq ($(rpmrel),)
  # look for fedora
@@ -85 +85 @@
  endif
 
- ifeq ($(filter-out rhel4 rhel5 rhel6 ol4 ol5 ol6 centos4 centos5 centos6 fedora9 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 turbolinux11,$(rpmrel)),)
+ ifeq ($(filter-out el4 el5 el6 ol4 ol5 ol6 centos4 centos5 centos6 fedora9 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 turbolinux11,$(rpmrel)),)
   rpmspec := rpm_redhat
  endif
@@ -111 +111 @@
 
 # Fedora13/14 is bleeding edge, the other jails have outdated kernel headers
-instmod  := $(if $(filter rhel4 rhel5 rhel6 ol4 ol5 ol6 centos4 centos5 centos6 sles10.1 sles11.0 fedora13 fedora14 fedora15 fedora16 fedora17,$(rpmrel)),,install_rpm)
+instmod  := $(if $(filter el4 el5 el6 ol4 ol5 ol6 centos4 centos5 centos6 sles10.1 sles11.0 fedora13 fedora14 fedora15 fedora16 fedora17,$(rpmrel)),,install_rpm)
 
 ifneq ($(STAGEDISO),)
@@ -133 +133 @@
 
 cfg_flags := $(if $(NOQT),--disable-qt,) \
-             $(if $(filter rhel4 sles10.1,$(rpmrel)),--build-libxml2,) \
-             $(if $(filter rhel4,$(rpmrel)),--build-libssl,) \
-             $(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 el4 sles10.1,$(rpmrel)),--build-libxml2,) \
+             $(if $(filter el4,$(rpmrel)),--build-libssl,) \
+             $(if $(filter el4 el5 ol4 ol5 centos4 centos5 sles10.1,$(rpmrel)),--build-libcurl,) \
+             $(if $(filter el5 centos5 sles10.1,$(rpmrel)),--disable-sdl-ttf,) \
              $(if $(filter sles10.1 turbolinux11,$(rpmrel)),--disable-pulse,) \
-             $(if $(filter rhel4 rhel5 ol4 ol5 centos4 centos5,$(rpmrel)),--enable-pulse,) \
-             $(if $(filter rhel4 rhel5 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,$(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 $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
              $(if $(HEADLESS),--build-headless,) \
@@ -164 +164 @@
              $(if $(STAGEDISO),VBOX_WITHOUT_ADDITIONS=1,) \
              $(if $(BLEEDING_EDGE),VBOX_BLEEDING_EDGE=$(BLEEDING_EDGE),) \
-             $(if $(filter rhel4 rhel5 ol4 ol5 centos4 centos5 fedora9 fedora10 sles10.1 turbolinux11,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
+             $(if $(filter el4 el5 ol4 ol5 centos4 centos5 fedora9 fedora10 sles10.1 turbolinux11,$(rpmrel)),,VBOX_WITH_SYSFS_BY_DEFAULT=1)
 
 rpm/configure-stamp: