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

Timestamp:

Aug 30, 2019 9:30:01 AM (6 years ago)

Author:

vboxsync

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

133009

Message:

Installer/linux: update for el8-amd, OL detection improvement

Location:

trunk/src/VBox/Installer/linux

Files:

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

trunk/src/VBox/Installer/linux/distributions_rpm

@@ -20 +20 @@
 fedora16        = FEDORA_16
 fedora15        = FEDORA_15
+el8             = EL_8
 el7             = EL_7
 el6             = EL_6

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

@@ -72 +72 @@
  rpmrel  := $(shell cat /etc/fedora-release 2> /dev/null | sed -e 's/^Fedora  *release  *\([1-9][0-9]*\) .*/fedora\1/')
  ifeq ($(rpmrel),)
+ # look for OEL
+  rpmrel  := $(shell cat /etc/enterprise-release 2> /dev/null | sed -ne 's/^Enterprise Linux[a-zA-Z ]*\([1-9][0-9]*\).*/el\1/p')
+ endif
  # look for OL
-  rpmrel  := $(shell cat /etc/enterprise-release 2> /dev/null | sed -ne 's/^Enterprise Linux[a-zA-Z ]*\([1-9][0-9]*\).*/el\1/p')
+  rpmrel  := $(shell cat /etc/oracle-release 2> /dev/null | sed -ne 's/^Oracle Linux[a-zA-Z ]*\([1-9][0-9]*\).*/el\1/p')
  endif
  ifeq ($(rpmrel),)
@@ -96 +99 @@
  endif
 
- ifeq ($(filter-out el5 el6 el7 fedora18 fedora19 fedora20 fedora21 fedora22 fedora24 fedora25 fedora26 fedora29,$(rpmrel)),)
+ ifeq ($(filter-out el5 el6 el7 el8 fedora18 fedora19 fedora20 fedora21 fedora22 fedora24 fedora25 fedora26 fedora29,$(rpmrel)),)
   rpmspec := rpm_redhat
  endif