From d5b08441369e1ea67683f816c8a880166420de45369130321b249d0e47f2c570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 11 Jul 2015 12:47:21 +0000 Subject: [PATCH] - Fix vbox build by replacing non-existent sed parameter: * virtualbox-sed-params.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=207 --- virtualbox-sed-params.patch | 12 ++++++++++++ virtualbox.changes | 6 ++++++ virtualbox.spec | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 virtualbox-sed-params.patch diff --git a/virtualbox-sed-params.patch b/virtualbox-sed-params.patch new file mode 100644 index 0000000..18615f6 --- /dev/null +++ b/virtualbox-sed-params.patch @@ -0,0 +1,12 @@ +diff -urN VirtualBox-5.0.0.old/src/VBox/Main/Makefile.kmk VirtualBox-5.0.0/src/VBox/Main/Makefile.kmk +--- VirtualBox-5.0.0.old/src/VBox/Main/Makefile.kmk 2015-07-11 13:17:27.573698915 +0200 ++++ VirtualBox-5.0.0/src/VBox/Main/Makefile.kmk 2015-07-11 14:34:21.357349819 +0200 +@@ -1199,7 +1199,7 @@ + $(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \ + --stringparam generating "dtrace-probes" \ + -o "$@" $(VBoxAPIWrap_VBOX_XSLT) $< +- $(QUIET)$(SED) -e '' -o "$@.tmp" \ ++ $(QUIET)$(SED) -e '' --output "$@.tmp" \ + "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-start.d" \ + "$@" \ + "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-end.d" diff --git a/virtualbox.changes b/virtualbox.changes index fe6edbf..53da611 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 11 12:46:51 UTC 2015 - tchvatal@suse.com + +- Fix vbox build by replacing non-existent sed parameter: + * virtualbox-sed-params.patch + ------------------------------------------------------------------- Sat Jul 11 11:41:26 UTC 2015 - tchvatal@suse.com diff --git a/virtualbox.spec b/virtualbox.spec index bdb6b78..7ff33cd 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -77,6 +77,8 @@ Patch104: vbox-fpie.diff Patch105: smap.diff # Patch to build with Factory gcc5 Patch106: gcc5-real-support.patch +# Patch to build with gnu sed correctly +Patch107: virtualbox-sed-params.patch BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel BuildRequires: acpica @@ -301,6 +303,7 @@ This package contains icons for guest desktop files that were created on the des %patch104 -p1 %patch105 -p1 %patch106 -p1 +%patch107 -p1 #copy user manual cp %{SOURCE1} UserManual.pdf #copy kbuild config