diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/console_current_vcs.patch | 59 | ||||
| -rw-r--r-- | debian/patches/hurd_console_startup.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 65 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 0cb609d7..05c24221 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ hurd (20090404-3) unreleased; urgency=low of pthread.h * debian/patches/libpthread_kill_0.patch: New patch to fix pthread_kill(th, 0); + * debian/patches/console_current_vcs.patch: Cherry-pick patch to fix + loading the current_vcs driver. + * debian/patches/hurd_console_startup.patch: Add -d current_vcs to enable + /dev/cons/vcs by default. -- Samuel Thibault <sthibault@debian.org> Tue, 13 Oct 2009 01:20:44 +0200 diff --git a/debian/patches/console_current_vcs.patch b/debian/patches/console_current_vcs.patch new file mode 100644 index 00000000..db9a2cc6 --- /dev/null +++ b/debian/patches/console_current_vcs.patch @@ -0,0 +1,59 @@ +commit 9291cd3fa6a76e999bc8dab25e9d5dc492403571 +Author: Samuel Thibault <samuel.thibault@ens-lyon.org> +Date: Sun Oct 25 20:55:04 2009 +0100 + + Fix current_vcs driver load + + * console-client/current-vcs.c (vcs_repeat_init): Rename function into... + (current_vcs_init): ... this. + (vcs_repeat_start): Rename function into... + (current_vcs_start): ... this. + (vcs_repeat_fini): Rename function into... + (current_vcs_fini): ... this. + +diff --git a/console-client/current-vcs.c b/console-client/current-vcs.c +index a86c670..1b63e0b 100644 +--- a/console-client/current-vcs.c ++++ b/console-client/current-vcs.c +@@ -167,7 +167,7 @@ static struct argp argp = {options, parse_opt, 0, doc}; + + /* Initialize the current VCS driver. */ + static error_t +-vcs_repeat_init (void **handle, int no_exit, int argc, char *argv[], int *next) ++current_vcs_init (void **handle, int no_exit, int argc, char *argv[], int *next) + { + error_t err; + int pos = 1; +@@ -184,7 +184,7 @@ vcs_repeat_init (void **handle, int no_exit, int argc, char *argv[], int *next) + } + + static error_t +-vcs_repeat_start (void *handle) ++current_vcs_start (void *handle) + { + error_t err; + +@@ -206,7 +206,7 @@ vcs_repeat_start (void *handle) + } + + static error_t +-vcs_repeat_fini (void *handle, int force) ++current_vcs_fini (void *handle, int force) + { + console_unregister_consnode (vcs_node); + console_destroy_consnode (vcs_node); +@@ -214,10 +214,10 @@ vcs_repeat_fini (void *handle, int force) + } + + +-struct driver_ops driver_vcs_repeat_ops = ++struct driver_ops driver_current_vcs_ops = + { +- vcs_repeat_init, +- vcs_repeat_start, +- vcs_repeat_fini ++ current_vcs_init, ++ current_vcs_start, ++ current_vcs_fini + }; + diff --git a/debian/patches/hurd_console_startup.patch b/debian/patches/hurd_console_startup.patch index 4344dc68..28a6dc01 100644 --- a/debian/patches/hurd_console_startup.patch +++ b/debian/patches/hurd_console_startup.patch @@ -19,7 +19,7 @@ + fi + if [ "$ENABLE" = "true" ]; then + console ${DISPLAY} ${KBD} ${KBD_REPEAT} \ -+ ${SPEAKER} ${MOUSE} ${MOUSE_REPEAT} -c /dev/vcs ++ ${SPEAKER} ${MOUSE} ${MOUSE_REPEAT} -d current_vcs -c /dev/vcs + fi + # Wait for runttys to die, meanwhile handling trapped signals. diff --git a/debian/patches/series b/debian/patches/series index 09588fd7..9276739a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -31,3 +31,4 @@ MAKEDEV.patch -p1 libdiskfs-rename.patch -p1 libpthread_cancel_init.patch -p1 libpthread_kill_0.patch -p1 +console_current_vcs.patch -p1 |