[VirtualBox-kmod] vboxsf need symbols of vboxguest on building modules, stage 2.
by Sérgio M. Basto
commit 2acb40a082a25dd1c646cb65a501a252cc64f07e
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed May 20 04:21:31 2020 +0100
vboxsf need symbols of vboxguest on building modules, stage 2.
VirtualBox-kmod.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index ee7623d..f375b01 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -37,7 +37,7 @@
Name: VirtualBox-kmod
Version: 6.1.8
-Release: 1%{?dist}
+Release: 2%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -96,6 +96,8 @@ for kernel_version in %{?kernel_versions}; do
done
%if %{with vboxguest}
export KBUILD_EXTRA_SYMBOLS=${PWD}/kmod_build_${kernel_version%%___*}/vboxguest/Module.symvers
+ # copy vboxguest (for guest) module symbols which are used by vboxsf km on building modules, stage 2.
+ cp _kmod_build_${kernel_version%%___*}/{vboxguest/Module.symvers,vboxsf}
make %{?_smp_mflags} KERN_DIR="${kernel_version##*___}" -C "${kernel_version##*___}" M="${PWD}/_kmod_build_${kernel_version%%___*}/vboxsf" modules
%endif
for module in vbox{netadp,netflt}; do
@@ -133,6 +135,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Wed May 20 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.8-2
+- vboxsf need symbols of vboxguest on building modules, stage 2.
+
* Sat May 16 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.8-1
- Update to 6.1.8
4 years, 6 months
[VirtualBox] Fix for guest additions on EL7, now we use vboxservice.service to load modules. Partial fix for rf
by Sérgio M. Basto
commit d390ad764126ad5faab01d5623c8fb2bbd026e73
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed May 20 02:37:42 2020 +0100
Fix for guest additions on EL7, now we use vboxservice.service to load modules.
Partial fix for rfbz #3966
VirtualBox-guest.modules | 3 ---
VirtualBox.spec | 16 +++++-----------
vboxservice.service | 4 ++++
3 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 17e883b..c9aeb5e 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -46,7 +46,7 @@
Name: VirtualBox
Version: 6.1.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -63,7 +63,6 @@ Source2: VirtualBox.appdata.xml
Source3: VirtualBox-60-vboxdrv.rules
Source4: VirtualBox.modules
Source5: VirtualBox-60-vboxguest.rules
-Source6: VirtualBox-guest.modules
Source7: vboxservice.service
Source8: 96-vbox.preset
Source10: vboxweb.service
@@ -599,11 +598,6 @@ desktop-file-validate \
install -p -m 0644 -D %{SOURCE7} %{buildroot}%{_unitdir}/vboxservice.service
install -p -m 0644 -D %{SOURCE8} %{buildroot}%{_presetdir}/96-vbox.preset
install -p -m 0644 -D %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules
-install -p -m 0644 -D %{SOURCE6} %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
-%if 0%{?fedora}
-#sed -i s/vboxvideo/d %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
-sed -i 's/vboxvideo/#vboxvideo/' %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
-%endif
%endif
# Module Source Code
@@ -714,9 +708,6 @@ getent passwd vboxadd >/dev/null || \
# Guest additions install
%post guest-additions
/sbin/ldconfig
-# should be in kmod package, not here, but we need modules loaded to start
-# vboxservice
-/bin/systemctl restart systemd-modules-load.service >/dev/null 2>&1 || :
%systemd_post vboxservice.service
#chcon -u system_u -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf" > /dev/null 2>&1
@@ -869,7 +860,6 @@ getent passwd vboxadd >/dev/null || \
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
%{_udevrulesdir}/60-vboxguest.rules
-%{_prefix}/lib/modules-load.d/%{name}-guest.conf
%{_unitdir}/vboxservice.service
%{_presetdir}/96-vbox.preset
%endif
@@ -878,6 +868,10 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Wed May 20 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.8-2
+- Fix for guest additions on EL7, now we use vboxservice.service to load modules.
+ Partial fix for rfbz #3966
+
* Fri May 15 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.8-1
- Update VBox to 6.1.8
diff --git a/vboxservice.service b/vboxservice.service
index 3eb3c0d..69c6b77 100644
--- a/vboxservice.service
+++ b/vboxservice.service
@@ -5,6 +5,10 @@ ConditionVirtualization=|kvm
ConditionVirtualization=|oracle
[Service]
+ExecStartPre=-/usr/bin/modprobe vboxguest
+ExecStartPre=-/usr/bin/modprobe vboxvideo
+ExecStartPre=-/usr/bin/modprobe vboxsf
+ExecStartPre=-/usr/bin/VBoxClient --vmsvga
ExecStart=/usr/sbin/VBoxService -f
[Install]
4 years, 6 months
[libopenshot/el7] (5 commits) ...Rebuild for ImageMagick on el7
by Sérgio M. Basto
Summary of changes:
c8a2769... Re-enable unit tests, ldconfig only RHEL < 8 (*)
cdd23e9... ExcludeArch: ppc64le (*)
87c5196... - Rebuild for ffmpeg-4.3 git (*)
885e34f... New upstream release (*)
4134dea... Rebuild for ImageMagick on el7 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 6 months
[libopenshot] Rebuild for ImageMagick on el7
by Sérgio M. Basto
commit 4134dea33aa03d1fef7c685058185fe1ff1dccd3
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed May 20 02:26:21 2020 +0100
Rebuild for ImageMagick on el7
libopenshot.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/libopenshot.spec b/libopenshot.spec
index b548f27..a677032 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -1,6 +1,6 @@
Name: libopenshot
Version: 0.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library for creating and editing videos
License: LGPLv3+
@@ -101,6 +101,9 @@ make os_test
%{ruby_vendorarchdir}/*
%changelog
+* Wed May 20 2020 Sérgio Basto <sergio(a)serjux.com> - 0.2.5-2
+- Rebuild for ImageMagick on el7
+
* Sat Mar 07 2020 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 0.2.5-1
- New upstream release
4 years, 6 months
[xine-lib] Rebuild for ImageMagick on el7
by Sérgio M. Basto
commit a106550c96c85ba277756c2cc163f818dfc7cdf2
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed May 20 01:37:43 2020 +0100
Rebuild for ImageMagick on el7
xine-lib.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index a43980a..fbbfdc4 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -38,7 +38,7 @@
Summary: A multimedia engine
Name: xine-lib
Version: 1.2.10
-Release: 5%{?snapshot:.%{date}hg%{revision}}%{?dist}
+Release: 6%{?snapshot:.%{date}hg%{revision}}%{?dist}
License: GPLv2+
URL: http://www.xine-project.org/
%if ! 0%{?snapshot}
@@ -341,6 +341,9 @@ mkdir -p %{buildroot}%{codecdir}
%changelog
+* Wed May 20 2020 Sérgio Basto <sergio(a)serjux.com> - 1.2.10-6
+- Rebuild for ImageMagick on el7
+
* Fri Apr 10 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.2.10-5
- Rebuild for new libcdio version
4 years, 6 months
[xine-lib: 9/9] Merge branch 'el7'
by Sérgio M. Basto
commit a9f3c1b1b48d443f64a15898ab55fcd015453a90
Merge: 737c9f2 82c75b4
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed May 20 00:48:06 2020 +0100
Merge branch 'el7'
---
4 years, 6 months
[xine-lib] (9 commits) ...Merge branch 'el7'
by Sérgio M. Basto
Summary of changes:
dbb4b01... xine-lib 1.2.5 (*)
741e231... drop unused patch (*)
e9fb28e... xine-lib 1.2.6 (*)
4b82bf0... Update to 1.2.8 (*)
afd5988... Merge branch 'master' into el7 (*)
4f08665... Rebuilt (*)
a6b8c11... Rebuild for ffmpeg-3.* on el7 (*)
82c75b4... Merge remote-tracking branch 'origin/master' into el7 (*)
a9f3c1b... Merge branch 'el7'
(*) This commit already existed in another branch; no separate mail sent
4 years, 6 months