[xorg-x11-drv-nvidia] Add conditions for f24 and el7
by Leigh Scott
commit c20013da72c353377d190cf2385ee887eaff8faf
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 18 12:24:18 2017 +0000
Add conditions for f24 and el7
xorg-x11-drv-nvidia.spec | 33 ++++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index d91f686..76bea97 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -1,6 +1,12 @@
%global _nvidia_serie nvidia
+%if 0%{?fedora} >= 25
%global _nvidia_libdir %{_libdir}
%global _nvidia_xorgdir %{_libdir}/%{_nvidia_serie}/xorg
+%else
+%global _nvidia_libdir %{_libdir}/%{_nvidia_serie}
+%global _nvidia_xorgdir %{_nvidia_libdir}/xorg
+%global _glvnd_libdir %{_libdir}/libglvnd
+%endif
%global debug_package %{nil}
%global __strip /bin/true
@@ -8,7 +14,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 375.26
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -189,6 +195,12 @@ rm -f nvidia-installer*
install -m 0755 -d $RPM_BUILD_ROOT%{_bindir}
+%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
+# ld.so.conf.d file
+install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+%endif
+
#Blacklist nouveau (since F-11)
install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
@@ -276,7 +288,7 @@ rm $RPM_BUILD_ROOT%{_nvidia_libdir}/libnvidia-{cfg,tls}.so
#Install static driver dependant configuration files
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
-%if 0%{?fedora} <= 24
+%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
%endif
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
@@ -300,6 +312,12 @@ desktop-file-install --vendor "" \
#Workaround for self made xorg.conf using a Files section.
ln -fs ../../%{_nvidia_serie}/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
+%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
+#Workaround for cuda availability - rfbz#2916
+ln -fs %{_nvidia_libdir}/libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so.1
+ln -fs %{_nvidia_libdir}/libcuda.so $RPM_BUILD_ROOT%{_libdir}/libcuda.so
+%endif
+
#Alternate-install-present is checked by the nvidia .run
install -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_nvidia_libdir}
@@ -470,7 +488,7 @@ fi ||:
%config %{_sysconfdir}/glvnd/egl_vendor.d/10_nvidia.json
%dir %{_sysconfdir}/nvidia
%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
-%if 0%{?fedora} <= 24
+%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
%config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
%config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
%endif
@@ -515,6 +533,9 @@ fi ||:
%files libs
%defattr(-,root,root,-)
%dir %{_nvidia_libdir}
+%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
+%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+%endif
%ghost %{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf
%{_nvidia_libdir}/alternate-install-present
%{_nvidia_libdir}/*.so.*
@@ -548,6 +569,9 @@ fi ||:
%{_bindir}/nvidia-persistenced
#nvidia-modprobe is setuid root to allow users to load the module in
%attr(4755, root, root) %{_bindir}/nvidia-modprobe
+%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
+%{_libdir}/libcuda.so*
+%endif
%{_nvidia_libdir}/libcuda.so*
%{_nvidia_libdir}/libnvcuvid.so*
%{_nvidia_libdir}/libnvidia-encode.so*
@@ -590,6 +614,9 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Wed Jan 18 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.26-9
+- Add conditions for f24 and el7
+
* Tue Jan 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.26-8
- Changes for mesa glvnd
- Move nvidia libs to lib directoy and remove ldconfig config file
7 years, 10 months
[xorg-x11-drv-nvidia] add python version to shebang
by Leigh Scott
commit a0ba7b9a0a81424d4e525efdf2d5fbdf499cf943
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 18 10:40:51 2017 +0000
add python version to shebang
parse-readme.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/parse-readme.py b/parse-readme.py
index 3da92a6..b2fa2ba 100755
--- a/parse-readme.py
+++ b/parse-readme.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# -*- coding: utf-8 -*-
#
# Copyright (C) 2016 Richard Hughes <richard(a)hughsie.com>
7 years, 10 months
[xorg-x11-drv-nvidia] add missing python2 buildrequires
by Leigh Scott
commit 3cfcb554b7d06d97f13a5caa73a513964115db97
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 18 10:37:43 2017 +0000
add missing python2 buildrequires
xorg-x11-drv-nvidia.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 99fde08..d91f686 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -40,6 +40,7 @@ Requires(postun): systemd
%endif
%if 0%{?fedora} >= 25
# AppStream metadata generation
+BuildRequires: python2
BuildRequires: libappstream-glib%{?_isa} >= 0.6.3
%endif
7 years, 10 months
[xorg-x11-drv-nvidia] Changes for mesa glvnd
by Leigh Scott
commit 19ec459cc7bebef0cf878cc8b5ab80c44966414d
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 18 10:17:12 2017 +0000
Changes for mesa glvnd
parse-readme.py | 61 ++++++++++++++++++++++++++++++
xorg-x11-drv-nvidia.metainfo.xml | 36 ++++++++++++++++++
xorg-x11-drv-nvidia.spec | 81 ++++++++++++++++++++++++++--------------
3 files changed, 150 insertions(+), 28 deletions(-)
---
diff --git a/parse-readme.py b/parse-readme.py
new file mode 100755
index 0000000..3da92a6
--- /dev/null
+++ b/parse-readme.py
@@ -0,0 +1,61 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2016 Richard Hughes <richard(a)hughsie.com>
+# Licensed under the GNU General Public License Version or later
+
+from __future__ import print_function
+import sys
+
+def main():
+ if len(sys.argv) != 3:
+ print("usage: %s README.txt \"header to match\"" % sys.argv[0])
+ return 1
+
+ # open file
+ f = open(sys.argv[1])
+ in_section = False
+ in_table = False
+ pids = []
+ for line in f.readlines():
+
+ # find the right data table
+ if line.find(sys.argv[2]) != -1:
+ in_section = True
+ continue
+ if not in_section:
+ continue
+
+ # remove Windows and Linux line endings
+ line = line.replace('\r', '')
+ line = line.replace('\n', '')
+
+ # end of section
+ if len(line) > 0 and not line.startswith(' '):
+ in_section = False
+ in_table = False
+ continue
+
+ # empty line
+ if len(line) == 0:
+ continue
+
+ # skip the header
+ if line.startswith(' ---'):
+ in_table = True
+ continue
+ if not in_table:
+ continue
+
+ # get name
+ pid = int(line[42:46], 16)
+ if not pid in pids:
+ pids.append(pid)
+
+ # output
+ for pid in pids:
+ vid = 0x10de
+ print("pci:v%08Xd%08Xsv*sd*bc*sc*i*" % (vid, pid))
+
+if __name__ == "__main__":
+ main()
diff --git a/xorg-x11-drv-nvidia.metainfo.xml b/xorg-x11-drv-nvidia.metainfo.xml
new file mode 100644
index 0000000..519aa6a
--- /dev/null
+++ b/xorg-x11-drv-nvidia.metainfo.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2016 Richard Hughes <richard(a)hughsie.com> -->
+<component type="driver">
+ <id>xorg-x11-drv-nvidia</id>
+ <name>NVIDIA Linux Graphics Driver</name>
+ <summary>Accelerated Linux Graphics Driver</summary>
+ <description>
+ <p>
+ The NVIDIA Accelerated Linux Graphics Driver brings accelerated 2D
+ functionality and high-performance OpenGL support to Linux with the
+ use of NVIDIA graphics processing units.
+ </p>
+ <p>
+ These drivers provide optimized hardware acceleration for OpenGL and X
+ applications and support nearly all recent NVIDIA GPU products.
+ The NVIDIA graphics driver uses a Unified Driver Architecture: the single
+ graphics driver supports all modern NVIDIA GPUs.
+ </p>
+ </description>
+ <translation/>
+ <url type="homepage">http://www.nvidia.com/</url>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>LicenseRef-proprietary:NVIDIA</project_license>
+ <developer_name>NVIDIA Corporation</developer_name>
+ <keywords>
+ <keyword>NVIDIA</keyword>
+ <keyword>driver</keyword>
+ <keyword>GeForce</keyword>
+ <keyword>CUDA</keyword>
+ <keyword>Quadro</keyword>
+ <keyword>Vulkan</keyword>
+ <keyword>OpenGL</keyword>
+ </keywords>
+ <url type="bugtracker">https://bugzilla.rpmfusion.org</url>
+ <update_contact>xorg-x11-drv-nvidia(a)rpmfusion.org</update_contact>
+</component>
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index a0cf9ee..99fde08 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -1,7 +1,6 @@
%global _nvidia_serie nvidia
-%global _nvidia_libdir %{_libdir}/%{_nvidia_serie}
-%global _nvidia_xorgdir %{_nvidia_libdir}/xorg
-%global _glvnd_libdir %{_libdir}/libglvnd
+%global _nvidia_libdir %{_libdir}
+%global _nvidia_xorgdir %{_libdir}/%{_nvidia_serie}/xorg
%global debug_package %{nil}
%global __strip /bin/true
@@ -9,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 375.26
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -27,26 +26,35 @@ Source8: nvidia-old.conf
Source9: nvidia-settings.desktop
Source10: nvidia.conf
Source11: 00-ignoreabi.conf
+Source12: xorg-x11-drv-nvidia.metainfo.xml
+Source13: parse-readme.py
ExclusiveArch: i686 x86_64 armv7hl
-BuildRequires: desktop-file-utils
+BuildRequires: desktop-file-utils
%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
-Buildrequires: systemd
-Requires(post): systemd
-Requires(preun): systemd
+Buildrequires: systemd
+Requires(post): systemd
+Requires(preun): systemd
Requires(postun): systemd
%endif
+%if 0%{?fedora} >= 25
+# AppStream metadata generation
+BuildRequires: libappstream-glib%{?_isa} >= 0.6.3
+%endif
Requires(post): ldconfig
Requires(postun): ldconfig
Requires(post): grubby
-Requires: which
+Requires: which
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
-Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release}
%if 0%{?fedora} >= 25
-Requires: xorg-x11-server-Xorg%{_isa} >= 1.19.0-3
+Requires: xorg-x11-server-Xorg%{?_isa} >= 1.19.0-3
+Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
+Requires: mesa-libGL%{?_isa} >= 13.0.3-3
+Requires: mesa-libGLES%{?_isa} >= 13.0.3-3
%endif
Obsoletes: %{_nvidia_serie}-kmod < %{?epoch}:%{version}
@@ -90,12 +98,12 @@ http://rpmfusion.org/Howto/nVidia
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
-Requires: %{name}-cuda%{_isa} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-cuda%{?_isa} = %{?epoch}:%{version}-%{release}
#Don't put an epoch here
Provides: cuda-drivers-devel = %{version}
-Provides: cuda-drivers-devel%{_isa} = %{version}
+Provides: cuda-drivers-devel%{?_isa} = %{version}
%description devel
This package provides the development files of the %{name} package,
@@ -112,7 +120,7 @@ Conflicts: xorg-x11-drv-nvidia-340xx-cuda
#Don't put an epoch here
Provides: cuda-drivers = %{version}
-Provides: cuda-drivers%{_isa} = %{version}
+Provides: cuda-drivers%{?_isa} = %{version}
%description cuda
This package provides the CUDA driver libraries.
@@ -129,8 +137,14 @@ which is generated during the build of main package.
Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
Requires: %{name} = %{?epoch}:%{version}-%{release}
-Requires: libvdpau%{_isa} >= 0.5
-Requires: libglvnd%{_isa}
+Requires: libvdpau%{?_isa} >= 0.5
+Requires: libglvnd%{?_isa} >= 0.2
+%if 0%{?fedora} >= 25
+Requires: libglvnd-egl%{?_isa} >= 0.2
+Requires: libglvnd-gles%{?_isa} >= 0.2
+Requires: libglvnd-glx%{?_isa} >= 0.2
+Requires: libglvnd-opengl%{?_isa} >= 0.2
+%endif
%ifarch x86_64 i686
Requires: vulkan-filesystem
%endif
@@ -174,10 +188,6 @@ rm -f nvidia-installer*
install -m 0755 -d $RPM_BUILD_ROOT%{_bindir}
-# ld.so.conf.d file
-install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
-
#Blacklist nouveau (since F-11)
install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
@@ -265,7 +275,9 @@ rm $RPM_BUILD_ROOT%{_nvidia_libdir}/libnvidia-{cfg,tls}.so
#Install static driver dependant configuration files
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+%if 0%{?fedora} <= 24
install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+%endif
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
%if 0%{?fedora} <= 24
install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
@@ -287,10 +299,6 @@ desktop-file-install --vendor "" \
#Workaround for self made xorg.conf using a Files section.
ln -fs ../../%{_nvidia_serie}/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
-#Workaround for cuda availability - rfbz#2916
-ln -fs %{_nvidia_libdir}/libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so.1
-ln -fs %{_nvidia_libdir}/libcuda.so $RPM_BUILD_ROOT%{_libdir}/libcuda.so
-
#Alternate-install-present is checked by the nvidia .run
install -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_nvidia_libdir}
@@ -337,6 +345,17 @@ tar Jcf $RPM_BUILD_ROOT%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}
#Add autostart file for nvidia-settings to load user config
install -D -p -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
+%if 0%{?fedora} >= 25
+# install AppData and add modalias provides
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata/
+install -pm 0644 %{SOURCE12} %{buildroot}%{_datadir}/appdata/
+fn=$RPM_BUILD_ROOT%{_datadir}/appdata/xorg-x11-drv-nvidia.metainfo.xml
+%{SOURCE13} README.txt "NVIDIA GEFORCE GPUS" | xargs appstream-util add-provide ${fn} modalias
+%{SOURCE13} README.txt "NVIDIA QUADRO GPUS" | xargs appstream-util add-provide ${fn} modalias
+%{SOURCE13} README.txt "NVIDIA NVS GPUS" | xargs appstream-util add-provide ${fn} modalias
+%{SOURCE13} README.txt "NVIDIA TESLA GPUS" | xargs appstream-util add-provide ${fn} modalias
+%endif
+
%pre
if [ "$1" -eq "1" ]; then
@@ -452,8 +471,8 @@ fi ||:
%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
%if 0%{?fedora} <= 24
%config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
-%endif
%config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
+%endif
# Comment Xorg abi override
#%%config %%{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf
%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
@@ -478,6 +497,9 @@ fi ||:
%if 0%{?fedora} >= 21
%{_datadir}/X11/xorg.conf.d/nvidia.conf
%endif
+%if 0%{?fedora} >= 25
+%{_datadir}/appdata/xorg-x11-drv-nvidia.metainfo.xml
+%endif
%dir %{_datadir}/nvidia
%{_datadir}/nvidia/nvidia-application-profiles-%{version}-*
%{_datadir}/applications/*nvidia-settings.desktop
@@ -492,7 +514,6 @@ fi ||:
%files libs
%defattr(-,root,root,-)
%dir %{_nvidia_libdir}
-%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%ghost %{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf
%{_nvidia_libdir}/alternate-install-present
%{_nvidia_libdir}/*.so.*
@@ -526,7 +547,6 @@ fi ||:
%{_bindir}/nvidia-persistenced
#nvidia-modprobe is setuid root to allow users to load the module in
%attr(4755, root, root) %{_bindir}/nvidia-modprobe
-%{_libdir}/libcuda.so*
%{_nvidia_libdir}/libcuda.so*
%{_nvidia_libdir}/libnvcuvid.so*
%{_nvidia_libdir}/libnvidia-encode.so*
@@ -569,6 +589,11 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Tue Jan 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.26-8
+- Changes for mesa glvnd
+- Move nvidia libs to lib directoy and remove ldconfig config file
+- Add appdata info
+
* Sat Dec 31 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-7
- Update nvidia.conf for latest Xorg changes
7 years, 10 months
[VirtualBox-kmod/f25] (88 commits) ...Update VBox to 5.1.14
by Sérgio M. Basto
Summary of changes:
df44363... * Wed Oct 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.0 (*)
e297e94... * Sat Nov 02 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.2 (*)
a946864... * Sat Nov 30 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.4 (*)
808a779... * Sun Dec 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
a5eb8e5... * Sat Dec 07 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
6d28bf5... * Sat Dec 07 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
03028b4... * Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
1b70f88... * Thu Dec 19 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.6 (*)
20b26a9... * Fri Dec 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
5c013db... * Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
cb9f598... * Thu Dec 26 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.6 (*)
fd02ac4... * Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
ea18d5f... * Fri Jan 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
2c6ebcf... * Tue Jan 28 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
8950269... * Thu Jan 30 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
12c8921... * Fri Feb 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
6ba2d0d... * Wed Feb 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
562147c... * Sat Feb 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
1fd7cc2... * Mon Feb 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
7f24a02... * Mon Feb 24 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
8c9596e... * Tue Feb 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
691f105... * Tue Mar 04 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
7374f0f... * Sun Mar 09 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
746841f... * Tue Mar 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
d954926... * Mon Mar 31 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
983eef5... * Wed Apr 02 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
1e7f01e... * Fri Apr 04 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
9ef7945... * Wed Apr 16 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
dc04f30... * Sat Apr 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
7e7544a... * Wed Apr 30 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
a29a679... * Thu May 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
8679fc4... * Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
9aa463d... * Sat May 17 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
abb4eb5... * Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
909b0a2... * Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
0419ddf... * Fri Jun 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
02ab6e6... * Tue Jun 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
5b5f308... * Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
b724d55... * Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
06824e7... * Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
91bb48d... * Thu Jul 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
246d321... * Fri Jul 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
16cd534... * Mon Jul 28 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
bc95803... Rebuilt (*)
440adf5... * Sat Aug 02 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
74ee2f3... * Wed Aug 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
ee2ce2f... * Fri Aug 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
1455e72... * Wed Aug 20 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
a3b5f45... * Wed Aug 20 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
0da9394... * Sat Aug 30 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
5879906... * Tue Sep 09 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
03f9368... * Thu Sep 11 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
2e6b755... Rebuilt for kernel (*)
d8ce7ca... * Fri Sep 19 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
15461fa... * Tue Oct 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
facf5d8... * Fri Oct 10 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
9905f50... * Sun Oct 12 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
5ff13fe... * Thu Oct 16 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
b3ef463... * Tue Oct 28 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
f66850c... * Fri Oct 31 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
aa967d8... * Mon Nov 10 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
20dfc07... * Sun Nov 16 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
db7ab2a... * Sun Nov 23 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.2 (*)
a6def89... * Sun Nov 23 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
3d5d804... Fix for current (*)
71d7a43... * Sat Dec 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
546e2db... * Thu Dec 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
5d7f623... * Sat Jan 10 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
3954e17... * Mon Feb 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
73c211c... * Wed Feb 04 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
30e660f... * Sun Feb 08 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
25d8dc4... * Sat Feb 14 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
bd89d58... * Fri Mar 06 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
4482086... * Tue Mar 10 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
ba1c5a1... * Mon Mar 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
df892f7... * Tue Mar 31 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.2 (*)
cbd645c... * Wed Apr 15 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
077f947... * Wed Apr 22 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
24e45aa... * Sat May 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
d259b63... * Sat May 09 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
1c4ed3f... * Wed May 13 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
4111081... * Mon May 18 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.2 (*)
55f7259... * Sun May 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
cf8ca2f... * Tue Jun 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
262026d... * Wed Jun 10 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3 (*)
2b2d579... sync with master (*)
770af16... Merge branch 'el7' (*)
9ecc4dd... Update VBox to 5.1.14 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 10 months
[VirtualBox/f24] (20 commits) ...Update VBox to 5.1.14
by Sérgio M. Basto
Summary of changes:
cd507d3... * Wed Dec 25 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.6 (*)
45ee3aa... Deleted some patches that are no longer in use. (*)
968ed18... * Mon Mar 31 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
1c6647b... * Fri May 16 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
85a123d... * Tue Jul 15 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
de6f9c2... add comment to changelog and restore Buildrequires for devi (*)
25fff56... * Wed Sep 10 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
547b186... * Sat Oct 11 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
2494136... * Sun Nov 23 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.2 (*)
a755886... * Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.2 (*)
51db390... * Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.2 (*)
961b84e... * Fri Dec 26 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.2 (*)
1ced427... * Tue Mar 24 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
e55d98b... * Wed May 13 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.2 (*)
2bf937b... add VirtualBox-4.3.26-gcc.patch (*)
a552046... Merge commit 'f209f85548af6e8b52ef75eb8b819311a2424329' int (*)
9e883bf... Merge branch 'el7' (*)
738bad0... Use systemd-detect-virt to detect if we can install (*)
4728a69... Revert "Use systemd-detect-virt to detect if we can install (*)
cafa488... Update VBox to 5.1.14 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 10 months
[VirtualBox-kmod] Update VBox to 5.1.14
by Sérgio M. Basto
commit 9ecc4dd6f21d16c21d7cfe1965ee1da884f6624e
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Jan 18 02:30:37 2017 +0000
Update VBox to 5.1.14
VirtualBox-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 575a530..c7bd092 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -26,7 +26,7 @@
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
-Version: 5.1.10
+Version: 5.1.14
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Release: 1%{?dist}
@@ -106,6 +106,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Wed Jan 18 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.14-1
+- Update VBox to 5.1.14
+
* Tue Nov 22 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.10-1
- New upstream vesion, 5.1.10
7 years, 10 months
[VirtualBox/f25] (20 commits) ...Update VBox to 5.1.14
by Sérgio M. Basto
Summary of changes:
cd507d3... * Wed Dec 25 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.6 (*)
45ee3aa... Deleted some patches that are no longer in use. (*)
968ed18... * Mon Mar 31 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
1c6647b... * Fri May 16 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
85a123d... * Tue Jul 15 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
de6f9c2... add comment to changelog and restore Buildrequires for devi (*)
25fff56... * Wed Sep 10 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
547b186... * Sat Oct 11 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.1 (*)
2494136... * Sun Nov 23 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.2 (*)
a755886... * Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.2 (*)
51db390... * Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.2 (*)
961b84e... * Fri Dec 26 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.2 (*)
1ced427... * Tue Mar 24 2015 Leigh Scott <leigh123linux(a)googlemail.com (*)
e55d98b... * Wed May 13 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.2 (*)
2bf937b... add VirtualBox-4.3.26-gcc.patch (*)
a552046... Merge commit 'f209f85548af6e8b52ef75eb8b819311a2424329' int (*)
9e883bf... Merge branch 'el7' (*)
738bad0... Use systemd-detect-virt to detect if we can install (*)
4728a69... Revert "Use systemd-detect-virt to detect if we can install (*)
cafa488... Update VBox to 5.1.14 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 10 months
[VirtualBox] Update VBox to 5.1.14
by Sérgio M. Basto
commit cafa4880efb6f5cfc351d55f38d851a584ce37b3
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jan 17 19:50:00 2017 +0000
Update VBox to 5.1.14
.gitignore | 1 +
VirtualBox-OSE-4.0.2-aiobug.patch | 15 +++++----------
VirtualBox.spec | 5 ++++-
sources | 2 +-
4 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 525b6e5..8ee18b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ VirtualBox-5.0.16.tar.bz2
/VirtualBox-5.1.6.tar.bz2
/VirtualBox-5.1.8.tar.bz2
/VirtualBox-5.1.10.tar.bz2
+/VirtualBox-5.1.14.tar.bz2
diff --git a/VirtualBox-OSE-4.0.2-aiobug.patch b/VirtualBox-OSE-4.0.2-aiobug.patch
index 2ef7307..51c9913 100644
--- a/VirtualBox-OSE-4.0.2-aiobug.patch
+++ b/VirtualBox-OSE-4.0.2-aiobug.patch
@@ -7,11 +7,9 @@ Subject: [PATCH] Disable the aio bug detection
src/VBox/Main/src-client/ConsoleImpl2.cpp | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
-diff --git a/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/VBox/Main/src-client/ConsoleImpl2.cpp
-index cfa0bd4..ef4aca4 100644
---- a/src/VBox/Main/src-client/ConsoleImpl2.cpp
-+++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp
-@@ -4057,6 +4057,8 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst,
+--- ./src/VBox/Main/src-client/ConsoleImpl2.cpp.orig 2016-12-20 15:36:24.000000000 +0000
++++ ./src/VBox/Main/src-client/ConsoleImpl2.cpp 2016-12-21 03:04:13.283475098 +0000
+@@ -4095,6 +4095,8 @@ int Console::i_configMediumAttachment(co
mfSnapshotFolderSizeWarningShown = true;
}
@@ -20,14 +18,11 @@ index cfa0bd4..ef4aca4 100644
#ifdef RT_OS_LINUX
/*
* Ext4 bug: Check if the host I/O cache is disabled and the disk image is located
-@@ -4110,6 +4112,7 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst,
- }
+@@ -4172,6 +4174,7 @@ int Console::i_configMediumAttachment(co
+ fUseHostIOCache = true;
}
#endif
+#endif
}
}
---
-1.7.3.4
-
diff --git a/VirtualBox.spec b/VirtualBox.spec
index ac99fa9..1eb9298 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -23,7 +23,7 @@
%bcond_with vnc
Name: VirtualBox
-Version: 5.1.10
+Version: 5.1.14
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -760,6 +760,9 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Tue Jan 17 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.14-1
+- Update VBox to 5.1.14
+
* Tue Nov 22 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.10-1
- New upstream release, 5.1.10
diff --git a/sources b/sources
index e062c49..06b21fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-889d90a7d8119a6bcc699be258ca4a96 VirtualBox-5.1.10.tar.bz2
+21eaec9f21477d555559a63761779880 VirtualBox-5.1.14.tar.bz2
7 years, 10 months
[VirtualBox] Revert "Use systemd-detect-virt to detect if we can install"
by Sérgio M. Basto
commit 4728a69f39d4d8adad80bb30e94b2c71f1835c36
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jan 17 19:28:09 2017 +0000
Revert "Use systemd-detect-virt to detect if we can install"
This reverts commit 738bad03ff3a651a54b9225098f8b89399fee446.
VirtualBox.spec | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index a37062f..ac99fa9 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -25,7 +25,7 @@
Name: VirtualBox
Version: 5.1.10
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -158,6 +158,8 @@ Summary: core part (host server) for %{name}
Group: Development/Tools
Requires: %{name}-kmod = %{version}
Provides: %{name}-kmod-common = %{version}-%{release}
+Conflicts: %{name}-guest <= %{version}-%{release}
+Conflicts: %{name}-guest-additions <= %{version}-%{release}
%description server
%{name} without Qt GUI part.
@@ -206,6 +208,7 @@ Requires: %(xserver-sdk-abi-requires ansic)
Requires: %(xserver-sdk-abi-requires videodrv)
Requires: %(xserver-sdk-abi-requires xinput)
%endif
+Conflicts: %{name} <= %{version}-%{release}
%description guest-additions
@@ -607,13 +610,6 @@ fi
/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%pre guest-additions
-if [ $(systemd-detect-virt | grep -iP "oracle|kvm" -c) -eq 0 ]; then
-echo "This package it is only to install in one Oracle VM VirtualBox."
-echo "You are trying install VirtualBox guest-additions but it hasn't been \
-detected that your system is running in a VirtualBox virtualization, so we \
-forced the installation to fail."
-exit 1
-fi
# 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
@@ -764,12 +760,6 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%{_datadir}/%{name}-kmod-%{version}
%changelog
-* Mon Nov 28 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.10-2
-- Use systemd-detect-virt to detect if we can install
- VirtualBox-guest-additions, which fix an old problem which made not possible
- install VirtualBox in a guest machine.
- Removed conflicts between main package and guest-additions.
-
* Tue Nov 22 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.10-1
- New upstream release, 5.1.10
7 years, 10 months