]> code.ossystems Code Review - openembedded-core.git/commitdiff
distcc: use useradd.bbclass to add the distcc user
authorLaurentiu Palcu <laurentiu.palcu@intel.com>
Mon, 17 Dec 2012 09:46:47 +0000 (11:46 +0200)
committerSaul Wold <sgw@linux.intel.com>
Wed, 19 Dec 2012 07:48:22 +0000 (23:48 -0800)
This is needed for the postinstalls to run at do_rootfs time.

[YOCTO #3601]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-devtools/distcc/distcc_2.18.3.bb

index de181e5e87e47c0823453985efb10d84d54b411c..bd2af4a1b57a3cd21d8f2fe02eb9d606d703d33b 100644 (file)
@@ -4,7 +4,7 @@ compilation of C/C++/ObjC code across machines on a network."
 SECTION = "devel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r8"
+PR = "r9"
 
 DEPENDS = "avahi"
 
@@ -28,7 +28,14 @@ SRC_URI = "http://distcc.googlecode.com/files/${BPN}-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "0d6b80a1efc3a3d816c4f4175f63eaa2"
 SRC_URI[sha256sum] = "6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434"
 
-inherit autotools pkgconfig update-rc.d
+inherit autotools pkgconfig update-rc.d useradd
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system \
+                       --home /dev/null \
+                       --no-create-home \
+                       --gid nogroup \
+                       distcc"
 
 INITSCRIPT_NAME = "distcc"
 
@@ -53,10 +60,6 @@ FILES_${PN} = " ${sysconfdir} \
 FILES_distcc-distmon-gnome = "  ${bindir}/distccmon-gnome \
                                ${datadir}/distcc"
 
-pkg_postinst_${PN} () {
-       if test "x$D" != "x"; then
-               exit 1
-       else
-               grep distcc /etc/passwd || adduser --system --home /dev/null --no-create-home --empty-password --ingroup nogroup distcc
-       fi
+pkg_postrm_${PN} () {
+       deluser distcc || true
 }