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:42:49 +0000 |
| commit | bb544a4d9b0b889d6acacdd73e3a790546fe13ba (patch) | |
| tree | e273882119ac06edab9ca54bee2947f12a60d77b /meta/recipes-core | |
| parent | b348e31c93f08332667df65cd2ecec63631d184e (diff) | |
| download | openembedded-core-contrib-bb544a4d9b0b889d6acacdd73e3a790546fe13ba.tar.gz | |
kbd: configure.ac: Fix logic of vlock configure switch
Downstream bug report: https://bugs.gentoo.org/661650
Upstream-Status: Backport [f7f357ef079b6d185f340e716d7c72a98d82bad0]
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/recipes-core')
| -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 @@ +From f7f357ef079b6d185f340e716d7c72a98d82bad0 Mon Sep 17 00:00:00 2001 +From: Garry Filakhtov <filakhtov@gmail.com> +Date: Fri, 20 Jul 2018 15:58:56 +0200 +Subject: [PATCH] configure.ac: Fix logic of vlock configure switch + +Downstream bug report: https://bugs.gentoo.org/661650 + +Upstream-Status: Backport [f7f357ef079b6d185f340e716d7c72a98d82bad0] + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +Signed-off-by: De Huo <de.huo@windriver.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 87eb63c..07098cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,7 +119,7 @@ AM_CONDITIONAL(BUILD_LIBKEYMAP, test "$BUILD_LIBKEYMAP" = "yes") + + AC_ARG_ENABLE(vlock, + AS_HELP_STRING(--disable-vlock, [do not build vlock]), +- [VLOCK_PROG=no],[VLOCK_PROG=yes]) ++ [VLOCK_PROG=$enableval],[VLOCK_PROG=yes]) + AM_CONDITIONAL(VLOCK, test "$VLOCK_PROG" = "yes") + + if test "$VLOCK_PROG" = "yes"; then +-- +2.23.0 + 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" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ file://run-ptest \ ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://set-proper-path-of-resources.patch', '', d)} \ + file://0001-configure.ac-Fix-logic-of-vlock-configure-switch.patch \ " SRC_URI[md5sum] = "c1635a5a83b63aca7f97a3eab39ebaa6" |