mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

kbd: fix pam DISTRO_FEATURES check

Browse Source 
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>
This commit is contained in:
Rouven Czerwinski
2022-05-04 17:47:55 +02:00
committed by Richard Purdie
parent cb70fcae6b
commit 10002fa826
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-core/kbd/kbd_2.4.0.bb
View File

@@ -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