variable escaping fix after previuos release change [release 6.1.12-3mamba;Sat Jul 25 2020]
This commit is contained in:
parent
d7d787c7e0
commit
34bd35905c
73
VirtualBox-6.0.14-vbox-cpuhotplug-build.patch
Normal file
73
VirtualBox-6.0.14-vbox-cpuhotplug-build.patch
Normal file
@ -0,0 +1,73 @@
|
||||
--- "VirtualBox-6 1.0.10-orig/src/VBox/Devices/PC/vbox-cpuhotplug.dsl" 2019-08-28 14:37:51.872756997 +0200
|
||||
+++ "VirtualBox-6 1.0.10/src/VBox/Devices/PC/vbox-cpuhotplug.dsl" 2019-08-28 14:38:58.122755384 +0200
|
||||
@@ -95,38 +95,38 @@ DefinitionBlock ("SSDT-cpuhotplug.aml",
|
||||
} \
|
||||
} \
|
||||
|
||||
- GENERATE_CPU_OBJECT(0x00, SCK0, "SCKCPU0", CPU0, "SCK0-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x01, SCK1, "SCKCPU1", CPU1, "SCK1-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x02, SCK2, "SCKCPU2", CPU2, "SCK2-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x03, SCK3, "SCKCPU3", CPU3, "SCK3-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x04, SCK4, "SCKCPU4", CPU4, "SCK4-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x05, SCK5, "SCKCPU5", CPU5, "SCK5-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x06, SCK6, "SCKCPU6", CPU6, "SCK6-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x07, SCK7, "SCKCPU7", CPU7, "SCK7-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x08, SCK8, "SCKCPU8", CPU8, "SCK8-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x09, SCK9, "SCKCPU9", CPU9, "SCK9-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x0a, SCKA, "SCKCPUA", CPUA, "SCKA-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x0b, SCKB, "SCKCPUB", CPUB, "SCKB-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x0c, SCKC, "SCKCPUC", CPUC, "SCKC-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x0d, SCKD, "SCKCPUD", CPUD, "SCKD-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x0e, SCKE, "SCKCPUE", CPUE, "SCKE-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x0f, SCKF, "SCKCPUF", CPUF, "SCKF-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x10, SCKG, "SCKCPUG", CPUG, "SCKG-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x11, SCKH, "SCKCPUH", CPUH, "SCKH-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x12, SCKI, "SCKCPUI", CPUI, "SCKI-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x13, SCKJ, "SCKCPUJ", CPUJ, "SCKJ-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x14, SCKK, "SCKCPUK", CPUK, "SCKK-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x15, SCKL, "SCKCPUL", CPUL, "SCKL-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x16, SCKM, "SCKCPUM", CPUM, "SCKM-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x17, SCKN, "SCKCPUN", CPUN, "SCKN-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x18, SCKO, "SCKCPUO", CPUO, "SCKO-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x19, SCKP, "SCKCPUP", CPUP, "SCKP-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x1a, SCKQ, "SCKCPUQ", CPUQ, "SCKQ-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x1b, SCKR, "SCKCPUR", CPUR, "SCKR-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x1c, SCKS, "SCKCPUS", CPUS, "SCKS-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x1d, SCKT, "SCKCPUT", CPUT, "SCKT-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x1e, SCKU, "SCKCPUU", CPUU, "SCKU-CPU0")
|
||||
- GENERATE_CPU_OBJECT(0x1f, SCKV, "SCKCPUV", CPUV, "SCKV-CPU0")
|
||||
+ GENERATE_CPU_OBJECT(0x00, SCK0, "SCKCPU0", CPU0, 0)
|
||||
+ GENERATE_CPU_OBJECT(0x01, SCK1, "SCKCPU1", CPU1, 1)
|
||||
+ GENERATE_CPU_OBJECT(0x02, SCK2, "SCKCPU2", CPU2, 2)
|
||||
+ GENERATE_CPU_OBJECT(0x03, SCK3, "SCKCPU3", CPU3, 3)
|
||||
+ GENERATE_CPU_OBJECT(0x04, SCK4, "SCKCPU4", CPU4, 4)
|
||||
+ GENERATE_CPU_OBJECT(0x05, SCK5, "SCKCPU5", CPU5, 5)
|
||||
+ GENERATE_CPU_OBJECT(0x06, SCK6, "SCKCPU6", CPU6, 6)
|
||||
+ GENERATE_CPU_OBJECT(0x07, SCK7, "SCKCPU7", CPU7, 7)
|
||||
+ GENERATE_CPU_OBJECT(0x08, SCK8, "SCKCPU8", CPU8, 8)
|
||||
+ GENERATE_CPU_OBJECT(0x09, SCK9, "SCKCPU9", CPU9, 9)
|
||||
+ GENERATE_CPU_OBJECT(0x0a, SCKA, "SCKCPUA", CPUA, 10)
|
||||
+ GENERATE_CPU_OBJECT(0x0b, SCKB, "SCKCPUB", CPUB, 11)
|
||||
+ GENERATE_CPU_OBJECT(0x0c, SCKC, "SCKCPUC", CPUC, 12)
|
||||
+ GENERATE_CPU_OBJECT(0x0d, SCKD, "SCKCPUD", CPUD, 13)
|
||||
+ GENERATE_CPU_OBJECT(0x0e, SCKE, "SCKCPUE", CPUE, 14)
|
||||
+ GENERATE_CPU_OBJECT(0x0f, SCKF, "SCKCPUF", CPUF, 15)
|
||||
+ GENERATE_CPU_OBJECT(0x10, SCKG, "SCKCPUG", CPUG, 16)
|
||||
+ GENERATE_CPU_OBJECT(0x11, SCKH, "SCKCPUH", CPUH, 17)
|
||||
+ GENERATE_CPU_OBJECT(0x12, SCKI, "SCKCPUI", CPUI, 18)
|
||||
+ GENERATE_CPU_OBJECT(0x13, SCKJ, "SCKCPUJ", CPUJ, 19)
|
||||
+ GENERATE_CPU_OBJECT(0x14, SCKK, "SCKCPUK", CPUK, 20)
|
||||
+ GENERATE_CPU_OBJECT(0x15, SCKL, "SCKCPUL", CPUL, 21)
|
||||
+ GENERATE_CPU_OBJECT(0x16, SCKM, "SCKCPUM", CPUM, 22)
|
||||
+ GENERATE_CPU_OBJECT(0x17, SCKN, "SCKCPUN", CPUN, 23)
|
||||
+ GENERATE_CPU_OBJECT(0x18, SCKO, "SCKCPUO", CPUO, 24)
|
||||
+ GENERATE_CPU_OBJECT(0x19, SCKP, "SCKCPUP", CPUP, 25)
|
||||
+ GENERATE_CPU_OBJECT(0x1a, SCKQ, "SCKCPUQ", CPUQ, 26)
|
||||
+ GENERATE_CPU_OBJECT(0x1b, SCKR, "SCKCPUR", CPUR, 27)
|
||||
+ GENERATE_CPU_OBJECT(0x1c, SCKS, "SCKCPUS", CPUS, 28)
|
||||
+ GENERATE_CPU_OBJECT(0x1d, SCKT, "SCKCPUT", CPUT, 29)
|
||||
+ GENERATE_CPU_OBJECT(0x1e, SCKU, "SCKCPUU", CPUU, 30)
|
||||
+ GENERATE_CPU_OBJECT(0x1f, SCKV, "SCKCPUV", CPUV, 31)
|
||||
|
||||
#undef GENERATE_CPU_OBJECT
|
||||
}
|
||||
13
VirtualBox-6.1.10-vboxweb-gsoap.patch
Normal file
13
VirtualBox-6.1.10-vboxweb-gsoap.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/src/VBox/Main/webservice/vboxweb.cpp b/src/VBox/Main/webservice/vboxweb.cpp
|
||||
index 8dd3ca1b..9d5c9138 100644
|
||||
--- a/src/VBox/Main/webservice/vboxweb.cpp
|
||||
+++ b/src/VBox/Main/webservice/vboxweb.cpp
|
||||
@@ -944,7 +944,7 @@ static void doQueuesLoop()
|
||||
if (rv == 0)
|
||||
continue; // timeout, not necessary to bother gsoap
|
||||
// r < 0, errno
|
||||
- if (soap_socket_errno(soap.master) == SOAP_EINTR)
|
||||
+ if (soap_socket_errno == SOAP_EINTR)
|
||||
rv = 0; // re-check if we should terminate
|
||||
break;
|
||||
}
|
||||
252
VirtualBox.spec
252
VirtualBox.spec
@ -17,14 +17,15 @@
|
||||
%endif
|
||||
|
||||
Name: VirtualBox
|
||||
Version: 6.0.8
|
||||
Release: 1mamba
|
||||
Version: 6.1.12
|
||||
Release: 3mamba
|
||||
Summary: A general-purpose full virtualizer for x86 hardware
|
||||
Group: Graphical Desktop/Applications/Utilities
|
||||
Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Stefano Cotta Ramusino <stefano.cotta@openmamba.org>
|
||||
URL: http://www.virtualbox.org/
|
||||
# 6.1.12: real source is 6.1.12a
|
||||
Source0: http://download.virtualbox.org/virtualbox/%{version}/VirtualBox-%{version}.tar.bz2
|
||||
Source1: %{name}-wrapper
|
||||
Source2: %{name}-initscript
|
||||
@ -33,6 +34,7 @@ Source4: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdd
|
||||
Source5: %{name}-modprobe
|
||||
# git clone https://github.com/Thorsten-Sick/vdfuse.git
|
||||
Source6: vdfuse-20140417git.tar.xz
|
||||
Source7: VBox.png
|
||||
Patch0: %{name}-4.0.8-enable_ffmpeg_capture.patch
|
||||
Patch1: %{name}-4.1.8-x86_64-disable_check_32bit.patch
|
||||
Patch2: VirtualBox-4.3.12-gcc-4.9.patch
|
||||
@ -44,19 +46,19 @@ Patch7: VirtualBox-5.1.22-build-gsoap.patch
|
||||
Patch8: VirtualBox-5.0.24-ogl-include-path.patch
|
||||
Patch9: VirtualBox-5.2.2-no-vboxvideo.patch
|
||||
Patch10: VirtualBox-5.2.30-x86-conflicting_type_ptrdiff_t.patch
|
||||
Patch11: VirtualBox-6.0.14-vbox-cpuhotplug-build.patch
|
||||
Patch12: VirtualBox-6.1.10-vboxweb-gsoap.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: ldconfig
|
||||
BuildRequires: libGL-devel
|
||||
BuildRequires: libIDL-devel
|
||||
BuildRequires: libSDL-devel
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libXcomposite-devel
|
||||
BuildRequires: libXcursor-devel
|
||||
BuildRequires: libXdamage-devel
|
||||
BuildRequires: libXext-devel
|
||||
BuildRequires: libXfixes-devel
|
||||
BuildRequires: libXmu-devel
|
||||
BuildRequires: libXrandr-devel
|
||||
BuildRequires: libXt-devel
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: libdevmapper-devel
|
||||
@ -87,6 +89,9 @@ BuildRequires: latex-font-bera
|
||||
BuildRequires: gsoap-devel
|
||||
BuildRequires: jdk
|
||||
BuildRequires: librtmp-devel
|
||||
%ifarch x86_64
|
||||
BuildRequires: glibc-multilib-devel
|
||||
%endif
|
||||
Provides: kernelvboxdrv
|
||||
Obsoletes: kernelvboxdrv
|
||||
Requires(post):kernelheaders
|
||||
@ -139,6 +144,10 @@ Provides: xorgdrvvideo
|
||||
#Requires: kernelvboxvideo
|
||||
Requires: xorg-server >= %{xorg_ver}
|
||||
Requires: xorg-server <= %{xorg_ver}.255
|
||||
Provides: VirtualBox-vboxguest
|
||||
Obsoletes: VirtualBox-vboxguest
|
||||
Provides: kernelvboxvideo
|
||||
Obsoletes: kernelvboxvideo
|
||||
|
||||
%description -n xorg-drv-video-vboxvideo
|
||||
X.org video driver for VirtualBox guest machine-
|
||||
@ -153,34 +162,35 @@ Requires: xorg-server <= %{xorg_ver}.255
|
||||
%description -n xorg-drv-input-vboxmouse
|
||||
X.org mouse driver for VirtualBox guest machine.
|
||||
|
||||
%package vboxguest
|
||||
Group: System/Kernel and Hardware
|
||||
Summary: Kernel DRM driver for VirtualBox guest machines
|
||||
Requires(post):dkms
|
||||
Requires(post):kernelheaders
|
||||
Requires(post):libelf-devel
|
||||
Provides: kernelvboxvideo
|
||||
Obsoletes: kernelvboxvideo
|
||||
#%package vboxguest
|
||||
#Group: System/Kernel and Hardware
|
||||
#Summary: Kernel DRM driver for VirtualBox guest machines
|
||||
#Requires(post):dkms
|
||||
#Requires(post):kernelheaders
|
||||
#Requires(post):libelf-devel
|
||||
#Provides: kernelvboxvideo
|
||||
#Obsoletes: kernelvboxvideo
|
||||
#
|
||||
#%description vboxguest
|
||||
#Kernel DRM driver for VirtualBox guest machines.
|
||||
|
||||
%description vboxguest
|
||||
Kernel DRM driver for VirtualBox guest machines.
|
||||
%debug_package
|
||||
|
||||
%prep
|
||||
%setup -q -a6
|
||||
#-D -T
|
||||
#:<< _EOF
|
||||
#%patch1 -p1
|
||||
#%patch2 -p1
|
||||
#%patch4 -p1
|
||||
#%patch3 -p1
|
||||
%patch5 -p1
|
||||
#%patch6 -p2
|
||||
%patch7 -p1
|
||||
#%patch8 -p1
|
||||
%patch9 -p1
|
||||
%ifarch %{ix86}
|
||||
%patch10 -p1
|
||||
%endif
|
||||
%patch12 -p1
|
||||
|
||||
%ifarch %{ix86}
|
||||
sed -i "s|VBOX_SUPPORTED_HOST_ARCHS := amd64|VBOX_SUPPORTED_HOST_ARCHS := x86|" Config.kmk
|
||||
%endif
|
||||
|
||||
echo "\
|
||||
VBOX_WITH_ORIGIN :=
|
||||
@ -208,6 +218,7 @@ VBOX_WITH_UPDATE_REQUEST=
|
||||
VBOX_GCC_OPT=%{optflags}" > LocalConfig.kmk
|
||||
|
||||
%build
|
||||
#:<< _EOF
|
||||
export CFLAGS="%optflags"
|
||||
export CXXFLAGS="%optflags"
|
||||
|
||||
@ -220,10 +231,8 @@ export CXXFLAGS="%optflags"
|
||||
--with-gcc=%{_host}-gcc \
|
||||
--with-g++=%{_host}-g++ \
|
||||
--enable-vnc \
|
||||
%ifnarch x86_64
|
||||
--disable-python \
|
||||
%endif
|
||||
%if "%{stage1}" == "1"
|
||||
--disable-python \
|
||||
--disable-java
|
||||
%endif
|
||||
|
||||
@ -266,28 +275,32 @@ kmk %{?_smp_mflags} CPPFLAGS="%{optflags} -fpermissive"
|
||||
install -d %{buildroot}%{_libdir}/%{name}
|
||||
cp -a out/*/release/bin/* %{buildroot}%{_libdir}/%{name}/
|
||||
|
||||
#install -d %{buildroot}%{_libdir}/xorg/modules/drivers
|
||||
#mv %{buildroot}%{_libdir}/%{name}/additions/vboxvideo_drv_system.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
|
||||
#rm -f %{buildroot}%{_libdir}/%{name}/additions/vboxvideo_drv*
|
||||
##install -d %{buildroot}%{_libdir}/xorg/modules/drivers
|
||||
##mv %{buildroot}%{_libdir}/%{name}/additions/vboxvideo_drv_system.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
|
||||
##rm -f %{buildroot}%{_libdir}/%{name}/additions/vboxvideo_drv*
|
||||
|
||||
install -d %{buildroot}%{_libdir}/dri
|
||||
mv %{buildroot}%{_libdir}/%{name}/additions/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so
|
||||
#install -d %{buildroot}%{_libdir}/dri
|
||||
#mv %{buildroot}%{_libdir}/%{name}/additions/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so
|
||||
|
||||
#install -d %{buildroot}%{_libdir}/xorg/modules/input
|
||||
#mv %{buildroot}%{_libdir}/%{name}/additions/vboxmouse_drv_%{xorgdrvver}.so* %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
|
||||
rm -f %{buildroot}%{_libdir}/%{name}/additions/vboxmouse_drv*
|
||||
##install -d %{buildroot}%{_libdir}/xorg/modules/input
|
||||
##mv %{buildroot}%{_libdir}/%{name}/additions/vboxmouse_drv_%{xorgdrvver}.so* %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
|
||||
#rm -f %{buildroot}%{_libdir}/%{name}/additions/vboxmouse_drv*
|
||||
|
||||
# install desktop menu icon
|
||||
install -d %{buildroot}%{_datadir}/pixmaps/
|
||||
%ifarch x86_64
|
||||
cp %{buildroot}%{_libdir}/%{name}/VBox.png %{buildroot}%{_datadir}/pixmaps/VBox.png
|
||||
%else
|
||||
cp %{SOURCE7} %{buildroot}%{_datadir}/pixmaps/VBox.png
|
||||
%endif
|
||||
|
||||
## install modprobe file
|
||||
#install -D -m 644 %{S:5} %{buildroot}%{_sysconfdir}/modprobe.d/vboxdrv.conf
|
||||
|
||||
# fixup strange shared library permissions
|
||||
for library in $(find %{buildroot}%{_libdir}/%{name} -name \*.so); do
|
||||
chmod 755 $library
|
||||
done
|
||||
## fixup strange shared library permissions
|
||||
#for library in $(find %{buildroot}%{_libdir}/%{name} -name \*.so); do
|
||||
# chmod 755 $library
|
||||
#done
|
||||
|
||||
# install wrappers
|
||||
install -d %{buildroot}%{_sysconfdir}/vbox
|
||||
@ -310,6 +323,7 @@ install -D -m0755 src/VBox/Installer/linux/vboxweb-service.sh %{buildroot}%{_ini
|
||||
#install -D -m0755 src/VBox/Installer/linux/vboxballoonctrl-service.sh.in %{buildroot}%{_initrddir}/vboxballoon-service
|
||||
|
||||
# install udev rules
|
||||
%ifarch x86_64
|
||||
install -d %{buildroot}/lib/udev/rules.d/
|
||||
cat > %{buildroot}/lib/udev/rules.d/59-vboxdrv.rules << EOF
|
||||
KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
|
||||
@ -324,6 +338,7 @@ EOF
|
||||
install -d -m0755 %{buildroot}/lib/udev/
|
||||
mv %{buildroot}%{_libdir}/VirtualBox/VBoxCreateUSBNode.sh \
|
||||
%{buildroot}/lib/udev/VBoxCreateUSBNode.sh
|
||||
%endif
|
||||
|
||||
# install icons
|
||||
for size in 16 32 48 64; do
|
||||
@ -347,7 +362,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/VBoxPython2_4.so
|
||||
rm -rf %{buildroot}%{_libdir}/%{name}/VBoxPython2_6.so
|
||||
|
||||
# install additions
|
||||
mv %{buildroot}%{_libdir}/%{name}/additions/VBoxOGL*.so %{buildroot}%{_libdir}/
|
||||
#mv %{buildroot}%{_libdir}/%{name}/additions/VBoxOGL*.so %{buildroot}%{_libdir}/
|
||||
cp src/VBox/Additions/linux/installer/vboxadd-service.sh %{buildroot}%{_initrddir}/vboxadd
|
||||
install -d -m 0755 %{buildroot}%{_sbindir}
|
||||
mv %{buildroot}%{_libdir}/%{name}/additions/{VBoxService,VBoxClient,VBoxControl} %{buildroot}%{_sbindir}/
|
||||
@ -363,37 +378,43 @@ cat > %{buildroot}%{_sysconfdir}/default/virtualbox << _EOF
|
||||
VBOXWEB_USER=root
|
||||
_EOF
|
||||
|
||||
#make -C out/linux.%virtualbox_arch/release/bin/src/ \
|
||||
# KERN_DIR=%{_prefix}/src/linux-%{kernel_version}%{?KERNEL_TARGET}
|
||||
#make -C out/linux.%virtualbox_arch/release/bin/additions/src/vboxvideo \
|
||||
# KERN_DIR=%{_prefix}/src/linux-%{kernel_version}%{?KERNEL_TARGET}
|
||||
#make -C out/linux.%virtualbox_arch/release/bin/additions/src/vboxguest \
|
||||
# KERN_DIR=%{_prefix}/src/linux-%{kernel_version}%{?KERNEL_TARGET}
|
||||
#/lib/modules/%{KERNEL_VER}%{KERNEL_TARGET}/kernel/drivers/virtualbox/vboxdrv.ko
|
||||
#/lib/modules/%{KERNEL_VER}%{KERNEL_TARGET}/kernel/drivers/virtualbox/vboxnetadp.ko
|
||||
#/lib/modules/%{KERNEL_VER}%{KERNEL_TARGET}/kernel/drivers/virtualbox/vboxnetflt.ko
|
||||
#/lib/modules/%{KERNEL_VER}%{KERNEL_TARGET}/kernel/drivers/virtualbox/vboxpci.ko
|
||||
|
||||
# dkms
|
||||
for p in vboxdrv vboxnetadp vboxnetflt vboxpci; do
|
||||
for p in vboxdrv vboxnetadp vboxnetflt; do
|
||||
install -d -m0755 %{buildroot}%{_prefix}/src/${p}-%{version}
|
||||
cp -a out/linux.%virtualbox_arch/release/bin/src/${p}/* %{buildroot}%{_prefix}/src/${p}-%{version}/
|
||||
done
|
||||
|
||||
# dkms for vboxvideo
|
||||
install -d -m0755 %{buildroot}%{_prefix}/src/vboxvideo-%{version}
|
||||
cp -a out/linux.%virtualbox_arch/release/bin/additions/src/vboxvideo/* %{buildroot}%{_prefix}/src/vboxvideo-%{version}/
|
||||
## dkms for vboxvideo
|
||||
#install -d -m0755 %{buildroot}%{_prefix}/src/vboxvideo-%{version}
|
||||
#cp -a out/linux.%virtualbox_arch/release/bin/additions/src/vboxvideo/* %{buildroot}%{_prefix}/src/vboxvideo-%{version}/
|
||||
|
||||
# dkms for vboxguest
|
||||
install -d -m0755 %{buildroot}%{_prefix}/src/vboxguest-%{version}
|
||||
cp -a out/linux.%virtualbox_arch/release/bin/additions/src/vboxguest/* %{buildroot}%{_prefix}/src/vboxguest-%{version}/
|
||||
## dkms for vboxguest
|
||||
#install -d -m0755 %{buildroot}%{_prefix}/src/vboxguest-%{version}
|
||||
#cp -a out/linux.%virtualbox_arch/release/bin/additions/src/vboxguest/* %{buildroot}%{_prefix}/src/vboxguest-%{version}/
|
||||
|
||||
for p in vboxdrv; do
|
||||
|
||||
for p in vboxdrv vboxnetadp vboxnetflt vboxpci vboxvideo vboxguest; do
|
||||
cat > %{buildroot}%{_prefix}/src/${p}-%{version}/dkms.conf << _EOF
|
||||
PACKAGE_NAME=${p}
|
||||
PACKAGE_VERSION=%{version}
|
||||
MAKE="make -C \${kernel_source_dir} SUBDIRS=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build modules"
|
||||
CLEAN="make -C \${kernel_source_dir} SUBDIRS=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build clean"
|
||||
MAKE="make -C \${kernel_source_dir} M=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build modules && cp \${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build/Module.symvers \${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/"
|
||||
CLEAN="make -C \${kernel_source_dir} M=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build clean"
|
||||
BUILT_MODULE_NAME=${p}
|
||||
BUILT_MODULE_LOCATION=./
|
||||
DEST_MODULE_LOCATION=/kernel/drivers/virtualbox
|
||||
REMAKE_INITRD=no
|
||||
AUTOINSTALL=yes
|
||||
_EOF
|
||||
|
||||
done
|
||||
|
||||
for p in vboxnetadp vboxnetflt; do
|
||||
|
||||
cat > %{buildroot}%{_prefix}/src/${p}-%{version}/dkms.conf << _EOF
|
||||
PACKAGE_NAME=${p}
|
||||
PACKAGE_VERSION=%{version}
|
||||
MAKE="make -C \${kernel_source_dir} M=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build KBUILD_EXTRA_SYMBOLS=\${dkms_tree}/vboxdrv/\${PACKAGE_VERSION}/Module.symvers modules"
|
||||
CLEAN="make -C \${kernel_source_dir} M=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build clean"
|
||||
BUILT_MODULE_NAME=${p}
|
||||
BUILT_MODULE_LOCATION=./
|
||||
DEST_MODULE_LOCATION=/kernel/drivers/virtualbox
|
||||
@ -409,7 +430,6 @@ cat > %{buildroot}%{_prefix}/lib/modules-load.d/virtualbox.conf << _EOF
|
||||
vboxdrv
|
||||
vboxnetflt
|
||||
vboxnetadp
|
||||
vboxpci
|
||||
_EOF
|
||||
|
||||
## build and install vdfuse
|
||||
@ -453,7 +473,7 @@ fi
|
||||
if [ $1 -eq 0 ]; then
|
||||
%{_sbindir}/groupdel vboxusers 2>/dev/null
|
||||
fi
|
||||
for p in vboxdrv vboxnetadp vboxnetflt vboxpci; do
|
||||
for p in vboxdrv vboxnetadp vboxnetflt; do
|
||||
dkms remove -q -m ${p} -v %{version} --all
|
||||
done
|
||||
:
|
||||
@ -467,7 +487,7 @@ done
|
||||
|
||||
%posttrans
|
||||
if [ $1 -ge 1 ]; then
|
||||
for p in vboxdrv vboxnetadp vboxnetflt vboxpci; do
|
||||
for p in vboxdrv vboxnetadp vboxnetflt; do
|
||||
dkms add -q -m ${p} -v %{version}
|
||||
dkms install -q -m ${p} -v %{version} --force
|
||||
done
|
||||
@ -486,33 +506,33 @@ fi
|
||||
%systed_postun_with_restart wboxweb-service
|
||||
:
|
||||
|
||||
%preun vboxguest
|
||||
# erase
|
||||
dkms remove -q -m vboxguest -v %{version} --all
|
||||
dkms remove -q -m vboxvideo -v %{version} --all
|
||||
:
|
||||
#%preun vboxguest
|
||||
## erase
|
||||
#dkms remove -q -m vboxguest -v %{version} --all
|
||||
#dkms remove -q -m vboxvideo -v %{version} --all
|
||||
#:
|
||||
|
||||
%post vboxguest
|
||||
dkms remove -q -m vboxguest -v 4.2.10 --all
|
||||
dkms remove -q -m vboxvideo -v 4.2.10 --all
|
||||
dkms remove -q -m vboxguest -v 4.2.12 --all
|
||||
dkms remove -q -m vboxvideo -v 4.2.12 --all
|
||||
dkms remove -q -m vboxguest -v 4.2.14 --all
|
||||
dkms remove -q -m vboxvideo -v 4.2.14 --all
|
||||
dkms remove -q -m vboxguest -v 4.2.16 --all
|
||||
dkms remove -q -m vboxvideo -v 4.2.16 --all
|
||||
dkms remove -q -m vboxguest -v 4.2.18 --all
|
||||
dkms remove -q -m vboxvideo -v 4.2.18 --all
|
||||
:
|
||||
#%post vboxguest
|
||||
#dkms remove -q -m vboxguest -v 4.2.10 --all
|
||||
#dkms remove -q -m vboxvideo -v 4.2.10 --all
|
||||
#dkms remove -q -m vboxguest -v 4.2.12 --all
|
||||
#dkms remove -q -m vboxvideo -v 4.2.12 --all
|
||||
#dkms remove -q -m vboxguest -v 4.2.14 --all
|
||||
#dkms remove -q -m vboxvideo -v 4.2.14 --all
|
||||
#dkms remove -q -m vboxguest -v 4.2.16 --all
|
||||
#dkms remove -q -m vboxvideo -v 4.2.16 --all
|
||||
#dkms remove -q -m vboxguest -v 4.2.18 --all
|
||||
#dkms remove -q -m vboxvideo -v 4.2.18 --all
|
||||
#:
|
||||
|
||||
%posttrans vboxguest
|
||||
if [ $1 -ge 1 ]; then
|
||||
dkms add -q -m vboxguest -v %{version}
|
||||
dkms add -q -m vboxvideo -v %{version}
|
||||
dkms install -q -m vboxguest -v %{version} --force
|
||||
dkms install -q -m vboxvideo -v %{version} --force
|
||||
fi
|
||||
:
|
||||
#%posttrans vboxguest
|
||||
#if [ $1 -ge 1 ]; then
|
||||
# dkms add -q -m vboxguest -v %{version}
|
||||
# dkms add -q -m vboxvideo -v %{version}
|
||||
# dkms install -q -m vboxguest -v %{version} --force
|
||||
# dkms install -q -m vboxvideo -v %{version} --force
|
||||
#fi
|
||||
#:
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
@ -524,7 +544,7 @@ fi
|
||||
%{_bindir}/VBoxSDL
|
||||
%{_bindir}/VirtualBox
|
||||
%{_bindir}/vditool
|
||||
/lib/udev/rules.d/59-vboxdrv.rules
|
||||
%{_udevrulesdir}/59-vboxdrv.rules
|
||||
/lib/udev/VBoxCreateUSBNode.sh
|
||||
%dir %{_libdir}/%{name}
|
||||
%{_libdir}/%{name}/DbgPlugInDiggers.so
|
||||
@ -538,11 +558,12 @@ fi
|
||||
%attr(4755,root,root) %{_libdir}/%{name}/VBoxNetNAT
|
||||
%{_libdir}/%{name}/*.sh
|
||||
%{_libdir}/%{name}/VBox*.so
|
||||
%{_libdir}/%{name}/VMMRC.rc
|
||||
%{_libdir}/%{name}/VMMRC.debug
|
||||
#%{_libdir}/%{name}/VMMRC.rc
|
||||
#%{_libdir}/%{name}/VMMRC.debug
|
||||
%{_libdir}/%{name}/VMMR0.r0
|
||||
%{_libdir}/%{name}/VMMR0.debug
|
||||
%{_libdir}/%{name}/iPxeBaseBin
|
||||
%{_libdir}/VirtualBox/bldRTLdrCheckImports
|
||||
%{_libdir}/VirtualBox/VBox.png
|
||||
%{_libdir}/VirtualBox/VBoxAutostart
|
||||
%{_libdir}/VirtualBox/VBoxBalloonCtrl
|
||||
@ -550,10 +571,11 @@ fi
|
||||
%{_libdir}/VirtualBox/VBoxCpuReport
|
||||
%{_libdir}/VirtualBox/VBox*.debug
|
||||
%{_libdir}/VirtualBox/VBox*.r0
|
||||
%{_libdir}/VirtualBox/VBox*.rc
|
||||
#%{_libdir}/VirtualBox/VBox*.rc
|
||||
%{_libdir}/VirtualBox/VBox*.fd
|
||||
%{_libdir}/VirtualBox/VBoxDTrace
|
||||
%{_libdir}/VirtualBox/VBoxExtPackHelperApp
|
||||
%{_libdir}/VirtualBox/vboximg-mount
|
||||
%{_libdir}/VirtualBox/VBoxManage
|
||||
%{_libdir}/VirtualBox/VBoxManageHelp
|
||||
%{_libdir}/VirtualBox/VBoxSVC
|
||||
@ -564,7 +586,7 @@ fi
|
||||
%{_libdir}/VirtualBox/VBoxXPCOMIPCD
|
||||
%attr(4755,root,root) %{_libdir}/VirtualBox/VirtualBoxVM
|
||||
%{_libdir}/VirtualBox/VirtualBoxVM.so
|
||||
%{_libdir}/VirtualBox/bldRTLdrCheckImports
|
||||
%{_libdir}/VirtualBox/UICommon.so
|
||||
%dir %{_libdir}/%{name}/components
|
||||
%{_libdir}/%{name}/components/VBox*.so
|
||||
%{_libdir}/%{name}/components/VBoxXPCOMBase.xpt
|
||||
@ -574,8 +596,8 @@ fi
|
||||
%{_libdir}/VirtualBox/ExtensionPacks/VNC/*
|
||||
%dir %{_libdir}/%{name}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
|
||||
%{_libdir}/%{name}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/*
|
||||
%dir %{_libdir}/%{name}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/
|
||||
%{_libdir}/%{name}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/*
|
||||
#%dir %{_libdir}/%{name}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/
|
||||
#%{_libdir}/%{name}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/*
|
||||
%dir %{_libdir}/%{name}/UnattendedTemplates
|
||||
%{_libdir}/%{name}/UnattendedTemplates/*
|
||||
%dir %{_libdir}/VirtualBox/dtrace
|
||||
@ -609,7 +631,7 @@ fi
|
||||
%{_libdir}/%{name}/virtualbox.xml
|
||||
%{_libdir}/%{name}/xpidl
|
||||
%{_libdir}/%{name}/UserManual.pdf
|
||||
%{_libdir}/dri/vboxvideo_dri.so
|
||||
#%{_libdir}/dri/vboxvideo_dri.so
|
||||
%{_datadir}/icons/hicolor/*/apps/%{name}.png
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/pixmaps/VBox.png
|
||||
@ -620,8 +642,8 @@ fi
|
||||
%{_prefix}/src/vboxnetadp-%{version}/*
|
||||
%dir %{_prefix}/src/vboxnetflt-%{version}
|
||||
%{_prefix}/src/vboxnetflt-%{version}/*
|
||||
%dir %{_prefix}/src/vboxpci-%{version}
|
||||
%{_prefix}/src/vboxpci-%{version}/*
|
||||
#%dir %{_prefix}/src/vboxpci-%{version}
|
||||
#%{_prefix}/src/vboxpci-%{version}/*
|
||||
%doc COPYING
|
||||
|
||||
%files devel
|
||||
@ -646,8 +668,9 @@ fi
|
||||
%files additions
|
||||
%defattr(-,root,root)
|
||||
%{_initrddir}/vboxadd
|
||||
%{_libdir}/VirtualBox/additions/VBoxEGL.so
|
||||
%{_libdir}/VBoxOGL*.so
|
||||
%{_libdir}/VirtualBox/additions/VBoxDRMClient
|
||||
#%{_libdir}/VirtualBox/additions/VBoxEGL.so
|
||||
#%{_libdir}/VBoxOGL*.so
|
||||
%{_sbindir}/VBoxClient
|
||||
%{_sbindir}/VBoxControl
|
||||
%{_sbindir}/VBoxService
|
||||
@ -661,14 +684,33 @@ fi
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/%{name}/additions/VBoxGuestAdditions.iso
|
||||
|
||||
%files vboxguest
|
||||
%defattr(-,root,root)
|
||||
%dir %{_prefix}/src/vboxguest-%{version}
|
||||
%{_prefix}/src/vboxguest-%{version}/*
|
||||
%dir %{_prefix}/src/vboxvideo-%{version}
|
||||
%{_prefix}/src/vboxvideo-%{version}/*
|
||||
#%files vboxguest
|
||||
#%defattr(-,root,root)
|
||||
#%dir %{_prefix}/src/vboxguest-%{version}
|
||||
#%{_prefix}/src/vboxguest-%{version}/*
|
||||
#%dir %{_prefix}/src/vboxvideo-%{version}
|
||||
#%{_prefix}/src/vboxvideo-%{version}/*
|
||||
|
||||
%changelog
|
||||
* Sat Jul 25 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 6.1.12-3mamba
|
||||
- variable escaping fix after previuos release change
|
||||
|
||||
* Fri Jul 24 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 6.1.12-2mamba
|
||||
- vboxnetflt, vboxnetadp: provide and use Module.symvers from vboxdrv to fix build
|
||||
|
||||
* Fri Jul 24 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 6.1.12-1mamba
|
||||
- update to 6.1.12
|
||||
- obsolete VirtualBox-vboxguest now in kernel tree
|
||||
|
||||
* Sat Jun 13 2020 Automatic Build System <autodist@mambasoft.it> 6.1.10-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Wed Dec 11 2019 Automatic Build System <autodist@mambasoft.it> 6.0.14-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Jul 25 2019 Automatic Build System <autodist@mambasoft.it> 6.0.10-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Jul 18 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.8-1mamba
|
||||
- update to 6.0.8
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user