lirc.spec dla PLD AC ze sterownikami dev/input = finish

[Tomasz Narloch]

Jakub Piotr Cłapa wrote:
> Tomasz Narloch wrote:
>   
>> Mam karte telewizyjna Winfast XP Expert z pilotem i do niego potrzebuje
>> lirc-a.
>>
>> PLD AC 2.6.14.7-4 Athlon
>>
>> Jak się okazało zbudowanie paczki dla mnie wydalo sie klopotliwe wiec
>> zmienilem troche speca:
>> http://cvs.pld-linux.org/cgi-bin/cvsweb/SPECS/lirc.spec?rev=1.124
>>
>> Jak ktoś moglby go dodać ....:)
>>     
>
> Jeśli chcesz dodania, to podeślij diff -u.
>
>   
Powinien juz sie nadac:]
Patch7 przyslalem juz w ktoryms z poprzednich postow.

Pozdrawiam TOmek




----------------------------------------------------------------------
Poznaj Stefana! Zmien komunikator! >>> http://link.interia.pl/f1924
-------------- next part --------------
--- lirc.spec.orig	2006-04-11 02:12:29.000000000 +0200
+++ lirc.spec	2006-04-11 04:51:28.000000000 +0200
@@ -34,8 +34,9 @@
 Patch4:		%{name}-alpha.patch
 Patch5:		%{name}-i2c-2.8.x.patch
 Patch6:		%{name}-sparc.patch
+Patch7:		%{name}-remotes.patch
 URL:		http://www.lirc.org/
-%{?with_x:BuildRequires:	xorg-lib-libX11-devel}
+%{?with_x:BuildRequires:	X11-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
@@ -907,6 +908,7 @@
 fi
 %endif
 %patch6 -p1
+%patch7 -p1
 
 %build
 echo '#' > drivers/Makefile.am
@@ -923,7 +925,7 @@
 	--with-port=0x2f8 \
 	--with-irq=3 \
 	--without-soft-carrier \
-	--with-driver=serial
+	--with-driver=userspace
 
 %{__make}
 
@@ -932,37 +934,41 @@
 
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
 	drivers=%{drivers}
+	rm -rf o
+	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+		exit 1
+	fi
+	install -d o/include/{linux,config}
+	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+	%if %{without dist_kernel}
+		[ ! -L o/include/asm ] && 
+		ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm
+		touch o/include/config/MARKER
+		ln -sf %{_kernelsrcdir}/scripts o/
+	%else
+		%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+	%endif
 	for drv in $drivers; do
+		cd $drv
 		if [ "$drv" == "lirc_parallel" ] && [ "$cfg" == "smp" ]; then
 			echo "lirc_parallel is not smp safe"
 		else
-		cd $drv
-		if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-			exit 1
-		fi
-		#rm -rf include
-		install -d include/{linux,config}
-		ln -sf %{_kernelsrcdir}/config-$cfg .config
-		ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-		[ ! -L include/asm ] && ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-		ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-		%if %{without dist_kernel}
-			ln -sf %{_kernelsrcdir}/scripts
-		%endif
-		touch include/config/MARKER
-		%{__make} clean \
-			RCS_FIND_IGNORE="-name '*.ko' -o" \
-			M=$PWD O=$PWD \
-			%{?with_verbose:V=1}
-		%{__make} \
-			M=$PWD O=$PWD \
-			%{?with_verbose:V=1}
-		mv $drv{,-$cfg}.ko
-		cd ../
+			ln -sf ../o
+			%{__make} clean \
+				RCS_FIND_IGNORE="-name '*.ko' -o" \
+				M=$PWD O=$PWD/o \
+				%{?with_verbose:V=1}
+			%{__make} \
+				M=$PWD O=$PWD/o \
+				%{?with_verbose:V=1}
+			mv $drv{,-$cfg}.ko
 		fi
+		cd ..
 	done
 done
-cd ../
+cd ..
 
 %endif