From 10002fa826337e1593ae57d26e6b1f5e118f5419 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Wed, 4 May 2022 17:47:55 +0200 Subject: kbd: fix pam DISTRO_FEATURES check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- meta/recipes-core/kbd/kbd_2.4.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-core/kbd') 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 -- cgit v1.2.3-54-g00ecf