Changeset 58387 in vbox for trunk/src/VBox

Timestamp:

Oct 23, 2015 11:07:48 AM (9 years ago)

Author:

vboxsync

Message:

Installer/linux (host): silence some non-fatal warnings in rpm/rules and do not copy no-longer-needed files.

File:

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

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

@@ -84 +84 @@
  ifeq ($(rpmrel),)
  # look for fedora
-  rpmrel  := $(shell cat /etc/fedora-release | sed -e 's/^Fedora  *release  *\([1-9][0-9]*\) .*/fedora\1/')
+  rpmrel  := $(shell cat /etc/fedora-release 2> /dev/null | sed -e 's/^Fedora  *release  *\([1-9][0-9]*\) .*/fedora\1/')
  endif
  ifeq ($(rpmrel),)
  # look for OL
-  rpmrel  := $(shell cat /etc/enterprise-release | sed -ne 's/^Enterprise Linux[a-zA-Z ]*\([1-9][0-9]*\).*/ol\1/p')
+  rpmrel  := $(shell cat /etc/enterprise-release 2> /dev/null | sed -ne 's/^Enterprise Linux[a-zA-Z ]*\([1-9][0-9]*\).*/ol\1/p')
  endif
  ifeq ($(rpmrel),)
  # look for CentOS
-  rpmrel  := $(shell cat /etc/redhat-release | sed -ne 's/^CentOS[a-zA-Z ]*\([1-9][0-9]*\).*/centos\1/p')
+  rpmrel  := $(shell cat /etc/redhat-release 2> /dev/null | sed -ne 's/^CentOS[a-zA-Z ]*\([1-9][0-9]*\).*/centos\1/p')
  endif
  ifeq ($(rpmrel),)
  # look for Red Hat
-  rpmrel  := $(shell cat /etc/redhat-release | sed -ne 's/^Red Hat[a-zA-Z ]*\([1-9][0-9]*\).*/centos\1/p')
+  rpmrel  := $(shell cat /etc/redhat-release 2> /dev/null | sed -ne 's/^Red Hat[a-zA-Z ]*\([1-9][0-9]*\).*/centos\1/p')
  endif
  ifeq ($(rpmrel),)
@@ -239 +239 @@
             -e "s|%WEBSVC%|$(if $(NOWEBSVC),false,true)|g" \
             rpm/VirtualBox.tmpl.spec > $(archdir)/VirtualBox.spec
-        cp vboxdrv.sh $(archdir)
-        cp vboxballoonctrl-service.sh $(archdir)
-        cp vboxautostart-service.sh $(archdir)
-        cp vboxweb-service.sh $(archdir)
-        cp VBox.sh $(archdir)
         mv rpm/VirtualBox-$(ver) rpm/$(rpmname)
         tar -cf rpm/VirtualBox.tar -C rpm $(rpmname)