Author: baggins Date: Tue Feb 14 10:17:50 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 25
- just drop -(non)dist game, build now
---- Files affected:
packages/lirc:
lirc.spec (1.316 -> 1.317)
---- Diffs:
================================================================
Index: packages/lirc/lirc.spec
diff -u packages/lirc/lirc.spec:1.316 packages/lirc/lirc.spec:1.317
--- packages/lirc/lirc.spec:1.316 Mon Feb 13 23:20:26 2012
+++ packages/lirc/lirc.spec Tue Feb 14 11:17:45 2012
@@ -21,7 +21,7 @@
%endif
%define pname lirc
-%define rel 24.1
+%define rel 25
#
# main package
@@ -598,36 +598,19 @@
cd drivers
drivers=%{drivers}
-rm -rf o
-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 -s %{_kernelsrcdir} o
-fi
for drv in $drivers; do
cd $drv
- ln -sf ../o
%{__make} clean \
+ LIRC_DEVDIR=`pwd` \
RCS_FIND_IGNORE="-name '*.ko' -o" \
- M=$PWD O=$PWD/o \
%{?with_verbose:V=1}
%{__make} -j1 \
- M=$PWD O=$PWD/o \
+ LIRC_DEVDIR=`pwd` \
CONSTIFY_PLUGIN="" \
KBUILD_MODPOST_WARN=1 \
%{?with_verbose:V=1}
- [ -r "%{_kernelsrcdir}/config-dist" ] && mv $drv{,-dist}.ko
cd ..
done
@@ -645,12 +628,7 @@
drivers=%{drivers}
install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
for drv in $drivers; do
- 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
+ install drivers/$drv/$drv.ko
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$drv.ko
done
%endif
@@ -997,6 +975,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.317 2012/02/14 10:17:45 baggins
+- rel 25
+- just drop -(non)dist game, build now
+
Revision 1.316 2012/02/13 22:20:26 baggins
- does not build, too many hacks :/
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lirc/lirc.spec?r1=1.316&r2=1.317&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
