From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alan Jenkins Date: Thu, 29 Oct 2009 16:01:37 +0000 Subject: Re: [PATCH] extras/keymap: fix build (GEN keys.txt) Message-Id: <4AE9BC61.9020606@tuffmail.co.uk> List-Id: References: <4AE9A648.2090006@tuffmail.co.uk> In-Reply-To: <4AE9A648.2090006@tuffmail.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-hotplug@vger.kernel.org Lennart Poettering wrote: > On Thu, 29.10.09 14:27, Alan Jenkins (alan-jenkins@tuffmail.co.uk) wrote: > > >> Commit 7d701b0 "Merge keymap building in the top-level Makefile.am" >> caused a build failure when extras are enabled. >> >> Fix the generation of keys.txt by reverting to the original command. >> -extras/keymap/keys.txt: /usr/include/linux/input.h >> - $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[[:space:]]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ >> +extras/keymap/keys.txt: /usr/include/linux/input.h Makefile >> + $(AM_V_GEN)$(AWK) '/^#define.*KEY_/ { if ($$2 != "KEY_MAX" && >> $$2 != "KEY_CNT") { print $$2 } }' < $< > $@ >> > > The s/^KEY_COFFEE$$/KEY_SCREENLOCK/ you dropped here actually > matters. It needs to be kept. > I'm not dropping anything that was ever used, or which ever worked, at least within the main udev tree :-P. This patch just reverts to the last known working version of the command. I would suggest applying any necessary changes as separate commits. Sorry for not being more explicit about this in the first place :). Note that this specific sed command doesn't seem to work for my system: GEN extras/keymap/keys-from-name.gperf GEN extras/keymap/keys-from-name.h Key link: "KEY_SCREENLOCK" = "KEY_SCREENLOCK", with key set "cekss". 1 input keys have identical hash values, use option -D. make: *** [extras/keymap/keys-from-name.h] Error 1 This is with /usr/include/linux/input.h as provided by debian "linux-libc-dev-2.6.30-8". Thanks Alan