[VirtualBox-kmod] elfutils-libelf-devel is needed in el8 to build kmods
by Sérgio M. Basto
commit 440cf00af032ace1f437dde11914e6250b96c44f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Jun 10 02:11:59 2020 +0100
elfutils-libelf-devel is needed in el8 to build kmods
VirtualBox-kmod.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 30da21f..6a1ed84 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -47,7 +47,7 @@ URL: http://www.virtualbox.org/wiki/VirtualBox
Source1: excludekernel-filter.txt
-%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
+%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time, elfutils-libelf-devel
BuildRequires: %{AkmodsBuildRequires}
ExclusiveArch: x86_64
3 years, 11 months
[VirtualBox/el8] (7 commits) ...Install the new VBoxDRMClient binary for guest-additions
by Sérgio M. Basto
Summary of changes:
2f1555a... Update VBox to 6.1.10 (*)
da592e9... Minor fixes (*)
58f90db... Only in epel7 run the scriptlets of Icon Cache, mimeinfo an (*)
1ab2955... Update helper script (*)
5b42b94... Rfbz #3966, not using anymore systemd-modules-load.service (*)
d773823... Drop wayland-crash patch and fix wrong path to (*)
d6a670b... Install the new VBoxDRMClient binary for guest-additions (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 11 months
[VirtualBox/f32] (6 commits) ...Install the new VBoxDRMClient binary for guest-additions
by Sérgio M. Basto
Summary of changes:
da592e9... Minor fixes (*)
58f90db... Only in epel7 run the scriptlets of Icon Cache, mimeinfo an (*)
1ab2955... Update helper script (*)
5b42b94... Rfbz #3966, not using anymore systemd-modules-load.service (*)
d773823... Drop wayland-crash patch and fix wrong path to (*)
d6a670b... Install the new VBoxDRMClient binary for guest-additions (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 11 months
[VirtualBox] Install the new VBoxDRMClient binary for guest-additions
by Sérgio M. Basto
commit d6a670bce24f85e69e698aa119b9d77a26a3a230
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jun 9 22:06:38 2020 +0100
Install the new VBoxDRMClient binary for guest-additions
VirtualBox.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index a6f88c6..7744c21 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -580,6 +580,7 @@ install -m 0755 -t %{buildroot}%{_sbindir} \
obj/bin/additions/VBoxService \
obj/bin/additions/mount.vboxsf
install -m 0755 -t %{buildroot}%{_bindir} \
+ obj/bin/additions/VBoxDRMClient \
obj/bin/additions/VBoxClient \
obj/bin/additions/VBoxControl
@@ -861,6 +862,7 @@ getent passwd vboxadd >/dev/null || \
%{_bindir}/VBoxClient
%{_bindir}/VBoxControl
%{_bindir}/VBoxClient-all
+%{_bindir}/VBoxDRMClient
%{_sbindir}/VBoxService
%{_sbindir}/mount.vboxsf
%{_libdir}/security/pam_vbox.so
@@ -880,6 +882,7 @@ getent passwd vboxadd >/dev/null || \
%changelog
* Mon Jun 08 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.10-2
+- Install the new VBoxDRMClient binary for guest-additions
- Drop wayland-crash patch and fix wrong path to modprobe
- Rfbz #3966, not using anymore systemd-modules-load.service
Instead we use one systemd service (vboxdrv.service) to load the server modules.
3 years, 11 months
[VirtualBox] Drop wayland-crash patch and fix wrong path to
by Sérgio M. Basto
commit d77382330e1d65f00170108402a244eae7868cb4
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jun 9 21:55:21 2020 +0100
Drop wayland-crash patch and fix wrong path to
modprobe: Failed at step EXEC spawning /usr/bin/modprobe: No such file or directory
VirtualBox-6.1.4-wayland-crash.patch | 15 ---------------
VirtualBox.spec | 3 +--
vboxservice.service | 2 +-
3 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 3c985b7..a6f88c6 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -90,7 +90,6 @@ Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
Patch70: vbox-python-detection.diff
Patch80: VirtualBox-6.1.4-gcc10.patch
-Patch84: VirtualBox-6.1.4-wayland-crash.patch
Patch85: VirtualBox-6.1.4-Xwayland-shortcut-inhibit.patch
Patch86: VirtualBox-6.1.0-VBoxRem.patch
@@ -342,7 +341,6 @@ rm -r src/libs/zlib-1.2.*/
%patch61 -p1 -b .automount
%patch70 -p1 -b .python-detection
%patch80 -p1 -b .hack
-%patch84 -p1 -b .wayland
%patch85 -p1 -b .wayland2
%patch86 -p1 -b .vboxrem
@@ -882,6 +880,7 @@ getent passwd vboxadd >/dev/null || \
%changelog
* Mon Jun 08 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.10-2
+- Drop wayland-crash patch and fix wrong path to modprobe
- Rfbz #3966, not using anymore systemd-modules-load.service
Instead we use one systemd service (vboxdrv.service) to load the server modules.
- Only in epel7 run the scriptlets of Icon Cache, mimeinfo and Desktop databases
diff --git a/vboxservice.service b/vboxservice.service
index cdfa4ce..34a9e5e 100644
--- a/vboxservice.service
+++ b/vboxservice.service
@@ -6,7 +6,7 @@ ConditionVirtualization=|oracle
[Service]
Type=simple
-ExecStartPre=-/usr/bin/modprobe vboxguest
+ExecStartPre=-/usr/sbin/modprobe vboxguest
ExecStart=/usr/sbin/VBoxService -f
Restart=on-failure
3 years, 11 months
[VirtualBox] Rfbz #3966, not using anymore systemd-modules-load.service
by Sérgio M. Basto
commit 5b42b948cf3b5e8d1256af1aba9aa468d85bd028
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jun 9 20:36:07 2020 +0100
Rfbz #3966, not using anymore systemd-modules-load.service
Instead we use one systemd service (vboxdrv.service) to load the server modules.
96-vbox-server.preset | 7 +++++++
96-vbox.preset | 3 +++
VirtualBox-6.1.0-strings.patch | 16 ++++++++--------
VirtualBox.modules | 3 ---
VirtualBox.spec | 35 ++++++++++++++++++++++++++---------
vboxdrv.service | 17 +++++++++++++++++
6 files changed, 61 insertions(+), 20 deletions(-)
---
diff --git a/96-vbox-server.preset b/96-vbox-server.preset
new file mode 100644
index 0000000..789679b
--- /dev/null
+++ b/96-vbox-server.preset
@@ -0,0 +1,7 @@
+# Also see:
+# New wiki:
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/DefaultServices/
+# Old wiki:
+# https://fedoraproject.org/wiki/Starting_services_by_default
+
+enable vboxdrv.service
diff --git a/96-vbox.preset b/96-vbox.preset
index 85dde97..9d42a25 100644
--- a/96-vbox.preset
+++ b/96-vbox.preset
@@ -1,4 +1,7 @@
# Also see:
+# New wiki:
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/DefaultServices/
+# Old wiki:
# https://fedoraproject.org/wiki/Starting_services_by_default
# Installing presets is not the preferred solution but until another one
diff --git a/VirtualBox-6.1.0-strings.patch b/VirtualBox-6.1.0-strings.patch
index 1f9ee37..2e44b14 100644
--- a/VirtualBox-6.1.0-strings.patch
+++ b/VirtualBox-6.1.0-strings.patch
@@ -13,7 +13,7 @@
+ " <font color=blue>dnf install akmod-VirtualBox kernel-devel-$(uname -r)</font>"
+ "If you installed VirtualBox packages and don't want reboot the system, you may need load the "
+ "kernel driver, doing as root:"
-+ " <font color=blue>akmods; systemctl restart systemd-modules-load.service</font><br/><br/>"
++ " <font color=blue>akmods; systemctl restart vboxdrv.service</font><br/><br/>"
"If your system has EFI Secure Boot enabled you may also need to sign "
"the kernel modules (vboxdrv, vboxnetflt, vboxnetadp, vboxpci) before "
"you can load them. Please see your Linux system's documentation for "
@@ -25,7 +25,7 @@
- "VirtualBox."
- );
+ "successful. Executing<br/><br/>"
-+ " <font color=blue>rmmod vboxnetadp vboxnetflt vboxpci vboxdrv; systemctl restart systemd-modules-load.service</font> as root<br/><br/>"
++ " <font color=blue>rmmod vboxnetadp vboxnetflt vboxpci vboxdrv; systemctl restart vboxdrv.service</font> as root<br/><br/>"
+ "may correct this. Make sure that you do not mix the "
+ "RPMFusion version and the Oracle version of VirtualBox."
+
@@ -38,7 +38,7 @@
- " <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
- "may correct this. Make sure that you are not mixing builds "
- "of VirtualBox from different sources."
-+ " <font color=blue>rmmod vboxnetadp vboxnetflt vboxpci vboxdrv; systemctl restart systemd-modules-load.service</font> as root<br/><br/>"
++ " <font color=blue>rmmod vboxnetadp vboxnetflt vboxpci vboxdrv; systemctl restart vboxdrv.service</font> as root<br/><br/>"
+ "may correct this. Make sure that you do not mix the "
+ "RPMFusion version and the Oracle version of VirtualBox."
);
@@ -67,7 +67,7 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Installer/linux/VBox.sh VirtualBox-6.0
- sudo /sbin/vboxconfig
+ dnf install akmod-VirtualBox kernel-devel-$(uname -r)
-+ akmods --kernels $(uname -r) && systemctl restart systemd-modules-load.service
++ akmods --kernels $(uname -r) && systemctl restart vboxdrv.service
You will not be able to start VMs until this problem is fixed.
EOF
@@ -78,7 +78,7 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Installer/linux/VBox.sh VirtualBox-6.0
- sudo /sbin/vboxconfig
+ dnf install akmod-VirtualBox kernel-devel-$(uname -r)
-+ akmods --kernels $(uname -r) && systemctl restart systemd-modules-load.service
++ akmods --kernels $(uname -r) && systemctl restart vboxdrv.service
- and if that is not successful, try to re-install the package.
+ and if that is not successful, try see if
@@ -94,7 +94,7 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Installer/linux/VBox.sh VirtualBox-6.0
"way for your host system. Then try to recompile and reload the "
"kernel modules by executing "
- "'/sbin/vboxconfig' as root");
-+ "'akmods && systemctl restart systemd-modules-load.service' as root");
++ "'akmods && systemctl restart vboxdrv.service' as root");
break;
#endif
@@ -107,7 +107,7 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Installer/linux/VBox.sh VirtualBox-6.0
- "'/sbin/vboxconfig' as root");
+ "in the right way for your system."
+ "Load the kernel module by executing "
-+ "'systemctl restart systemd-modules-load.service' as root");
++ "'systemctl restart vboxdrv.service' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
@@ -120,7 +120,7 @@ diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Installer/linux/VBox.sh VirtualBox-6.0
- "'/sbin/vboxconfig' as root");
+ "in the right way for your system."
+ "Install the kernel module by executing 'dnf install akmod-VirtualBox kernel-devel-$(uname -r)'"
-+ "and 'akmods && systemctl restart systemd-modules-load.service' as root");
++ "and 'akmods && systemctl restart vboxdrv.service' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
diff --git a/VirtualBox.spec b/VirtualBox.spec
index f8864bb..3c985b7 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -46,7 +46,7 @@
Name: VirtualBox
Version: 6.1.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -61,10 +61,11 @@ Source0: https://download.virtualbox.org/virtualbox/%{version}%{?prereltag}/V
Source1: https://download.virtualbox.org/virtualbox/%{version}%{?prereltag}/UserMa...
Source2: VirtualBox.appdata.xml
Source3: VirtualBox-60-vboxdrv.rules
-Source4: VirtualBox.modules
+Source4: vboxdrv.service
Source5: VirtualBox-60-vboxguest.rules
Source7: vboxservice.service
Source8: 96-vbox.preset
+Source9: 96-vbox-server.preset
Source10: vboxweb.service
Source20: os_mageia.png
Source21: os_mageia_64.png
@@ -515,7 +516,6 @@ ln -s ../..%{_libdir}/virtualbox/vbox-img %{buildroot}%{_bindir}/vbox-img
#ln -s /usr/share/virtualbox/src/vboxhost $RPM_BUILD_ROOT/usr/src/vboxhost-%VER%
-
# Components, preserve symlinks
cp -a obj/bin/components/* %{buildroot}%{_libdir}/virtualbox/components/
cp obj/bin/UnattendedTemplates/* %{buildroot}%{_libdir}/virtualbox/UnattendedTemplates
@@ -625,8 +625,10 @@ echo 'INSTALL_DIR=%{_libdir}/virtualbox' > %{buildroot}%{_sysconfdir}/vbox/vbox.
install -p -m 0755 -D obj/bin/VBoxCreateUSBNode.sh %{buildroot}%{_prefix}/lib/udev/VBoxCreateUSBNode.sh
install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxdrv.rules
-# Install modules load script
-install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_prefix}/lib/modules-load.d/%{name}.conf
+# Install service to load server modules
+install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_unitdir}/vboxdrv.service
+install -p -m 0644 -D %{SOURCE9} %{buildroot}%{_presetdir}/96-vbox-server.preset
+
# Menu entry
desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
@@ -661,9 +663,13 @@ then
/sbin/udevadm trigger --subsystem-match=usb --action=add >/dev/null 2>&1 || :
/sbin/udevadm settle >/dev/null 2>&1 || :
fi
+%systemd_post vboxdrv.service
+
+%preun server
+%systemd_preun vboxdrv.service
-# should be in kmod package, not here
-/bin/systemctl restart systemd-modules-load.service >/dev/null 2>&1 || :
+%postun server
+%systemd_postun_with_restart vboxdrv.service
# Need review, I don't know the rules of Icon Cache, mimeinfo and Desktop databases for epel 8
%if 0%{?rhel} && 0%{?rhel} < 8
@@ -711,7 +717,6 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
getent passwd vboxadd >/dev/null || \
useradd -r -g 1 -d /var/run/vboxadd -s /sbin/nologin vboxadd 2>&1
-
# Guest additions install
%post guest-additions
/sbin/ldconfig
@@ -807,7 +812,8 @@ getent passwd vboxadd >/dev/null || \
%dir %{_sysconfdir}/vbox
%config %{_sysconfdir}/vbox/vbox.cfg
%{_udevrulesdir}/60-vboxdrv.rules
-%{_prefix}/lib/modules-load.d/%{name}.conf
+%{_unitdir}/vboxdrv.service
+%{_presetdir}/96-vbox-server.preset
%{_prefix}/lib/udev/VBoxCreateUSBNode.sh
%files
@@ -875,6 +881,17 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Mon Jun 08 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.10-2
+- Rfbz #3966, not using anymore systemd-modules-load.service
+ Instead we use one systemd service (vboxdrv.service) to load the server modules.
+- Only in epel7 run the scriptlets of Icon Cache, mimeinfo and Desktop databases
+- Move icons files from server sub-package to main (Qt/Desktop) sub-package
+- Also scriptlets of usb moved to server sub-package
+- Minor fixes
+ Rename patch VirtualBox-6.1.4-hacks to VirtualBox-6.1.4-gcc10
+ Syncronize vboxservice.service with virtualbox-guest-additions from Fedora
+ Remove bundled src/libs/openssl
+
* Sat Jun 06 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.10-1
- Update VBox to 6.1.10
diff --git a/vboxdrv.service b/vboxdrv.service
new file mode 100644
index 0000000..189f48c
--- /dev/null
+++ b/vboxdrv.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Linux kernel module init script
+
+[Service]
+Type=oneshot
+ExecStart=/sbin/modprobe vboxdrv
+ExecStart=/sbin/modprobe vboxnetflt
+ExecStart=/sbin/modprobe vboxnetadp
+ExecStop=/sbin/modprobe -r vboxnetadp
+ExecStop=/sbin/modprobe -r vboxnetflt
+ExecStop=/sbin/modprobe -r vboxdrv
+
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+
3 years, 11 months
[VirtualBox] Update helper script
by Sérgio M. Basto
commit 1ab2955219e0d4daed17e6933d88837d2655a345
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jun 9 20:29:40 2020 +0100
Update helper script
update_vbox.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/update_vbox.sh b/update_vbox.sh
index 2e75efd..f9c160f 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,7 +1,7 @@
VERSION=6.1.10
-REL=1
+REL=2
RAWHIDE=33
-REPOS="f32 f31 f30 el7"
+REPOS="f32 f31 el7"
if [ -z "$1" ]
then
stage=0
@@ -14,9 +14,12 @@ then
echo STAGE 0
git checkout master
git pull
+if test $REL -eq 1
+then
rpmdev-bumpspec -n $VERSION -c "Update VBox to $VERSION" VirtualBox.spec
rm UserManual.pdf
spectool -g VirtualBox.spec
+fi
rfpkg srpm && copr-cli build sergiomb/vboxfor23 VirtualBox-$VERSION-$REL.fc$RAWHIDE.src.rpm
fi
3 years, 11 months
[aegisub] Fix FTBFS
by Leigh Scott
commit 54873c67397ae9751005c98938882eafcf059d76
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jun 9 18:57:37 2020 +0100
Fix FTBFS
aegisub-fix_build_with_make4.3.patch | 23 +++++++++++++++++++++++
aegisub.spec | 2 ++
2 files changed, 25 insertions(+)
---
diff --git a/aegisub-fix_build_with_make4.3.patch b/aegisub-fix_build_with_make4.3.patch
new file mode 100644
index 0000000..6edb8c3
--- /dev/null
+++ b/aegisub-fix_build_with_make4.3.patch
@@ -0,0 +1,23 @@
+From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
+From: wangqr <wangqr(a)wangqr.tk>
+Date: Mon, 17 Feb 2020 14:42:07 +0800
+Subject: [PATCH] Use target name without directory in $*_OBJ macro
+
+Fix Aegisub/Aegisub#171
+---
+ Makefile.target | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.target b/Makefile.target
+index 516ef3c24..5c4c5d259 100644
+--- a/Makefile.target
++++ b/Makefile.target
+@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
+ # Libraries contain all object files they depend on (but they may depend on other files)
+ # Not using libtool on OS X because it has an unsilenceable warning about a
+ # compatibility issue with BSD 4.3 (wtf)
+-lib%.a: $$($$*_OBJ)
++lib%.a: $$($$(*F)_OBJ)
+ @$(BIN_MKDIR_P) $(dir $@)
+ $(BIN_AR) cru $@ $(filter %.o,$^)
+ $(BIN_RANLIB) $@
diff --git a/aegisub.spec b/aegisub.spec
index 3831515..1069963 100644
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -27,6 +27,8 @@ Patch5: aegisub-git-version.patch
Patch6: aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch
#PATCH-FIX-UPSTREAM - davejplater(a)gmail.com - aegisub-boost169.patch - Fixes build with boost 1.69 where boost/gil/gil_all.hpp is moved to -boost169.patch
Patch7: aegisub-boost169.patch
+# https://github.com/wangqr/Aegisub/commit/f4cc905c69ca69c68cb95674cefce4ab...
+Patch8: aegisub-fix_build_with_make4.3.patch
# luajit isn't available on powerpc
# boost m4 detection is failing on i686 and armv7hl
3 years, 11 months
