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

Timestamp:

Jul 24, 2014 1:41:15 PM (11 years ago)

Author:

vboxsync

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

95210

Message:

rpm: el7-amd64

Location:

trunk/src/VBox/Installer/linux

Files:

• distributions_rpm (modified) (1 diff)
• rpm/rules (modified) (2 diffs)

trunk/src/VBox/Installer/linux/distributions_rpm

@@ -9 +9 @@
 fedora16        = FEDORA_16
 fedora15        = FEDORA_15
+el7             = EL_7
 el6             = EL_6
 el5             = EL_5

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

@@ -71 +71 @@
 
 ifneq ($(MAKECMDGOALS),clean)
- rpmrel   := $(subst rhel,el,$(shell cat /etc/distname))
+ rpmrel   := $(subst ol,el,$(subst rhel,el,$(shell cat /etc/distname)))
  ifeq ($(rpmrel),)
  # look for fedora
@@ -85 +85 @@
  endif
 
- ifeq ($(filter-out el5 el6 ol5 ol6 centos5 centos6 fedora15 fedora16 fedora17 fedora18,$(rpmrel)),)
+ ifeq ($(filter-out el5 el6 ol5 ol6 el7 centos5 centos6 fedora15 fedora16 fedora17 fedora18,$(rpmrel)),)
   rpmspec := rpm_redhat
  endif