Changeset 73093 in vbox for trunk

Timestamp:

Jul 12, 2018 7:10:56 PM (7 years ago)

Author:

vboxsync

Message:

rpm/rules: stop using /etc/distname to determine the distribution as we can do it without.

File:

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

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

@@ -69 +69 @@
 
 ifneq ($(MAKECMDGOALS),clean)
- rpmrel   := $(subst ol,el,$(subst rhel,el,$(subst centos,el,$(shell cat /etc/distname))))
- ifeq ($(rpmrel),)
  # look for fedora
-  rpmrel  := $(shell cat /etc/fedora-release 2> /dev/null | sed -e 's/^Fedora  *release  *\([1-9][0-9]*\) .*/fedora\1/')
- endif
+ rpmrel  := $(shell cat /etc/fedora-release 2> /dev/null | sed -e 's/^Fedora  *release  *\([1-9][0-9]*\) .*/fedora\1/')
  ifeq ($(rpmrel),)
  # look for OL
@@ -91 +88 @@
  endif
  ifeq ($(rpmrel),)
-  $(error failed to detect the release type. Add /etc/distname or hack the detection.)
+  $(error failed to detect the release type.  Hack the detection.)
  endif