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. It should work properly again after running 'git clean -xdf'; there might be a way to trigger automatic build system refresh but it didn't look like something worth spending too much time on. > We could simply keep libvirt calling it 'rfb' instead of 'qnum', > but 'qnum' does feel like a saner name Yeah, I think we should try to avoid diverging from whatever naming convention keycodemapdb has adopted. The couple of tweaks that I've made should be enough to ensure existing users keep on working even after the rename. -- Andrea Bolognani / Red Hat / Virtualization -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
