From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 2/2] kbd: update to 2.0.3
Date: Tue, 29 Mar 2016 14:23:38 +0100 [thread overview]
Message-ID: <1459257818.30749.187.camel@ipfire.org> (raw)
In-Reply-To: <1458479644-8292-2-git-send-email-marcel.lorenz@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 31663 bytes --]
Hi,
On Sun, 2016-03-20 at 14:14 +0100, Marcel Lorenz wrote:
> Update kbd to the last version from linunx from scratch.
>
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
>
> ---
> config/rootfiles/common/kbd | 114 ++++++++++++---
> lfs/kbd | 27 ++--
> src/patches/kbd-2.0.3-backspace-1.patch | 250
> ++++++++++++++++++++++++++++++++
> 3 files changed, 352 insertions(+), 39 deletions(-)
> create mode 100644 src/patches/kbd-2.0.3-backspace-1.patch
>
> diff --git a/config/rootfiles/common/kbd b/config/rootfiles/common/kbd
> index 5f694ff..10e4bb8 100644
> --- a/config/rootfiles/common/kbd
> +++ b/config/rootfiles/common/kbd
> @@ -1,7 +1,7 @@
> bin/kbd_mode
> -bin/loadkeys
> bin/openvt
> bin/setfont
> +bin/loadkeys
> #lib/kbd
> #lib/kbd/consolefonts
> #lib/kbd/consolefonts/161.cp.gz
Why is this not in alphabetical order?
> @@ -19,32 +19,45 @@ bin/setfont
> #lib/kbd/consolefonts/Cyr_a8x14.psfu.gz
> #lib/kbd/consolefonts/Cyr_a8x16.psfu.gz
> #lib/kbd/consolefonts/Cyr_a8x8.psfu.gz
> -#lib/kbd/consolefonts/ERRORS
> +#lib/kbd/consolefonts/ERRORS.gz
> #lib/kbd/consolefonts/Goha-12.psfu.gz
> #lib/kbd/consolefonts/Goha-14.psfu.gz
> #lib/kbd/consolefonts/Goha-16.psfu.gz
> #lib/kbd/consolefonts/GohaClassic-12.psfu.gz
> #lib/kbd/consolefonts/GohaClassic-14.psfu.gz
> #lib/kbd/consolefonts/GohaClassic-16.psfu.gz
> +#lib/kbd/consolefonts/Lat2-Terminus16.psfu.gz
> #lib/kbd/consolefonts/LatArCyrHeb-08.psfu.gz
> #lib/kbd/consolefonts/LatArCyrHeb-14.psfu.gz
> lib/kbd/consolefonts/LatArCyrHeb-16+.psfu.gz
> lib/kbd/consolefonts/LatArCyrHeb-16.psfu.gz
> #lib/kbd/consolefonts/LatArCyrHeb-19.psfu.gz
> +#lib/kbd/consolefonts/LatGrkCyr-12x22.psfu.gz
> +#lib/kbd/consolefonts/LatGrkCyr-8x16.psfu.gz
> +#lib/kbd/consolefonts/LatKaCyrHeb-14.psfu.gz
> #lib/kbd/consolefonts/Mik_8x16.gz
> -#lib/kbd/consolefonts/README.12x22
> -#lib/kbd/consolefonts/README.Arabic
> -#lib/kbd/consolefonts/README.Cyrillic
> -#lib/kbd/consolefonts/README.Ethiopic
> -#lib/kbd/consolefonts/README.Greek
> -#lib/kbd/consolefonts/README.Hebrew
> -#lib/kbd/consolefonts/README.cp1250
> -#lib/kbd/consolefonts/README.cybercafe
> -#lib/kbd/consolefonts/README.drdos
> -#lib/kbd/consolefonts/README.lat0
> -#lib/kbd/consolefonts/README.lat7
> -#lib/kbd/consolefonts/README.lat9
> -#lib/kbd/consolefonts/README.psfu
> +#lib/kbd/consolefonts/README.12x22.gz
> +#lib/kbd/consolefonts/README.Arabic.gz
> +#lib/kbd/consolefonts/README.Cyrillic.gz
> +#lib/kbd/consolefonts/README.Ethiopic.gz
> +#lib/kbd/consolefonts/README.Greek.gz
> +#lib/kbd/consolefonts/README.Hebrew.gz
> +#lib/kbd/consolefonts/README.Lat2-Terminus16.gz
> +#lib/kbd/consolefonts/README.LatGrkCyr.gz
> +#lib/kbd/consolefonts/README.Sun.gz
> +#lib/kbd/consolefonts/README.cp1250.gz
> +#lib/kbd/consolefonts/README.cybercafe.gz
> +#lib/kbd/consolefonts/README.drdos.gz
> +#lib/kbd/consolefonts/README.eurlatgr.gz
> +#lib/kbd/consolefonts/README.eurlatgr.mappings.gz
> +#lib/kbd/consolefonts/README.lat0.gz
> +#lib/kbd/consolefonts/README.lat7.gz
> +#lib/kbd/consolefonts/README.lat9.gz
> +#lib/kbd/consolefonts/README.psfu.gz
> +#lib/kbd/consolefonts/UniCyrExt_8x16.psf.gz
> +#lib/kbd/consolefonts/UniCyr_8x14.psf.gz
> +#lib/kbd/consolefonts/UniCyr_8x16.psf.gz
> +#lib/kbd/consolefonts/UniCyr_8x8.psf.gz
> #lib/kbd/consolefonts/alt-8x14.gz
> #lib/kbd/consolefonts/alt-8x16.gz
> #lib/kbd/consolefonts/alt-8x8.gz
> @@ -72,6 +85,7 @@ lib/kbd/consolefonts/LatArCyrHeb-16.psfu.gz
> #lib/kbd/consolefonts/drdos8x16.psfu.gz
> #lib/kbd/consolefonts/drdos8x6.psfu.gz
> #lib/kbd/consolefonts/drdos8x8.psfu.gz
> +#lib/kbd/consolefonts/eurlatgr.psfu.gz
> #lib/kbd/consolefonts/gr737a-8x8.psfu.gz
> #lib/kbd/consolefonts/gr737a-9x14.psfu.gz
> #lib/kbd/consolefonts/gr737a-9x16.psfu.gz
> @@ -191,6 +205,8 @@ lib/kbd/consolefonts/lat5-16.psfu.gz
> #lib/kbd/consolefonts/lat9w-14.psfu.gz
> #lib/kbd/consolefonts/lat9w-16.psfu.gz
> lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz
> +#lib/kbd/consolefonts/latarcyrheb-sun32.psfu.gz
> +#lib/kbd/consolefonts/pancyrillic.f16.psfu.gz
> #lib/kbd/consolefonts/partialfonts
> #lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.08.gz
> #lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.14.gz
> @@ -307,11 +323,26 @@ lib/kbd/keymaps/i386
> #lib/kbd/keymaps/i386/azerty/fr.map.gz
> #lib/kbd/keymaps/i386/azerty/wangbe.map.gz
> #lib/kbd/keymaps/i386/azerty/wangbe2.map.gz
> +#lib/kbd/keymaps/i386/bepo
> +#lib/kbd/keymaps/i386/bepo/fr-bepo-latin9.map.gz
> +#lib/kbd/keymaps/i386/bepo/fr-bepo.map.gz
> +#lib/kbd/keymaps/i386/colemak
> +#lib/kbd/keymaps/i386/colemak/en-latin9.map.gz
> #lib/kbd/keymaps/i386/dvorak
> #lib/kbd/keymaps/i386/dvorak/ANSI-dvorak.map.gz
> +#lib/kbd/keymaps/i386/dvorak/dvorak-ca-fr.map.gz
> +#lib/kbd/keymaps/i386/dvorak/dvorak-es.map.gz
> +#lib/kbd/keymaps/i386/dvorak/dvorak-fr.map.gz
> #lib/kbd/keymaps/i386/dvorak/dvorak-l.map.gz
> +#lib/kbd/keymaps/i386/dvorak/dvorak-la.map.gz
> +#lib/kbd/keymaps/i386/dvorak/dvorak-programmer.map.gz
> #lib/kbd/keymaps/i386/dvorak/dvorak-r.map.gz
> +#lib/kbd/keymaps/i386/dvorak/dvorak-ru.map.gz
> +#lib/kbd/keymaps/i386/dvorak/dvorak-sv-a1.map.gz
> +#lib/kbd/keymaps/i386/dvorak/dvorak-sv-a5.map.gz
> +#lib/kbd/keymaps/i386/dvorak/dvorak-uk.map.gz
> #lib/kbd/keymaps/i386/dvorak/dvorak.map.gz
> +#lib/kbd/keymaps/i386/dvorak/no.map.gz
> #lib/kbd/keymaps/i386/fgGIod
> #lib/kbd/keymaps/i386/fgGIod/tr_f-latin5.map.gz
> #lib/kbd/keymaps/i386/fgGIod/trf.map.gz
> @@ -319,6 +350,7 @@ lib/kbd/keymaps/i386/include
> #lib/kbd/keymaps/i386/include/applkey.map.gz
> #lib/kbd/keymaps/i386/include/azerty-layout.inc
> #lib/kbd/keymaps/i386/include/backspace.map.gz
> +#lib/kbd/keymaps/i386/include/compose.inc
> #lib/kbd/keymaps/i386/include/ctrl.map.gz
> #lib/kbd/keymaps/i386/include/euro.map.gz
> #lib/kbd/keymaps/i386/include/euro1.inc
> @@ -334,7 +366,11 @@ lib/kbd/keymaps/i386/include
> #lib/kbd/keymaps/i386/include/qwertz-layout.inc
> #lib/kbd/keymaps/i386/include/unicode.map.gz
> #lib/kbd/keymaps/i386/include/windowkeys.map.gz
> +#lib/kbd/keymaps/i386/olpc
> +#lib/kbd/keymaps/i386/olpc/es.map.gz
> +#lib/kbd/keymaps/i386/olpc/pt.map.gz
> #lib/kbd/keymaps/i386/qwerty
> +#lib/kbd/keymaps/i386/qwerty/bashkir.map.gz
> #lib/kbd/keymaps/i386/qwerty/bg-cp1251.map.gz
> #lib/kbd/keymaps/i386/qwerty/bg-cp855.map.gz
> #lib/kbd/keymaps/i386/qwerty/bg_bds-cp1251.map.gz
> @@ -345,7 +381,9 @@ lib/kbd/keymaps/i386/include
> #lib/kbd/keymaps/i386/qwerty/br-abnt2.map.gz
> #lib/kbd/keymaps/i386/qwerty/br-latin1-abnt2.map.gz
> #lib/kbd/keymaps/i386/qwerty/br-latin1-us.map.gz
> +#lib/kbd/keymaps/i386/qwerty/by-cp1251.map.gz
> #lib/kbd/keymaps/i386/qwerty/by.map.gz
> +#lib/kbd/keymaps/i386/qwerty/bywin-cp1251.map.gz
> #lib/kbd/keymaps/i386/qwerty/cf.map.gz
> #lib/kbd/keymaps/i386/qwerty/cz-cp1250.map.gz
> #lib/kbd/keymaps/i386/qwerty/cz-lat2-prog.map.gz
> @@ -361,8 +399,6 @@ lib/kbd/keymaps/i386/include
> #lib/kbd/keymaps/i386/qwerty/es.map.gz
> #lib/kbd/keymaps/i386/qwerty/et-nodeadkeys.map.gz
> #lib/kbd/keymaps/i386/qwerty/et.map.gz
> -#lib/kbd/keymaps/i386/qwerty/fi-latin1.map.gz
> -#lib/kbd/keymaps/i386/qwerty/fi-latin9.map.gz
> #lib/kbd/keymaps/i386/qwerty/fi.map.gz
> #lib/kbd/keymaps/i386/qwerty/gr-pc.map.gz
> #lib/kbd/keymaps/i386/qwerty/gr.map.gz
> @@ -377,10 +413,15 @@ lib/kbd/keymaps/i386/include
> #lib/kbd/keymaps/i386/qwerty/it.map.gz
> #lib/kbd/keymaps/i386/qwerty/it2.map.gz
> #lib/kbd/keymaps/i386/qwerty/jp106.map.gz
> +#lib/kbd/keymaps/i386/qwerty/kazakh.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ky_alt_sh-UTF-8.map.gz
> +#lib/kbd/keymaps/i386/qwerty/kyrgyz.map.gz
> #lib/kbd/keymaps/i386/qwerty/la-latin1.map.gz
> #lib/kbd/keymaps/i386/qwerty/lt.baltic.map.gz
> #lib/kbd/keymaps/i386/qwerty/lt.l4.map.gz
> #lib/kbd/keymaps/i386/qwerty/lt.map.gz
> +#lib/kbd/keymaps/i386/qwerty/lv-tilde.map.gz
> +#lib/kbd/keymaps/i386/qwerty/lv.map.gz
> #lib/kbd/keymaps/i386/qwerty/mk-cp1251.map.gz
> #lib/kbd/keymaps/i386/qwerty/mk-utf.map.gz
> #lib/kbd/keymaps/i386/qwerty/mk.map.gz
> @@ -392,9 +433,14 @@ lib/kbd/keymaps/i386/include
> #lib/kbd/keymaps/i386/qwerty/no.map.gz
> #lib/kbd/keymaps/i386/qwerty/pc110.map.gz
> #lib/kbd/keymaps/i386/qwerty/pl.map.gz
> +#lib/kbd/keymaps/i386/qwerty/pl1.map.gz
> #lib/kbd/keymaps/i386/qwerty/pl2.map.gz
> +#lib/kbd/keymaps/i386/qwerty/pl3.map.gz
> +#lib/kbd/keymaps/i386/qwerty/pl4.map.gz
> #lib/kbd/keymaps/i386/qwerty/pt-latin1.map.gz
> #lib/kbd/keymaps/i386/qwerty/pt-latin9.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ro.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ro_std.map.gz
> #lib/kbd/keymaps/i386/qwerty/ro_win.map.gz
> #lib/kbd/keymaps/i386/qwerty/ru-cp1251.map.gz
> #lib/kbd/keymaps/i386/qwerty/ru-ms.map.gz
> @@ -405,6 +451,19 @@ lib/kbd/keymaps/i386/include
> #lib/kbd/keymaps/i386/qwerty/ru3.map.gz
> #lib/kbd/keymaps/i386/qwerty/ru4.map.gz
> #lib/kbd/keymaps/i386/qwerty/ru_win.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ruwin_alt-CP1251.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ruwin_alt-KOI8-R.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ruwin_alt-UTF-8.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ruwin_alt_sh-UTF-8.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ruwin_cplk-CP1251.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ruwin_cplk-KOI8-R.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ruwin_cplk-UTF-8.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ruwin_ct_sh-CP1251.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ruwin_ct_sh-KOI8-R.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ruwin_ct_sh-UTF-8.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ruwin_ctrl-CP1251.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ruwin_ctrl-KOI8-R.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ruwin_ctrl-UTF-8.map.gz
> #lib/kbd/keymaps/i386/qwerty/se-fi-ir209.map.gz
> #lib/kbd/keymaps/i386/qwerty/se-fi-lat6.map.gz
> #lib/kbd/keymaps/i386/qwerty/se-ir209.map.gz
> @@ -413,9 +472,16 @@ lib/kbd/keymaps/i386/include
> #lib/kbd/keymaps/i386/qwerty/sk-qwerty.map.gz
> #lib/kbd/keymaps/i386/qwerty/sr-cy.map.gz
> #lib/kbd/keymaps/i386/qwerty/sv-latin1.map.gz
> +#lib/kbd/keymaps/i386/qwerty/tj_alt-UTF8.map.gz
> #lib/kbd/keymaps/i386/qwerty/tr_q-latin5.map.gz
> #lib/kbd/keymaps/i386/qwerty/tralt.map.gz
> +#lib/kbd/keymaps/i386/qwerty/trf.map.gz
> #lib/kbd/keymaps/i386/qwerty/trq.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ttwin_alt-UTF-8.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ttwin_cplk-UTF-8.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ttwin_ct_sh-UTF-8.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ttwin_ctrl-UTF-8.map.gz
> +#lib/kbd/keymaps/i386/qwerty/ua-cp1251.map.gz
> #lib/kbd/keymaps/i386/qwerty/ua-utf-ws.map.gz
> #lib/kbd/keymaps/i386/qwerty/ua-utf.map.gz
> #lib/kbd/keymaps/i386/qwerty/ua-ws.map.gz
> @@ -426,10 +492,13 @@ lib/kbd/keymaps/i386/include
> #lib/kbd/keymaps/i386/qwertz
> #lib/kbd/keymaps/i386/qwertz/croat.map.gz
> #lib/kbd/keymaps/i386/qwertz/cz-us-qwertz.map.gz
> +#lib/kbd/keymaps/i386/qwertz/cz.map.gz
> #lib/kbd/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz
> #lib/kbd/keymaps/i386/qwertz/de-latin1.map.gz
> +#lib/kbd/keymaps/i386/qwertz/de-mobii.map.gz
> #lib/kbd/keymaps/i386/qwertz/de.map.gz
> #lib/kbd/keymaps/i386/qwertz/de_CH-latin1.map.gz
> +#lib/kbd/keymaps/i386/qwertz/de_alt_UTF-8.map.gz
> #lib/kbd/keymaps/i386/qwertz/fr_CH-latin1.map.gz
> #lib/kbd/keymaps/i386/qwertz/fr_CH.map.gz
> #lib/kbd/keymaps/i386/qwertz/hu.map.gz
> @@ -461,6 +530,7 @@ lib/kbd/keymaps/include
> #lib/kbd/keymaps/mac/all/mac-fr.map.gz
> #lib/kbd/keymaps/mac/all/mac-fr_CH-latin1.map.gz
> #lib/kbd/keymaps/mac/all/mac-it.map.gz
> +#lib/kbd/keymaps/mac/all/mac-pl.map.gz
> #lib/kbd/keymaps/mac/all/mac-pt-latin1.map.gz
> #lib/kbd/keymaps/mac/all/mac-se.map.gz
> #lib/kbd/keymaps/mac/all/mac-template.map.gz
> @@ -469,6 +539,7 @@ lib/kbd/keymaps/include
> #lib/kbd/keymaps/mac/include
> #lib/kbd/keymaps/mac/include/mac-azerty-layout.inc
> #lib/kbd/keymaps/mac/include/mac-euro.map.gz
> +#lib/kbd/keymaps/mac/include/mac-euro2.map.gz
> #lib/kbd/keymaps/mac/include/mac-linux-keys-bare.inc
> #lib/kbd/keymaps/mac/include/mac-qwerty-layout.inc
> #lib/kbd/keymaps/mac/include/mac-qwertz-layout.inc
> @@ -489,6 +560,7 @@ lib/kbd/keymaps/include
> #lib/kbd/keymaps/sun/sunt5-ru.map.gz
> #lib/kbd/keymaps/sun/sunt5-uk.map.gz
> #lib/kbd/keymaps/sun/sunt5-us-cz.map.gz
> +#lib/kbd/keymaps/sun/sunt6-uk.map.gz
> lib/kbd/unimaps
> #lib/kbd/unimaps/8859-1.a0-ff.uni
> #lib/kbd/unimaps/8859-10.a0-ff.uni
> @@ -559,7 +631,7 @@ usr/bin/deallocvt
> usr/bin/dumpkeys
> usr/bin/fgconsole
> usr/bin/getkeycodes
> -usr/bin/getunimap
> +usr/bin/kbdinfo
> #usr/bin/kbdrate
> usr/bin/loadunimap
> #usr/bin/mapscrn
> @@ -570,9 +642,8 @@ usr/bin/loadunimap
> #usr/bin/resizecons
> usr/bin/setkeycodes
> usr/bin/setleds
> -usr/bin/setlogcons
> usr/bin/setmetamode
> -usr/bin/setvesablank
> +usr/bin/setvtrgb
> usr/bin/showconsolefont
> usr/bin/showkey
> usr/bin/unicode_start
> @@ -595,12 +666,11 @@ usr/bin/unicode_stop
> #usr/share/man/man1/unicode_stop.1
> #usr/share/man/man5/keymaps.5
> #usr/share/man/man8/getkeycodes.8
> -#usr/share/man/man8/getunimap.8
> #usr/share/man/man8/kbdrate.8
> #usr/share/man/man8/loadunimap.8
> #usr/share/man/man8/mapscrn.8
> #usr/share/man/man8/resizecons.8
> #usr/share/man/man8/setfont.8
> #usr/share/man/man8/setkeycodes.8
> -#usr/share/man/man8/setvesablank.8
> +#usr/share/man/man8/setvtrgb.8
> #usr/share/man/man8/showconsolefont.8
> diff --git a/lfs/kbd b/lfs/kbd
> index bb9d261..9691d23 100644
> --- a/lfs/kbd
> +++ b/lfs/kbd
> @@ -24,10 +24,10 @@
>
> include Config
>
> -VER = 1.12
> +VER = 2.0.3
>
> THISAPP = kbd-$(VER)
> -DL_FILE = $(THISAPP).tar.bz2
> +DL_FILE = $(THISAPP).tar.xz
> DL_FROM = $(URL_IPFIRE)
> DIR_APP = $(DIR_SRC)/$(THISAPP)
> TARGET = $(DIR_INFO)/$(THISAPP)
> @@ -35,18 +35,12 @@ TARGET = $(DIR_INFO)/$(THISAPP)
> #############################################################################
> ##
> # Top-level Rules
> #############################################################################
> ##
> -objects = $(DL_FILE) $(THISAPP)-more-programs-1.patch \
> - kbd-latarcyrheb-16-fixed.tar.bz2 kbd-latsun-fonts.tar.bz2
You cannot remove the font tarballs because these are used in the build.
Removing them from here (and below) would cause that they are not downloaded any
more.
> +
> +objects = $(DL_FILE)
>
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> -$(THISAPP)-more-programs-1.patch = $(DL_FROM)/kbd-$(VER)-more-programs-
> 1.patch
> -kbd-latarcyrheb-16-fixed.tar.bz2 = $(DL_FROM)/kbd-latarcyrheb-16-
> fixed.tar.bz2
> -kbd-latsun-fonts.tar.bz2 = $(DL_FROM)/kbd-latsun-fonts.tar.bz2
>
> -$(DL_FILE)_MD5 = 069d1175b4891343b107a8ac2b4a39f6
> -$(THISAPP)-more-programs-1.patch_MD5 = dc70180a6bc0afa2b741cd38e3cc2e18
> -kbd-latarcyrheb-16-fixed.tar.bz2_MD5 = 884fdbb0b952b2e3e8389a0c40a3e301
> -kbd-latsun-fonts.tar.bz2_MD5 = e22ee88353968df8d4a4b1bf1fa8fc31
> +$(DL_FILE)_MD5 = 231b46e7142eb41ea3ae06d2ded3c208
>
> install : $(TARGET)
>
> @@ -75,18 +69,17 @@ $(subst %,%_MD5,$(objects)) :
>
> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> @$(PREBUILD)
> - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
> - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-more-
> programs-1.patch
> - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-
> backspace-1.patch
> - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-
> gcc4_fixes-1.patch
> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
> + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kbd-2.0.3-
> backspace-1.patch
>
> # Extract our own fonts
> cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latarcyrheb-16-fixed.tar.bz2
> cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latsun-fonts.tar.bz2
>
> - cd $(DIR_APP) && ./configure --datadir=/lib/kbd --disable-nls
> + cd $(DIR_APP) && ./configure --datadir=/lib/kbd --disable-nls --
> disable-vlock --prefix=/usr
I would prefer to order the switches as usual. --prefix goes first, then --
datadir and all --disable-* after that.
> +
> cd $(DIR_APP) && make $(MAKETUNING)
> cd $(DIR_APP) && make install
> - mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin
> + mv -v /usr/bin/{kbd_mode,openvt,setfont,loadkeys} /bin
> @rm -rf $(DIR_APP)
> @$(POSTBUILD)
> diff --git a/src/patches/kbd-2.0.3-backspace-1.patch b/src/patches/kbd-2.0.3-
> backspace-1.patch
> new file mode 100644
> index 0000000..8fec171
> --- /dev/null
> +++ b/src/patches/kbd-2.0.3-backspace-1.patch
> @@ -0,0 +1,250 @@
> +Submitted By: Matt Burgess
> +Date: 2008-12-06
> +Initial Package Version: 1.15
> +Upstream Status: Not submitted, possibly incomplete
> +Description: Makes Backspace and Delete keys consistent in all i386 keymaps.
> +Makes the Backspace key send character code 127, and Delete send a well known
> +escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386.
> +
> +Original patch for 1.12 by Alexander Patrakov.
> +Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map,
> +ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>.
> +Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
> +
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-
> 1.15/data/keymaps/i386/dvorak/dvorak-l.map
> +--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map 2008-06-20
> 12:36:01.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map 2008-12-03
> 22:27:55.000000000 +0000
> +@@ -43,7 +43,7 @@
> + keycode 11 = three numbersign
> + keycode 12 = two at
> + keycode 13 = one exclam
> +- keycode 14 = BackSpace Delete
> ++ keycode 14 = Delete Delete
> + ! --------------------------------------------------------------------------
> + ! Row 3
> + ! --------------------------------------------------------------------------
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-
> 1.15/data/keymaps/i386/dvorak/dvorak-r.map
> +--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map 2008-06-20
> 12:36:01.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map 2008-12-03
> 22:28:13.000000000 +0000
> +@@ -43,7 +43,7 @@
> + keycode 11 = slash question
> + keycode 12 = bracketleft braceleft
> + keycode 13 = bracketright braceright
> +- keycode 14 = BackSpace Delete
> ++ keycode 14 = Delete Delete
> + ! --------------------------------------------------------------------------
> + ! Row 3
> + ! --------------------------------------------------------------------------
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-
> 1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map
> +--- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-10-23
> 20:03:58.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-12-03
> 22:40:32.000000000 +0000
> +@@ -51,7 +51,7 @@
> + alt keycode 12 = Meta_minus
> + keycode 13 = minus underscore
> + alt keycode 13 = Meta_equal
> +-keycode 14 = BackSpace Delete
> ++keycode 14 = Delete Delete
> + alt keycode 14 = Meta_Delete
> + keycode 15 = Tab Meta_Tab
> + alt keycode 15 = Meta_Tab
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-
> 1.15/data/keymaps/i386/qwerty/lt.l4.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map 2008-10-23
> 20:03:59.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map 2008-12-03
> 22:42:14.000000000 +0000
> +@@ -205,7 +205,7 @@
> + # edit this if you want the key above <Enter> to delete symbols above
> + # cursor, not before.
> + keycode 14 = \
> +- BackSpace BackSpace BackSpace Bac
> kSpace \
> ++ Delete Delete Delete
> Delete \
> + Delete Delete Delete
> Delete \
> + Meta_BackSpace Meta_BackSpace Meta_BackSpace
> Meta_BackSpace \
> + Meta_Delete Meta_Delete Meta_Delete Meta_D
> elete
> +@@ -506,7 +506,7 @@
> +
> + # Edit this if you want strict VT100 emulation.
> + string F111 = "\033[3$"
> +-keycode 111 = Delete F111 Delete
> F111 \
> ++keycode 111 = Remove F111 Remove
> F111 \
> + Remove Remove Remove
> Remove \
> + Meta_Delete Meta_Delete Meta_Delete Meta_D
> elete \
> + Boot Boot Boot Bo
> ot
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-
> 1.15/data/keymaps/i386/qwerty/lt.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map 2008-10-23
> 20:03:59.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/lt.map 2008-12-03
> 22:42:58.000000000 +0000
> +@@ -204,7 +204,7 @@
> + # edit this if you want the key above <Enter> to delete symbols above
> + # cursor, not before.
> + keycode 14 = \
> +- BackSpace BackSpace BackSpace Bac
> kSpace \
> ++ Delete Delete Delete
> Delete \
> + Delete Delete Delete
> Delete \
> + Meta_BackSpace Meta_BackSpace Meta_BackSpace
> Meta_BackSpace \
> + Meta_Delete Meta_Delete Meta_Delete Meta_D
> elete
> +@@ -505,7 +505,7 @@
> +
> + # Edit this if you want strict VT100 emulation.
> + string F111 = "\033[3$"
> +-keycode 111 = Delete F111 Delete
> F111 \
> ++keycode 111 = Remove F111 Remove
> F111 \
> + Remove Remove Remove
> Remove \
> + Meta_Delete Meta_Delete Meta_Delete Meta_D
> elete \
> + Boot Boot Boot Bo
> ot
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-
> 1.15/data/keymaps/i386/qwerty/no-latin1.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map 2008-06-20
> 12:36:00.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map 2008-12-03
> 22:44:25.000000000 +0000
> +@@ -3,7 +3,7 @@
> + # Send comments to Kjetil T. Homme <kjetilho(a)ifi.uio.no>
> + include "linux-with-alt-and-altgr"
> + plain keycode 83 = KP_Comma
> +- plain keycode 111 = Delete # "Remove" originally,
> weird...
> ++ plain keycode 111 = Remove
> + strings as usual
> +
> + keycode 1 = Escape
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-
> 1.15/data/keymaps/i386/qwerty/ru1.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map 2008-10-23
> 20:03:59.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map 2008-12-03
> 22:45:32.000000000 +0000
> +@@ -143,8 +143,8 @@
> +
> + # The keycode "0xFF" is too dangerous for many programs (including emacs).
> + # So let it be bracket instead of Hard Sign.
> +-# altgr keycode 27 = +0xDF
> +-# altgr shift keycode 27 = +0xFF
> ++altgr keycode 27 = +0xDF
> ++altgr shift keycode 27 = +0xFF
> + control keycode 27 = Control_bracketright
> + altgr control keycode 27 = Control_bracketright
> + alt keycode 27 = Meta_bracketright
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-
> 1.15/data/keymaps/i386/qwerty/ru2.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map 2008-10-23
> 20:03:59.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/ru2.map 2008-12-03
> 22:46:15.000000000 +0000
> +@@ -46,7 +46,7 @@
> + alt keycode 12 = Meta_minus
> + keycode 13 = equal plus equal
> plus
> + alt keycode 13 = Meta_equal
> +- keycode 14 = BackSpace BackSpace BackSpace
> BackSpace
> ++ keycode 14 = Delete Delete Delete Delete
> + alt keycode 14 = Meta_Delete
> + keycode 15 = Tab Tab Tab
> Tab
> + alt keycode 15 = Meta_Tab
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-
> 1.15/data/keymaps/i386/qwerty/ru-cp1251.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map 2008-10-23
> 20:03:59.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map 2008-12-03
> 22:47:12.000000000 +0000
> +@@ -39,7 +39,7 @@
> + alt keycode 12 = Meta_minus
> + keycode 13 = equal plus equal
> plus
> + alt keycode 13 = Meta_equal
> +- keycode 14 = BackSpace
> ++ keycode 14 = Delete
> + alt keycode 14 = Meta_Delete
> + keycode 15 = Tab
> + alt keycode 15 = Meta_Tab
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-
> 1.15/data/keymaps/i386/qwerty/ru-ms.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map 2008-10-23
> 20:03:59.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map 2008-12-03
> 22:48:10.000000000 +0000
> +@@ -89,8 +89,8 @@
> + altgr alt keycode 13 = Meta_equal
> + shift alt keycode 13 = Meta_plus
> + altgr shift alt keycode 13 = Meta_plus
> +- keycode 14 = BackSpace BackSpace BackSpace BackS
> pace
> +-# keycode 14 = Delete Delete Delete Delete
> ++# keycode 14 = BackSpace BackSpace BackSpace Back
> Space
> ++ keycode 14 = Delete Delete Delete Delete
> + alt keycode 14 = Meta_Delete
> + altgr alt keycode 14 = Meta_Delete
> + keycode 15 = Tab Tab Tab
> Tab
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-
> 1.15/data/keymaps/i386/qwerty/ru_win.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map 2008-10-23
> 20:03:59.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map 2008-12-03
> 22:49:17.000000000 +0000
> +@@ -42,7 +42,7 @@
> + alt keycode 12 = Meta_minus
> + keycode 13 = equal plus equal
> plus
> + alt keycode 13 = Meta_equal
> +- keycode 14 = BackSpace BackSpace BackSpace
> BackSpace
> ++ keycode 14 = Delete Delete Delete Delete
> + alt keycode 14 = Meta_Delete
> + keycode 15 = Tab Tab Tab
> Tab
> + alt keycode 15 = Meta_Tab
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-
> 1.15/data/keymaps/i386/qwerty/se-ir209.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map 2008-10-23
> 20:03:59.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map 2008-12-03
> 22:50:18.000000000 +0000
> +@@ -345,7 +345,7 @@
> + keycode 109 = Next Scroll_Forward
> + keycode 110 = Insert
> +
> +- keycode 111 = Delete # "Remove" originally, weird...
> ++ keycode 111 = Remove
> + control alt keycode 111 = Boot
> + control altgr keycode 111 = Boot
> +
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-
> 1.15/data/keymaps/i386/qwerty/se-lat6.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map 2008-10-23
> 20:03:59.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map 2008-12-03
> 22:50:44.000000000 +0000
> +@@ -374,6 +374,6 @@
> + keycode 109 = Next Scroll_Forward
> + keycode 110 = Insert
> +
> +- keycode 111 = Delete # "Remove" originally, weird...
> ++ keycode 111 = Remove
> + control alt keycode 111 = Boot
> + control altgr keycode 111 = Boot
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-
> 1.15/data/keymaps/i386/qwerty/tr_q-latin5.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-10-23
> 20:03:59.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-12-03
> 22:52:09.000000000 +0000
> +@@ -49,7 +49,7 @@
> + alt keycode 12 = Meta_minus
> + keycode 13 = minus underscore
> + alt keycode 13 = Meta_equal
> +-keycode 14 = BackSpace Delete
> ++keycode 14 = Delete Delete
> + alt keycode 14 = Meta_Delete
> + keycode 15 = Tab Meta_Tab
> + alt keycode 15 = Meta_Tab
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-
> 1.15/data/keymaps/i386/qwerty/ua.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map 2008-10-23
> 20:03:59.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/ua.map 2008-12-03
> 22:52:52.000000000 +0000
> +@@ -249,7 +249,7 @@
> + shift ctrll ctrlr keycode 13 = plus
> + alt ctrll ctrlr keycode 13 = Meta_equal
> + shift alt ctrll ctrlr keycode 13 = Meta_plus
> +-keycode 14 = BackSpace Delete
> ++keycode 14 = Delete Delete
> + control keycode 14 = BackSpace
> + alt keycode 14 = Meta_Delete
> + ctrlr keycode 14 = BackSpace
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-
> 1.15/data/keymaps/i386/qwerty/ua-utf.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map 2008-10-23
> 20:03:59.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map 2008-12-03
> 22:53:36.000000000 +0000
> +@@ -250,7 +250,7 @@
> + shift ctrll ctrlr keycode 13 = plus
> + alt ctrll ctrlr keycode 13 = Meta_equal
> + shift alt ctrll ctrlr keycode 13 = Meta_plus
> +-keycode 14 = BackSpace Delete
> ++keycode 14 = Delete Delete
> + control keycode 14 = BackSpace
> + alt keycode 14 = Meta_Delete
> + ctrlr keycode 14 = BackSpace
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-
> 1.15/data/keymaps/i386/qwerty/ua-utf-ws.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-10-23
> 20:03:59.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-12-03
> 22:54:06.000000000 +0000
> +@@ -260,7 +260,7 @@
> + shift ctrll ctrlr keycode 13 = plus
> + alt ctrll ctrlr keycode 13 = Meta_equal
> + shift alt ctrll ctrlr keycode 13 = Meta_plus
> +-keycode 14 = BackSpace Delete
> ++keycode 14 = Delete Delete
> + control keycode 14 = BackSpace
> + alt keycode 14 = Meta_Delete
> + ctrlr keycode 14 = BackSpace
> +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-
> 1.15/data/keymaps/i386/qwerty/ua-ws.map
> +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map 2008-10-23
> 20:03:59.000000000 +0100
> ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map 2008-12-03
> 22:54:23.000000000 +0000
> +@@ -260,7 +260,7 @@
> + shift ctrll ctrlr keycode 13 = plus
> + alt ctrll ctrlr keycode 13 = Meta_equal
> + shift alt ctrll ctrlr keycode 13 = Meta_plus
> +-keycode 14 = BackSpace Delete
> ++keycode 14 = Delete Delete
> + control keycode 14 = BackSpace
> + alt keycode 14 = Meta_Delete
> + ctrlr keycode 14 = BackSpace
-Michael
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2016-03-29 13:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-20 13:14 [PATCH 1/2] New package: libcheck (dependency for kbd 2.0.3) Marcel Lorenz
2016-03-20 13:14 ` [PATCH 2/2] kbd: update to 2.0.3 Marcel Lorenz
2016-03-29 13:23 ` Michael Tremer [this message]
2016-03-29 13:25 ` [PATCH 1/2] New package: libcheck (dependency for kbd 2.0.3) Michael Tremer
2016-05-09 14:46 ` Marcel Lorenz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459257818.30749.187.camel@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox