Changeset 82845 in vbox for trunk/src/VBox

Timestamp:

Jan 23, 2020 3:35:53 PM (5 years ago)

Author:

vboxsync

Message:

Installer/Linux: ticketref:18900 openSUSE Tumbleweed: cannot build RPM packages

Location:

trunk/src/VBox/Installer/linux

Files:

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

trunk/src/VBox/Installer/linux/distributions_rpm

@@ +1 @@
+openSUSETW      = OPENSUSE_TW
 openSUSE150     = OPENSUSE_15_0
 openSUSE132     = OPENSUSE_13_2

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

@@ -92 +92 @@
   rpmrel  := $(shell cat /etc/SUSE-brand 2> /dev/null | sed -ne 's/^VERSION *= *\([0-9]*\)\.\([0-9]*\)/openSUSE\1\2/p')
  endif
+ # look for openSUSE Tumbleweed
+ ifeq ($(rpmrel),)
+  rpmrel := $(shell cat /etc/SUSE-brand 2> /dev/null | sed -ne 's/^VERSION *= *tumbleweed/openSUSETW/p')
+ endif
  ifeq ($(rpmrel),)
   $(error failed to detect the release type.  Hack the detection.)
@@ -104 +108 @@
   rpmspec := rpm_redhat
  endif
- ifeq ($(filter-out openSUSE110 openSUSE111 openSUSE112 openSUSE113 openSUSE114 openSUSE123 openSUSE131 openSUSE132 openSUSE150,$(rpmrel)),)
+ ifeq ($(filter-out openSUSE110 openSUSE111 openSUSE112 openSUSE113 openSUSE114 openSUSE123 openSUSE131 openSUSE132 openSUSE150 openSUSETW,$(rpmrel)),)
   rpmspec := rpm_suse
  endif