[systemd-devel] 220 tarball erroneously ships keyboard-keys-from-name.gperf

[Lennart Poettering]

On Fri, 22.05.15 17:28, Martin Pitt (martin.pitt at ubuntu.com) wrote:

> Hello,
> 
> while packaging 220, I got the audit related build failure that was
> already reported [1], but also another one:

I think this has been fixed now with Tom's commit
ee3c31bf69746c5afc764c3d0337feec1bf25f0e contributed my Marc-Antoine.

Please verify.

Lennart

> 
> | In file included from ../src/udev/udev-builtin-keyboard.c:29:0:
> | ./src/udev/keyboard-keys-from-name.h: In function 'keyboard_lookup_key':
> | ./src/udev/keyboard-keys-from-name.h:253:21: error: 'KEY_NUMERIC_A' undeclared (first use in this function)
> |        {"numeric_a", KEY_NUMERIC_A},
> |                      ^
> | ./src/udev/keyboard-keys-from-name.h:253:21: note: each undeclared identifier is reported only once for each function it appears in
> | ./src/udev/keyboard-keys-from-name.h:275:21: error: 'KEY_NUMERIC_C' undeclared (first use in this function)
> |        {"numeric_c", KEY_NUMERIC_C},
> |                      ^
> | ./src/udev/keyboard-keys-from-name.h:347:21: error: 'KEY_NUMERIC_D' undeclared (first use in this function)
> |        {"numeric_d", KEY_NUMERIC_D},
> |                      ^
> | ./src/udev/keyboard-keys-from-name.h:420:21: error: 'KEY_NUMERIC_B' undeclared (first use in this function)
> |        {"numeric_b", KEY_NUMERIC_B},
> |                      ^
> | ./src/udev/keyboard-keys-from-name.h:464:26: error: 'KEY_ROTATE_DISPLAY' undeclared (first use in this function)
> |        {"rotate_display", KEY_ROTATE_DISPLAY},
> 
> This is because unlike 219 and earlier, the 220 tarball ships a
> pregenerated src/udev/keyboard-keys-from-name.gperf. In Debian sid,
> the above constants are not defined (in the kernel headers, I
> presume). I think src/udev/keyboard-keys-from-name.gperf is supposed
> to be built during package build? I see that somewhere between 219 and
> 220 this happened in Makefile.am:
> 
> -CLEANFILES += \
> -       src/udev/keyboard-keys-from-name.gperf \
> -       src/udev/keyboard-keys.txt \
> -       src/udev/net/link-config-gperf.c
> 
> but apparently this wasn't put back someplace else?
> 
> Thanks,
> 
> Martin
> 
> [1] http://lists.freedesktop.org/archives/systemd-devel/2015-May/032148.html
> -- 
> Martin Pitt                        | http://www.piware.de
> Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Lennart

-- 
Lennart Poettering, Red Hat