From patchwork Thu Dec 8 08:44:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 04/17] sysstat: don't run populate-volatile.sh update in do_rootfs or without populate-volatile.sh Date: Thu, 08 Dec 2011 08:44:04 -0000 From: Saul Wold X-Patchwork-Id: 16475 Message-Id: To: openembedded-core@openembedded.org From: Martin Jansa Signed-off-by: Martin Jansa --- meta/recipes-extended/sysstat/sysstat.inc | 7 ++++++- meta/recipes-extended/sysstat/sysstat_10.0.3.bb | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 2936f96..ca40ab5 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -22,7 +22,12 @@ do_install() { } pkg_postinst_${PN} () { - /etc/init.d/populate-volatile.sh update + if [ -n "$D" ]; then + exit 1 + fi + if [ -e /etc/init.d/populate-volatile.sh ]; then + /etc/init.d/populate-volatile.sh update + fi } diff --git a/meta/recipes-extended/sysstat/sysstat_10.0.3.bb b/meta/recipes-extended/sysstat/sysstat_10.0.3.bb index d445e88..7ef6c60 100644 --- a/meta/recipes-extended/sysstat/sysstat_10.0.3.bb +++ b/meta/recipes-extended/sysstat/sysstat_10.0.3.bb @@ -2,7 +2,7 @@ require sysstat.inc LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -PR = "r0" +PR = "r1" SRC_URI[md5sum] = "0e1ed5200f31f69a3b90ff1e81c07745" SRC_URI[sha256sum] = "7c0dd172f09edaff100b33db29ef502e15e71867b505c6d519f76a24fabcc1f5"