diff options
author | De Huo <De.Huo@windriver.com> | 2020-02-04 07:06:03 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-04 18:43:08 +0000 |
commit | d4cd1c045e9465524dd783da152711ad5ff23fa1 (patch) | |
tree | 60c03ffea85a609cd30aaf35fd1038d051866982 /meta | |
parent | 09e695246d30ef9b73e743e0130e710e19793d14 (diff) | |
download | poky-d4cd1c045e9465524dd783da152711ad5ff23fa1.tar.gz |
kbd: configure.ac: Fix logic of vlock configure switch
Downstream bug report: https://bugs.gentoo.org/661650
Upstream-Status: Backport [f7f357ef079b6d185f340e716d7c72a98d82bad0]
(From OE-Core rev: bb544a4d9b0b889d6acacdd73e3a790546fe13ba)
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Signed-off-by: De Huo <De.Huo@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/kbd/kbd/0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch | 31 | ||||
-rw-r--r-- | meta/recipes-core/kbd/kbd_2.0.4.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-core/kbd/kbd/0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch b/meta/recipes-core/kbd/kbd/0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch new file mode 100644 index 0000000000..c3f068f61b --- /dev/null +++ b/meta/recipes-core/kbd/kbd/0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From f7f357ef079b6d185f340e716d7c72a98d82bad0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Garry Filakhtov <filakhtov@gmail.com> | ||
3 | Date: Fri, 20 Jul 2018 15:58:56 +0200 | ||
4 | Subject: [PATCH] configure.ac: Fix logic of vlock configure switch | ||
5 | |||
6 | Downstream bug report: https://bugs.gentoo.org/661650 | ||
7 | |||
8 | Upstream-Status: Backport [f7f357ef079b6d185f340e716d7c72a98d82bad0] | ||
9 | |||
10 | Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> | ||
11 | Signed-off-by: De Huo <de.huo@windriver.com> | ||
12 | --- | ||
13 | configure.ac | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 87eb63c..07098cf 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -119,7 +119,7 @@ AM_CONDITIONAL(BUILD_LIBKEYMAP, test "$BUILD_LIBKEYMAP" = "yes") | ||
21 | |||
22 | AC_ARG_ENABLE(vlock, | ||
23 | AS_HELP_STRING(--disable-vlock, [do not build vlock]), | ||
24 | - [VLOCK_PROG=no],[VLOCK_PROG=yes]) | ||
25 | + [VLOCK_PROG=$enableval],[VLOCK_PROG=yes]) | ||
26 | AM_CONDITIONAL(VLOCK, test "$VLOCK_PROG" = "yes") | ||
27 | |||
28 | if test "$VLOCK_PROG" = "yes"; then | ||
29 | -- | ||
30 | 2.23.0 | ||
31 | |||
diff --git a/meta/recipes-core/kbd/kbd_2.0.4.bb b/meta/recipes-core/kbd/kbd_2.0.4.bb index 4af3256fff..17ce6e7a9c 100644 --- a/meta/recipes-core/kbd/kbd_2.0.4.bb +++ b/meta/recipes-core/kbd/kbd_2.0.4.bb | |||
@@ -13,6 +13,7 @@ RCONFLICTS_${PN} = "console-tools" | |||
13 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ | 13 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ |
14 | file://run-ptest \ | 14 | file://run-ptest \ |
15 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://set-proper-path-of-resources.patch', '', d)} \ | 15 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://set-proper-path-of-resources.patch', '', d)} \ |
16 | file://0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch \ | ||
16 | " | 17 | " |
17 | 18 | ||
18 | SRC_URI[md5sum] = "c1635a5a83b63aca7f97a3eab39ebaa6" | 19 | SRC_URI[md5sum] = "c1635a5a83b63aca7f97a3eab39ebaa6" |