OKi They Are All Works.
1. Nowe Źródełka 8.31a9 współpracujące z kernelami 2.6.x (prawdopodobnie
z
2.4.x tesh ale nie sprawdzalem)
2. Defaultowo buduje się z --with dist_kernel (mozliwe z without)
3. Stare patche działają (ltmodem-make.patch.diff) tj. patch na patcha.
4. Nowa łatka ltmodem-warn.patch (mam nadzieję że nic nie popsułem i to
tylko sprawa kosmetyczna która likwiduje jeden warning przy kompilacji)
5. Buduje się spokojnie z konta zwykłego uzytkownika.
.....
432. Sory ze nie dałem diffa alee mi się strasznie spać chce.....i nie
kumam nic.
....
456. Wielkie dzięki dla tego kto mnie przyparł do muru :P
TODO Sprawdzic z 2.4 i SMP jak sie komus bedzie nudzic.
Index: SOURCES/ltmodem-make.patch
===================================================================
RCS file: /cvsroot/SOURCES/ltmodem-make.patch,v
retrieving revision 1.5
diff -u -r1.5 ltmodem-make.patch
--- SOURCES/ltmodem-make.patch 18 Sep 2003 16:02:22 -0000 1.5
+++ SOURCES/ltmodem-make.patch 25 Jan 2005 04:14:20 -0000
@@ -1,30 +1,18 @@
---- ltmodem-8.26a9/source/configure.in 2002-11-25 03:09:39.000000000 +0100
-+++ ltmodem-8.26a9.pius/source/configure.in 2003-09-18 17:30:57.000000000 +0200
-@@ -134,7 +134,6 @@
+--- ltmodem-8.31a9/source/configure.in 2004-11-05 03:28:20.000000000 +0100
++++ ltmodem-8.31a9.fix/source/configure.in 2005-01-24 06:05:52.000000000 +0100
+@@ -156,7 +156,6 @@
echo "Checking kernel header version"
KVERSION="conftest.kversion"
--CFLAGS="-I$KERNEL_SOURCE_TREE/include"
+-CFLAGS="-I$KERNEL_DIR/include"
AC_TRY_RUN(
- #include "$KERNEL_SOURCE_TREE/include/linux/autoconf.h"
- #include "$KERNEL_SOURCE_TREE/include/linux/config.h"
---- ltmodem-8.26a9/source/Makefile.in 2002-11-18 17:04:10.000000000 +0100
-+++ ltmodem-8.26a9.pius/source/Makefile.in 2003-09-18 17:30:07.000000000 +0200
-@@ -14,7 +14,7 @@
-
- ifeq ($(GCCVERSION),3)
- KCFLAGS = -D__KERNEL__ [EMAIL PROTECTED]@/include \
-- -Wall -Wstrict-prototypes -O3 \
-+ -Wall -Wstrict-prototypes -O3 \
- -fomit-frame-pointer -fno-strict-aliasing -pipe \
- -fno-strength-reduce \
- -DMODULE -DLT_VERSION=$(LT_VERSION) -DLINUX \
-@@ -22,9 +22,9 @@
- -DLT_SERIAL_MODULE=$(subst lt_,lt$(LTNUMBER)_,@LT_SERIAL_MODULE@)
- else
- KCFLAGS = -D__KERNEL__ [EMAIL PROTECTED]@/include \
-- -Wall -Wstrict-prototypes -O3 \
-+ -Wall -Wstrict-prototypes -O3 \
+ #define __KERNEL__
+ #include "$KERNEL_DIR/include/linux/autoconf.h"
+--- ltmodem-8.31a9/source/Makefile.2.4.in 2004-10-16 01:42:43.000000000 +0200
++++ ltmodem-8.31a9.fix/source/Makefile.2.4.in 2005-01-24 06:06:10.000000000 +0100
+@@ -28,7 +28,7 @@
+ KCFLAGS = -D__KERNEL__ [EMAIL PROTECTED]@/include \
+ -Wall -Wstrict-prototypes -O3 \
-fomit-frame-pointer -fno-strict-aliasing -pipe \
- -fno-strength-reduce -m486 -malign-loops=2 \
+ -fno-strength-reduce -malign-loops=2 \
# $Revision: 1.36 $, $Date: 2003/09/18 16:00:37 $
#
# Conditional build:
# _without_dist_kernel - without kernel from distribution
#
%bcond_without dist_kernel
Summary: Kernel module for Lucent modems
Summary(de): Kernmodul für Lucent-Modems
Summary(pl): Moduł jądra dla modemów Lucent
Name: ltmodem
Version: 8.31a9
Release: 0.2
License: GPL
Group: Base/Kernel
Source0:
http://linmodems.technion.ac.il/packages/ltmodem/archive/source/%{name}-%{version}.tar.gz
# Source0-md5: bd0e54ddb2c7037b644b9c6cb6bce9ea
Patch0: %{name}-make.patch
Patch1: %{name}-warn.patch
URL: http://linmodems.technion.ac.il/
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
BuildRequires: autoconf
%{?with_dist_kernel:BuildRequires: kernel-headers}
BuildRequires: rpmbuild(macros) >= 1.118
ExclusiveArch: %{ix86}
ExclusiveOS: Linux
%description
ltmodem is a kernel module supporting Lucent-chip-based modems. These
modems are made available as the /dev/ttyLT0 device.
%description -l de
ltmodem ist ein Kernmodul, der unterstützt Lucent-Chip-basierte
Modems. Diese Modems werden als das /dev/ttyLT0-Gerät gewährt.
%description -l pl
ltmodem jest modułem jądra obsługującym modemy oparte na układach
Lucent. Modemy te udostępniane są jako urządzenie /dev/ttyLT0.
%package -n kernel-char-ltmodem
Summary: Kernel module for Lucent modems
Summary(de): Kernmodul für Lucent-Modems
Summary(pl): Moduł jądra dla modemów Lucent
Release: [EMAIL PROTECTED]
Group: Base/Kernel
%{?with_dist_kernel:%requires_releq_kernel_up}
Requires(post,postun): modutils >= 2.4.6-3
Requires: dev >= 2.7.7-9
Conflicts: ppp < 2.4.0
Obsoletes: ltmodem
Obsoletes: kernel-net-ltmodem
%description -n kernel-char-ltmodem
ltmodem is a kernel module supporting Lucent-chip-based modems. These
modems are made available as the /dev/ttyLT0 device.
%description -n kernel-char-ltmodem -l de
ltmodem ist ein Kernmodul, der unterstützt Lucent-Chip-basierte
Modems. Diese Modems werden als das /dev/ttyLT0-Gerät gewährt.
%description -n kernel-char-ltmodem -l pl
ltmodem jest modułem jądra obsługującym modemy oparte na układach
Lucent. Modemy te udostępniane są jako urządzenie /dev/ttyLT0.
%package -n kernel-smp-char-ltmodem
Summary: Kernel module for Lucent modems
Summary(de): Kernmodul für Lucent-Modems
Summary(pl): Moduł jądra dla modemów Lucent
Release: [EMAIL PROTECTED]
Group: Base/Kernel
%{?with_dist_kernel:%requires_releq_kernel_smp}
Requires(post,postun): modutils >= 2.4.6-3
Requires: dev >= 2.7.7-9
Conflicts: ppp < 2.4.0
Obsoletes: ltmodem
Obsoletes: kernel-smp-net-ltmodem
%description -n kernel-smp-char-ltmodem
ltmodem is a kernel module supporting Lucent-chip-based modems. These
modems are made available as the /dev/ttyLT0 device.
%description -n kernel-smp-char-ltmodem -l de
ltmodem ist ein Kernmodul, der unterstützt Lucent-Chip-basierte
Modems. Diese Modems werden als das /dev/ttyLT0-Gerät gewährt.
%description -n kernel-smp-char-ltmodem -l pl
ltmodem jest modułem jądra obsługującym modemy oparte na układach
Lucent. Modemy te udostępniane są jako urządzenie /dev/ttyLT0.
%prep
%setup -q
tar xzf source.tar.gz
%patch0 -p1
%patch1 -p1
%build
cd source
%{__autoconf}
mkdir linux
ln -sf %{_kernelsrcdir}/config-up linux/.config
ln -sf %{_kernelsrcdir}/include linux/include
ln -sf %{_kernelsrcdir}/Makefile linux/Makefile
ln -sf %{_kernelsrcdir}/scripts linux/scripts
ln -sf %{_kernelsrcdir}/arch linux/arch
CFLAGS="%{rpmcflags} -Ilinux/include"
%configure \
--with-force=yes \
--with-kernel=linux
%{__make}
mv lt_*.ko ..
%if 0
CFLAGS="$CFLAGS -D__KERNEL_SMP=1"
%configure \
--with-force=yes \
--with-kernel=linux
ln -sf %{_kernelsrcdir}/config-smp linux/.config
%{__make}
%endif
%install
rm -rf $RPM_BUILD_ROOT
install -dD $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
cp -f lt_*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
%if 0
cp -f source/lt_*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
%endif
rm -rf DOCs/Installers
%clean
rm -rf $RPM_BUILD_ROOT
%post -n kernel-char-ltmodem
%depmod %{_kernel_ver}
%postun -n kernel-char-ltmodem
%depmod %{_kernel_ver}
%post -n kernel-smp-char-ltmodem
%depmod %{_kernel_ver}smp
%postun -n kernel-smp-char-ltmodem
%depmod %{_kernel_ver}smp
%files -n kernel-char-ltmodem
%defattr(644,root,root,755)
%doc 1ST-READ DOCs/* source/{CHANGELOG,UPDATES-BUGS}
/lib/modules/%{_kernel_ver}/*/*
%if 0
%files -n kernel-smp-char-ltmodem
%defattr(644,root,root,755)
%doc 1ST-READ DOCs/* source/{CHANGELOG,UPDATES-BUGS}
/lib/modules/%{_kernel_ver}smp/*/*
%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log: ltmodem.spec,v $
Revision 1.36 2003/09/18 16:00:37 pius
- updated to 8.26a9
(this version also works with kernel compiled with gcc3)
Revision 1.35 2003/07/10 13:49:49 trojan
- added using depmod macro
Revision 1.34 2003/05/28 12:59:38 malekith
- massive attack: source-md5
Revision 1.33 2003/05/25 05:50:18 misi3k
- massive attack s/pld.org.pl/pld-linux.org/
Revision 1.32 2003/05/16 08:53:05 trojan
- fixed depmod in %%post and %%postun when build with _without_dist_kernel
Revision 1.31 2003/05/14 14:42:44 qboosh
- added depmod options so modules can be installed for kernel other than running
Revision 1.30 2003/04/11 10:01:37 qboosh
- standardized kernel modules perms (644,root,root)
Revision 1.29 2003/03/13 13:23:49 qboosh
- Obsoletes for old names
Revision 1.28 2003/03/03 14:57:11 adamg
- package are now named kernel{-smp}-char-ltmodem-*
Revision 1.27 2002/11/27 21:10:42 juandon
- new %%doc
Revision 1.26 2002/05/21 23:14:06 kloczek
perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
s/^automake -a -c -f/\%\{__automake\}/; \
s/^autoconf/\%\{__autoconf\}/"
Revision 1.25 2002/05/14 15:46:12 ankry
- fixed URL
Revision 1.24 2002/04/14 11:43:13 saq
- "SMP kernels are not supported with this driver", so %%if 0 SMP building
- pass kernel include dir manually, configure.in won't do this
- STBR on nest and test it
Revision 1.23 2002/04/14 11:31:56 saq
- introduce current module building scheme ({SM,U}P in one pass}
- cleanups
- NFY, need to fix SMP building
Revision 1.22 2002/04/14 10:30:53 filon
- updated to 6.00c2
- removed unneded docs
Revision 1.21 2002/04/07 07:22:49 filon
- updated to 6.00b14
Revision 1.20 2002/03/15 17:34:22 dzimi
- back revision 1.18, my fault with commit my workdir :/
Revision 1.18 2002/02/22 23:29:14 kloczek
- removed all Group fields translations (oure rpm now can handle translating
Group field using gettext).
Revision 1.17 2002/01/18 02:13:45 kloczek
perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/"
Revision 1.16 2001/10/16 10:41:42 qboosh
- added empty base package to remove junk from .src.rpm name
Revision 1.15 2001/09/19 21:47:08 saq
- new module naming scheme
- s/-/_/g in @... suffix
Revision 1.14 2001/09/13 08:35:22 saq
- updated for 6.00a
Revision 1.13 2001/08/24 22:40:45 saq
- s/install -m644/cp/
- adapterized
Revision 1.12 2001/08/15 20:29:29 saq
- use %%_kernelsrcdir
- cleanups
- STB
Revision 1.11 2001/08/10 20:45:55 saq
- smp conditional build
Revision 1.10 2001/07/26 16:50:25 saq
- don't use macros not available in standard rpm. Define them in the spec.
(_kernel_ver, _kernel24)
Revision 1.9 2001/07/23 22:22:52 saq
A group commit:
- %define _kernel_ver and _kernel24 removed (already in rpm.macros)
- kernel modules get a @%{_kernel_ver} release suffix and conflict wrong
kernel version
- other packages get a @%{_kernel_series} release suffix and conflict
wrong kernel series
- need a rebuilt RPM to build these
Revision 1.8 2001/06/03 18:40:35 kloczek
- release 2.
Revision 1.7 2001/06/03 18:36:19 saq
- conflicts with kernel < 2.4.0 (incompatible new serial driver)
- STB
Revision 1.6 2001/05/30 05:54:55 kloczek
- simplifications in %install.
Revision 1.5 2001/05/28 19:12:18 saq
- updated to 5.99b
- won't work with PLD kernel
Revision 1.4 2001/03/19 22:22:51 saq
- removed /dev/* (went to dev.spec)
Revision 1.3 2001/03/19 17:22:17 saq
- upgrade to 5.78e
Revision 1.2 2000/12/04 17:27:02 saq
- update to 5.78
- a specific kernel's no longer required
Revision 1.1 2000/10/19 22:53:50 saq
- initial release
--- ltmodem-8.31a9/source/ltmodem.c 2004-07-09 03:03:04.000000000 +0200
+++ ltmodem-8.31a9.fix/source/ltmodem.c 2005-01-24 07:00:25.968196040 +0100
@@ -475,7 +475,7 @@
ASMLINKAGE
byte dp_regread ( byte reg )
{
- unsigned long flags;
+ unsigned long flags = 0;
byte ret;
// just in case this is called inside the interrupt
if (x_smp_num_cpus() > 1)
_______________________________________________
pld-devel-pl mailing list
pld-devel-pl@pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
