Attachment 220160 Details for Bug 337238

[patch] werners-change.patch

werners-change.patch (text/plain), 3.87 KB, created by Mike Fabian on 2008-06-04 17:01:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Fabian

Created: 2008-06-04 17:01:47 UTC

Size: 3.87 KB

patch

obsolete

>/work/SRC/all/BASE/kbdã ãã«çºè¦: MD5SUMS
>/work/SRC/all/BASE/kbdã ãã«çºè¦: MD5SUMS.meta
>.ã ãã«çºè¦: kbd-1.12-dumpkeys-C-opt.diff
>diff -u /work/SRC/all/BASE/kbd/kbd.changes ./kbd.changes
>--- /work/SRC/all/BASE/kbd/kbd.changes	2008-05-19 12:40:19.000000000 +0200
>+++ ./kbd.changes	2008-06-04 18:56:12.122747000 +0200
>@@ -1,4 +1,10 @@
> -------------------------------------------------------------------
>+Wed Jun  4 18:53:46 CEST 2008 - werner@suse.de
>+
>+- Add "-C" option also to dumpkeys to make kbd init script work on
>+  /dev/console and /dev/tty even within e.g. xterm (bnc#337238)
>+
>+-------------------------------------------------------------------
> Mon May 19 12:39:16 CEST 2008 - jw@suse.de
> 
> - added ru1_win-utf.map fixing bnc#337238
>diff -u /work/SRC/all/BASE/kbd/kbd.init ./kbd.init
>--- /work/SRC/all/BASE/kbd/kbd.init	2008-05-07 18:31:16.000000000 +0200
>+++ ./kbd.init	2008-06-04 18:51:17.092494000 +0200
>@@ -95,10 +95,11 @@
>     test -c /dev/$tty		|| continue
>     > /dev/$tty &> /dev/null	|| continue
>     # consider settings in /etc/sysconfig/keyboard:KBD_TTY
>-    if test -n "$KBD_TTY"; then
>-	echo "$KBD_TTY" | grep -q $tty || continue
>-    fi
>-    newkbd="${newkbd:+$newkbd }/dev/$tty"
>+    test -z "$KBD_TTY"          && continue
>+    case ":${KBD_TTY// /:}:" in
>+    *:$tty:*)
>+	newkbd="${newkbd:+$newkbd }/dev/$tty"
>+    esac
> done
> KBD_TTY="$newkbd"
> unset newkbd
>@@ -161,9 +162,16 @@
> 	    if test -n "$KBD_DELAY"; then
> 		KBDOPT="${KBDOPT:+$KBDOPT }-d $KBD_DELAY"
> 	    fi
>-	    if test -n "$KBDOPT" ; then
>+	    if test -n "$KBDOPT" -a -x /bin/kbdrate ; then
> 		echo -n "Keyboard: "
>-		/bin/kbdrate $KBDOPT
>+		for tty in $KBD_TTY; do
>+		    /bin/kbdrate $KBDOPT < $tty 2> /dev/null
>+		    rc_status
>+		    case "$KBDOPT" in
>+		    *-s*) continue ;;
>+		    esac
>+		    KBDOPT="${KBDOPT:+$KBDOPT }-s"
>+		done
> 		rc_status -v1
> 	    fi
> 	fi
>@@ -446,32 +454,35 @@
> 	case "$RUNLEVEL" in
> 	    S|N|1|\#) true ;;
> 	    *)
>+		trap "rm -f /dev/shm/defkeymap.map" EXIT SIGTERM
>+		dumpkeys -C ${KBD_TTY%% *} > /dev/shm/defkeymap.map
>+
> 	        case $LOCALE_CHARMAP in
> 		    UTF-8)
> 			# Change the keyboard mapping in such a way that the
> 			# non-ASCII keys produce UTF-8 encoded multibyte sequences
> 			# instead of single bytes >= 0x80 in a legacy 8-bit encoding.
>-			( dumpkeys | loadkeys -C "$KBD_TTY" --unicode ) > /dev/null 2>&1
>+			loadkeys -C "$KBD_TTY" --unicode /dev/shm/defkeymap.map > /dev/null 2>&1
> 			;;
> 		    *) 
> 			;;
> 		esac
>-		dumpkeys=yes
>-		if type -p cmp > /dev/null 2>&1 && \
>-		    dumpkeys | cmp -s /etc/defkeymap.map
>+
>+		if type -p cmp > /dev/null 2>&1 && cmp -s /etc/defkeymap.map /dev/shm/defkeymap.map
> 		then
>-		    dumpkeys=no
>+		    rm -f /dev/shm/defkeymap.map
> 		fi
> 
>-		if test "$dumpkeys" = "yes" ; then
>+		if test -s /dev/shm/defkeymap.map ; then
> 		    # FIXME: this should be done much earlier
> 		    # to avoid bugzilla# 259694 or similar.
>-		    ( dumpkeys > /etc/defkeymap.map ) > /dev/null 2>&1
>+		    mv /dev/shm/defkeymap.map /etc/defkeymap.map
> 		    if test ! -z "$KEYMAP" && test "$KEYMAP" != "/etc/defkeymap.map" ; then
> 		        test ! -e "$KEYMAP" && KEYMAP=$K
> 			echo $KEYMAP > /etc/defkeymap.name
> 		    fi
> 		fi
>+		trap - EXIT SIGTERM
> 	esac
> 
> 	;;
>diff -u /work/SRC/all/BASE/kbd/kbd.spec ./kbd.spec
>--- /work/SRC/all/BASE/kbd/kbd.spec	2008-05-20 01:47:33.000000000 +0200
>+++ ./kbd.spec	2008-06-04 18:38:38.811139000 +0200
>@@ -61,6 +61,7 @@
> Patch26:        kbd-%{version}-setfont-no-cruft.diff
> Patch27:        kbd-%{version}-be-nice-to-kdm.diff
> Patch28:        bnc147581_jp106.diff
>+Patch29:        kbd-%{version}-dumpkeys-C-opt.diff
> BuildRoot:      %{_tmppath}/%{name}-%{version}-build
> PreReq:         %fillup_prereq %insserv_prereq
> BuildRequires:  bison flex
>@@ -117,6 +118,7 @@
> %patch26 -p1
> # %patch27 -p1		# obsoleted. #302010
> %patch28 -p1
>+%patch29 -p0
> 
> %build
> for i in `find data/keymaps/mac -type f` ; do
>/work/SRC/all/BASE/kbdã ãã«çºè¦: ready

Actions: View | Diff

Attachments on bug 337238: 216175 | 216178 | 216359 | 220160