diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-extended/sudo | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/sudo')
-rw-r--r-- | meta/recipes-extended/sudo/sudo.inc | 8 | ||||
-rw-r--r-- | meta/recipes-extended/sudo/sudo_1.9.7p1.bb | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 0bea35a0a3..f109672b7e 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc | |||
@@ -24,14 +24,14 @@ PACKAGECONFIG ??= "" | |||
24 | PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" | 24 | PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" |
25 | PACKAGECONFIG[pam-wheel] = ",,,pam-plugin-wheel" | 25 | 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=${base_bindir}/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 | ||
33 | # mksigname/mksiglist are used on build host to generate source files | 33 | # mksigname/mksiglist are used on build host to generate source files |
34 | do_compile_prepend () { | 34 | do_compile:prepend () { |
35 | # Remove build host references from sudo_usage.h | 35 | # Remove build host references from sudo_usage.h |
36 | sed -i \ | 36 | sed -i \ |
37 | -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \ | 37 | -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \ |
@@ -46,7 +46,7 @@ do_compile_prepend () { | |||
46 | # script (from sudo) will recursively create ${localstatedir}/lib/sudo | 46 | # script (from sudo) will recursively create ${localstatedir}/lib/sudo |
47 | # and then chmod each directory with 0700 permissions, which isn't what | 47 | # and then chmod each directory with 0700 permissions, which isn't what |
48 | # we want (i.e, users would not be able to access /var/lib). | 48 | # we want (i.e, users would not be able to access /var/lib). |
49 | do_install_prepend (){ | 49 | do_install:prepend (){ |
50 | mkdir -p ${D}/${localstatedir}/lib | 50 | mkdir -p ${D}/${localstatedir}/lib |
51 | } | 51 | } |
52 | 52 | ||
diff --git a/meta/recipes-extended/sudo/sudo_1.9.7p1.bb b/meta/recipes-extended/sudo/sudo_1.9.7p1.bb index aba6f4a595..8d47c01706 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.7p1.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.7p1.bb | |||
@@ -10,7 +10,7 @@ PAM_SRC_URI = "file://sudo.pam" | |||
10 | SRC_URI[sha256sum] = "391431f454e55121b60c6ded0fcf30ddb80d623d7d16a6d1907cfa6a0b91d8cf" | 10 | SRC_URI[sha256sum] = "391431f454e55121b60c6ded0fcf30ddb80d623d7d16a6d1907cfa6a0b91d8cf" |
11 | 11 | ||
12 | DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 12 | DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
13 | RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" | 13 | RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" |
14 | 14 | ||
15 | CACHED_CONFIGUREVARS = " \ | 15 | CACHED_CONFIGUREVARS = " \ |
16 | ac_cv_type_rsize_t=no \ | 16 | ac_cv_type_rsize_t=no \ |
@@ -28,7 +28,7 @@ EXTRA_OECONF += " \ | |||
28 | --libexecdir=${libdir} \ | 28 | --libexecdir=${libdir} \ |
29 | " | 29 | " |
30 | 30 | ||
31 | do_install_append () { | 31 | do_install:append () { |
32 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 32 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
33 | install -D -m 644 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo | 33 | install -D -m 644 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo |
34 | if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then | 34 | if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then |
@@ -44,7 +44,7 @@ do_install_append () { | |||
44 | rmdir -p --ignore-fail-on-non-empty ${D}/run/sudo | 44 | rmdir -p --ignore-fail-on-non-empty ${D}/run/sudo |
45 | } | 45 | } |
46 | 46 | ||
47 | FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la \ | 47 | FILES:${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/*.la \ |
48 | ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la" | 48 | ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la" |
49 | 49 | ||
50 | SUDO_PACKAGES = "${PN}-sudo\ | 50 | SUDO_PACKAGES = "${PN}-sudo\ |
@@ -52,8 +52,8 @@ SUDO_PACKAGES = "${PN}-sudo\ | |||
52 | 52 | ||
53 | PACKAGE_BEFORE_PN = "${SUDO_PACKAGES}" | 53 | PACKAGE_BEFORE_PN = "${SUDO_PACKAGES}" |
54 | 54 | ||
55 | RDEPENDS_${PN}-sudo = "${PN}-lib" | 55 | RDEPENDS:${PN}-sudo = "${PN}-lib" |
56 | RDEPENDS_${PN} += "${SUDO_PACKAGES}" | 56 | RDEPENDS:${PN} += "${SUDO_PACKAGES}" |
57 | 57 | ||
58 | FILES_${PN}-sudo = "${bindir}/sudo ${bindir}/sudoedit" | 58 | FILES:${PN}-sudo = "${bindir}/sudo ${bindir}/sudoedit" |
59 | FILES_${PN}-lib = "${localstatedir} ${libexecdir} ${sysconfdir} ${libdir} ${nonarch_libdir}" | 59 | FILES:${PN}-lib = "${localstatedir} ${libexecdir} ${sysconfdir} ${libdir} ${nonarch_libdir}" |