diff options
| -rw-r--r-- | meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patch b/meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patch new file mode 100644 index 0000000000..a74cbb0c0e --- /dev/null +++ b/meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | From 3c52a84ff8775590e7e9da9c0d4408c23494305e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
| 3 | Date: Mon, 17 Jun 2019 15:36:34 +0800 | ||
| 4 | Subject: [PATCH] configure.ac: fix configure error with dash | ||
| 5 | |||
| 6 | A configure error occurs when /bin/sh -> dash: | ||
| 7 | checking for is_selinux_enabled in -lselinux... yes | ||
| 8 | checking for semanage_connect in -lsemanage... yes | ||
| 9 | configure: 16322: test: yesyes: unexpected operator | ||
| 10 | |||
| 11 | Use "=" instead of "==" since dash doesn't support this operator. | ||
| 12 | |||
| 13 | Upstream-Status: Backport | ||
| 14 | [https://github.com/shadow-maint/shadow/commit/3c52a84ff8775590e7e9da9c0d4408c23494305e] | ||
| 15 | |||
| 16 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 17 | --- | ||
| 18 | configure.ac | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/configure.ac b/configure.ac | ||
| 22 | index 6762556..1907afb 100644 | ||
| 23 | --- a/configure.ac | ||
| 24 | +++ b/configure.ac | ||
| 25 | @@ -500,7 +500,7 @@ if test "$with_selinux" != "no"; then | ||
| 26 | AC_MSG_ERROR([libsemanage not found]) | ||
| 27 | fi | ||
| 28 | |||
| 29 | - if test "$selinux_lib$semanage_lib" == "yesyes" ; then | ||
| 30 | + if test "$selinux_lib$semanage_lib" = "yesyes" ; then | ||
| 31 | AC_DEFINE(WITH_SELINUX, 1, | ||
| 32 | [Build shadow with SELinux support]) | ||
| 33 | LIBSELINUX="-lselinux" | ||
| 34 | -- | ||
| 35 | 2.7.4 | ||
| 36 | |||
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 831751d6de..7f82d20826 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc | |||
| @@ -13,6 +13,7 @@ SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}. | |||
| 13 | file://shadow-4.1.3-dots-in-usernames.patch \ | 13 | file://shadow-4.1.3-dots-in-usernames.patch \ |
| 14 | file://0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch \ | 14 | file://0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch \ |
| 15 | file://0002-gettime-Use-secure_getenv-over-getenv.patch \ | 15 | file://0002-gettime-Use-secure_getenv-over-getenv.patch \ |
| 16 | file://0001-configure.ac-fix-configure-error-with-dash.patch \ | ||
| 16 | ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ | 17 | ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ |
| 17 | " | 18 | " |
| 18 | 19 | ||
