rpms/nvidia-304xx-kmod/F-20 4.0.0_kernel.patch, NONE, 1.1 nvidia-304xx-kmod.spec, 1.80, 1.81
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26778
Modified Files:
nvidia-304xx-kmod.spec
Added Files:
4.0.0_kernel.patch
Log Message:
* Mon May 25 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 304.123-3
- Patch for 4.0.0 kernel
4.0.0_kernel.patch:
nv-pat.c | 9 +++++++++
1 file changed, 9 insertions(+)
--- NEW FILE 4.0.0_kernel.patch ---
--- a/kernel/nv-pat.c 2015-01-11 04:30:46.000000000 +0000
+++ b/kernel/nv-pat.c 2015-02-23 10:39:33.352315652 +0000
@@ -35,8 +35,13 @@ static inline void nv_disable_caches(uns
unsigned long cr0 = read_cr0();
write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
wbinvd();
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,20,0)
+ *cr4 = __read_cr4();
+ if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
+#else
*cr4 = read_cr4();
if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
+#endif
__flush_tlb();
}
@@ -46,7 +51,11 @@ static inline void nv_enable_caches(unsi
wbinvd();
__flush_tlb();
write_cr0((cr0 & 0x9fffffff));
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,20,0)
+ if (cr4 & 0x80) __write_cr4(cr4);
+#else
if (cr4 & 0x80) write_cr4(cr4);
+#endif
}
static int nv_determine_pat_mode(void)
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-20/nvidia-304xx-kmod.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- nvidia-304xx-kmod.spec 24 May 2015 15:58:26 -0000 1.80
+++ nvidia-304xx-kmod.spec 25 May 2015 13:11:25 -0000 1.81
@@ -3,12 +3,12 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
Name: nvidia-304xx-kmod
Version: 304.123
# Taken over by kmodtool
-Release: 2%{?dist}.6
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,6 +18,7 @@
#ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
Source0: nvidia-kmod-data-%{version}.tar.xz
Patch0: 3.19_kernel.patch
+Patch1: 4.0.0_kernel.patch
Source11: nvidia-304xx-kmodtool-excludekernel-filterfile
@@ -47,6 +48,7 @@
do
pushd nvidiapkg-${arch}
%patch0 -p1
+%patch1 -p1
popd
done
@@ -80,6 +82,9 @@
%changelog
+* Mon May 25 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 304.123-3
+- Patch for 4.0.0 kernel
+
* Sun May 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 304.123-2.6
- Rebuilt for kernel
8 years, 11 months
rpms/nvidia-kmod/F-20 4.0.0_kernel.patch,NONE,1.1
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26603
Added Files:
4.0.0_kernel.patch
Log Message:
* Mon May 25 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.113-3
- Patch for 4.0.0 kernel
4.0.0_kernel.patch:
nv-pat.c | 9 +++++++++
1 file changed, 9 insertions(+)
--- NEW FILE 4.0.0_kernel.patch ---
--- a/kernel/nv-pat.c 2015-01-11 04:30:46.000000000 +0000
+++ b/kernel/nv-pat.c 2015-02-23 10:39:33.352315652 +0000
@@ -35,8 +35,13 @@ static inline void nv_disable_caches(uns
unsigned long cr0 = read_cr0();
write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
wbinvd();
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,20,0)
+ *cr4 = __read_cr4();
+ if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
+#else
*cr4 = read_cr4();
if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
+#endif
__flush_tlb();
}
@@ -46,7 +51,11 @@ static inline void nv_enable_caches(unsi
wbinvd();
__flush_tlb();
write_cr0((cr0 & 0x9fffffff));
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,20,0)
+ if (cr4 & 0x80) __write_cr4(cr4);
+#else
if (cr4 & 0x80) write_cr4(cr4);
+#endif
}
static int nv_determine_pat_mode(void)
8 years, 11 months
rpms/nvidia-kmod/F-20 nvidia-kmod.spec,1.226,1.227
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26358
Modified Files:
nvidia-kmod.spec
Log Message:
* Mon May 25 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.113-3
- Patch for 4.0.0 kernel
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-20/nvidia-kmod.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- nvidia-kmod.spec 24 May 2015 15:59:10 -0000 1.226
+++ nvidia-kmod.spec 25 May 2015 13:04:38 -0000 1.227
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
Name: nvidia-kmod
Epoch: 1
Version: 331.113
# Taken over by kmodtool
-Release: 2%{?dist}.6
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -27,6 +27,7 @@
Patch0: nv-linux-arm.patch
Patch1: 3.18_kernel.patch
Patch2: 3.19_kernel.patch
+Patch3: 4.0.0_kernel.patch
Source11: nvidia-kmodtool-excludekernel-filterfile
@@ -58,6 +59,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
popd
done
@@ -101,6 +103,9 @@
%changelog
+* Mon May 25 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.113-3
+- Patch for 4.0.0 kernel
+
* Sun May 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.113-2.6
- Rebuilt for kernel
8 years, 11 months
rpms/staging-kmod/devel staging-kmod.spec,1.56,1.57
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25462
Modified Files:
staging-kmod.spec
Log Message:
* Mon May 25 2015 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.0.4-1
- Update to 4.0.4
- Drop LINE6_USB and TOUCHSCREEN_CLEARPAD_TM1217 (dropped upstream)
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/devel/staging-kmod.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- staging-kmod.spec 25 May 2015 12:08:35 -0000 1.56
+++ staging-kmod.spec 25 May 2015 12:41:30 -0000 1.57
@@ -47,7 +47,7 @@
%setup -q -c -T -a 0
# disable drivers that are enabled in Fedora's kernel or not yet relevant, as those otherweise would get build
-sed -i '/.COMMON_CLK_XLNX_CLKWZRD/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.MTD_SPINAND/ d; /.R8712U/ d; /.RTL8192E/ d; /.R8192EE/ d; /.R8723AU/ d; /.SENSORS_ISL29/ d; /.IMX/ d; /.DWC2/ d; /.VIDEO_TLG2300/ d; /.GS_FPGABOOT/ d;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
+sed -i '/.COMMON_CLK_XLNX_CLKWZRD/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.MTD_SPINAND/ d; /.R8712U/ d; /.RTL8192E/ d; /.R8192EE/ d; /.R8723AU/ d; /.SENSORS_ISL29/ d; /.IMX/ d; /.DWC2/ d; /.VIDEO_TLG2300/ d; /.GS_FPGABOOT/ d; /.I2O/ d;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
# broken in 3.13
sed -i 's!#include "dot11d.h"!#include "ieee80211/dot11d.h"!' linux-staging-%{version}/drivers/staging/rtl8192u/{r8192U_core.c,r8192U_wx.c,r819xU_phy.c}
8 years, 11 months
rpms/staging-kmod/F-20 staging-kmod.spec,1.104,1.105
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25072
Modified Files:
staging-kmod.spec
Log Message:
* Mon May 25 2015 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.0.4-1
- Update to 4.0.4
- Drop LINE6_USB and TOUCHSCREEN_CLEARPAD_TM1217 (dropped upstream)
- Disable I2O (enabled in Fedora-x86-32)
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-20/staging-kmod.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- staging-kmod.spec 25 May 2015 12:09:08 -0000 1.104
+++ staging-kmod.spec 25 May 2015 12:35:11 -0000 1.105
@@ -47,7 +47,7 @@
%setup -q -c -T -a 0
# disable drivers that are enabled in Fedora's kernel or not yet relevant, as those otherweise would get build
-sed -i '/.COMMON_CLK_XLNX_CLKWZRD/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.MTD_SPINAND/ d; /.R8712U/ d; /.RTL8192E/ d; /.R8192EE/ d; /.R8723AU/ d; /.SENSORS_ISL29/ d; /.IMX/ d; /.DWC2/ d; /.VIDEO_TLG2300/ d; /.GS_FPGABOOT/ d;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
+sed -i '/.COMMON_CLK_XLNX_CLKWZRD/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.MTD_SPINAND/ d; /.R8712U/ d; /.RTL8192E/ d; /.R8192EE/ d; /.R8723AU/ d; /.SENSORS_ISL29/ d; /.IMX/ d; /.DWC2/ d; /.VIDEO_TLG2300/ d; /.GS_FPGABOOT/ d; /.I2O/ d;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
# broken in 3.13
sed -i 's!#include "dot11d.h"!#include "ieee80211/dot11d.h"!' linux-staging-%{version}/drivers/staging/rtl8192u/{r8192U_core.c,r8192U_wx.c,r819xU_phy.c}
@@ -132,6 +132,7 @@
* Mon May 25 2015 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.0.4-1
- Update to 4.0.4
- Drop LINE6_USB and TOUCHSCREEN_CLEARPAD_TM1217 (dropped upstream)
+- Disable I2O (enabled in Fedora-x86-32)
* Wed Apr 8 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2
- Update for ARM
8 years, 11 months
rpms/staging-kmod/F-20 .cvsignore, 1.15, 1.16 sources, 1.16, 1.17 staging-kmod.spec, 1.103, 1.104
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24181
Modified Files:
.cvsignore sources staging-kmod.spec
Log Message:
* Mon May 25 2015 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.0.4-1
- Update to 4.0.4
- Drop LINE6_USB and TOUCHSCREEN_CLEARPAD_TM1217 (dropped upstream)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-20/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 30 Mar 2015 20:09:04 -0000 1.15
+++ .cvsignore 25 May 2015 12:09:08 -0000 1.16
@@ -1 +1 @@
-linux-staging-3.19.2.tar.xz
+linux-staging-4.0.4.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-20/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 30 Mar 2015 20:09:04 -0000 1.16
+++ sources 25 May 2015 12:09:08 -0000 1.17
@@ -1 +1 @@
-1a55d353d0d56480b5dc28e7caa92a16 linux-staging-3.19.2.tar.xz
+aae6537c7756d5adc4fdf3428ef0a37f linux-staging-4.0.4.tar.xz
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-20/staging-kmod.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- staging-kmod.spec 24 May 2015 15:57:24 -0000 1.103
+++ staging-kmod.spec 25 May 2015 12:09:08 -0000 1.104
@@ -1,7 +1,7 @@
# akmods not supported
# which drivers to built
-%global stgdrvs FB_XGI FT1000 LINE6_USB LTE_GDM724X PRISM2_USB R8188EU RTL8192U SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_WPAN_HCD VT6655 VT6656 WIMAX_GDM72XX
+%global stgdrvs FB_XGI FT1000 LTE_GDM724X PRISM2_USB R8188EU RTL8192U SPEAKUP TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_WPAN_HCD VT6655 VT6656 WIMAX_GDM72XX
%ifnarch %{arm}
%global stgdrvs %{stgdrvs} SLICOSS
%endif
@@ -16,8 +16,8 @@
#global prever rc8
Name: staging-kmod
-Version: 3.19.2
-Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.6
+Version: 4.0.4
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -129,23 +129,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Sun May 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2.6
-- Rebuilt for kernel
-
-* Wed May 13 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2.5
-- Rebuilt for kernel
-
-* Sat May 09 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2.4
-- Rebuilt for kernel
-
-* Sat May 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2.3
-- Rebuilt for kernel
-
-* Wed Apr 22 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2.2
-- Rebuilt for kernel
-
-* Wed Apr 15 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2.1
-- Rebuilt for kernel
+* Mon May 25 2015 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.0.4-1
+- Update to 4.0.4
+- Drop LINE6_USB and TOUCHSCREEN_CLEARPAD_TM1217 (dropped upstream)
* Wed Apr 8 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2
- Update for ARM
8 years, 11 months
rpms/staging-kmod/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 staging-kmod.spec, 1.55, 1.56
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24096
Modified Files:
.cvsignore sources staging-kmod.spec
Log Message:
* Mon May 25 2015 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.0.4-1
- Update to 4.0.4
- Drop LINE6_USB and TOUCHSCREEN_CLEARPAD_TM1217 (dropped upstream)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 24 Mar 2015 19:11:17 -0000 1.11
+++ .cvsignore 25 May 2015 12:08:35 -0000 1.12
@@ -1 +1 @@
-linux-staging-3.19.2.tar.xz
+linux-staging-4.0.4.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 24 Mar 2015 19:11:17 -0000 1.11
+++ sources 25 May 2015 12:08:35 -0000 1.12
@@ -1 +1 @@
-1a55d353d0d56480b5dc28e7caa92a16 linux-staging-3.19.2.tar.xz
+aae6537c7756d5adc4fdf3428ef0a37f linux-staging-4.0.4.tar.xz
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/devel/staging-kmod.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- staging-kmod.spec 24 May 2015 15:55:41 -0000 1.55
+++ staging-kmod.spec 25 May 2015 12:08:35 -0000 1.56
@@ -1,7 +1,7 @@
# akmods not supported
# which drivers to built
-%global stgdrvs FB_XGI FT1000 LINE6_USB LTE_GDM724X PRISM2_USB R8188EU RTL8192U SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_WPAN_HCD VT6655 VT6656 WIMAX_GDM72XX
+%global stgdrvs FB_XGI FT1000 LTE_GDM724X PRISM2_USB R8188EU RTL8192U SPEAKUP TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_WPAN_HCD VT6655 VT6656 WIMAX_GDM72XX
%ifnarch %{arm}
%global stgdrvs %{stgdrvs} SLICOSS
%endif
@@ -16,8 +16,8 @@
#global prever rc8
Name: staging-kmod
-Version: 3.19.2
-Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.8
+Version: 4.0.4
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -129,29 +129,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Sun May 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2.8
-- Rebuilt for kernel
-
-* Wed May 20 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2.7
-- Rebuilt for kernel
-
-* Wed May 13 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2.6
-- Rebuilt for kernel
-
-* Sat May 09 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2.5
-- Rebuilt for kernel
-
-* Sat May 02 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2.4
-- Rebuilt for kernel
-
-* Wed Apr 22 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2.3
-- Rebuilt for kernel
-
-* Wed Apr 15 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2.2
-- Rebuilt for kernel
-
-* Wed Apr 15 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2.1
-- Rebuilt for kernel
+* Mon May 25 2015 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.0.4-1
+- Update to 4.0.4
+- Drop LINE6_USB and TOUCHSCREEN_CLEARPAD_TM1217 (dropped upstream)
* Wed Apr 8 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 3.19.2-2
- Update for ARM
8 years, 11 months
rpms/staging-kmod-addons/F-20 .cvsignore, 1.11, 1.12 create-linux-staging-tarball.sh, 1.6, 1.7 sources, 1.16, 1.17 staging-kmod-addons.spec, 1.20, 1.21
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod-addons/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24032
Modified Files:
.cvsignore create-linux-staging-tarball.sh sources
staging-kmod-addons.spec
Log Message:
* Mon May 25 2015 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.0.4-1
- Update to 4.0.4
- Drop LINE6_USB and TOUCHSCREEN_CLEARPAD_TM1217 (dropped upstream)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-20/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 30 Mar 2015 20:10:01 -0000 1.11
+++ .cvsignore 25 May 2015 12:07:41 -0000 1.12
@@ -1 +1 @@
-linux-staging-3.19.2.tar.xz
+linux-staging-4.0.4.tar.xz
Index: create-linux-staging-tarball.sh
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-20/create-linux-staging-tarball.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- create-linux-staging-tarball.sh 13 Jul 2014 13:54:45 -0000 1.6
+++ create-linux-staging-tarball.sh 25 May 2015 12:07:41 -0000 1.7
@@ -1,4 +1,5 @@
-#! /bin/bash
+#! /bin/bash
+set -e
if [[ ! "${1}" ]]; then
echo "Please give version number as parameter"
exit 1
@@ -13,7 +14,7 @@
# * remove tmpdir on abortion
pushd ${tmpdir}/ > /dev/null
echo downloading
-wget --quiet http://www.kernel.org/pub/linux/kernel/v3.0/linux-${1}.tar.xz
+wget --quiet http://www.kernel.org/pub/linux/kernel/v4.x/linux-${1}.tar.xz
echo extracing
tar -xJf linux-${1}.tar.xz linux-${1}/COPYING linux-${1}/drivers/staging/ linux-${1}/drivers/video/fbdev/sis/
echo creating archive
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-20/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 30 Mar 2015 20:10:03 -0000 1.16
+++ sources 25 May 2015 12:07:41 -0000 1.17
@@ -1 +1 @@
-1a55d353d0d56480b5dc28e7caa92a16 linux-staging-3.19.2.tar.xz
+aae6537c7756d5adc4fdf3428ef0a37f linux-staging-4.0.4.tar.xz
Index: staging-kmod-addons.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-20/staging-kmod-addons.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- staging-kmod-addons.spec 30 Mar 2015 20:10:03 -0000 1.20
+++ staging-kmod-addons.spec 25 May 2015 12:07:41 -0000 1.21
@@ -1,12 +1,11 @@
# drivers that we ship; to be synced with staging-kmod.spec
-%global stgdrvs FB_XGI FT1000 LINE6_USB LTE_GDM724X PRISM2_USB R8188EU RTL8192U SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_WPAN_HCD VT6655 VT6656 WIMAX_GDM72XX
-
+%global stgdrvs FB_XGI FT1000 LTE_GDM724X PRISM2_USB R8188EU RTL8192U SPEAKUP TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_WPAN_HCD VT6655 VT6656 WIMAX_GDM72XX SLICOSS
# makes handling for rc kernels a whole lot easier:
#global prever rc8
Name: staging-kmod-addons
-Version: 3.19.2
+Version: 4.0.4
Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
Summary: Documentation and shared parts for the kmod-staging packages
@@ -53,6 +52,10 @@
%changelog
+* Mon May 25 2015 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.0.4-1
+- Update to 4.0.4
+- Drop LINE6_USB and TOUCHSCREEN_CLEARPAD_TM1217 (dropped upstream)
+
* Tue Mar 24 2015 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.19.2-1
- Update to 3.19.2
- Drop BCM_WIMAX, dropped upstream
8 years, 11 months
rpms/staging-kmod-addons/devel create-linux-staging-tarball.sh, 1.4, 1.5 sources, 1.11, 1.12 staging-kmod-addons.spec, 1.13, 1.14
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod-addons/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23965
Modified Files:
create-linux-staging-tarball.sh sources
staging-kmod-addons.spec
Log Message:
* Mon May 25 2015 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.0.4-1
- Update to 4.0.4
- Drop LINE6_USB and TOUCHSCREEN_CLEARPAD_TM1217 (dropped upstream)
Index: create-linux-staging-tarball.sh
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/devel/create-linux-staging-tarball.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- create-linux-staging-tarball.sh 15 Nov 2014 20:16:21 -0000 1.4
+++ create-linux-staging-tarball.sh 25 May 2015 12:07:18 -0000 1.5
@@ -1,4 +1,5 @@
-#! /bin/bash
+#! /bin/bash
+set -e
if [[ ! "${1}" ]]; then
echo "Please give version number as parameter"
exit 1
@@ -13,7 +14,7 @@
# * remove tmpdir on abortion
pushd ${tmpdir}/ > /dev/null
echo downloading
-wget --quiet http://www.kernel.org/pub/linux/kernel/v3.0/linux-${1}.tar.xz
+wget --quiet http://www.kernel.org/pub/linux/kernel/v4.x/linux-${1}.tar.xz
echo extracing
tar -xJf linux-${1}.tar.xz linux-${1}/COPYING linux-${1}/drivers/staging/ linux-${1}/drivers/video/fbdev/sis/
echo creating archive
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 24 Mar 2015 19:11:55 -0000 1.11
+++ sources 25 May 2015 12:07:18 -0000 1.12
@@ -1 +1 @@
-1a55d353d0d56480b5dc28e7caa92a16 linux-staging-3.19.2.tar.xz
+aae6537c7756d5adc4fdf3428ef0a37f linux-staging-4.0.4.tar.xz
Index: staging-kmod-addons.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/devel/staging-kmod-addons.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- staging-kmod-addons.spec 24 Mar 2015 19:11:55 -0000 1.13
+++ staging-kmod-addons.spec 25 May 2015 12:07:18 -0000 1.14
@@ -1,12 +1,11 @@
# drivers that we ship; to be synced with staging-kmod.spec
-%global stgdrvs FB_XGI FT1000 LINE6_USB LTE_GDM724X PRISM2_USB R8188EU RTL8192U SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_WPAN_HCD VT6655 VT6656 WIMAX_GDM72XX
-
+%global stgdrvs FB_XGI FT1000 LTE_GDM724X PRISM2_USB R8188EU RTL8192U SPEAKUP TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_WPAN_HCD VT6655 VT6656 WIMAX_GDM72XX SLICOSS
# makes handling for rc kernels a whole lot easier:
#global prever rc8
Name: staging-kmod-addons
-Version: 3.19.2
+Version: 4.0.4
Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
Summary: Documentation and shared parts for the kmod-staging packages
@@ -53,6 +52,10 @@
%changelog
+* Mon May 25 2015 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.0.4-1
+- Update to 4.0.4
+- Drop LINE6_USB and TOUCHSCREEN_CLEARPAD_TM1217 (dropped upstream)
+
* Tue Mar 24 2015 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.19.2-1
- Update to 3.19.2
- Drop BCM_WIMAX, dropped upstream
8 years, 11 months
rpms/xroar/devel .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 xroar.spec, 1.25, 1.26
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/xroar/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8785
Modified Files:
.cvsignore sources xroar.spec
Log Message:
* Sun May 24 2015 Andrea Musuruane <musuruan(a)gmail.com> 0.33.1-1
- Upgrade to 0.33.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xroar/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 11 May 2014 16:44:38 -0000 1.18
+++ .cvsignore 24 May 2015 19:17:43 -0000 1.19
@@ -1,2 +1,2 @@
-xroar-0.32.tar.gz
+xroar-0.33.1.tar.gz
dragon.rom
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xroar/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 11 May 2014 16:44:38 -0000 1.18
+++ sources 24 May 2015 19:17:43 -0000 1.19
@@ -1,2 +1,2 @@
-744c99c9fe08479963394391b54f6c78 xroar-0.32.tar.gz
+5971fce41ebe8d1c27d510bf765f4e18 xroar-0.33.1.tar.gz
f8b5f52c07abb4dc9102d8420605d7e4 dragon.rom
Index: xroar.spec
===================================================================
RCS file: /cvs/free/rpms/xroar/devel/xroar.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xroar.spec 1 Sep 2014 02:33:08 -0000 1.25
+++ xroar.spec 24 May 2015 19:17:43 -0000 1.26
@@ -1,6 +1,6 @@
Name: xroar
-Version: 0.32
-Release: 2%{?dist}
+Version: 0.33.1
+Release: 1%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
License: GPLv2+
URL: http://www.6809.org.uk/xroar/
@@ -39,9 +39,8 @@
make %{?_smp_mflags} VERBOSE=1
# Build docs
-make doc/xroar.txt
-make doc/xroar.html
-make doc/xroar.pdf
+make html
+make pdf
# Generate desktop file
cat >%{name}.desktop <<EOF
@@ -96,6 +95,8 @@
--dir %{buildroot}%{_datadir}/applications \
%{name}-minifirm.desktop
+rm -f %{buildroot}%{_infodir}/dir
+
%post
/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
@@ -127,13 +128,16 @@
%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/%{name}-minifirm.desktop
%{_infodir}/%{name}*
+%{_mandir}/man1/%{name}.1*
%doc ChangeLog COPYING.GPL COPYING.LGPL-2.1 README
-%doc doc/%{name}.txt
-%doc doc/%{name}.html doc/%{name}-screens.png
+%doc doc/%{name}.html doc/%{name}-screens.png doc/%{name}-timebandit-af.png
%doc doc/%{name}.pdf
%changelog
+* Sun May 24 2015 Andrea Musuruane <musuruan(a)gmail.com> 0.33.1-1
+- Upgrade to 0.33.1
+
* Mon Sep 01 2014 Sérgio Basto <sergio(a)serjux.com> - 0.32-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
8 years, 11 months