summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2020-02-07 14:29:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-11 23:05:13 +0000
commit5737722432ce26d961c3fb556651056aedb34526 (patch)
tree0bce9e3f52198e7c1882c3c934c52634f77482e5 /meta/recipes-extended
parent74efd4db8b7e7c7c965a7074e1f085e6a4a718fd (diff)
downloadpoky-5737722432ce26d961c3fb556651056aedb34526.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) (From OE-Core rev: 6e809474ab686fba6924d8b46fd0b9eab5c66c06) (From OE-Core rev: 232430bdee74bb266ded6ccf2fb3842caad06181) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/sudo/sudo.inc2
-rw-r--r--meta/recipes-extended/sudo/sudo_1.8.27.bb9
2 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 15075bcefd..4edfabe510 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
27CONFFILES_${PN} = "${sysconfdir}/sudoers" 27CONFFILES_${PN} = "${sysconfdir}/sudoers"
28 28
29EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor" 29EXTRA_OECONF = "--with-editor=${base_bindir}/vi --with-env-editor"
30 30
31EXTRA_OECONF_append_libc-musl = " --disable-hardening " 31EXTRA_OECONF_append_libc-musl = " --disable-hardening "
32 32
diff --git a/meta/recipes-extended/sudo/sudo_1.8.27.bb b/meta/recipes-extended/sudo/sudo_1.8.27.bb
index ee3be95644..6d470d0373 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.27.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.27.bb
@@ -15,8 +15,15 @@ SRC_URI[sha256sum] = "7beb68b94471ef56d8a1036dbcdc09a7b58a949a68ffce48b83f837dd3
15DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 15DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
16RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" 16RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
17 17
18CACHED_CONFIGUREVARS = " \
19 ac_cv_type_rsize_t=no \
20 ac_cv_path_MVPROG=${base_bindir}/mv \
21 ac_cv_path_BSHELLPROG=${base_bindir}/sh \
22 ac_cv_path_SENDMAILPROG=${sbindir}/sendmail \
23 ac_cv_path_VIPROG=${base_bindir}/vi \
24 "
25
18EXTRA_OECONF += " \ 26EXTRA_OECONF += " \
19 ac_cv_type_rsize_t=no \
20 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ 27 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \
21 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \ 28 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)} \
22 --with-vardir=/var/lib/sudo \ 29 --with-vardir=/var/lib/sudo \