Bug 235564 - INDEX.keymaps for vt contains "from-" keymaps but the files are missing
Summary: INDEX.keymaps for vt contains "from-" keymaps but the files are missing
Status: In Progress
Alias: None
Product: Base System
Classification: Unclassified
Component: misc (show other bugs)
Version: CURRENT
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-bugs mailing list
URL:
Keywords: vt
Depends on:
Blocks:
 
Reported: 2019-02-07 00:44 UTC by scootergrisen
Modified: 2019-12-10 20:11 UTC (History)
2 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description scootergrisen 2019-02-07 00:44:31 UTC
It seems the following keymaps are listed in share/vt/keymaps/INDEX.keymaps but they do not exists in the share/vt/keymaps/ folder:

    ch-fr.kbd.from-cp850
    ch.kbd.from-cp850
    cz.kbd.from-ce
    cz.qwerty.kbd.from-ce
    de.kbd.from-cp850
    dk.kbd.from-cp865
    ee.kbd.from-cp850
    ee.kbd.from-iso1
    es.kbd.from-iso1
    fi.kbd.from-cp850
    ru.kbd.from-cp866
    ru.kbd.from-iso5
    se.kbd.from-cp850
    ua.kbd.from-iso5

They all have "from-" in them.
And for some reason the "from-*" part appear after the ".kbd".
If the files need to exists i would guess they should all end with ".kbd" like the rest of the keymap files so:

    ch-fr.from-cp850.kbd
    ch.from-cp850.kbd
    cz.from-ce.kbd
    cz.qwerty.from-ce.kbd
    de.from-cp850.kbd
    dk.from-cp865.kbd
    ee.from-cp850.kbd
    ee.from-iso1.kbd
    es.from-iso1.kbd
    fi.from-cp850.kbd
    ru.from-cp866.kbd
    ru.from-iso5.kbd
    se.from-cp850.kbd
    ua.from-iso5.kbd

If they should not exists then i suggest removing the lines from the share/vt/keymaps/INDEX.keymaps file.



I also compared share/syscons/keymaps/INDEX.keymaps and the files in share/syscons/keymaps/ and there does not seem to be any missing files for syscons.
Comment 1 scootergrisen 2019-02-07 01:09:17 UTC
I also checked the fonts:

share/syscons/fonts/INDEX.fonts seems to be missing lines with:

    swiss-8x14.fnt
    swiss-8x16.fnt
    swiss-8x8.fnt

Since the file names exists in share/syscons/fonts/.



share/vt/fonts/INDEX.fonts contains:

    gallant.fnt
    terminus-b32.fnt
    tom-thumb.fnt
    vgarom-16x32.fnt
    vgarom-8x14.fnt
    vgarom-8x16.fnt
    vgarom-8x8.fnt
    vgarom-thin-8x16.fnt
    vgarom-thin-8x8.fnt

But the file names in share/vt/fonts/ ends with .hex (not .fnt):

    gallant.hex
    terminus-b32.hex
    tom-thumb.hex
    vgarom-16x32.hex
    vgarom-8x14.hex
    vgarom-8x16.hex
    vgarom-8x8.hex
    vgarom-thin-8x16.hex
    vgarom-thin-8x8.hex

So i guess either share/vt/fonts/INDEX.fonts should be changed from .hex to .fnt or the file names in share/vt/fonts/ should be changed from .fnt to .hex.

Should they not be the same?
https://github.com/freebsd/freebsd/blob/master/share/vt/fonts/Makefile says something about SUFFIXES but i dont know what it means.
Comment 2 Ed Maste freebsd_committer 2019-12-10 03:22:15 UTC
These from- keymap references were added in r270114.
Comment 3 commit-hook freebsd_committer 2019-12-10 14:36:20 UTC
A commit references this bug:

Author: emaste
Date: Tue Dec 10 14:35:39 UTC 2019
New revision: 355585
URL: https://svnweb.freebsd.org/changeset/base/355585

Log:
  remove nonexistent from-* entries from vt INDEX.keymaps

  A number of entries of the form "de.kbd.from-cp850" existed in vt's
  INDEX.keymaps, added in r270114, but these files do not exist.

  PR:		235564
  Submitted by:	scootergrisen gmail com
  MFC after:	1 week

Changes:
  head/share/vt/keymaps/INDEX.keymaps
Comment 4 Ed Maste freebsd_committer 2019-12-10 17:20:41 UTC
> But the file names in share/vt/fonts/ ends with .hex (not .fnt):

In the source tree, not the installed files.
Comment 5 Ed Maste freebsd_committer 2019-12-10 17:21:46 UTC
> https://github.com/freebsd/freebsd/blob/master/share/vt/fonts/Makefile says
> something about SUFFIXES but i dont know what it means.

Ah, this is part of the make rule that tells the build process how to convert .hex files to .fnt at build time.
Comment 6 Ed Maste freebsd_committer 2019-12-10 17:23:56 UTC
> share/syscons/fonts/INDEX.fonts seems to be missing lines with:
>
>    swiss-8x14.fnt
>    swiss-8x16.fnt
>    swiss-8x8.fnt

I'm not sure what the description should be for those font files; given that syscons(4) is the deprecated legacy console I will just leave the syscons INDEX.fonts as is.
Comment 7 commit-hook freebsd_committer 2019-12-10 20:11:49 UTC
A commit references this bug:

Author: emaste
Date: Tue Dec 10 20:11:39 UTC 2019
New revision: 355594
URL: https://svnweb.freebsd.org/changeset/base/355594

Log:
  remove again nonexistent from-* entries from vt INDEX.keymaps

  A number of entries of the form "de.kbd.from-cp850" existed in vt's
  INDEX.keymaps, added in r270114, but these files do not exist.

  I removed them in r355585 but accidentally re-added them in r355592.
  Remove them yet again.

  PR:		235564, 235853
  MFC after:	1 week

Changes:
  head/share/vt/keymaps/INDEX.keymaps