October 2021 - rpmfusion-commits

[VirtualBox-kmod/el8] (2 commits) ...Add fixes for EL8.5 or Centos Stream kernels

by Sérgio M. Basto

Summary of changes: 2803914... Add fixes-for-5.15 (*) 364e19b... Add fixes for EL8.5 or Centos Stream kernels (*) (*) This commit already existed in another branch; no separate mail sent

3 years, 1 month

1
0
0 / 0

[VirtualBox-kmod] Add fixes for EL8.5 or Centos Stream kernels

by Sérgio M. Basto

commit 364e19b3ebc59897d7e0b6fe1aaa8a241ac17459 Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Tue Oct 12 21:19:02 2021 +0100 Add fixes for EL8.5 or Centos Stream kernels VirtualBox-kmod.spec | 9 +- fixes-for-EL8.5.patch | 358 ++++++++++++++++++++++++++++++++++++++++++++++++++ update_vbox.sh | 2 +- 3 files changed, 366 insertions(+), 3 deletions(-) --- diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index c0c2e3c..6b33130 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -15,7 +15,7 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} %global buildforkernels akmod %global debug_package %{nil} %endif @@ -32,7 +32,7 @@ Name: VirtualBox-kmod Version: 6.1.26 -Release: 2%{?dist} +Release: 3%{?dist} #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} Summary: Kernel module for VirtualBox @@ -41,6 +41,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 Patch1: fixes-for-5.15_fedora.patch +Patch2: fixes-for-EL8.5.patch %global AkmodsBuildRequires %{_bindir}/kmodtool VirtualBox-kmodsrc >= %{version}%{vboxreltag} xz time elfutils-libelf-devel gcc @@ -63,6 +64,7 @@ Kernel module for VirtualBox tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz pushd %{name}-%{version} %patch1 -p1 +%patch2 -p1 popd # error out if there was something wrong with kmodtool @@ -126,6 +128,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) %changelog +* Tue Oct 12 2021 Sérgio Basto <sergio(a)serjux.com> - 6.1.26-3 +- Add fixes for EL8.5 or Centos Stream kernels + * Mon Sep 13 2021 Sérgio Basto <sergio(a)serjux.com> - 6.1.26-2 - Add fixes-for-5.15 diff --git a/fixes-for-EL8.5.patch b/fixes-for-EL8.5.patch new file mode 100644 index 0000000..67e3b3c --- /dev/null +++ b/fixes-for-EL8.5.patch @@ -0,0 +1,358 @@ +diff -rup -x .orig VirtualBox-kmod-6.1.26.orig/vboxdrv/r0drv/linux/alloc-r0drv-linux.c VirtualBox-kmod-6.1.26/vboxdrv/r0drv/linux/alloc-r0drv-linux.c +--- VirtualBox-kmod-6.1.26.orig/vboxdrv/r0drv/linux/alloc-r0drv-linux.c 2021-07-28 17:24:50.000000000 +0100 ++++ VirtualBox-kmod-6.1.26/vboxdrv/r0drv/linux/alloc-r0drv-linux.c 2021-10-12 18:49:32.252593879 +0100 +@@ -38,7 +38,7 @@ + + + #if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP) +-# if RTLNX_VER_MIN(2,6,23) && RTLNX_VER_MAX(5,8,0) ++# if RTLNX_VER_MIN(2,6,23) && RTLNX_VER_MAX(5,8,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + /** + * Starting with 2.6.23 we can use __get_vm_area and map_vm_area to allocate + * memory in the moduel range. This is preferrable to the exec heap below. +diff -rup -x .orig VirtualBox-kmod-6.1.26.orig/vboxguest/r0drv/linux/alloc-r0drv-linux.c VirtualBox-kmod-6.1.26/vboxguest/r0drv/linux/alloc-r0drv-linux.c +--- VirtualBox-kmod-6.1.26.orig/vboxguest/r0drv/linux/alloc-r0drv-linux.c 2021-07-28 17:24:50.000000000 +0100 ++++ VirtualBox-kmod-6.1.26/vboxguest/r0drv/linux/alloc-r0drv-linux.c 2021-10-12 18:49:32.253593876 +0100 +@@ -38,7 +38,7 @@ + + + #if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP) +-# if RTLNX_VER_MIN(2,6,23) && RTLNX_VER_MAX(5,8,0) ++# if RTLNX_VER_MIN(2,6,23) && RTLNX_VER_MAX(5,8,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + /** + * Starting with 2.6.23 we can use __get_vm_area and map_vm_area to allocate + * memory in the moduel range. This is preferrable to the exec heap below. +diff -rup -x .orig VirtualBox-kmod-6.1.26.orig/vboxvideo/vbox_drv.c VirtualBox-kmod-6.1.26/vboxvideo/vbox_drv.c +--- VirtualBox-kmod-6.1.26.orig/vboxvideo/vbox_drv.c 2021-08-09 17:39:08.000000000 +0100 ++++ VirtualBox-kmod-6.1.26/vboxvideo/vbox_drv.c 2021-10-12 18:49:32.250593886 +0100 +@@ -345,7 +345,7 @@ static struct drm_driver driver = { + .dumb_map_offset = vbox_dumb_mmap_offset, + #if RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,3) + .dumb_destroy = vbox_dumb_destroy, +-#elif RTLNX_VER_MAX(5,12,0) ++#elif RTLNX_VER_MAX(5,12,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + .dumb_destroy = drm_gem_dumb_destroy, + #endif + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, +@@ -355,7 +355,7 @@ static struct drm_driver driver = { + .gem_prime_import_sg_table = vbox_gem_prime_import_sg_table, + .gem_prime_mmap = vbox_gem_prime_mmap, + +-#if RTLNX_VER_MAX(5,11,0) ++#if RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + .dev_priv_size = 0, + # if RTLNX_VER_MIN(4,7,0) + .gem_free_object_unlocked = vbox_gem_free_object, +Only in VirtualBox-kmod-6.1.26/vboxvideo: vbox_drv.c.orig +diff -rup -x .orig VirtualBox-kmod-6.1.26.orig/vboxvideo/vbox_drv.h VirtualBox-kmod-6.1.26/vboxvideo/vbox_drv.h +--- VirtualBox-kmod-6.1.26.orig/vboxvideo/vbox_drv.h 2021-08-09 17:39:08.000000000 +0100 ++++ VirtualBox-kmod-6.1.26/vboxvideo/vbox_drv.h 2021-10-12 18:49:32.250593886 +0100 +@@ -171,7 +171,7 @@ + #if RTLNX_VER_MAX(5,13,0) + # include <drm/ttm/ttm_memory.h> + #endif +-#if RTLNX_VER_MAX(5,12,0) ++#if RTLNX_VER_MAX(5,12,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + # include <drm/ttm/ttm_module.h> + #endif + #if RTLNX_VER_MIN(5,10,0) +Only in VirtualBox-kmod-6.1.26/vboxvideo: vbox_drv.h.orig +diff -rup -x .orig VirtualBox-kmod-6.1.26.orig/vboxvideo/vbox_fb.c VirtualBox-kmod-6.1.26/vboxvideo/vbox_fb.c +--- VirtualBox-kmod-6.1.26.orig/vboxvideo/vbox_fb.c 2021-08-09 17:39:08.000000000 +0100 ++++ VirtualBox-kmod-6.1.26/vboxvideo/vbox_fb.c 2021-10-12 18:50:18.475449235 +0100 +@@ -296,7 +296,7 @@ static int vboxfb_create(struct drm_fb_h + return ret; + } + +-#if RTLNX_VER_MIN(5,12,0) ++#if RTLNX_VER_MIN(5,12,0) || RTLNX_RHEL_MAJ_PREREQ(8,5) + ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.mem.num_pages, &bo->kmap); + #else + ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->kmap); +Only in VirtualBox-kmod-6.1.26/vboxvideo: vbox_fb.c.orig +diff -rup -x .orig VirtualBox-kmod-6.1.26.orig/vboxvideo/vbox_mode.c VirtualBox-kmod-6.1.26/vboxvideo/vbox_mode.c +--- VirtualBox-kmod-6.1.26.orig/vboxvideo/vbox_mode.c 2021-08-09 17:39:08.000000000 +0100 ++++ VirtualBox-kmod-6.1.26/vboxvideo/vbox_mode.c 2021-10-12 18:51:05.138303200 +0100 +@@ -851,7 +851,7 @@ static int vbox_cursor_set2(struct drm_c + vbox->cursor_data_size = data_size; + dst = vbox->cursor_data; + +-#if RTLNX_VER_MIN(5,12,0) ++#if RTLNX_VER_MIN(5,12,0) || RTLNX_RHEL_MAJ_PREREQ(8,5) + ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.mem.num_pages, &uobj_map); + #else + ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &uobj_map); +Only in VirtualBox-kmod-6.1.26/vboxvideo: vbox_mode.c.orig +diff -rup -x .orig VirtualBox-kmod-6.1.26.orig/vboxvideo/vbox_ttm.c VirtualBox-kmod-6.1.26/vboxvideo/vbox_ttm.c +--- VirtualBox-kmod-6.1.26.orig/vboxvideo/vbox_ttm.c 2021-08-09 17:39:08.000000000 +0100 ++++ VirtualBox-kmod-6.1.26/vboxvideo/vbox_ttm.c 2021-10-12 19:46:47.551880097 +0100 +@@ -28,7 +28,7 @@ + * Michael Thayer <michael.thayer(a)oracle.com> + */ + #include "vbox_drv.h" +-#if RTLNX_VER_MIN(5,11,0) ++#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_MAJ_PREREQ(8,5) + # include <drm/drm_gem.h> + # include <drm/drm_gem_ttm_helper.h> + # include <drm/drm_gem_vram_helper.h> +@@ -131,7 +131,7 @@ static bool vbox_ttm_bo_is_vbox_bo(struc + return false; + } + +-#if RTLNX_VER_MAX(5,10,0) ++#if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + static int + vbox_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type, + struct ttm_mem_type_manager *man) +@@ -175,7 +175,7 @@ static int vbox_bo_verify_access(struct + return 0; + } + +-#if RTLNX_VER_MAX(5,10,0) ++#if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_RANGE(8,5, 8,99) + static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, + struct ttm_mem_reg *mem) + { +@@ -215,7 +215,7 @@ static int vbox_ttm_io_mem_reserve(struc + struct vbox_private *vbox = vbox_bdev(bdev); + mem->bus.addr = NULL; + mem->bus.offset = 0; +-# if RTLNX_VER_MAX(5,12,0) ++# if RTLNX_VER_MAX(5,12,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + mem->size = mem->num_pages << PAGE_SHIFT; + # endif + mem->start = 0; +@@ -225,10 +225,10 @@ static int vbox_ttm_io_mem_reserve(struc + /* system memory */ + return 0; + case TTM_PL_VRAM: +-# if RTLNX_VER_MIN(5,11,0) ++# if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + mem->bus.caching = ttm_write_combined; + # endif +-# if RTLNX_VER_MIN(5,10,0) ++# if RTLNX_VER_MIN(5,10,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + mem->bus.offset = (mem->start << PAGE_SHIFT) + pci_resource_start(vbox->dev->pdev, 0); + # else + mem->bus.offset = mem->start << PAGE_SHIFT; +@@ -250,7 +250,7 @@ static void vbox_ttm_io_mem_free(struct + struct ttm_resource *mem) + { + } +-#elif RTLNX_VER_MIN(5,10,0) ++#elif RTLNX_VER_MIN(5,10,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev, + struct ttm_resource *mem) + { +@@ -268,7 +268,7 @@ static void vbox_ttm_tt_destroy(struct t + ttm_tt_fini(tt); + kfree(tt); + } +-#elif RTLNX_VER_MIN(5,10,0) ++#elif RTLNX_VER_MIN(5,10,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + static void vbox_ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *tt) + { + ttm_tt_fini(tt); +@@ -302,12 +302,12 @@ static struct ttm_tt *vbox_ttm_tt_create + if (!tt) + return NULL; + +-#if RTLNX_VER_MAX(5,10,0) ++#if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_RANGE(8,5, 8,99) + tt->func = &vbox_tt_backend_func; + #endif + #if RTLNX_VER_MAX(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, bdev, size, page_flags, dummy_read_page)) { +-#elif RTLNX_VER_MAX(5,11,0) ++#elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_RANGE(8,5, 8,99) + if (ttm_tt_init(tt, bo, page_flags)) { + #else + if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined)) { +@@ -339,7 +339,7 @@ static void vbox_ttm_tt_unpopulate(struc + } + #endif + +-#if RTLNX_VER_MIN(5,11,0) ++#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + static int vbox_bo_move(struct ttm_buffer_object *bo, bool evict, + struct ttm_operation_ctx *ctx, struct ttm_resource *new_mem, + struct ttm_place *hop) +@@ -354,14 +354,14 @@ static struct ttm_device_funcs vbox_bo_d + static struct ttm_bo_driver vbox_bo_driver = { + #endif /* < 5.13.0 */ + .ttm_tt_create = vbox_ttm_tt_create, +-#if RTLNX_VER_MIN(5,10,0) ++#if RTLNX_VER_MIN(5,10,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + .ttm_tt_destroy = vbox_ttm_tt_destroy, + #endif + #if RTLNX_VER_MAX(4,17,0) + .ttm_tt_populate = vbox_ttm_tt_populate, + .ttm_tt_unpopulate = vbox_ttm_tt_unpopulate, + #endif +-#if RTLNX_VER_MAX(5,10,0) ++#if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + .init_mem_type = vbox_bo_init_mem_type, + #endif + #if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4) +@@ -380,7 +380,7 @@ static struct ttm_bo_driver vbox_bo_driv + .lru_tail = &ttm_bo_default_lru_tail, + .swap_lru_tail = &ttm_bo_default_swap_lru_tail, + #endif +-#if RTLNX_VER_MIN(5,11,0) ++#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + .move = &vbox_bo_move, + #endif + }; +@@ -409,7 +409,7 @@ int vbox_mm_init(struct vbox_private *vb + vbox->ttm.bo_global_ref.ref.object, + #endif + &vbox_bo_driver, +-#if RTLNX_VER_MIN(5,11,0) ++#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + dev->dev, + #endif + #if RTLNX_VER_MIN(3,15,0) || RTLNX_RHEL_MAJ_PREREQ(7,1) +@@ -420,7 +420,7 @@ int vbox_mm_init(struct vbox_private *vb + #elif RTLNX_VER_MAX(5,2,0) && !RTLNX_RHEL_MAJ_PREREQ(8,2) + DRM_FILE_PAGE_OFFSET, + #endif +-#if RTLNX_VER_MIN(5,11,0) ++#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + false, + #endif + true); +@@ -433,7 +433,7 @@ int vbox_mm_init(struct vbox_private *vb + #endif + } + +-#if RTLNX_VER_MIN(5,10,0) ++#if RTLNX_VER_MIN(5,10,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + ret = ttm_range_man_init(bdev, TTM_PL_VRAM, false, + vbox->available_vram_size >> PAGE_SHIFT); + #else +@@ -501,7 +501,7 @@ void vbox_ttm_placement(struct vbox_bo * + bo->placement.busy_placement = bo->placements; + + if (mem_type & VBOX_MEM_TYPE_VRAM) { +-#if RTLNX_VER_MIN(5,11,0) ++#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + bo->placements[c].mem_type = TTM_PL_VRAM; + PLACEMENT_FLAGS(bo->placements[c++]) = 0; + #elif RTLNX_VER_MIN(5,10,0) +@@ -514,7 +514,7 @@ void vbox_ttm_placement(struct vbox_bo * + #endif + } + if (mem_type & VBOX_MEM_TYPE_SYSTEM) { +-#if RTLNX_VER_MIN(5,11,0) ++#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + bo->placements[c].mem_type = TTM_PL_SYSTEM; + PLACEMENT_FLAGS(bo->placements[c++]) = 0; + #elif RTLNX_VER_MIN(5,10,0) +@@ -527,7 +527,7 @@ void vbox_ttm_placement(struct vbox_bo * + #endif + } + if (!c) { +-#if RTLNX_VER_MIN(5,11,0) ++#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + bo->placements[c].mem_type = TTM_PL_SYSTEM; + PLACEMENT_FLAGS(bo->placements[c++]) = 0; + #elif RTLNX_VER_MIN(5,10,0) +@@ -551,7 +551,7 @@ void vbox_ttm_placement(struct vbox_bo * + #endif + } + +-#if RTLNX_VER_MIN(5,11,0) ++#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + static const struct drm_gem_object_funcs vbox_drm_gem_object_funcs = { + .free = vbox_gem_free_object, + .print_info = drm_gem_ttm_print_info, +@@ -576,7 +576,7 @@ int vbox_bo_create(struct drm_device *de + if (ret) + goto err_free_vboxbo; + +-#if RTLNX_VER_MIN(5,11,0) ++#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + if (!vboxbo->gem.funcs) { + vboxbo->gem.funcs = &vbox_drm_gem_object_funcs; + } +@@ -634,7 +634,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 + struct ttm_operation_ctx ctx = { false, false }; + #endif + int ret; +-#if RTLNX_VER_MAX(5,11,0) ++#if RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + int i; + #endif + +@@ -648,7 +648,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 + + vbox_ttm_placement(bo, mem_type); + +-#if RTLNX_VER_MAX(5,11,0) ++#if RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + for (i = 0; i < bo->placement.num_placement; i++) + PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT; + #endif +@@ -663,7 +663,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 + + bo->pin_count = 1; + +-#if RTLNX_VER_MIN(5,11,0) ++#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + ttm_bo_pin(&bo->bo); + #endif + +@@ -676,12 +676,12 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 + int vbox_bo_unpin(struct vbox_bo *bo) + { + #if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) +-# if RTLNX_VER_MAX(5,11,0) ++# if RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + struct ttm_operation_ctx ctx = { false, false }; + # endif + #endif + int ret; +-#if RTLNX_VER_MAX(5,11,0) ++#if RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + int i; + #endif + +@@ -693,27 +693,27 @@ int vbox_bo_unpin(struct vbox_bo *bo) + if (bo->pin_count) + return 0; + +-#if RTLNX_VER_MAX(5,11,0) ++#if RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + for (i = 0; i < bo->placement.num_placement; i++) + PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT; + #endif + + #if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) + ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false); +-#elif RTLNX_VER_MAX(5,11,0) ++#elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx); + #endif + if (ret) + return ret; + +-#if RTLNX_VER_MIN(5,11,0) ++#if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99) + ttm_bo_unpin(&bo->bo); + #endif + + return 0; + } + +-#if RTLNX_VER_MAX(5,11,0) ++#if RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5) + /* + * Move a vbox-owned buffer object to system memory if no one else has it + * pinned. The caller must have pinned it previously, and this call will +@@ -767,5 +767,4 @@ int vbox_mmap(struct file *filp, struct + file_priv = filp->private_data; + vbox = file_priv->minor->dev->dev_private; + +- return ttm_bo_mmap(filp, vma, &vbox->ttm.bdev); +-} ++ return ttm_bo_mmap(filp, vma, &vbox->ttm.bdev);} diff --git a/update_vbox.sh b/update_vbox.sh index 0b22ca7..14df09e 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -32,7 +32,7 @@ echo Press enter to continue; read dummy; BRANCH1=f$RAWHIDE BRANCH2=fc$RAWHIDE echo koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2 -koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-3.$BRANCH2 +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 ) & fi

3 years, 1 month

1
0
0 / 0

[amule] Not requiring cryptopp version for epel builds

by Sérgio M. Basto

Summary of changes: a21e1c9... Not requiring cryptopp version for epel builds (*) (*) This commit already existed in another branch; no separate mail sent

3 years, 1 month

1
0
0 / 0

[amule/el7] (27 commits) ...Not requiring cryptopp version for epel builds

by Sérgio M. Basto

Summary of changes: ab2662d... Amule also have issues with compat-wxGTK3-gtk2, revert to w (*) 6941571... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*) d66b127... Rebuilt (*) 423b8e5... Rebuilt (*) a288956... Attempt to build with wxGTK3 (*) e25d6d6... Add compiler (*) 3309fe7... Use wxGTK3-gtk2 since with gtk3 is crashing (#5197) (*) 2ad553e... - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass (*) 5a3ed14... - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass (*) c1117ae... Update to the latest git snapshot (*) 286566a... Bump version (*) 65f61ca... Some changes based on Mageia spec Let's try wxGTK with GTK3 (*) 3273dcd... Add appdata file, copied from https://github.com/sanjayan (*) a28b4b3... install "-P" is deprecated (*) 6f6e8c9... Rebuilt (*) 4258524... - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass (*) a7eab5a... Update gitignore (*) 1fb0cc9... rebuilt (*) 3312634... Update snapshot (*) 89b72c6... Fix compilation with gcc-11 (*) 4a678f9... - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass (*) 367b1e5... Rebuilt (*) 17deec4... New upstream release (*) 9a748e0... - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass (*) 3a316ba... Rebuild for cryptopp update from 8.4.0 to 8.6.0 (*) 93b4fb4... PR 298 from upstream to allow build with autoconf 2.71 (*) a21e1c9... Not requiring cryptopp version for epel builds (*) (*) This commit already existed in another branch; no separate mail sent

3 years, 1 month

1
0
0 / 0

[amule/el8] Not requiring cryptopp version for epel builds

by Sérgio M. Basto

commit a21e1c9c02585c48cf9084c95054f95b1332b98b Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Tue Oct 12 15:22:54 2021 +0100 Not requiring cryptopp version for epel builds amule.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- diff --git a/amule.spec b/amule.spec index 78fc82a..4ed01af 100644 --- a/amule.spec +++ b/amule.spec @@ -21,7 +21,7 @@ BuildRequires: gettext-devel BuildRequires: flex BuildRequires: bison BuildRequires: readline-devel -BuildRequires: pkgconfig(cryptopp) >= 8.6.0 +BuildRequires: pkgconfig(cryptopp) BuildRequires: pkgconfig(libupnp) BuildRequires: pkgconfig(geoip) BuildRequires: libappstream-glib @@ -30,7 +30,6 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(ncurses) Requires: %{name}-nogui -Requires: cryptopp >= 8.6.0 %description aMule is an easy to use multi-platform client for ED2K Peer-to-Peer

3 years, 1 month

1
0
0 / 0

[lpf-spotify-client/el8] (4 commits) ...Update to 1.1.68.632.g2b11de83

by Sérgio M. Basto

Summary of changes: 319c459... Update to 1.1.55.498.gf9a83c60 (*) 0003537... Update to 1.1.56.595.g2d2da0de (*) f611d7b... Update to 1.1.67.586.gbb5ef64e (*) 91add82... Update to 1.1.68.632.g2b11de83 (*) (*) This commit already existed in another branch; no separate mail sent

3 years, 1 month

1
0
0 / 0

[megasync/f34] (2 commits) ...Rebuild for new cryptopp.

by Vasiliy Glazov

Summary of changes: 983d5f4... Fix glibc. (*) ec77188... Rebuild for new cryptopp. (*) (*) This commit already existed in another branch; no separate mail sent

3 years, 1 month

1
0
0 / 0

[chromium-freeworld/f33] (2 commits) ...fix patch

by Leigh Scott

Summary of changes: 64924b0... Update to 94.0.4606.81 (*) ec0a86f... fix patch (*) (*) This commit already existed in another branch; no separate mail sent

3 years, 1 month

1
0
0 / 0

[VirtualBox] Fix vendor

by Sérgio M. Basto

commit 3f5120951d5b8a9c110107ed4d694d392db80ebc Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Sat Oct 9 03:31:37 2021 +0100 Fix vendor VirtualBox.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- diff --git a/VirtualBox.spec b/VirtualBox.spec index 26ac948..3d8c0d7 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -375,9 +375,12 @@ cp %{SOURCE1} UserManual.pdf . ./env.sh umask 0022 -#TODO fix publisher in copr +%if "%{vendor}" == "RPM Fusion" +%global publisher _rpmfusion +%else %global publisher _%{?vendor:%(echo "%{vendor}" | \ - sed -e 's/[^[:alnum:]]//g; s/FedoraProject//' | cut -c -9)}%{?!vendor:custom} + sed -e 's/[^[:alnum:]]//g; s/FedoraCopruser//' | cut -c -9)}%{?!vendor:custom} +%endif # VirtualBox build system installs and builds in the same step, # not always looking for the installed files in places they have

3 years, 1 month

1
0
0 / 0

[gstreamer1-libav] rfpkg new-sources seems that sometimes fails

by Sérgio M. Basto

commit 388bae92a5c8d9da428f2297e4fa776178c9c342 Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Sat Oct 9 21:13:53 2021 +0100 rfpkg new-sources seems that sometimes fails sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/sources b/sources index 1b47723..6805f84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.19.1.tar.xz) = 37541e5de9621bbc68e3d56504bd9ebe1ba286c7f22720478a3e6d8bd9d69a8722c050d05e54aaee18a83685c867d7673a9c17d81f6e208628bd948775d92db0 +SHA512 (gst-libav-1.19.2.tar.xz) = e10e0e21aea655c500ef1266eee0410e3777e3a4aa0b85c75bc127345ddd62224dd07f063d30a06d64bf60e66508e9aca361665777935ca999d28c1c8d0eba36

3 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits October 2021