packages: lirc/lirc.spec, lirc/lirc-kernel.patch - rel 27; build on 2.6.38 now

arekm arekm at pld-linux.org
Sun Mar 27 20:55:25 CEST 2011


Author: arekm                        Date: Sun Mar 27 18:55:25 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 27; build on 2.6.38 now

---- Files affected:
packages/lirc:
   lirc.spec (1.272 -> 1.273) , lirc-kernel.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/lirc/lirc.spec
diff -u packages/lirc/lirc.spec:1.272 packages/lirc/lirc.spec:1.273
--- packages/lirc/lirc.spec:1.272	Sun Mar 27 12:51:32 2011
+++ packages/lirc/lirc.spec	Sun Mar 27 20:55:19 2011
@@ -21,7 +21,7 @@
 %endif
 
 %define		pname	lirc
-%define		rel	26
+%define		rel	27
 
 #
 # main package
@@ -55,6 +55,7 @@
 Patch4:		%{pname}-sparc.patch
 Patch5:		%{pname}-remotes.patch
 Patch6:		%{pname}-kernelcc.patch
+Patch7:		%{pname}-kernel.patch
 URL:		http://www.lirc.org/
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf >= 2.50
@@ -669,6 +670,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 echo '#' > drivers/Makefile.am
@@ -1157,6 +1159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.273  2011/03/27 18:55:19  arekm
+- rel 27; build on 2.6.38 now
+
 Revision 1.272  2011/03/27 10:51:32  arekm
 - release 26
 

================================================================
Index: packages/lirc/lirc-kernel.patch
diff -u /dev/null packages/lirc/lirc-kernel.patch:1.4
--- /dev/null	Sun Mar 27 20:55:25 2011
+++ packages/lirc/lirc-kernel.patch	Sun Mar 27 20:55:19 2011
@@ -0,0 +1,20 @@
+fix undeclared current_cpu_data in lirc-modules-source (LP: #726182)
+
+BeeHock Goh <beehock at gmail.com> Mon Mar 14 2011
+
+--- a/drivers/lirc_serial/lirc_serial.c	2010-09-04 18:38:49 +0000
++++ b/drivers/lirc_serial/lirc_serial.c	2011-03-14 15:35:02 +0000
+@@ -90,6 +90,12 @@
+ #include <linux/mm.h>
+ #include <linux/delay.h>
+ #include <linux/poll.h>
++
++#ifndef current_cpu_data
++/* Macro current_cpu_data no longer defined in processor.h in newer kernel */
++#define current_cpu_data __get_cpu_var(cpu_info)
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18)
+ #include <linux/platform_device.h>
+ #endif
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lirc/lirc.spec?r1=1.272&r2=1.273&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lirc/lirc-kernel.patch?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list