On Mon, Mar 12, 2018 at 03:30:33PM +0100, Andrea Bolognani wrote: > On Mon, 2018-03-12 at 14:00 +0000, Daniel P. Berrangé wrote: > > On Mon, Mar 12, 2018 at 02:29:49PM +0100, Andrea Bolognani wrote: > > > This time around it's not enough to just pick the latest commit, > > > because with aed87bb2aa6ed83b49574eb982e3bdd4c36acf17 keycodemapdb > > > renamed the 'rfb' keycode to 'qnum' and we need to accept the new > > > name while maintaining backwards compatibility. > > > > > > Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx> > > > > When I apply this I get an error during build due to the rename > > > > Traceback (most recent call last): > > File "./keycodemapdb/tools/keymap-gen", line 1054, in <module> > > main() > > File "./keycodemapdb/tools/keymap-gen", line 1049, in main > > args.func(args) > > File "./keycodemapdb/tools/keymap-gen", line 945, in code_table > > SRC_GENERATORS[args.lang].generate_code_table(args.varname, database, args.mapname) > > File "./keycodemapdb/tools/keymap-gen", line 402, in generate_code_table > > mapname, ", ".join(database.mapto.keys()))) > > Exception: Unknown map rfb, expected one of xorgxwin, osx, qcode, usb, xkb, sun, linux, xkbdxt, adb, win32, html, atset1, xorgkbd, atset3, atset2, xwinxt, > x11, qnum, xtkbd, xorgxquartz, xorgevdev > > > > > > except that it doesn't actually seem to cause an error - it seems > > to be ignored. I'm not sure why we see this, nor why it isn't > > apparently fatal > > The build system doesn't get refreshed automatically after this > change, so it's still trying to generate virkeycodetable_rfb.h > and failing because the current version of keymap-gen doesn't know > about it. Perhaps it would be better if I just made 'keymap-gen' continue to accept 'rfb' as a deprecated alias for 'qnum' Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
