On Mon, Jul 02, 2007 at 09:59:43AM +0200, Frans Pop wrote:
> On Friday 27 April 2007 15:04, Anton Zinoviev wrote:
> > The second stage is the full deployment of the udebs of console-setup.
> > Currently these udebs are disabled but I can enable them as soon as
> > you tell me.
>
> Could you enable these udebs again, preferably including the changes that
> Colin says are needed?
> Please contact him directly if it is not yet clear what these changes are.
I've attached a diff of my changes relevant to enabling udebs.
* Set default charmap for d-i to UTF-8.
* Remove unhelpful defaults for several questions.
- I know we discussed this in #386837, where you said you were
concerned about an old cdebconf bug. I'm sure that this bug no
longer exists, and those Default entries cannot do anything good;
please remove them.
* Allow preseeding of console-setup/modelcode,
console-setup/layoutcode, console-setup/variantcode,
console-setup/optionscode, and console-setup/fontsize.
* Add a few bits of installer integration to console-setup-udeb
borrowed from kbd-chooser.
* Remove outdated note about loadkeys in console-setup-udeb's
description.
* Enable udebs.
setfont also needs to be added to kbd-udeb; patch for that attached as
well.
Cheers,
--
Colin Watson [EMAIL PROTECTED]
diff -Nru /tmp/2jEmYnoMDI/console-setup-1.16/debian/config.proto /tmp/Hk3Rjg0w7C/console-setup-1.16ubuntu4/debian/config.proto
--- /tmp/2jEmYnoMDI/console-setup-1.16/debian/config.proto 2007-05-01 22:09:03.000000000 +0100
+++ /tmp/Hk3Rjg0w7C/console-setup-1.16ubuntu4/debian/config.proto 2007-06-08 14:08:48.000000000 +0100
@@ -926,8 +943,10 @@
if which locale >/dev/null; then
default_charmap=`locale charmap`
+elif [ -d /lib/debian-installer ]; then
+ default_charmap=UTF-8
else
- default_charmap=unknown # TODO: d-i
+ default_charmap=unknown
fi
if [ "$locale" = C ]; then
default_charmap=UTF-8
@@ -1119,10 +1143,34 @@
esac
fi
+# Get defaults from debconf, to allow preseeding.
+if db_get console-setup/modelcode && [ "$RET" ]; then
+ default_model="$RET"
+fi
+if db_get console-setup/layoutcode && [ "$RET" ]; then
+ default_layout="$RET"
+ layout_priority=medium
+fi
+if db_get console-setup/variantcode && [ "$RET" ]; then
+ default_variant="$RET"
+fi
+if db_get console-setup/optionscode && [ "$RET" ]; then
+ XKBOPTIONS="$RET"
+ got_xkboptions=yes
+fi
+if db_get console-setup/fontsize && [ "$RET" ]; then
+ db_set console-setup/fontsize-text "$RET"
+ db_set console-setup/fontsize-fb "$RET"
+fi
+
# Load the config file, if it exists.
if [ -e $CONFIGFILE ]; then
. $CONFIGFILE || true
+ got_full_config=yes
+ got_xkboptions=yes
+ model_priority=medium
+ layout_priority=medium
default_ttys="$ACTIVE_CONSOLES"
default_charmap="$CHARMAP"
default_fontface="$FONTFACE"
@@ -1151,7 +1201,9 @@
default_variant="$XKBVARIANT"
;;
esac
+fi
+if [ "$got_xkboptions" = yes ]; then
default_toggle='No toggling'
default_switch='No temporary switch'
default_altgr='No AltGr key'
@@ -1232,7 +1284,9 @@
unsupported_layout=yes;;
esac
done
+fi
+if [ "$got_full_config" = yes ]; then
# Store values from config file into debconf db.
db_set console-setup/ttys "$default_ttys"
@@ -1242,6 +1296,8 @@
db_set console-setup/fontsize-text "$default_fontsize"
db_set console-setup/fontsize-fb "$default_fontsize"
db_set console-setup/fontsize "$default_fontsize"
+fi
+if [ "$got_xkboptions" = yes ]; then
db_set console-setup/toggle "$default_toggle"
db_set console-setup/switch "$default_switch"
db_set console-setup/altgr "$default_altgr"
diff -Nru /tmp/2jEmYnoMDI/console-setup-1.16/debian/console-setup-udeb.base-installer /tmp/Hk3Rjg0w7C/console-setup-1.16ubuntu4/debian/console-setup-udeb.base-installer
--- /tmp/2jEmYnoMDI/console-setup-1.16/debian/console-setup-udeb.base-installer 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/Hk3Rjg0w7C/console-setup-1.16ubuntu4/debian/console-setup-udeb.base-installer 2007-05-02 12:41:00.000000000 +0100
@@ -0,0 +1,11 @@
+#! /bin/sh
+set -e
+
+. /usr/share/debconf/confmodule
+
+mkdir -p /target/etc/default
+cp -a /etc/default/console-setup /target/etc/default/
+
+apt-install console-setup || true
+
+exit 0
diff -Nru /tmp/2jEmYnoMDI/console-setup-1.16/debian/console-setup-udeb.startup /tmp/Hk3Rjg0w7C/console-setup-1.16ubuntu4/debian/console-setup-udeb.startup
--- /tmp/2jEmYnoMDI/console-setup-1.16/debian/console-setup-udeb.startup 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/Hk3Rjg0w7C/console-setup-1.16ubuntu4/debian/console-setup-udeb.startup 2007-05-02 12:41:00.000000000 +0100
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+if [ "$TERM_TYPE" = virtual ]; then
+ # Set console mode to Unicode, if necessary.
+ if type kbd-mode >/dev/null 2>&1; then
+ kbd-mode -u
+ fi
+
+ # TODO: support bootkbd= (may require teaching setupcon more about
+ # ckbcomp-mini?)
+fi
diff -Nru /tmp/2jEmYnoMDI/console-setup-1.16/debian/console-setup.templates /tmp/Hk3Rjg0w7C/console-setup-1.16ubuntu4/debian/console-setup.templates
--- /tmp/2jEmYnoMDI/console-setup-1.16/debian/console-setup.templates 2007-05-01 22:09:03.000000000 +0100
+++ /tmp/Hk3Rjg0w7C/console-setup-1.16ubuntu4/debian/console-setup.templates 2007-05-02 12:41:00.000000000 +0100
@@ -154,31 +154,25 @@
Template: console-setup/modelcode
Type: string
-Default: this default value is completely ignored
Description: for internal use
Template: console-setup/layoutcode
Type: string
-Default: this default value is completely ignored
Description: for internal use
Template: console-setup/variantcode
Type: string
-Default: this default value is completely ignored
Description: for internal use
Template: console-setup/optionscode
Type: string
-Default: this default value is completely ignored
Description: for internal use
Template: console-setup/fontsize
Type: string
-Default: this default value is completely ignored
Description: for internal use
Template: console-setup/codesetcode
Type: string
-Default: this default value is completely ignored
Description: for internal use
diff -Nru /tmp/2jEmYnoMDI/console-setup-1.16/debian/control /tmp/Hk3Rjg0w7C/console-setup-1.16ubuntu4/debian/control
--- /tmp/2jEmYnoMDI/console-setup-1.16/debian/control 2007-05-01 22:09:03.000000000 +0100
+++ /tmp/Hk3Rjg0w7C/console-setup-1.16ubuntu4/debian/control 2007-06-01 16:16:46.000000000 +0100
@@ -67,3 +67,68 @@
the source BDF font should be 7, 8 or 9 pixels, otherwise the
converter creates fonts suitable for framebuffer only.
+Package: console-setup-udeb
+Section: debian-installer
+Priority: extra
+Depends: console-setup-ekmap, console-setup-fonts-udeb, archdetect, cdebconf-udeb, kbd-udeb
+Architecture: all
+Description: Configure the keyboard
+ This is an experimental replacement of kbd-chooser.
+XC-Package-Type: udeb
+XB-Installer-Menu-Item: 1200
+
+Package: console-setup-amiga-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: extra
+Architecture: all
+Description: Encoded keyboard layouts for amiga keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-ataritt-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: extra
+Architecture: all
+Description: Encoded keyboard layouts for ataritt keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-macintoshold-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: extra
+Architecture: all
+Description: Encoded keyboard layouts for macintoshold keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-pc-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: extra
+Architecture: all
+Description: Encoded keyboard layouts for pc keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-sun4-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: extra
+Architecture: all
+Description: Encoded keyboard layouts for sun4 keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-sun5-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: extra
+Architecture: all
+Description: Encoded keyboard layouts for sun5 keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-fonts-udeb
+Section: debian-installer
+Priority: extra
+Architecture: all
+Description: Console fonts for Debian Installer
+XC-Package-Type: udeb
+
diff -Nru /tmp/2jEmYnoMDI/console-setup-1.16/debian/control-udeb /tmp/Hk3Rjg0w7C/console-setup-1.16ubuntu4/debian/control-udeb
--- /tmp/2jEmYnoMDI/console-setup-1.16/debian/control-udeb 2007-05-01 22:09:03.000000000 +0100
+++ /tmp/Hk3Rjg0w7C/console-setup-1.16ubuntu4/debian/control-udeb 1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-Package: console-setup-udeb
-Section: debian-installer
-Priority: extra
-Depends: console-setup-ekmap, archdetect, cdebconf-udeb
-Architecture: all
-Description: Configure the keyboard
- This is an experimental replacement of kbd-chooser. It depends on
- loadkeys which does not exist in the installer currently.
-XC-Package-Type: udeb
-XB-Installer-Menu-Item: 1200
-
-Package: console-setup-amiga-ekmap
-Provides: console-setup-ekmap
-Section: debian-installer
-Priority: extra
-Architecture: all
-Description: Encoded keyboard layouts for amiga keyboards
-XC-Package-Type: udeb
-
-Package: console-setup-ataritt-ekmap
-Provides: console-setup-ekmap
-Section: debian-installer
-Priority: extra
-Architecture: all
-Description: Encoded keyboard layouts for ataritt keyboards
-XC-Package-Type: udeb
-
-Package: console-setup-macintoshold-ekmap
-Provides: console-setup-ekmap
-Section: debian-installer
-Priority: extra
-Architecture: all
-Description: Encoded keyboard layouts for macintoshold keyboards
-XC-Package-Type: udeb
-
-Package: console-setup-pc-ekmap
-Provides: console-setup-ekmap
-Section: debian-installer
-Priority: extra
-Architecture: all
-Description: Encoded keyboard layouts for pc keyboards
-XC-Package-Type: udeb
-
-Package: console-setup-sun4-ekmap
-Provides: console-setup-ekmap
-Section: debian-installer
-Priority: extra
-Architecture: all
-Description: Encoded keyboard layouts for sun4 keyboards
-XC-Package-Type: udeb
-
-Package: console-setup-sun5-ekmap
-Provides: console-setup-ekmap
-Section: debian-installer
-Priority: extra
-Architecture: all
-Description: Encoded keyboard layouts for sun5 keyboards
-XC-Package-Type: udeb
-
-Package: console-setup-fonts-udeb
-Section: debian-installer
-Priority: extra
-Architecture: all
-Description: Console fonts for Debian Installer
-XC-Package-Type: udeb
-
diff -Nru /tmp/2jEmYnoMDI/console-setup-1.16/debian/rules /tmp/Hk3Rjg0w7C/console-setup-1.16ubuntu4/debian/rules
--- /tmp/2jEmYnoMDI/console-setup-1.16/debian/rules 2007-05-01 22:09:03.000000000 +0100
+++ /tmp/Hk3Rjg0w7C/console-setup-1.16ubuntu4/debian/rules 2007-05-02 12:41:01.000000000 +0100
@@ -51,7 +51,7 @@
dh_clean
.PHONY : install
-install: install-main install-mini install-bdf2psf
+install: install-main install-mini install-bdf2psf install-udeb
.PHONY : install-main
install-main: build
@@ -205,6 +211,12 @@
dh_link -pconsole-setup-udeb usr/bin/ckbcomp-mini usr/bin/ckbcomp
dh_install -pconsole-setup-udeb setupcon bin
dh_install -p console-setup-udeb debian/console-setup.config usr/share/console-setup-mini
+ dh_installdirs -p console-setup-udeb lib/debian-installer.d
+ install -m0644 debian/console-setup-udeb.startup \
+ debian/console-setup-udeb/lib/debian-installer.d/S55console-setup
+ dh_installdirs -p console-setup-udeb usr/lib/base-installer.d
+ install -m0755 debian/console-setup-udeb.base-installer \
+ debian/console-setup-udeb/usr/lib/base-installer.d/20console-setup
dh_installdirs -p console-setup-udeb etc/default
dh_installdirs -p console-setup-udeb etc/console-setup/
dh_installdirs -p console-setup-udeb usr/share/doc/console-setup-mini/examples/
diff -u kbd-1.12/debian/rules kbd-1.12/debian/rules
--- kbd-1.12/debian/rules
+++ kbd-1.12/debian/rules
@@ -29,10 +29,11 @@
build-udeb-stamp: patch configure
dh_testdir
rm src/*.o
- rm src/kbd_mode src/loadkeys
- make -C src CFLAGS="-Os -g -Wall" ARCH=${ARCH} loadkeys kbd_mode
+ rm src/kbd_mode src/loadkeys src/setfont
+ make -C src CFLAGS="-Os -g -Wall" ARCH=${ARCH} loadkeys kbd_mode setfont
mv src/loadkeys src/loadkeys-udeb
mv src/kbd_mode src/kbd_mode-udeb
+ mv src/setfont src/setfont-udeb
rm src/*.o
touch $@
@@ -40,10 +41,11 @@
build-stamp: patch configure
dh_testdir
rm -f src/*.o
- rm -f src/kbd_mode src/loadkeys
- make -C src CFLAGS="-Os -g -Wall" ARCH=${ARCH} loadkeys kbd_mode
+ rm -f src/kbd_mode src/loadkeys src/setfont
+ make -C src CFLAGS="-Os -g -Wall" ARCH=${ARCH} loadkeys kbd_mode setfont
mv src/loadkeys .
mv src/kbd_mode .
+ mv src/setfont .
rm -f src/*.o
make CFLAGS="-O2 -g -Wall" ARCH=${ARCH}
make CFLAGS="-O2 -g -Wall" ARCH=${ARCH} -C contrib codepage splitfont vcstime
@@ -55,7 +57,7 @@
dh_testroot
rm -f build-stamp configure-stamp \
contrib/codepage contrib/splitfont contrib/vcstime
- rm -f loadkeys kbd_mode
+ rm -f loadkeys kbd_mode setfont
-make reallyclean ARCH=${ARCH}
dh_clean
@@ -95,6 +97,7 @@
# install files for the udeb
install -m 755 ${topdir}/loadkeys ${udebdir}/bin
install -m 755 ${topdir}/kbd_mode ${udebdir}/bin
+ install -m 755 ${topdir}/setfont ${udebdir}/bin
binary-indep:
