summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/kbd
diff options
context:
space:
mode:
authorRouven Czerwinski <rcz@pengutronix.de>2022-05-04 17:47:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-05 21:17:37 +0100
commit10002fa826337e1593ae57d26e6b1f5e118f5419 (patch)
tree40121b9dcad56376f735c905402b0fdaf54874b7 /meta/recipes-core/kbd
parentcb70fcae6b35cef800d437c338a7ecfeaacd26ca (diff)
downloadpoky-10002fa826337e1593ae57d26e6b1f5e118f5419.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. (From OE-Core rev: 366c657c688270d68b1c688a2446389c8934cd58) 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>
Diffstat (limited to 'meta/recipes-core/kbd')
-rw-r--r--meta/recipes-core/kbd/kbd_2.4.0.bb2
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"
31FILES:${PN}-unimaps = "${datadir}/unimaps" 31FILES:${PN}-unimaps = "${datadir}/unimaps"
32 32
33do_install:append () { 33do_install:append () {
34 if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ] \ 34 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)}" = "yes" ] \
35 && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then 35 && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then
36 mv -f ${D}${sysconfdir}/pam.d/vlock ${D}${sysconfdir}/pam.d/vlock.kbd 36 mv -f ${D}${sysconfdir}/pam.d/vlock ${D}${sysconfdir}/pam.d/vlock.kbd
37 fi 37 fi