Author: czarny Date: Sat Jun 16 10:02:40 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- jpegs in docs are a good idea; one picture is worth a thousand words
- other TODO added
- some part of new kernel module build methodology
- lirc_parallel commented out everywhere, as all PLD kernels are smp
- removed the echos that printed macros
- adapted the old build script for new metthodology; couldn't make it work with
the new build_kernel_modules
---- Files affected:
SPECS:
lirc.spec (1.138 -> 1.139)
---- Diffs:
================================================================
Index: SPECS/lirc.spec
diff -u SPECS/lirc.spec:1.138 SPECS/lirc.spec:1.139
--- SPECS/lirc.spec:1.138 Mon Jun 11 13:52:27 2007
+++ SPECS/lirc.spec Sat Jun 16 12:02:35 2007
@@ -1,6 +1,7 @@
# $Revision$, $Date$
# TODO
-# - are jpegs in docs (remotes) a good idea?
+# - try to make it use builder_kernel_modules and install_kernel_modules; I
couldn't make it
+# - take a look at lirc 0.8.2; it's configure.in has some bug in generating
kernelcc check script
#
# Conditional build:
%bcond_without dist_kernel # without sources of distribution kernel
@@ -8,8 +9,16 @@
%bcond_without userspace # build only packages with kernel modules
%bcond_without svga # without svgalib-based utility
%bcond_without x # without X11-based utilitied
+
+%if %{without kernel}
+%undefine with_dist_kernel
+%endif
+
+#
+# main package
#
-%define drivers "lirc_it87 lirc_serial lirc_atiusb
lirc_mceusb lirc_sir lirc_bt829 lirc_i2c lirc_mceusb2 lirc_streamzap lirc_cmdir
lirc_igorplugusb lirc_dev lirc_imon lirc_sasem lirc_parallel lirc_gpio"
+# lirc_parallel is not trhead safe, so not on this list
+%define drivers "lirc_it87 lirc_serial lirc_atiusb
lirc_mceusb lirc_sir lirc_bt829 lirc_i2c lirc_mceusb2 lirc_streamzap lirc_cmdir
lirc_igorplugusb lirc_dev lirc_imon lirc_sasem lirc_gpio"
%define no_install_post_strip 1
Summary: Linux Infrared Remote Control daemons
Summary(pl.UTF-8): Serwery do zdalnego sterowania Linuksem za pomocą
podczerwieni
@@ -41,12 +50,12 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
-%if %{with dist_kernel} && %{with kernel}
-BuildRequires: kernel-headers
+%if %{with kernel}
+BuildRequires: kernel%{_alt_kernel}-module-build
BuildRequires: kernel%{_alt_kernel}-source
%endif
%{?with_kernel:BuildRequires: %{kgcc_package}}
-BuildRequires: rpmbuild(macros) >= 1.118
+BuildRequires: rpmbuild(macros) >= 1.379
%{?with_svga:BuildRequires: svgalib-devel}
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-libs = %{version}-%{release}
@@ -133,10 +142,12 @@
Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
Requires(post,postun): /sbin/depmod
Requires: %{name} = %{version}-%{_rel}
-Requires: kernel%{_alt_kernel}-char-lirc-dev = [EMAIL PROTECTED]
Conflicts: dev < 2.8.0-3
%description -n kernel%{_alt_kernel}-char-lirc-atiusb
@@ -157,10 +168,12 @@
Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
Requires(post,postun): /sbin/depmod
Requires: %{name} = %{version}-%{_rel}
-Requires: kernel%{_alt_kernel}-char-lirc-dev = [EMAIL PROTECTED]
Conflicts: dev < 2.8.0-3
%description -n kernel%{_alt_kernel}-char-lirc-bt829
@@ -181,10 +194,12 @@
Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
Requires(post,postun): /sbin/depmod
Requires: %{name} = %{version}-%{_rel}
-Requires: kernel%{_alt_kernel}-char-lirc-dev = [EMAIL PROTECTED]
Conflicts: dev < 2.8.0-3
%description -n kernel%{_alt_kernel}-char-lirc-cmdir
@@ -205,7 +220,10 @@
Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
Requires(post,postun): /sbin/depmod
Requires: %{name} = %{version}-%{_rel}
Conflicts: dev < 2.8.0-3
@@ -230,10 +248,12 @@
Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
Requires(post,postun): /sbin/depmod
Requires: %{name} = %{version}-%{_rel}
-Requires: kernel%{_alt_kernel}-char-lirc-dev = [EMAIL PROTECTED]
Conflicts: dev < 2.8.0-3
Obsoletes: lirc-modules
Obsoletes: lirc-modules-gpio
@@ -256,10 +276,12 @@
Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
Requires(post,postun): /sbin/depmod
Requires: %{name} = %{version}-%{_rel}
-Requires: kernel%{_alt_kernel}-char-lirc-dev = [EMAIL PROTECTED]
Conflicts: dev < 2.8.0-3
Obsoletes: lirc-modules
Obsoletes: lirc-modules-i2c
@@ -282,10 +304,12 @@
Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
Requires(post,postun): /sbin/depmod
Requires: %{name} = %{version}-%{_rel}
-Requires: kernel%{_alt_kernel}-char-lirc-dev = [EMAIL PROTECTED]
Conflicts: dev < 2.8.0-3
Obsoletes: lirc-modules
Obsoletes: lirc-modules-igorplugusb
@@ -308,10 +332,12 @@
Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
Requires(post,postun): /sbin/depmod
Requires: %{name} = %{version}-%{_rel}
-Requires: kernel%{_alt_kernel}-char-lirc-dev = [EMAIL PROTECTED]
Conflicts: dev < 2.8.0-3
Obsoletes: lirc-modules
Obsoletes: lirc-modules-imon
@@ -334,10 +360,12 @@
Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
Requires(post,postun): /sbin/depmod
Requires: %{name} = %{version}-%{_rel}
-Requires: kernel%{_alt_kernel}-char-lirc-dev = [EMAIL PROTECTED]
Conflicts: dev < 2.8.0-3
%description -n kernel%{_alt_kernel}-char-lirc-it87
@@ -358,10 +386,12 @@
Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
Requires(post,postun): /sbin/depmod
Requires: %{name} = %{version}-%{_rel}
-Requires: kernel%{_alt_kernel}-char-lirc-dev = [EMAIL PROTECTED]
Conflicts: dev < 2.8.0-3
%description -n kernel%{_alt_kernel}-char-lirc-mceusb
@@ -382,10 +412,12 @@
Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
Requires(post,postun): /sbin/depmod
Requires: %{name} = %{version}-%{_rel}
-Requires: kernel%{_alt_kernel}-char-lirc-dev = [EMAIL PROTECTED]
Conflicts: dev < 2.8.0-3
%description -n kernel%{_alt_kernel}-char-lirc-sasem
@@ -406,10 +438,12 @@
Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
Requires(post,postun): /sbin/depmod
Requires: %{name} = %{version}-%{_rel}
-Requires: kernel%{_alt_kernel}-char-lirc-dev = [EMAIL PROTECTED]
%{?with_dist_kernel:Requires: setserial}
Conflicts: dev < 2.8.0-3
Obsoletes: lirc-modules
@@ -433,10 +467,12 @@
Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
Requires(post,postun): /sbin/depmod
Requires: %{name} = %{version}-%{_rel}
-Requires: kernel%{_alt_kernel}-char-lirc-dev = [EMAIL PROTECTED]
Conflicts: dev < 2.8.0-3
Obsoletes: lirc-modules
Obsoletes: lirc-modules-streamzap
@@ -454,37 +490,44 @@
Moduł lirc_streamzap.
-%package -n kernel%{_alt_kernel}-char-lirc-parallel
-Summary: Kernel modules for Linux Infrared Remote Control
-Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
-Release: [EMAIL PROTECTED]
-Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
-Requires(post,postun): /sbin/depmod
-Requires: %{name} = %{version}-%{_rel}
-Conflicts: dev < 2.8.0-3
-Obsoletes: lirc-modules
-Obsoletes: lirc-modules-parallel
-
-%description -n kernel%{_alt_kernel}-char-lirc-parallel
-This package contains the kernel modules necessary to operate some
-infrared remote control devices (such as the ones bundled with TV
-cards).
-
-lirc-parallel module for devices connected to parallel port.
-
-%description -n kernel%{_alt_kernel}-char-lirc-parallel -l pl.UTF-8
-Ten pakiet zawiera moduły jądra niezbędne do obsługi niektórych
-pilotów na podczerwień (w tym tych dostarczanych z kartami TV).
-
-Moduł lirc_parallel dla urządzeń podłączanych do portu równoległego.
+## Unused now, as all kernels are smp by default
+#%package -n kernel%{_alt_kernel}-char-lirc-parallel
+#Summary: Kernel modules for Linux Infrared Remote Control
+#Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
+#Release: [EMAIL PROTECTED]
+#Group: Base/Kernel
+#%if %{with dist_kernel}
+#%requires_releq_kernel
+#Requires(postun): %releq_kernel
+#%endif
+#Requires(post,postun): /sbin/depmod
+#Requires: %{name} = %{version}-%{_rel}
+#Conflicts: dev < 2.8.0-3
+#Obsoletes: lirc-modules
+#Obsoletes: lirc-modules-parallel
+#
+#%description -n kernel%{_alt_kernel}-char-lirc-parallel
+#This package contains the kernel modules necessary to operate some
+#infrared remote control devices (such as the ones bundled with TV
+#cards).
+#
+#lirc-parallel module for devices connected to parallel port.
+#
+#%description -n kernel%{_alt_kernel}-char-lirc-parallel -l pl.UTF-8
+#Ten pakiet zawiera moduły jądra niezbędne do obsługi niektórych
+#pilotów na podczerwień (w tym tych dostarczanych z kartami TV).
+#
+#Moduł lirc_parallel dla urządzeń podłączanych do portu równoległego.
%package -n kernel%{_alt_kernel}-char-lirc-sir
Summary: Kernel modules for Linux Infrared Remote Control
Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą
podczerwieni
Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun): %releq_kernel
+%endif
Requires(post,postun): /sbin/depmod
Requires: %{name} = %{version}-%{_rel}
Conflicts: dev < 2.8.0-3
@@ -519,9 +562,6 @@
obsługiwanych przez lirc.
%prep
-echo %{_alt_kernel}
-echo %{alt_kernel}
-echo %{_kernelsrcdir}
%setup -q -a 1
%patch0 -p1
%patch1 -p1
@@ -563,41 +603,44 @@
%if %{with kernel}
cd drivers
-for cfg in %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}; do
- drivers=%{drivers}
- rm -rf o
- if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
- exit 1
+drivers=%{drivers}
+rm -rf o
+if [ ! -r "%{_kernelsrcdir}/config-dist" ]; then
+ exit 1
+fi
+
+install -d o/include/{linux,config}
+ln -sf %{_kernelsrcdir}/config-dist o/.config
+ln -sf %{_kernelsrcdir}/include/linux/autoconf-dist.h
o/include/linux/autoconf.h
+[ ! -L o/include/asm ] && ln -sf
%{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm
+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
+ if [ "$drv" == "lirc_parallel" ] && [ "dist" == "dist" ]; then
+ echo "lirc_parallel is not smp safe"
+ else
+ 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{,-dist}.ko
fi
- install -d o/include/{linux,config}
- ln -sf %{_kernelsrcdir}/config-$cfg o/.config
- ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h
o/include/linux/autoconf.h
- [ ! -L o/include/asm ] && ln -sf
%{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm
- ln -sf %{_kernelsrcdir}/Module.symvers-$cfg 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
- if [ "$drv" == "lirc_parallel" ] && [ "$cfg" == "dist" ]; then
- echo "lirc_parallel is not smp safe"
- else
- 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
+ cd ..
done
+
cd ..
%endif
@@ -611,12 +654,8 @@
drivers=%{drivers}
install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
for drv in $drivers; do
- if [ "$drv" == "lirc_parallel" ] ; then
- echo "lirc_parallel is not smp safe"
- else
- install
drivers/$drv/$drv-%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$drv.ko
- fi
+ install
drivers/$drv/$drv-%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}.ko \
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$drv.ko
done
%endif
@@ -803,15 +842,15 @@
%postun -n kernel%{_alt_kernel}-char-lirc-streamzap
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-char-lirc-parallel
-%depmod %{_kernel_ver}
-if [ "$1" = "1" ]; then
- echo "Don't forget to add an 'alias lirc lirc_parallel' line"
- echo "to your /etc/modules.conf."
-fi
-
-%postun -n kernel%{_alt_kernel}-char-lirc-parallel
-%depmod %{_kernel_ver}
+#%post -n kernel%{_alt_kernel}-char-lirc-parallel
+#%depmod %{_kernel_ver}
+#if [ "$1" = "1" ]; then
+# echo "Don't forget to add an 'alias lirc lirc_parallel' line"
+# echo "to your /etc/modules.conf."
+#fi
+#
+#%postun -n kernel%{_alt_kernel}-char-lirc-parallel
+#%depmod %{_kernel_ver}
%post -n kernel%{_alt_kernel}-char-lirc-sir
%depmod %{_kernel_ver}
@@ -938,11 +977,11 @@
%endif
# currently not SMP-safe
-%if 0
-%files -n kernel%{_alt_kernel}-char-lirc-parallel
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/*/lirc_parallel*
-%endif
+#%if 0
+#%files -n kernel%{_alt_kernel}-char-lirc-parallel
+#%defattr(644,root,root,755)
+#/lib/modules/%{_kernel_ver}/*/lirc_parallel*
+#%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -950,6 +989,14 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.139 2007/06/16 10:02:35 czarny
+- jpegs in docs are a good idea; one picture is worth a thousand words
+- other TODO added
+- some part of new kernel module build methodology
+- lirc_parallel commented out everywhere, as all PLD kernels are smp
+- removed the echos that printed macros
+- adapted the old build script for new metthodology; couldn't make it work
with the new build_kernel_modules
+
Revision 1.138 2007/06/11 11:52:27 luzik
- new way of kernel modules build applied
- it builds
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/lirc.spec?r1=1.138&r2=1.139&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
