commit ac9903a2c8560f38d1b3bab6b8fda86b6682209e Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Thu Feb 20 07:30:21 2020 +0000 Update VBox to 6.1.4 .gitignore | 1 + Makefile.kmk_hack.patch | 20 +++++--------------- VirtualBox.spec | 7 +++++-- sources | 4 ++-- update_vbox.sh | 20 +++++++------------- 5 files changed, 20 insertions(+), 32 deletions(-) --- diff --git a/.gitignore b/.gitignore index e990a3a..eae5a7e 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ VirtualBox-5.0.16.tar.bz2 /VirtualBox-6.0.14.tar.bz2 /VirtualBox-6.1.0.tar.bz2 /VirtualBox-6.1.2.tar.bz2 +/VirtualBox-6.1.4.tar.bz2 diff --git a/Makefile.kmk_hack.patch b/Makefile.kmk_hack.patch index 2457d19..f0baf93 100644 --- a/Makefile.kmk_hack.patch +++ b/Makefile.kmk_hack.patch @@ -1,8 +1,8 @@ ---- ./Makefile.kmk.orig 2020-02-05 00:18:15.751562458 +0000 -+++ ./Makefile.kmk 2020-02-05 01:47:17.825333439 +0000 -@@ -169,15 +169,6 @@ ifeq ($(KBUILD_TARGET),darwin) - Frameworks/$(qtmod).framework/$(qtmod)=>Versions/5/$(qtmod) \ - Frameworks/$(qtmod).framework/Resources=>Versions/5/Resources) +--- ./Makefile.kmk.orig 2020-02-20 03:40:14.049126175 +0000 ++++ ./Makefile.kmk 2020-02-20 03:40:41.843981024 +0000 +@@ -188,15 +188,6 @@ ifeq ($(KBUILD_TARGET),darwin) + "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,(a)rpath)/$(qtmod).framework/Versions/5/$(qtmod)&quot; ) ) \ + "$(2)",) # HACK ALERT! Using $(source_type_prefix) to detect EXEC_SOURCES. else # win x11 - if1of ($(KBUILD_TARGET), linux solaris) - ifndef VBOX_ONLY_BUILD @@ -16,13 +16,3 @@ if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD) include $(KBUILD_PATH)/units/qt5.kmk ifeq ($(KBUILD_TARGET),win) ---- ./src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2020-02-08 23:53:19.747326051 +0000 -+++ ./src/VBox/Devices/PC/ipxe/Makefile.kmk 2020-02-08 23:54:17.038644318 +0000 -@@ -111,6 +111,7 @@ endif - TEMPLATE_iPxe_LNK_DEPS = $(VBOX_PATH_IPXE_SRC)/src/arch/i386/scripts/i386.lds - TEMPLATE_iPxe_CFLAGS = \ - -fno-pie \ -+ -fcommon \ - -ffreestanding \ - -ffunction-sections \ - -march=i386 \ diff --git a/VirtualBox.spec b/VirtualBox.spec index 9bcd12e..0108f7a 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -45,8 +45,8 @@ %endif Name: VirtualBox -Version: 6.1.2 -Release: 2%{?dist} +Version: 6.1.4 +Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware License: GPLv2 or (GPLv2 and CDDL) @@ -873,6 +873,9 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog +* Thu Feb 20 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.4-1 +- Update VBox to 6.1.4 + * Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 6.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 78d89c8..e4dfc27 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VirtualBox-6.1.2.tar.bz2) = 476dedd9dd7a213bd70920f4cdf594b5336555f31e5becb15b5c01d88fa7bed917258831af31600514362384401fd7040cb748a7c76896e4a027bef05026b585 -SHA512 (UserManual.pdf) = 8010804c58cb03b6f8995f4da5edd5c348d08ccf391e4d5ac1263ed0733bd5362e33bb9c60fcecb967d94136b868d6172dcc570b4535e01a9bd274a63314e16f +SHA512 (VirtualBox-6.1.4.tar.bz2) = 021592629614b9f8a57474b9a0cd110af7b63a3bc98b00806f4ce57b64f020fda313fdaef5cec546ad302f98093427818e176decbc026dffaa47faae574bf167 +SHA512 (UserManual.pdf) = 947786051ac708d94618bb9b1f6e90995b5e76dd035d98dc6105a898c5cc6b97f22f91d821f979caf77bee69a11e6902622901453570c84c8ebf58f4bee709b9 diff --git a/update_vbox.sh b/update_vbox.sh index ff8e7ae..da9a986 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,6 +1,7 @@ -VERSION=6.1.2 +VERSION=6.1.4 REL=1 -RAWHIDE=32 +RAWHIDE=33 +REPOS="f32 f31 f30 el7" if [ -z "$1" ] then stage=0 @@ -33,17 +34,10 @@ fi if test $stage -le 2 then echo STAGE 2 -git checkout f31 && git merge master && git push && rfpkg build --nowait; git checkout master -echo Press enter to continue; read dummy; -git checkout f30 && git merge master && git push && rfpkg build --nowait; git checkout master -echo Press enter to continue; read dummy; -fi -if test $stage -le 3 -then -echo STAGE 3 -#git checkout f29 && git merge master && git push && rfpkg build --nowait; git checkout master -#echo Press enter to continue; read dummy; +for repo in $REPOS ; do +echo Press enter to build on branch f$repo; read dummy; +git checkout $repo && git merge master && git push && rfpkg build --nowait; git checkout master +done fi -git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master echo "Continue in ../VirtualBox-kmod/update_vbox.sh"