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:19:55 +0000 |
| commit | 61650dd8498a093f3bfa93202c9cd2e9a7fb7834 (patch) | |
| tree | a522faed6009324891984628c0778df9b072f667 /meta/recipes-extended | |
| parent | 506b36b6d86b3454fcc3cb85f6229cbe8d14f5b5 (diff) | |
| download | openembedded-core-contrib-61650dd8498a093f3bfa93202c9cd2e9a7fb7834.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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
| -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" CONFFILES_${PN} = "${sysconfdir}/sudoers" -EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor" +EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor" EXTRA_OECONF_append_libc-musl = " --disable-hardening " 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 DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" +CACHED_CONFIGUREVARS = " \ + ac_cv_type_rsize_t=no \ + ac_cv_path_MVPROG=${base_bindir}/mv \ + ac_cv_path_BSHELLPROG=${base_bindir}/sh \ + ac_cv_path_SENDMAILPROG=${sbindir}/sendmail \ + ac_cv_path_VIPROG=${base_bindir}/vi \ + " + EXTRA_OECONF += " \ - ac_cv_type_rsize_t=no \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ --with-vardir=/var/lib/sudo \ |