Hello,
Frans Pop, le Sat 31 May 2008 18:59:32 +0200, a écrit :
> On Saturday 31 May 2008, Samuel Thibault wrote:
> > > What is the status of the kernel support and the l-m-e packaging?
> >
> > Attached is the patch to l-m-e which I have used.
>
> OK. But my question actually was: when can we expect these packages to hit
> the archive?
They now are in.
> > > Should that not include the kernel version, ABI and flavor?
> >
> > Hum, indeed. I don't know how to do that properly.
>
> See for example:
> http://svn.debian.org/wsvn/d-i/trunk/packages/partman/partman-crypto/finish-install.d/05crypto?op=file&rev=0&sc=0
Ok, thanks.
Attached are the patches against rootskel and finish-install which I
could test with success (provided the patch from bug #479227 is applied
to kernel-wedge and the speakup module be added to
linux-kernel-di-*-2.6)
Samuel
diff -urN rootskel-1.62/src/lib/debian-installer.d/Makefile
rootskel-1.62-mine/src/lib/debian-installer.d/Makefile
--- rootskel-1.62/src/lib/debian-installer.d/Makefile 2007-12-31
22:34:15.000000000 +0000
+++ rootskel-1.62-mine/src/lib/debian-installer.d/Makefile 2008-06-28
04:41:20.000000000 +0100
@@ -15,6 +15,7 @@
endif
files += \
+ S20speakup \
S30term \
S60frontend \
S65theme \
diff -urN rootskel-1.62/src/lib/debian-installer.d/S20speakup
rootskel-1.62-mine/src/lib/debian-installer.d/S20speakup
--- rootskel-1.62/src/lib/debian-installer.d/S20speakup 1970-01-01
01:00:00.000000000 +0100
+++ rootskel-1.62-mine/src/lib/debian-installer.d/S20speakup 2008-06-28
04:30:30.000000000 +0100
@@ -0,0 +1,5 @@
+if lsmod | grep -q speakup_
+then
+ DEBIAN_FRONTEND=text
+ export DEBIAN_FRONTEND
+fi
diff -urN rootskel-1.62/src/lib/debian-installer-startup.d/Makefile
rootskel-1.62-mine/src/lib/debian-installer-startup.d/Makefile
--- rootskel-1.62/src/lib/debian-installer-startup.d/Makefile 2008-02-20
23:56:38.000000000 +0000
+++ rootskel-1.62-mine/src/lib/debian-installer-startup.d/Makefile
2008-06-28 04:41:43.000000000 +0100
@@ -19,7 +19,8 @@
S02module-params \
S10syslog \
S20templates \
- S35term
+ S35term \
+ S37speakup
ifeq ($(DEB_HOST_ARCH_OS),linux)
ifneq (,$(filter i386 amd64,$(DEB_HOST_ARCH_CPU)))
diff -urN rootskel-1.62/src/lib/debian-installer-startup.d/S37speakup
rootskel-1.62-mine/src/lib/debian-installer-startup.d/S37speakup
--- rootskel-1.62/src/lib/debian-installer-startup.d/S37speakup 1970-01-01
01:00:00.000000000 +0100
+++ rootskel-1.62-mine/src/lib/debian-installer-startup.d/S37speakup
2008-06-28 04:30:33.000000000 +0100
@@ -0,0 +1,6 @@
+SYNTH=`sed < /proc/cmdline -n -e 's/.*speakup\.synth=\([^ ]*\).*/\1/p'`
+if [ -n "$SYNTH" ]
+then
+ modprobe speakup_$SYNTH
+ debconf-set debian-installer/framebuffer false
+fi
diff -urN finish-install-2.18/debian/rules finish-install-2.18-mine/debian/rules
--- finish-install-2.18/debian/rules 2008-02-13 13:48:37.000000000 +0000
+++ finish-install-2.18-mine/debian/rules 2008-06-28 04:43:38.000000000
+0100
@@ -3,6 +3,7 @@
DESTDIR = debian/finish-install
scripts = \
+ 05speakup \
10bind-mount \
20final-message \
50config-target-network \
diff -urN finish-install-2.18/finish-install.d/05speakup
finish-install-2.18-mine/finish-install.d/05speakup
--- finish-install-2.18/finish-install.d/05speakup 1970-01-01
01:00:00.000000000 +0100
+++ finish-install-2.18-mine/finish-install.d/05speakup 2008-06-28
04:26:37.000000000 +0100
@@ -0,0 +1,12 @@
+#!/bin/sh
+. /usr/share/debconf/confmodule
+SYNTH=`lsmod | grep ^speakup_ | cut -f 1 -d ' '`
+if [ -n "$SYNTH" ]
+then
+ db_get base-installer/kernel/image
+ KVERS=${RET#*-image-}
+ if apt-install speakup-modules-$KVERS 1>&2
+ then
+ echo $SYNTH >> /target/etc/modules
+ fi
+fi
