commit b085e2b21efa1c83d7cec1cd8d3653d611426fd4 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Wed Jul 17 18:07:49 2019 +0100 Update to 6.0.10 VirtualBox-kmod.spec | 11 +++++++---- update_vbox.sh | 25 ++++++++++++++----------- 2 files changed, 21 insertions(+), 15 deletions(-) --- diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index 0f3103e..871c4d9 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -44,8 +44,8 @@ %global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot Name: VirtualBox-kmod -Version: 6.0.8 -Release: 3%{?dist} +Version: 6.0.10 +Release: 1%{?dist} #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} Summary: Kernel module for VirtualBox @@ -55,7 +55,7 @@ URL: http://www.virtualbox.org/wiki/VirtualBox # This filters out the XEN kernel, since we don't run on XEN Source1: excludekernel-filter.txt Source2: https://github.com/jwrdegoede/vboxsf/archive/%{shortcommit1}.zip -Patch1: new-kernel-5.2.patch +#Patch1: new-kernel-5.2.patch Patch2: kernel-5.patch @@ -90,7 +90,7 @@ unzip %{SOURCE2} mv vboxsf-%{commit1}/ vboxsf/ %endif -%patch1 -p1 +#patch1 -p1 popd # error out if there was something wrong with kmodtool @@ -151,6 +151,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) %changelog +* Wed Jul 17 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 6.0.10-1 +- Update to 6.0.10 + * Wed Jul 10 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 6.0.8-3 - Fix build of vboxpci module under Linux 5.2, thanks to Steve Storey diff --git a/update_vbox.sh b/update_vbox.sh index c8c6975..1e7b6bd 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,4 +1,4 @@ -VERSION=6.0.8 +VERSION=6.0.10 REL=1 RAWHIDE=31 @@ -22,19 +22,23 @@ rfpkg srpm && copr-cli build sergiomb/vboxfor23 VirtualBox-kmod-$VERSION-$REL.fc #git reset HEAD~1 #git rm kernel-4.10.0-0.rc5.lnkops.v2.patch echo Press enter to continue; read dummy; -rfpkg push && rfpkg build --nowait #koji-rpmfusion watch-task fi if test $stage -le 1 then echo STAGE 1 +BRANCH1=f31 +BRANCH2=fc31 +koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2 +(koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 && \ +rfpkg push && rfpkg build --nowait ) & BRANCH1=f30 BRANCH2=fc30 echo Press enter tag-build $BRANCH1 to continue; read dummy; koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2 -koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 -git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master +(koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 && \ +git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master) & BRANCH1=f29 BRANCH2=fc29 echo Press enter tag-build $BRANCH1 to continue; read dummy; @@ -42,13 +46,12 @@ koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH (koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 && \ git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait) & #koji-rpmfusion watch-task -BRANCH1=f28 -BRANCH2=fc28 -echo Press enter to continue; read dummy; -koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2 -koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 -git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master -echo Press enter to continue; read dummy; +#BRANCH1=f28 +#BRANCH2=fc28 +#echo Press enter tag-build $BRANCH1 to continue; read dummy; +#koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2 +#koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 +#git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master fi if test $stage -le 2