diff options
author | Ross Burton <ross.burton@intel.com> | 2020-02-07 14:29:28 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-08 13:20:01 +0000 |
commit | 1b463c9e74507613261ab7c3c36707bf4223a925 (patch) | |
tree | 732aa9825d56e759aa1a10878186ff12d81a867f | |
parent | 468575f9733e6a397264a92c6a2b3c7afa88bce6 (diff) | |
download | poky-1b463c9e74507613261ab7c3c36707bf4223a925.tar.gz |
sudo: specify where target tools are
sudo uses AC_PATH_PROG to find target paths, which means at best
potential host-contamination (and reproducible issues) and at worst it
thinks sh is at /your/build/path/hosttools/sh.
Solve this by explicitly passing the correct paths to configure.
(From OE-Core rev: 61650dd8498a093f3bfa93202c9cd2e9a7fb7834)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/sudo/sudo.inc | 2 | ||||
-rw-r--r-- | meta/recipes-extended/sudo/sudo_1.8.30.bb | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 67815fa858..3b314dd4a9 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc | |||
@@ -26,7 +26,7 @@ PACKAGECONFIG[pam-wheel] = ",,,pam-plugin-wheel" | |||
26 | 26 | ||
27 | CONFFILES_${PN} = "${sysconfdir}/sudoers" | 27 | CONFFILES_${PN} = "${sysconfdir}/sudoers" |
28 | 28 | ||
29 | EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor" | 29 | EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor" |
30 | 30 | ||
31 | EXTRA_OECONF_append_libc-musl = " --disable-hardening " | 31 | EXTRA_OECONF_append_libc-musl = " --disable-hardening " |
32 | 32 | ||
diff --git a/meta/recipes-extended/sudo/sudo_1.8.30.bb b/meta/recipes-extended/sudo/sudo_1.8.30.bb index 6ea06a9040..9d014d294b 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.30.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.30.bb | |||
@@ -13,8 +13,15 @@ SRC_URI[sha256sum] = "a35ad3ddc7465703e04190d3ff0b8d78ded9246749becf9a014dcb9c31 | |||
13 | DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 13 | DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
14 | RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" | 14 | RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" |
15 | 15 | ||
16 | CACHED_CONFIGUREVARS = " \ | ||
17 | ac_cv_type_rsize_t=no \ | ||
18 | ac_cv_path_MVPROG=${base_bindir}/mv \ | ||
19 | ac_cv_path_BSHELLPROG=${base_bindir}/sh \ | ||
20 | ac_cv_path_SENDMAILPROG=${sbindir}/sendmail \ | ||
21 | ac_cv_path_VIPROG=${base_bindir}/vi \ | ||
22 | " | ||
23 | |||
16 | EXTRA_OECONF += " \ | 24 | EXTRA_OECONF += " \ |
17 | ac_cv_type_rsize_t=no \ | ||
18 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ | 25 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ |
19 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ | 26 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ |
20 | --with-vardir=/var/lib/sudo \ | 27 | --with-vardir=/var/lib/sudo \ |