[xorg-x11-drv-nvidia] bump changelog and cleanup previous commit
by Leigh Scott
commit d624ee2ad1385bda66c8ddd779aedb32231ff9e7
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Oct 31 15:34:15 2017 +0000
bump changelog and cleanup previous commit
xorg-x11-drv-nvidia.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 327d0b2..48b1e1b 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -37,7 +37,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 2
Version: 387.22
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -50,6 +50,7 @@ Source4: 99-nvidia.conf
Source5: 00-avoid-glamor.conf
Source6: blacklist-nouveau.conf
Source7: alternate-install-present
+Source9: nvidia-settings.desktop
Source10: nvidia.conf
Source11: 60-nvidia.rules
Source12: xorg-x11-drv-nvidia.metainfo.xml
@@ -372,6 +373,7 @@ tar Jcf %{buildroot}%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{
#Add autostart file for nvidia-settings to load user config
install -D -p -m 0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
+desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
%if 0%{?fedora} >= 25
# install AppData and add modalias provides
@@ -386,6 +388,7 @@ fn=%{buildroot}%{_datadir}/appdata/xorg-x11-drv-nvidia.metainfo.xml
# Install nvidia-fallback
%if 0%{?rhel} >= 6 || 0%{?fedora}
+mkdir -p %{buildroot}%{_unitdir}
install -p -m 0644 %{SOURCE20} %{buildroot}%{_udevrulesdir}
install -p -m 0644 %{SOURCE21} %{buildroot}%{_unitdir}
%endif
@@ -578,6 +581,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Tue Oct 31 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:387.22-2
+- Remove the prebuilt tools and use rpm packages instead
+
* Mon Oct 30 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:387.22-1
- Update to 387.22 release
7 years, 1 month
[xorg-x11-drv-nvidia] make changes to use external tools
by Leigh Scott
commit 0b5ace5cca1702f39c155a57fa452fe36bb3b8ee
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Oct 31 15:16:52 2017 +0000
make changes to use external tools
xorg-x11-drv-nvidia.spec | 70 +++++-------------------------------------------
1 file changed, 6 insertions(+), 64 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index a006092..327d0b2 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -50,7 +50,6 @@ Source4: 99-nvidia.conf
Source5: 00-avoid-glamor.conf
Source6: blacklist-nouveau.conf
Source7: alternate-install-present
-Source9: nvidia-settings.desktop
Source10: nvidia.conf
Source11: 60-nvidia.rules
Source12: xorg-x11-drv-nvidia.metainfo.xml
@@ -85,6 +84,8 @@ Requires(post): ldconfig
Requires(postun): ldconfig
Requires(post): grubby
Requires: which
+Requires: nvidia-settings%{?_isa} = %{version}
+Suggests: nvidia-xconfig%{?_isa} = %{version}
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release}
@@ -137,7 +138,8 @@ such as OpenGL headers.
Summary: CUDA driver for %{name}
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
Requires: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
-Provides: nvidia-persistenced = %{version}-%{release}
+Requires: nvidia-persistenced%{?_isa} = %{version}
+Suggests: nvidia-modprobe%{?_isa} = %{version}
Requires: ocl-icd%{?_isa}
Requires: opencl-filesystem
@@ -230,7 +232,6 @@ cp -a \
libnvidia-fbc.so.%{version} \
libnvidia-glcore.so.%{version} \
libnvidia-glsi.so.%{version} \
- libnvidia-gtk*.so.%{version} \
libnvidia-ifr.so.%{version} \
libnvidia-ml.so.%{version} \
libnvidia-ptxjitcompiler.so.%{version} \
@@ -320,7 +321,7 @@ install -p -m 0644 %{SOURCE16} %{buildroot}%{_dracut_conf_d}/
# Install binaries
install -m 0755 -d %{buildroot}%{_bindir}
-install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server,xconfig,settings,persistenced} \
+install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server} \
%{buildroot}%{_bindir}
# Install headers
@@ -329,20 +330,9 @@ install -p -m 0644 {gl.h,glext.h,glx.h,glxext.h} %{buildroot}%{_includedir}/nvid
# Install man pages
install -m 0755 -d %{buildroot}%{_mandir}/man1/
-install -p -m 0644 nvidia-{cuda-mps-control,persistenced,settings,smi,xconfig}.1.gz \
+install -p -m 0644 nvidia-{cuda-mps-control,smi}.1.gz \
%{buildroot}%{_mandir}/man1/
-# Install nvidia icon
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-install -pm 0644 nvidia-settings.png %{buildroot}%{_datadir}/pixmaps
-
-# Fix desktop file and validate
-sed -i -e 's|__UTILS_PATH__/||g' -e 's|__PIXMAP_PATH__/||g' nvidia-settings.desktop
-sed -i -e 's|nvidia-settings.png|nvidia-settings|g' nvidia-settings.desktop
-desktop-file-install --vendor "" \
- --dir %{buildroot}%{_datadir}/applications/ \
- nvidia-settings.desktop
-
#Alternate-install-present is checked by the nvidia .run
mkdir -p %{buildroot}%{_alternate_dir}
install -p -m 0644 %{SOURCE7} %{buildroot}%{_alternate_dir}
@@ -373,16 +363,6 @@ touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
-#Install the initscript
-tar jxf nvidia-persistenced-init.tar.bz2
-%if 0%{?rhel} > 6 || 0%{?fedora}
-mkdir -p %{buildroot}%{_unitdir}
-install -pm 0644 nvidia-persistenced-init/systemd/nvidia-persistenced.service.template \
- %{buildroot}%{_unitdir}/nvidia-persistenced.service
-#Change the daemon running owner
-sed -i -e "s/__USER__/root/" %{buildroot}%{_unitdir}/nvidia-persistenced.service
-%endif
-
#Create the default nvidia config directory
mkdir -p %{buildroot}%{_sysconfdir}/nvidia
@@ -449,11 +429,6 @@ fi
%post libs -p /sbin/ldconfig
-%post cuda
-%if 0%{?rhel} > 6 || 0%{?fedora}
-%systemd_post nvidia-persistenced.service
-%endif
-
%post cuda-libs -p /sbin/ldconfig
%if 0%{?rhel} == 6
@@ -471,20 +446,10 @@ if [ "$1" -eq "0" ]; then
[ -f %{_sysconfdir}/X11/xorg.conf ] && mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.nvidia_uninstalled &>/dev/null
fi ||:
-%if 0%{?rhel} > 6 || 0%{?fedora}
-%preun cuda
-%systemd_preun nvidia-persistenced.service
-%endif
-
%postun -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
-%postun cuda
-%if 0%{?rhel} > 6 || 0%{?fedora}
-%systemd_postun_with_restart nvidia-persistenced.service
-%endif
-
%postun cuda-libs -p /sbin/ldconfig
%files
@@ -526,32 +491,14 @@ fi ||:
%endif
%config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
%{_bindir}/nvidia-bug-report.sh
-%{_bindir}/nvidia-settings
-%{_bindir}/nvidia-xconfig
# Xorg libs that do not need to be multilib
%dir %{_nvidia_xorgdir}
%{_nvidia_xorgdir}/libglx.so
%{_nvidia_xorgdir}/libglx.so.%{version}
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
-%ifarch %{arm}
-%{_libdir}/libnvidia-gtk2.so.%{version}
-%endif
-%ifarch x86_64 i686
-%if 0%{?rhel} == 6
-%exclude %{_libdir}/libnvidia-gtk3.so.%{version}
-%{_libdir}/libnvidia-gtk2.so.%{version}
-%else
-%exclude %{_libdir}/libnvidia-gtk2.so.%{version}
-%{_libdir}/libnvidia-gtk3.so.%{version}
-%endif
-%endif
#/no_multilib
%dir %{_datadir}/nvidia
%{_datadir}/nvidia/nvidia-application-profiles-%{version}-*
-%{_datadir}/applications/*nvidia-settings.desktop
-%{_datadir}/pixmaps/*.png
-%{_mandir}/man1/nvidia-settings.*
-%{_mandir}/man1/nvidia-xconfig.*
%files kmodsrc
%dir %{_datadir}/nvidia-kmod-%{version}
@@ -594,20 +541,15 @@ fi ||:
%files cuda
%license nvidiapkg/LICENSE
-%if 0%{?rhel} > 6 || 0%{?fedora}
-%{_unitdir}/nvidia-persistenced.service
-%endif
%{_bindir}/nvidia-debugdump
%{_bindir}/nvidia-smi
%{_bindir}/nvidia-cuda-mps-control
%{_bindir}/nvidia-cuda-mps-server
-%{_bindir}/nvidia-persistenced
%ifarch x86_64 i686
%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
%endif
%{_mandir}/man1/nvidia-smi.*
%{_mandir}/man1/nvidia-cuda-mps-control.1.*
-%{_mandir}/man1/nvidia-persistenced.1.*
%{_modprobe_d}/nvidia-uvm.conf
%{_udevrulesdir}/60-nvidia-uvm.rules
7 years, 1 month
[VirtualBox-kmod] drop fixes_for_4.14.patch
by Sérgio M. Basto
commit 4d086260f6ebbc7a7557da42ccb733638d8c81c3
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Oct 31 02:45:53 2017 +0000
drop fixes_for_4.14.patch
VirtualBox-kmod.spec | 2 --
fixes_for_4.14.patch | 50 --------------------------------------------------
2 files changed, 52 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index fd27f99..2b84acd 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -37,7 +37,6 @@ 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: VirtualBox-kmod-excludekernel-filter.txt
-Patch1: fixes_for_4.14.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
@@ -60,7 +59,6 @@ Kernel module for VirtualBox
%prep
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
-%patch1 -p1 -b .kernel_4.14
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
7 years, 1 month
[VirtualBox-kmod] Update VBox to 5.1.30
by Sérgio M. Basto
commit d5a04f525340008e1f5574115db431c0d3c96009
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Oct 31 02:34:06 2017 +0000
Update VBox to 5.1.30
VirtualBox-kmod.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index f2e08d3..fd27f99 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -27,9 +27,9 @@
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
-Version: 5.1.28
+Version: 5.1.30
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 4%{?dist}
+Release: 1%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -109,6 +109,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Tue Oct 31 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.30-1
+- Update VBox to 5.1.30
+
* Thu Sep 21 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.28-4
- Add fixes for kernel 4.14
7 years, 1 month
[VirtualBox/f27] (4 commits) ...fix typo in update script
by Sérgio M. Basto
Summary of changes:
6225cb4... Epel 7 with X 1.19 don't need vboxvideo_drv https://forum (*)
1b96759... Update VBox to 5.1.30 (*)
472d0ce... Some updates on VirtualBox-guest-addition based on VirtualB (*)
d1f23de... fix typo in update script (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 1 month
[VirtualBox] fix typo in update script
by Sérgio M. Basto
commit d1f23de7685109a696f41512e947678514dcfcc5
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Oct 31 02:00:12 2017 +0000
fix typo in update script
update_vbox.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/update_vbox.sh b/update_vbox.sh
index 90a1a5d..a346796 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -7,7 +7,7 @@ rfpkg clog && rfpkg commit -F clog && /bin/rm clog && git show
echo Press enter to continue; read dummy;
rfpkg push && rfpkg build --nowait
echo Press enter to continue; read dummy;
-git checkout f24 && git merge master && git push && rfpkg build --nowait; git checkout master
+git checkout f27 && git merge master && git push && rfpkg build --nowait; git checkout master
echo Press enter to continue; read dummy;
git checkout f26 && git merge master && git push && rfpkg build --nowait; git checkout master
echo Press enter to continue; read dummy;
7 years, 1 month
[VirtualBox] Some updates on VirtualBox-guest-addition based on VirtualBox-guest-addition.spec in review rhbz #14
by Sérgio M. Basto
commit 472d0ce551924b9dec12db722fd32ee673ebb2dd
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Oct 31 00:50:49 2017 +0000
Some updates on VirtualBox-guest-addition based on VirtualBox-guest-addition.spec in review rhbz #1481630, with
proper fix for VirtualBox-5.0.22-guest_soname.patch
VBoxOGLRun.sh | 10 +++++
VirtualBox-5.0.22-guest_soname.patch | 19 ---------
VirtualBox.spec | 77 +++++++++++++++++++-----------------
3 files changed, 51 insertions(+), 55 deletions(-)
---
diff --git a/VBoxOGLRun.sh b/VBoxOGLRun.sh
new file mode 100644
index 0000000..aa34308
--- /dev/null
+++ b/VBoxOGLRun.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if VBoxClient --check3d; then
+ export LD_LIBRARY_PATH=/usr/lib64/VBoxGuestAdditions:/usr/lib/VBoxGuestAdditions
+else
+ echo "Error 3D passthru not enabled in VM settings." 1>&2
+ exit 1
+fi
+
+exec "$@"
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 345f55f..a1d6cfb 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -1,3 +1,5 @@
+%global __provides_exclude_from %{_libdir}/VBoxGuestAdditions
+
# Standard compiler flags, without:
# -Wall -- VirtualBox takes care of reasonable warnings very well
# -m32, -m64 -- 32bit code is built besides 64bit on x86_64
@@ -41,12 +43,13 @@ Obsoletes: %{name}-qt
Source0: https://download.virtualbox.org/virtualbox/%{version}%{?prereltag}/Virtua...
Source3: VirtualBox-60-vboxdrv.rules
+Source4: VirtualBox.modules
Source5: VirtualBox-60-vboxguest.rules
-Source6: VirtualBox.modules
-Source7: VirtualBox-guest.modules
+Source6: VirtualBox-guest.modules
+Source7: vboxservice.service
+Source8: 96-vbox.preset
+Source9: VBoxOGLRun.sh
Source10: vboxweb.service
-Source11: vboxservice.service
-Source12: 96-vbox.preset
Source20: os_mageia.png
Source21: os_mageia_64.png
Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
@@ -58,8 +61,6 @@ Patch26: VirtualBox-4.3.0-no-bundles.patch
Patch27: VirtualBox-gcc.patch
# from Debian
Patch28: 02-gsoap-build-fix.patch
-# from RPMFusion
-Patch35: VirtualBox-5.0.22-guest_soname.patch
# from Mageia
Patch50: VirtualBox-5.1.0-add-Mageia-support.patch
Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
@@ -118,9 +119,7 @@ BuildRequires: libstdc++-static
# For the X11 module
BuildRequires: libdrm-devel
BuildRequires: libpciaccess-devel
-BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libOSMesa-devel
-BuildRequires: mesa-libEGL-devel
BuildRequires: pixman-devel
BuildRequires: xorg-x11-proto-devel
BuildRequires: xorg-x11-server-devel
@@ -128,6 +127,11 @@ BuildRequires: libXcursor-devel
BuildRequires: libXcomposite-devel
BuildRequires: libXmu-devel
BuildRequires: libXinerama-devel
+BuildRequires: libXrandr-devel
+BuildRequires: libXt-devel
+BuildRequires: mesa-libEGL-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
%if %{with vnc}
BuildRequires: libvncserver-devel
%endif
@@ -214,12 +218,14 @@ Conflicts: %{name} <= %{version}-%{release}
Important note: VirtualBox-guest-additions can't be installed on Host (master)
system because contains X11 and OpenGL drives that will mess up with your X11
configurations.
+
This subpackage replace Oracle Linux Guest Addition but just for Fedora,
therefore should be installed only when we have one Fedora as a guest system.
Tools that use kernel modules for supporting integration with the Host,
including file sharing, clipboard sharing, X.org X11 video and mouse driver,
USB and webcam proxy and Seamless mode.
+To use OpenGL pass-through mode run apps using "VBoxOGLRun foo -opt1 -opt2".
%package kmodsrc
Summary: %{name} kernel module source code
@@ -232,11 +238,11 @@ which is generated during the build of main package.
%prep
%setup -q
-find -name '*.py[co]' -delete
# add Mageia images
cp -a %{SOURCE20} %{SOURCE21} src/VBox/Frontends/VirtualBox/images/
# Remove prebuilt binary tools
+find -name '*.py[co]' -delete
rm -r kBuild/
rm -r tools/
# Remove bundle X11 sources and some lib sources, before patching.
@@ -267,7 +273,6 @@ rm -r src/libs/zlib-1.2.8/
%if 0%{?fedora} > 20
%patch28 -p1 -b .gsoap2
%endif
-%patch35 -p1 -b .soname
%patch50 -p1 -b .mageia-support
%patch51 -p1 -b .revert-VBox.sh
@@ -304,10 +309,8 @@ umask 0022
# layout under 'obj' and shuffle files around in %%install.
kmk %{_smp_mflags} \
KBUILD_VERBOSE=2 \
- TOOL_YASM_AS=yasm \
PATH_OUT="$PWD/obj" \
- VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \
- VBOX_PATH_APP_DOCS=%{_docdir}/VirtualBox \
+ TOOL_YASM_AS=yasm \
VBOX_WITH_TESTCASES= \
VBOX_WITH_VALIDATIONKIT= \
VBOX_WITH_EXTPACK_VBOXDTRACE= \
@@ -452,6 +455,9 @@ done
install -p -m 0644 obj/bin/virtualbox.xml %{buildroot}%{_datadir}/mime/packages
# Guest X.Org drivers
+mkdir -p %{buildroot}%{_libdir}/security
+mkdir -p %{buildroot}%{_libdir}/VBoxGuestAdditions
+
# Michael Thayer from Oracle wrote: I have applied the patch [1] I posted so that you
# can build with VBOX_USE_SYSTEM_XORG_HEADERS=1 set in future to only
# build the X.Org drivers against the installed system headers.
@@ -472,35 +478,32 @@ install -m 0755 -D obj/bin/additions/vboxvideo_drv_system.so \
install -m 0755 -t %{buildroot}%{_sbindir} \
obj/bin/additions/VBoxService \
obj/bin/additions/mount.vboxsf
-
install -m 0755 -t %{buildroot}%{_bindir} \
obj/bin/additions/VBoxClient \
obj/bin/additions/VBoxControl
-install -m 0644 -D %{SOURCE11} \
- %{buildroot}%{_unitdir}/vboxservice.service
-
# Guest libraries
-install -m 0755 -t %{buildroot}%{_libdir} \
- obj/bin/additions/VBox*.so
-# New guest additions dropped vboxvideo_dri.so
-#install -d %{buildroot}%{_libdir}/dri
-#ln -sf ../VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so
-install -d %{buildroot}%{_libdir}/security
install -m 0755 -t %{buildroot}%{_libdir}/security \
obj/bin/additions/pam_vbox.so
+install -m 0755 -t %{buildroot}%{_libdir}/VBoxGuestAdditions \
+ obj/bin/additions/VBoxOGL*.so
+ln -s VBoxOGL.so %{buildroot}%{_libdir}/VBoxGuestAdditions/libGL.so.1
# init/vboxadd-x11 code near call the function install_x11_startup_app
-install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
+install -p -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
%{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
ln -s ../..%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh \
%{buildroot}%{_bindir}/VBoxClient-all
desktop-file-install --dir=%{buildroot}%{_sysconfdir}/xdg/autostart/ \
--remove-key=Encoding src/VBox/Additions/x11/Installer/vboxclient.desktop
-desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+desktop-file-validate \
+ %{buildroot}%{_sysconfdir}/xdg/autostart/vboxclient.desktop
-mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset
-install -pm 0644 %{SOURCE12} %{buildroot}%{_prefix}/lib/systemd/system-preset/96-vbox.preset
+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 0755 -D %{SOURCE9} %{buildroot}%{_bindir}/VBoxOGLRun
+install -p -m 0644 -D %{SOURCE6} %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
# Module Source Code
mkdir -p %{name}-kmod-%{version}
@@ -521,11 +524,9 @@ echo 'INSTALL_DIR=%{_libdir}/virtualbox' > %{buildroot}%{_sysconfdir}/vbox/vbox.
# Install udev rules
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 -p -m 0644 -D %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules
# Install modules load script
-install -p -m 0644 -D %{SOURCE6} %{buildroot}%{_prefix}/lib/modules-load.d/%{name}.conf
-install -p -m 0644 -D %{SOURCE7} %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
+install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_prefix}/lib/modules-load.d/%{name}.conf
# Menu entry
desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
@@ -602,14 +603,13 @@ fi
/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%pre guest-additions
-# This is the LSB version of useradd and should work on recent
-# distributions
-getent passwd vboxadd >/dev/null || useradd -d /var/run/vboxadd -g 1 -r -s /bin/false vboxadd 2>&1
-
# Add a group "vboxsf" for Shared Folders access
# All users which want to access the auto-mounted Shared Folders have to
# be added to this group.
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
@@ -735,6 +735,7 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%{_bindir}/VBoxClient
%{_bindir}/VBoxControl
%{_bindir}/VBoxClient-all
+%{_bindir}/VBoxOGLRun
%{_sbindir}/VBoxService
%{_sbindir}/mount.vboxsf
%{_libdir}/security/pam_vbox.so
@@ -742,13 +743,13 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
# do not use xorg module drive in newer versions
%{_libdir}/xorg/modules/drivers/*
%endif
-%{_libdir}/VBox*.so
+%{_libdir}/VBoxGuestAdditions
%{_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
-%{_prefix}/lib/systemd/system-preset/96-vbox.preset
+%{_presetdir}/96-vbox.preset
%files kmodsrc
%{_datadir}/%{name}-kmod-%{version}
@@ -756,6 +757,10 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%changelog
* Fri Oct 27 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.30-1
- Update VBox to 5.1.30
+- Some updates on VirtualBox-guest-addition based on VirtualBox-guest-addition.spec in review rhbz #1481630, with
+ proper fix for VirtualBox-5.0.22-guest_soname.patch
+
+- TODO check python3 and clean obsoleted scriptlets
* Sat Sep 16 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.28-2
- Epel 7 with X 1.19 don't need vboxvideo_drv
7 years, 1 month
[nvidia-kmod] Update to 387.22 release
by Leigh Scott
commit 40389c717e8250ba053e90616f70490e7dd5b36f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Oct 30 22:39:40 2017 +0000
Update to 387.22 release
nvidia-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index ef580bb..e3da2be 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -8,7 +8,7 @@
Name: nvidia-kmod
Epoch: 2
-Version: 387.12
+Version: 387.22
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -71,6 +71,9 @@ done
%changelog
+* Mon Oct 30 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:387.22-1
+- Update to 387.22 release
+
* Wed Oct 04 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:387.12-1
- Update to 387.12 beta
7 years, 1 month
