[VirtualBox-kmod] Update to 7.0.8

commit fb2fb4894ba53e679fc72c3e134f312781de2849 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Tue Apr 18 23:37:07 2023 +0100 Update to 7.0.8 ...inux-vboxvideo-Additional-build-fixes-for.patch | 75 ----- VirtualBox-kmod.spec | 13 +- fixes_for_cs8.8.patch | 36 +++ fixes_for_kernel_6.3.patch | 330 --------------------- update_vbox.sh | 19 +- 5 files changed, 55 insertions(+), 418 deletions(-) --- diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index bc26629..5d32633 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -39,8 +39,8 @@ # https://bugzilla.rpmfusion.org/show_bug.cgi?id=6519 Name: VirtualBox-kmod -Version: 7.0.6 -Release: 4%{?dist} +Version: 7.0.8 +Release: 1%{?dist} #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} Summary: Kernel module for VirtualBox @@ -48,9 +48,8 @@ License: GPLv2 or CDDL URL: http://www.virtualbox.org/wiki/VirtualBox # This filters out the XEN kernel, since we don't run on XEN Source1: excludekernel-filter.txt -Patch1: fixes_for_kernel_6.3.patch -Patch2: fix_7.0.6_locking_problems.patch -Patch3: 0001-Additions-Linux-vboxvideo-Additional-build-fixes-for.patch +Patch1: fix_7.0.6_locking_problems.patch +Patch2: fixes_for_cs8.8.patch %global AkmodsBuildRequires %{_bindir}/kmodtool VirtualBox-kmodsrc = %{version} xz time elfutils-libelf-devel gcc @@ -74,7 +73,6 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi pushd %{name}-%{version} %patch1 -p1 %patch2 -p1 -%patch3 -p1 popd # error out if there was something wrong with kmodtool @@ -137,6 +135,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) [ $MODS = $DIRS ] || [ $MODS = 0 ] %changelog +* Tue Apr 18 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 7.0.8-1 +- Update to 7.0.8 + * Thu Apr 13 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 7.0.6-4 - add opensuse patches fix_7.0.6_locking_problems.patch and fixes_for_kernel_6.3.patch diff --git a/fixes_for_cs8.8.patch b/fixes_for_cs8.8.patch new file mode 100644 index 0000000..7b1adf9 --- /dev/null +++ b/fixes_for_cs8.8.patch @@ -0,0 +1,36 @@ +--- ./vboxvideo/vbox_ttm.c.orig 2023-04-18 23:57:46.583842252 +0100 ++++ ./vboxvideo/vbox_ttm.c 2023-04-19 00:00:57.537182564 +0100 +@@ -316,9 +316,9 @@ static struct ttm_tt *vbox_ttm_tt_create + #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_RANGE(8,5, 8,99) + tt->func = &vbox_tt_backend_func; + #endif +-#if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_MAJ_PREREQ(9,2) ++#if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2) + if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined, 0)) { +-#elif RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99) ++#elif RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,8) + if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined)) { + #elif RTLNX_VER_MIN(4,17,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) + if (ttm_tt_init(tt, bo, page_flags)) { +--- ./vboxvideo/vbox_mode.c.orig 2023-04-18 23:56:36.335084935 +0100 ++++ ./vboxvideo/vbox_mode.c 2023-04-19 00:02:53.664781629 +0100 +@@ -45,7 +45,7 @@ + # include <drm/drm_probe_helper.h> + #endif + +-#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_MAJ_PREREQ(9,2) ++#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2) + # include <drm/drm_edid.h> + #endif + +--- ./vboxvideo/vbox_drv.h.orig 2023-04-18 23:56:20.637139167 +0100 ++++ ./vboxvideo/vbox_drv.h 2023-04-19 00:03:40.757619051 +0100 +@@ -184,7 +184,7 @@ + # include <drm/ttm/ttm_resource.h> + #endif + +-#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_MAJ_PREREQ(9,2) ++#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2) + # include <drm/drm_framebuffer.h> + #endif + diff --git a/update_vbox.sh b/update_vbox.sh index 07fc2e0..4c584b2 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,7 +1,7 @@ -VERSION=7.0.6 +VERSION=7.0.8 REL=1 -RAWHIDE=38 -REPOS="f37 f36 el9 el8" +RAWHIDE=39 +REPOS="f38 f37 f36 el9 el8" if [ -z "$1" ] then @@ -31,19 +31,23 @@ fi if test $stage -le 1; then echo STAGE 1 rfpkg ci -c && git show +fi +if test $stage -le 2; then +echo STAGE 2 BRANCH1=f$RAWHIDE BRANCH2=fc$RAWHIDE echo Press enter tag-build rawhide to continue or n to skip; read dummy; if [[ "$dummy" != "n" ]]; then echo koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2 +git checkout rawhide && rfpkg push 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 && rfpkg push && rfpkg build --nowait ) & +git checkout rawhide && rfpkg build --nowait ) & fi fi -if test $stage -le 2; then -echo STAGE 2 +if test $stage -le 3; then +echo STAGE 3 for repo in $REPOS ; do BRANCH1=$repo BRANCH2=$repo @@ -53,9 +57,10 @@ fi echo Press enter tag-build $BRANCH1 to continue or n to skip; read dummy; if [[ "$dummy" != "n" ]]; then echo koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2 +git checkout $BRANCH1 && git merge master 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) & +git checkout $BRANCH1 && rfpkg build --nowait; git checkout master) & fi done fi