diff options
| author |   Rouven Czerwinski <rcz@pengutronix.de> | 2022-05-04 17:47:55 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-05 21:17:12 +0100 |
| commit | 366c657c688270d68b1c688a2446389c8934cd58 (patch) | |
| tree | 6835017d85cba410210746dd29cdcf2bb46634fe | |
| parent | 335940ac3efb4589e67453b132c2e50bd6c75639 (diff) | |
| download | openembedded-core-contrib-366c657c688270d68b1c688a2446389c8934cd58.tar.gz | |
kbd: fix pam DISTRO_FEATURES check
The DISTRO_FEATURES check for pam does not have a variable for no set
and has no qouting for strings, in case pam is not contained within
DISTRO_FEATURES, the resulting test in the install routine will not
check against anything and fail with a syntax error:
[…]/build/tmp/work/cortexa9hf-neon-apa-linux-gnueabi/kbd/2.4.0-r0/temp/run.do_install.1052292: 158: [: =: unexpected operator
check within the do_install script:
if [ = yes ]
Provide the quoting and a proper no value in case the pam distro feature
ist not set.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/kbd/kbd_2.4.0.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/kbd/kbd_2.4.0.bb b/meta/recipes-core/kbd/kbd_2.4.0.bb index 8a68d647e2..4b23f1a89d 100644 --- a/meta/recipes-core/kbd/kbd_2.4.0.bb +++ b/meta/recipes-core/kbd/kbd_2.4.0.bb @@ -31,7 +31,7 @@ FILES:${PN}-keymaps = "${datadir}/keymaps" FILES:${PN}-unimaps = "${datadir}/unimaps" do_install:append () { - if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ] \ + if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)}" = "yes" ] \ && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then mv -f ${D}${sysconfdir}/pam.d/vlock ${D}${sysconfdir}/pam.d/vlock.kbd fi |