From 6d0ad5c31b71c40925b923d487c7af350cb37689 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 9 Nov 2011 17:04:08 -0600 Subject: sudo: Avoid post install scripts The post install script was removed, and the install_append updated to ensure the permissions are set correctly. (From OE-Core rev: 463e44ae159da2e03369f9ac14843b479de2e43d) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-extended/sudo/sudo.inc | 8 -------- meta/recipes-extended/sudo/sudo_1.8.3.bb | 5 ++++- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'meta/recipes-extended/sudo') diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index 72a7c167cd..83dd209afa 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -29,11 +29,3 @@ do_install_prepend (){ mkdir -p ${D}/${localstatedir}/lib } -pkg_postinst_${PN} () { - if [ "x$D" != "x" ]; then - exit 1 - fi - - chmod 4111 /usr/bin/sudo - chmod 0440 /etc/sudoers -} diff --git a/meta/recipes-extended/sudo/sudo_1.8.3.bb b/meta/recipes-extended/sudo/sudo_1.8.3.bb index 0ac0851153..99fe5b91e7 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.3.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.3.bb @@ -1,6 +1,6 @@ require sudo.inc -PR = "r0" +PR = "r1" SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ file://libtool.patch \ @@ -23,4 +23,7 @@ do_install_append () { break fi done + + chmod 4111 $D/usr/bin/sudo + chmod 0440 $D/etc/sudoers } -- cgit v1.2.3-54-g00ecf