Patchwork [CONSOLIDATED,PULL,6/9] sudo: Avoid post install scripts

login
mail settings
Submitter Saul Wold
Date Nov. 11, 2011, 8:36 a.m.
Message ID <463e44ae159da2e03369f9ac14843b479de2e43d.1321000451.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/14803/
State New
Headers show

Comments

Saul Wold - Nov. 11, 2011, 8:36 a.m.
From: Mark Hatle <mark.hatle@windriver.com>

The post install script was removed, and the install_append updated
to ensure the permissions are set correctly.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-extended/sudo/sudo.inc      |    8 --------
 meta/recipes-extended/sudo/sudo_1.8.3.bb |    5 ++++-
 2 files changed, 4 insertions(+), 9 deletions(-)

Patch

diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 72a7c16..83dd209 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 0ac0851..99fe5b9 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
 }