[nvidia-kmod/f23] (12 commits) ...Update to 367.57
by Leigh Scott
Summary of changes:
400130f... Attempt to fix build on armhfp - disabled for now (*)
2968532... Revert "Attempt to fix build on armhfp - disabled for now" (*)
f368277... Merge branch 'master' into f24 (*)
3c781e8... Merge branch 'master' into f24 (*)
5119729... Merge branch 'master' into f24 (*)
8512ae5... Merge branch 'master' into f24 (*)
6e118c4... Merge branch 'master' into f24 (*)
5f31d8d... Merge branch 'master' into f24 (*)
fdf267f... Merge branch 'master' into f24 (*)
fda966e... Merge branch 'master' into f24 (*)
1c8ae66... Merge branch 'f25' into f24 (*)
b9f5a82... Update to 367.57 (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 2 months
[nvidia-kmod/f24] Update to 367.57
by Leigh Scott
commit b9f5a823d38be314ea198bec4671ca9e8af63eec
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Oct 15 12:27:23 2016 +0100
Update to 367.57
nvidia-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 86e3ac9..5214d11 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -8,7 +8,7 @@
Name: nvidia-kmod
Epoch: 1
-Version: 367.44
+Version: 367.57
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Oct 15 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:367.57-1
+- Update to 367.57
+
* Wed Aug 24 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:367.44-1
- Update to 367.44
8 years, 2 months
[xorg-x11-drv-nvidia/f24] (3 commits) ...fix merge
by Leigh Scott
Summary of changes:
76b80a1... Revert "Update to 370.23 beta" (*)
968ad10... Merge branch 'f25' into f23 (*)
7b1b322... fix merge (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 2 months
[xorg-x11-drv-nvidia/f23: 16/16] fix merge
by Leigh Scott
commit 7b1b3220ed470697e1ce7b59147370969d2a2907
Merge: 968ad10 601ebc3
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Oct 15 09:16:30 2016 +0100
fix merge
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 31 ++++++++++++++++++++-----------
3 files changed, 26 insertions(+), 14 deletions(-)
---
8 years, 2 months
[xorg-x11-drv-nvidia/f23] (16 commits) ...fix merge
by Leigh Scott
Summary of changes:
901badb... Disable armhfp for now (*)
6af1ad6... Revert "Disable armhfp for now" (*)
c8a618c... Merge branch 'master' into f24 (*)
e2630fc... Merge branch 'master' into f24 (*)
f928a22... Merge branch 'master' into f24 (*)
a0166dc... Merge branch 'master' into f24 (*)
27fa710... Merge branch 'master' into f24 (*)
66298c0... Merge branch 'master' into f24 (*)
0855d1e... Merge branch 'master' into f24 (*)
3d9468d... Merge branch 'master' into f24 (*)
d5f68d0... Merge branch 'master' into f24 (*)
47afd92... Merge branch 'master' into f24 (*)
3110819... Revert "Update to 370.23 beta" (*)
f5a8246... Merge branch 'f25' into f24 (*)
601ebc3... Update to 367.57 (*)
7b1b322... fix merge
(*) This commit already existed in another branch; no separate mail sent
8 years, 2 months
[xorg-x11-drv-nvidia/f24] Update to 367.57
by Leigh Scott
commit 601ebc35459af3c9df53faa9f3f3e170054619bb
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Oct 15 09:08:43 2016 +0100
Update to 367.57
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 31 ++++++++++++++++++++-----------
3 files changed, 26 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3cbf3a0..7bdf0cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@ NVIDIA-Linux-x86_64-358.16.run
/NVIDIA-Linux-x86-367.44.run
/NVIDIA-Linux-x86_64-367.44.run
/NVIDIA-Linux-armv7l-gnueabihf-367.44.run
+/NVIDIA-Linux-armv7l-gnueabihf-367.57.run
+/NVIDIA-Linux-x86-367.57.run
+/NVIDIA-Linux-x86_64-367.57.run
diff --git a/sources b/sources
index 8871897..749927c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-93ff8e1fe32939ca4fd6522b93825edc NVIDIA-Linux-x86-367.44.run
-d34b42e64b25bf2a8d7b9a157723a3bd NVIDIA-Linux-x86_64-367.44.run
-4ac2c479bf8387f143254d5fd37b65b0 NVIDIA-Linux-armv7l-gnueabihf-367.44.run
+6939f33f3b75cc2e8027aa9b3467d37d NVIDIA-Linux-armv7l-gnueabihf-367.57.run
+5036001416df18d0cb6e2c8bc3935945 NVIDIA-Linux-x86-367.57.run
+5c82404798d8d4a64a6dfa931bf7afbf NVIDIA-Linux-x86_64-367.57.run
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index aaf9fa3..f96a65a 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -1,13 +1,14 @@
%global _nvidia_serie nvidia
%global _nvidia_libdir %{_libdir}/%{_nvidia_serie}
%global _nvidia_xorgdir %{_nvidia_libdir}/xorg
+%global _glvnd_libdir %{_libdir}/libglvnd
%global debug_package %{nil}
%global __strip /bin/true
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 367.44
+Version: 367.57
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -124,6 +125,7 @@ Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
Requires: %{name} = %{?epoch}:%{version}-%{release}
Requires: libvdpau%{_isa} >= 0.5
+Requires: libglvnd%{_isa}
%description libs
This package provides the shared libraries for %{name}.
@@ -166,12 +168,15 @@ 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 "%{_nvidia_libdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+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/
+# GLVND
+rm libGL.so.%{version}
+
# Simple wildcard install of libs
install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}
install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/
@@ -180,12 +185,13 @@ install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/
install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/
%endif
-# install stuff the wildcard missed
-install -p -m 0755 libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/
-ln -s libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL.so
-install -p -m 0755 libGLdispatch.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/
-install -p -m 0755 libOpenGL.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/
-ln -s libOpenGL.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenGL.so
+# GlVND
+ln -s libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLX_indirect.so.0
+
+# Fix unowned lib links
+ln -s libEGL_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL_nvidia.so.0
+ln -s libGLESv2_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLESv2_nvidia.so.2
+ln -s libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLX_nvidia.so.0
%ifarch x86_64 i686
# OpenCL config
@@ -527,7 +533,6 @@ fi ||:
%endif
%{_libdir}/vdpau/libvdpau_nvidia.so
%{_nvidia_libdir}/libnvidia-ifr.so
-%{_nvidia_libdir}/libEGL.so
%{_nvidia_libdir}/libEGL_nvidia.so
%{_nvidia_libdir}/libGLESv1_CM_nvidia.so
%{_nvidia_libdir}/libGLESv2_nvidia.so
@@ -536,11 +541,15 @@ fi ||:
%{_nvidia_libdir}/libnvidia-fbc.so
%{_nvidia_libdir}/libnvidia-glcore.so
%{_nvidia_libdir}/libnvidia-glsi.so
-%{_nvidia_libdir}/libGL.so
%{_nvidia_libdir}/libGLX_nvidia.so
-%{_nvidia_libdir}/libOpenGL.so
%changelog
+* Sat Oct 15 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:367.57-1
+- Update to 367.57
+- Add libglvnd path to ld.so.conf.d conf file
+- Switch to system libglvnd
+- Fix unowned file links
+
* Wed Aug 24 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:367.44-1
- Update to 367.44
8 years, 2 months
[xorg-x11-drv-nvidia/f25] (3 commits) ...readd description
by Leigh Scott
Summary of changes:
6ecfbc0... Switch to system libglvnd (*)
62bcab1... Add libglvnd path to ld.so.conf.d conf file (*)
99add75... readd description (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 2 months
[xorg-x11-drv-nvidia] readd description
by Leigh Scott
commit 99add756475ea8c798782e9ded1982ef16e02eed
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Oct 15 08:59:23 2016 +0100
readd description
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 9934dc6..65c7eb9 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -167,6 +167,7 @@ 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
8 years, 2 months
[akmods] Disable shutdown systemd service file by default.
by Richard Shaw
commit 87513fe6e8bf08ae53b28d529807e681148124a2
Author: Richard M. Shaw <hobbes1069(a)gmail.com>
Date: Fri Oct 14 08:17:43 2016 -0500
Disable shutdown systemd service file by default.
- Remove modprobe line from main service file.
.gitignore | 1 +
akmods.spec | 156 ++++++++++++++----------------------------------------------
sources | 1 +
3 files changed, 39 insertions(+), 119 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..5ce4841 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/akmods-0.5.6.tar.gz
diff --git a/akmods.spec b/akmods.spec
index 55e7063..d81eee2 100755
--- a/akmods.spec
+++ b/akmods.spec
@@ -1,19 +1,20 @@
Name: akmods
-Version: 0.5.4
-Release: 3%{?dist}
-Summary: Automatic kmods build and install tool
+Version: 0.5.6
+Release: 1%{?dist}
+Summary: Automatic kmods build and install tool
License: MIT
URL: http://rpmfusion.org/Packaging/KernelModules/Akmods
-Source0: akmods
-Source1: akmodsbuild
-Source2: akmodsposttrans
-Source3: akmods.service.in
-Source4: akmods-shutdown
-Source5: akmods-shutdown.service
-Source6: akmods.h2m
-Source7: 95-akmods.preset
+Source0: https://github.com/hobbes1069/%{name}/archive/v%{version}.tar.gz#/%{name}...
+#Source0: akmods
+#Source1: akmodsbuild
+#Source2: akmodsposttrans
+#Source3: akmods.service.in
+#Source4: akmods-shutdown
+#Source5: akmods-shutdown.service
+#Source6: akmods.h2m
+#Source7: 95-akmods.preset
BuildArch: noarch
@@ -47,13 +48,13 @@ Requires(postun): systemd
%description
-Akmods startup script will rebuild akmod packages during system
+Akmods startup script will rebuild akmod packages during system
boot while its background daemon will build them for kernels right
after they were installed.
%prep
-echo Nothing to prep.
+%setup -q
%build
@@ -62,25 +63,28 @@ echo Nothing to build.
%install
mkdir -p %{buildroot}%{_usrsrc}/akmods \
+ %{buildroot}%{_sbindir} \
+ %{buildroot}%{_sysconfdir}/kernel/postinst.d \
+ %{buildroot}%{_unitdir} \
%{buildroot}%{_localstatedir}/cache/akmods \
%{buildroot}%{_prefix}/lib/systemd/system-preset
-install -D -pm 0755 %{SOURCE0} %{buildroot}%{_sbindir}/akmods
-install -D -pm 0755 %{SOURCE1} %{buildroot}%{_sbindir}/akmodsbuild
-install -D -pm 0755 %{SOURCE4} %{buildroot}%{_sbindir}/akmods-shutdown
-install -D -pm 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/kernel/postinst.d/akmodsposttrans
-install -D -pm 0644 %{SOURCE5} %{buildroot}%{_unitdir}/akmods-shutdown.service
+install -pm 0755 akmods %{buildroot}%{_sbindir}/
+install -pm 0755 akmodsbuild %{buildroot}%{_sbindir}/
+install -pm 0755 akmods-shutdown %{buildroot}%{_sbindir}/
+install -pm 0755 akmodsposttrans %{buildroot}%{_sysconfdir}/kernel/postinst.d/
+install -pm 0644 akmods-shutdown.service %{buildroot}%{_unitdir}/
-sed "s|@SERVICE(a)|display-manager.service|" %{SOURCE3} >\
+sed "s|@SERVICE(a)|display-manager.service|" akmods.service.in >\
%{buildroot}%{_unitdir}/akmods.service
-install -pm 0644 %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/system-preset/
+install -pm 0644 95-akmods.preset %{buildroot}%{_prefix}/lib/systemd/system-preset/
# Generate and install man pages.
mkdir -p %{buildroot}%{_mandir}/man1
-help2man -N -i %{SOURCE6} -s 1 \
- -o %{buildroot}%{_mandir}/man1/akmods.1 %{SOURCE0}
-help2man -N -i %{SOURCE6} -s 1 \
- -o %{buildroot}%{_mandir}/man1/akmodsbuild.1 %{SOURCE1}
+help2man -N -i akmods.h2m -s 1 \
+ -o %{buildroot}%{_mandir}/man1/akmods.1 akmods
+help2man -N -i akmods.h2m -s 1 \
+ -o %{buildroot}%{_mandir}/man1/akmodsbuild.1 akmodsbuild
%pre
@@ -103,7 +107,7 @@ useradd -r -g akmods -d /var/cache/akmods/ -s /sbin/nologin \
%systemd_postun akmods-shutdown.service
-%files
+%files
%{_sbindir}/akmodsbuild
%{_sbindir}/akmods-shutdown
%{_sbindir}/akmods
@@ -117,6 +121,14 @@ useradd -r -g akmods -d /var/cache/akmods/ -s /sbin/nologin \
%changelog
+* Fri Oct 14 2016 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.6-1
+- Disable shutdown systemd service file by default.
+- Remove modprobe line from main service file.
+
+* Fri Apr 8 2016 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.5-1
+- Update to latest upstream release.
+- Fixes BZ#4023
+
* Wed Aug 17 2016 Sérgio Basto <sergio(a)serjux.com> - 0.5.4-3
- New release
@@ -169,97 +181,3 @@ useradd -r -g akmods -d /var/cache/akmods/ -s /sbin/nologin \
- Update for UsrMove support
- Remove unused references to older fedora
- Change Requires from kernel-devel to kernel-devel-uname-r
-
-* Thu Nov 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.3.8-3
-- Kmod can be newer than akmod due to rebuilds for new kernels (#2063)
-
-* Mon Nov 21 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.3.8-2
-- Add hint about kernel-devel package if rebuild fails due to lack of required
- development files.
-- Move logging from /var/cache/akmods/akmods.log to /var/log/akmods.log.
-
-* Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.3.7-1
-- Update to 0.3.7
-- Fixes #1805. Version check is now properly based on rpmdev-vercmp exit code.
-- Fixes #1813. Exit code is now 0 on success for systemd compatability.
-- Fixes #485. Change from "lockfile" to "flock" for lockfile management to
- remove dependency on procmail.
-- Fixes #773. Added /usr/bin/time as a requirement.
-- Fixes #1592.
-- Fixes #1930. "/var/cache/akmods" is now owned by the akmods user.
-
-* Sun Aug 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.3.6-3
-- add lockfile as hard dep
-
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.3.6-2
-- rebuild for new F11 features
-
-* Sun Feb 01 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.3.6-1
-- update to 0.3.6
--- better posttrans support
--- remove some leftovers from daemon stuff
--- fix a few minor bugs
--- use lockfile
-
-* Thu Jan 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.3.5-1
-- update to 0.3.5, fixes #340
-
-* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.3.4-1
-- update to 0.3.4, which has some cosmetic changes
-
-* Thu Oct 02 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.3.3-2
-- rebuild for rpm fusion
-
-* Sun Sep 21 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.3.3-1
-- proper check for kernel-devel files in akmods as well
-
-* Tue Sep 02 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.3.2-1
-- Start akmods way earlier (level 05) during boot (#1995)
-- proper check for kernel-devel files (#1942)
-
-* Tue Sep 02 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.3.1-2
-- Remove check section
-
-* Sun May 18 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.3.1-1
-- Remove check for inotify
-
-* Sat Apr 12 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.3.0-1
-- Fix thinko in akmodsposttrans
-
-* Sat Apr 12 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.3.0-0.4
-- split init script and poststrans stuff from akmodsds
-- rename akmodsd to akmods
-- rename akmodbuild to akmodsbuild
-- remove the inotifywatch stuff
-
-* Sun Mar 30 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.2.3-1
-- update akmodbuid manpage
-
-* Sat Mar 29 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.2.2-1
-- adjust to recent "arch and flavor in uname" changes from j-rod
-- add man page for akmodbuild
-- cleanups to akmodbuild
-
-* Thu Jan 31 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.2.1-2
-- add a hard dep on kmodtool which is needed during akmod building
-
-* Sat Jan 26 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.2.1-1
-- rename akmods to akmodbuild
-
-* Sun Jan 20 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.2.0-1
-- require kernel-devel
-- use rpmdev-vercmp to compare f a akmods is newer then the installed kmod
-- build and install akmods on install
-
-* Wed Jan 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.1.1-3
-- remove akmodstool and integrate it into kmodtool
-
-* Wed Jan 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.1.1-2
-- own /usr/src/akmods
-
-* Sun Jan 07 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.1.1-1
-- add rpm-build as Require
-- add a status function to akmodsd
-
-* Sun Jan 07 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0.1.0-1
-- Initial RPM release.
diff --git a/sources b/sources
index e69de29..dbb27de 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+8a7f2e0ac64bd8fc675f8963a0a20dee akmods-0.5.6.tar.gz
8 years, 2 months
