packages: lirc/lirc.spec - fix kernel module build without our=?UTF-8?Q?=20?=-(non)dist h...

[baggins]

Author: baggins                      Date: Mon Feb 13 22:13:10 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix kernel module build without our -(non)dist hacks

---- Files affected:
packages/lirc:
   lirc.spec (1.314 -> 1.315) 

---- Diffs:

================================================================
Index: packages/lirc/lirc.spec
diff -u packages/lirc/lirc.spec:1.314 packages/lirc/lirc.spec:1.315
--- packages/lirc/lirc.spec:1.314	Mon Feb 13 22:04:25 2012
+++ packages/lirc/lirc.spec	Mon Feb 13 23:13:04 2012
@@ -21,7 +21,7 @@
 %endif
 
 %define		pname	lirc
-%define		rel	24
+%define		rel	25
 
 #
 # main package
@@ -599,26 +599,20 @@
 
 drivers=%{drivers}
 rm -rf o
-if [ ! -r "%{_kernelsrcdir}/config-dist" ]; then
-	exit 1
-fi
-
-install -d o/include/{linux,generated,config} o/arch/powerpc/lib
-ln -sf %{_kernelsrcdir}/config-dist o/.config
-if [ -f %{_kernelsrcdir}/include/generated/autoconf-dist.h ]; then
-	ln -sf %{_kernelsrcdir}/include/generated/autoconf-dist.h o/include/generated/autoconf.h
-	ln -s ../generated/autoconf.h o/include/linux/autoconf.h
+if [ -r "%{_kernelsrcdir}/config-dist" ]; then
+	install -d o/include/{linux,generated,config} o/arch/powerpc/lib
+	ln -sf %{_kernelsrcdir}/config-dist o/.config
+	if [ -f %{_kernelsrcdir}/include/generated/autoconf-dist.h ]; then
+		ln -sf %{_kernelsrcdir}/include/generated/autoconf-dist.h o/include/generated/autoconf.h
+		ln -s ../generated/autoconf.h o/include/linux/autoconf.h
+	else
+		ln -sf %{_kernelsrcdir}/include/linux/autoconf-dist.h o/include/linux/autoconf.h
+	fi
+	ln -sf %{_kernelsrcdir}/Module.symvers-dist o/Module.symvers
+	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
 else
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-dist.h o/include/linux/autoconf.h
+	ln -s %{_kernelsrcdir} o
 fi
-ln -sf %{_kernelsrcdir}/Module.symvers-dist o/Module.symvers
-
-%if %{without dist_kernel}
-	touch o/include/config/MARKER
-	ln -sf %{_kernelsrcdir}/scripts o/
-%else
-	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%endif
 
 for drv in $drivers; do
 	cd $drv
@@ -633,7 +627,7 @@
 		CONSTIFY_PLUGIN="" \
 		KBUILD_MODPOST_WARN=1 \
 		%{?with_verbose:V=1}
-	mv $drv{,-dist}.ko
+	[ -r "%{_kernelsrcdir}/config-dist" ] && mv $drv{,-dist}.ko
 	cd ..
 done
 
@@ -651,8 +645,12 @@
 drivers=%{drivers}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
 for drv in $drivers; do
-	install drivers/$drv/$drv-%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$drv.ko
+	if [ -r "%{_kernelsrcdir}/config-dist" ]; then
+		install drivers/$drv/$drv-%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}.ko \
+			$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$drv.ko
+	else
+		install drivers/$drv/$drv.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$drv.ko
+	fi
 done
 %endif
 
@@ -999,6 +997,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.315  2012/02/13 22:13:04  baggins
+- fix kernel module build without our -(non)dist hacks
+
 Revision 1.314  2012/02/13 21:04:25  arekm
 - release 24
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lirc/lirc.spec?r1=1.314&r2=1.315&f=u