Skip to contentSkip to conversation

Small fixes for sysstat, matchbox-session and subversion upgrade

PATCH Applied Martin Jansa 3 participants 14 messages Dec 6, 2011 – Dec 8, 2011

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

cover Small fixes for sysstat, matchbox-session and subversion upgrade

The following changes since commit 0a7a8597be05c8def8af58eecab49d963dc9d757:

libsdl: Disable pulseaudio explicitly (2011-12-05 23:03:23 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull

Klaus Kurzmann (1):
subversion: update 1.7.0 to 1.7.1 and force libtool recreation

Martin Jansa (2):
sysstat: don't run populate-volatile.sh update in do_rootfs or
without populate-volatile.sh
matchbox-session-sato: respect VIRTUAL-RUNTIME_initscripts settings

 .../libtool2.patch                                 |    0
 .../{subversion_1.7.0.bb => subversion_1.7.1.bb}   |    7 ++++---
 meta/recipes-extended/sysstat/sysstat.inc          |    7 ++++++-
 meta/recipes-extended/sysstat/sysstat_10.0.3.bb    |    2 +-
 .../matchbox-sato/matchbox-session-sato_0.1.bb     |    7 +++++--
 5 files changed, 16 insertions(+), 7 deletions(-)
 rename meta/recipes-devtools/subversion/{subversion-1.7.0 => subversion-1.7.1}/libtool2.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion_1.7.0.bb => subversion_1.7.1.bb} (75%)
Signature · 1 line
1.7.8
author
#1 lore raw

PATCH 1/3 sysstat: don't run populate-volatile.sh update in do_rootfs or without populate-volatile.sh

Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-extended/sysstat/sysstat.inc       |    7 ++++++-
 meta/recipes-extended/sysstat/sysstat_10.0.3.bb |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
meta/recipes-extended/sysstat/sysstat.inc +6 -1
index 2936f96..ca40ab5 100644
@@ -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
 }
meta/recipes-extended/sysstat/sysstat_10.0.3.bb +1 -1
index d445e88..7ef6c60 100644
@@ -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"
Signature · 1 line
1.7.8
author
#2 lore raw

PATCH 2/3 subversion: update 1.7.0 to 1.7.1 and force libtool recreation

From: Klaus Kurzmann <[email protected]>

* subversion-1.7.* had libtool-2.4, oe-core now has 2.4.2 and it was failing:
x86_64-linux-libtool: Version mismatch error. This is libtool 2.4.2, but the
x86_64-linux-libtool: definition of this LT_INIT comes from libtool 2.4.
x86_64-linux-libtool: You should recreate aclocal.m4 with macros from libtool 2.4.2
x86_64-linux-libtool: and run autoconf again.

Signed-off-by Klaus Kurzmann <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
---
 .../libtool2.patch                                 |    0
 .../{subversion_1.7.0.bb => subversion_1.7.1.bb}   |    7 ++++---
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/subversion/{subversion-1.7.0 => subversion-1.7.1}/libtool2.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion_1.7.0.bb => subversion_1.7.1.bb} (75%)
meta/recipes-devtools/subversion/subversion-1.7.1/libtool2.patch renamed from meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
rename to meta/recipes-devtools/subversion/subversion-1.7.1/libtool2.patch
meta/recipes-devtools/subversion/subversion_1.7.1.bb renamed from meta/recipes-devtools/subversion/subversion_1.7.0.bb +4 -3
similarity index 75%
rename from meta/recipes-devtools/subversion/subversion_1.7.0.bb
rename to meta/recipes-devtools/subversion/subversion_1.7.1.bb
index 396b35b..a99e087 100644
@@ -14,8 +14,8 @@ DEFAULT_PREFERENCE = "-1"
 SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://libtool2.patch \
 "
-SRC_URI[md5sum] = "930e6644a1b6094efd268fde6a318f04"
-SRC_URI[sha256sum] = "64fd5f263a80e609717a3ca42f1f2625606a5c4a40a85716f82c866033780978"
+SRC_URI[md5sum] = "8a4fa74385df85a9702141b6b68b8307"
+SRC_URI[sha256sum] = "d34bde626fac1aa553f5c9aeedf961999a77cc31540ace18da5aeacdd03d6608"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4"
 

@@ -32,6 +32,7 @@ acpaths = "-I build/ -I build/ac-macros/"
 
 do_configure_prepend () {
 	rm -f ${S}/libtool
-	rm -f ${S}/build/libtool.m4
+	rm -f ${S}/build/libtool.m4 ${S}/build/ltmain.sh ${S}/build/ltoptions.m4 ${S}/build/ltsugar.m4 ${S}/build/ltversion.m4 ${S}/build/lt~obsolete.m4
+	rm -f ${S}/aclocal.m4
 	sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
 }
Signature · 1 line
1.7.8
author
#6 lore raw

PATCH 3/3 matchbox-session-sato: respect VIRTUAL-RUNTIME_initscripts settings

In reply to Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 .../matchbox-sato/matchbox-session-sato_0.1.bb     |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +5 -2
index 01e456e..c738584 100644
@@ -5,9 +5,12 @@ BUGTRACKER = "http://bugzilla.openedhand.com/"
 LICENSE = "GPL"
 LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63"
 
+# Distro can override initscripts provider
+VIRTUAL-RUNTIME_initscripts ?= "initscripts"
+
 SECTION = "x11"
-RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session"
-PR = "r28"
+RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato ${VIRTUAL-RUNTIME_initscripts} matchbox-session"
+PR = "r29"
 
 # This package is architecture specific because the session script is modified
 # based on the machine architecture.
Signature · 1 line
1.7.8
author
#3 lore raw

Re: [PATCH][oe-core 2/3] subversion: update 1.7.0 to 1.7.1 and force libtool recreation

In reply to Martin Jansa
Quoted 8 lines · Martin Jansa

From: Klaus Kurzmann <[email protected]>

* subversion-1.7.* had libtool-2.4, oe-core now has 2.4.2 and it was failing:
x86_64-linux-libtool: Version mismatch error. This is libtool 2.4.2, but the
x86_64-linux-libtool: definition of this LT_INIT comes from libtool 2.4.
x86_64-linux-libtool: You should recreate aclocal.m4 with macros from libtool 2.4.2
x86_64-linux-libtool: and run autoconf again.

Hmm, subversion-1.7.2 was released yesterday evening and 1.7.1 tar.bz2 removed (moved to archive). I'll retest with 1.7.2 and send updated patch.

Cheers,

Quoted 44 lines
Signed-off-by Klaus Kurzmann <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
---
 .../libtool2.patch                                 |    0
 .../{subversion_1.7.0.bb => subversion_1.7.1.bb}   |    7 ++++---
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/subversion/{subversion-1.7.0 => subversion-1.7.1}/libtool2.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion_1.7.0.bb => subversion_1.7.1.bb} (75%)
meta/recipes-devtools/subversion/subversion-1.7.1/libtool2.patch renamed from meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
rename to meta/recipes-devtools/subversion/subversion-1.7.1/libtool2.patch
meta/recipes-devtools/subversion/subversion_1.7.1.bb renamed from meta/recipes-devtools/subversion/subversion_1.7.0.bb +4 -3
similarity index 75%
rename from meta/recipes-devtools/subversion/subversion_1.7.0.bb
rename to meta/recipes-devtools/subversion/subversion_1.7.1.bb
index 396b35b..a99e087 100644
@@ -14,8 +14,8 @@ DEFAULT_PREFERENCE = "-1"
 SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://libtool2.patch \
 "
-SRC_URI[md5sum] = "930e6644a1b6094efd268fde6a318f04"
-SRC_URI[sha256sum] = "64fd5f263a80e609717a3ca42f1f2625606a5c4a40a85716f82c866033780978"
+SRC_URI[md5sum] = "8a4fa74385df85a9702141b6b68b8307"
+SRC_URI[sha256sum] = "d34bde626fac1aa553f5c9aeedf961999a77cc31540ace18da5aeacdd03d6608"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4"
 

@@ -32,6 +32,7 @@ acpaths = "-I build/ -I build/ac-macros/"
 
 do_configure_prepend () {
 	rm -f ${S}/libtool
-	rm -f ${S}/build/libtool.m4
+	rm -f ${S}/build/libtool.m4 ${S}/build/ltmain.sh ${S}/build/ltoptions.m4 ${S}/build/ltsugar.m4 ${S}/build/ltversion.m4 ${S}/build/lt~obsolete.m4
+	rm -f ${S}/aclocal.m4
 	sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
 }
Signature · 1 line
1.7.8
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#4 lore raw

PATCH 1/1 subversion: update 1.7.0 to 1.7.2 and force libtool recreation

From: Klaus Kurzmann <[email protected]>

* subversion-1.7.* had libtool-2.4, oe-core now has 2.4.2 and it was failing:
x86_64-linux-libtool: Version mismatch error. This is libtool 2.4.2, but the
x86_64-linux-libtool: definition of this LT_INIT comes from libtool 2.4.
x86_64-linux-libtool: You should recreate aclocal.m4 with macros from libtool 2.4.2
x86_64-linux-libtool: and run autoconf again.

Signed-off-by Klaus Kurzmann <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
---
 .../subversion/subversion-1.7.0/libtool2.patch     |   15 --------
 .../subversion/subversion-1.7.2/libtool2.patch     |   15 ++++++++
 .../subversion/subversion_1.7.0.bb                 |   37 -------------------
 .../subversion/subversion_1.7.2.bb                 |   38 ++++++++++++++++++++
 4 files changed, 53 insertions(+), 52 deletions(-)
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
 create mode 100644 meta/recipes-devtools/subversion/subversion-1.7.2/libtool2.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion_1.7.0.bb
 create mode 100644 meta/recipes-devtools/subversion/subversion_1.7.2.bb
meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch deleted +0 -15
deleted file mode 100644
index 5cd572b..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
---- a/configure.ac	2011-10-20 21:56:02.230663987 +0200
-+++ b/configure.ac	2011-08-17 15:01:30.000000000 +0200
-@@ -227,8 +227,8 @@
-   LIBTOOL="$sh_libtool"
-   SVN_LIBTOOL="$sh_libtool"
- else
--  sh_libtool="$abs_builddir/libtool"
--  SVN_LIBTOOL="\$(SHELL) $sh_libtool"
-+  sh_libtool="$abs_builddir/$host_alias-libtool"
-+  SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
- fi
- AC_SUBST(SVN_LIBTOOL)
-
meta/recipes-devtools/subversion/subversion-1.7.2/libtool2.patch new file +15 -0
new file mode 100644
index 0000000..5cd572b
@@ -0,0 +1,15 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+--- a/configure.ac	2011-10-20 21:56:02.230663987 +0200
++++ b/configure.ac	2011-08-17 15:01:30.000000000 +0200
+@@ -227,8 +227,8 @@
+   LIBTOOL="$sh_libtool"
+   SVN_LIBTOOL="$sh_libtool"
+ else
+-  sh_libtool="$abs_builddir/libtool"
+-  SVN_LIBTOOL="\$(SHELL) $sh_libtool"
++  sh_libtool="$abs_builddir/$host_alias-libtool"
++  SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
+ fi
+ AC_SUBST(SVN_LIBTOOL)
+
meta/recipes-devtools/subversion/subversion_1.7.0.bb deleted +0 -37
deleted file mode 100644
index 396b35b..0000000
@@ -1,37 +0,0 @@
-DESCRIPTION = "The Subversion (svn) client"
-SECTION = "console/network"
-DEPENDS = "apr-util neon"
-RDEPENDS_${PN} = "neon"
-LICENSE = "Apache-2"
-HOMEPAGE = "http://subversion.tigris.org"
-
-BBCLASSEXTEND = "native"
-
-# negative, because of new checkout format in 1.7.0 
-# and distro PREMIRRORs need to be in sync with users
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
-           file://libtool2.patch \
-"
-SRC_URI[md5sum] = "930e6644a1b6094efd268fde6a318f04"
-SRC_URI[sha256sum] = "64fd5f263a80e609717a3ca42f1f2625606a5c4a40a85716f82c866033780978"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4"
-
-EXTRA_OECONF = " \
-                --without-berkeley-db --without-apxs --without-apache \
-                --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
-                --with-apr-util=${STAGING_BINDIR_CROSS}"
-
-inherit autotools
-
-export LDFLAGS += " -L${STAGING_LIBDIR} "
-
-acpaths = "-I build/ -I build/ac-macros/"
-
-do_configure_prepend () {
-	rm -f ${S}/libtool
-	rm -f ${S}/build/libtool.m4
-	sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
-}
meta/recipes-devtools/subversion/subversion_1.7.2.bb new file +38 -0
new file mode 100644
index 0000000..23e2132
@@ -0,0 +1,38 @@
+DESCRIPTION = "The Subversion (svn) client"
+SECTION = "console/network"
+DEPENDS = "apr-util neon"
+RDEPENDS_${PN} = "neon"
+LICENSE = "Apache-2"
+HOMEPAGE = "http://subversion.tigris.org"
+
+BBCLASSEXTEND = "native"
+
+# negative, because of new checkout format in 1.7.0 
+# and distro PREMIRRORs need to be in sync with users
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
+           file://libtool2.patch \
+"
+SRC_URI[md5sum] = "1e5dfffd27be080672e5a042564368a8"
+SRC_URI[sha256sum] = "7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4"
+
+EXTRA_OECONF = " \
+                --without-berkeley-db --without-apxs --without-apache \
+                --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
+                --with-apr-util=${STAGING_BINDIR_CROSS}"
+
+inherit autotools
+
+export LDFLAGS += " -L${STAGING_LIBDIR} "
+
+acpaths = "-I build/ -I build/ac-macros/"
+
+do_configure_prepend () {
+	rm -f ${S}/libtool
+	rm -f ${S}/build/libtool.m4 ${S}/build/ltmain.sh ${S}/build/ltoptions.m4 ${S}/build/ltsugar.m4 ${S}/build/ltversion.m4 ${S}/build/lt~obsolete.m4
+	rm -f ${S}/aclocal.m4
+	sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
+}
Signature · 1 line
1.7.8
Applied
#5 lore raw

Re: [PATCH] subversion: update 1.7.0 to 1.7.2 and force libtool recreation

Quoted 11 lines · Martin Jansa

From: Klaus Kurzmann <[email protected]>

* subversion-1.7.* had libtool-2.4, oe-core now has 2.4.2 and it was failing:
x86_64-linux-libtool: Version mismatch error. This is libtool 2.4.2, but the
x86_64-linux-libtool: definition of this LT_INIT comes from libtool 2.4.
x86_64-linux-libtool: You should recreate aclocal.m4 with macros from libtool 2.4.2
x86_64-linux-libtool: and run autoconf again.

Signed-off-by Klaus Kurzmann <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
Quoted 10 lines
---
 .../subversion/subversion-1.7.0/libtool2.patch     |   15 --------
 .../subversion/subversion-1.7.2/libtool2.patch     |   15 ++++++++
 .../subversion/subversion_1.7.0.bb                 |   37 -------------------
 .../subversion/subversion_1.7.2.bb                 |   38 ++++++++++++++++++++
 4 files changed, 53 insertions(+), 52 deletions(-)
 delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
 create mode 100644 meta/recipes-devtools/subversion/subversion-1.7.2/libtool2.patch
 delete mode 100644 meta/recipes-devtools/subversion/subversion_1.7.0.bb
 create mode 100644 meta/recipes-devtools/subversion/subversion_1.7.2.bb

Merged to master, thanks.

Richard

#8 lore raw

Re: [PATCH][oe-core 1/3] sysstat: don't run populate-volatile.sh update in do_rootfs or without populate-volatile.sh

In reply to Martin Jansa
Quoted 12 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-extended/sysstat/sysstat.inc       |    7 ++++++-
 meta/recipes-extended/sysstat/sysstat_10.0.3.bb |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
meta/recipes-extended/sysstat/sysstat.inc +0 -0
index 2936f96..ca40ab5 100644
@@ -22,7 +22,12 @@ do_install() {
 }

meta/recipes-extended/sysstat/sysstat.inc do_install() { · line 31

Quoted 10 lines
meta/recipes-extended/sysstat/sysstat.inc +6 -1
 
 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
 }

The subject commit message and the code match now, thanks :)

My only other question is whether we need to run this at first boot time? At first boot after rootfs, populate-volatile will run anyway. We therefore don't need to run the update as a postinst on device as part of first boot as well as it will always be covered if present.

I therefore think this should be an "exit 0" and the commit message should be:

"sysstat: don't run populate-volatile.sh update in do_rootfs, first boot or without populate-volatile.sh"

Does that make sense?

Cheers,

Richard

#9 lore raw

Re: [PATCH][oe-core 1/3] sysstat: don't run populate-volatile.sh update in do_rootfs or without populate-volatile.sh

Op 7 dec. 2011, om 13:48 heeft Richard Purdie het volgende geschreven:

Quoted 26 lines · Martin Jansa
Quoted 12 lines
Signed-off-by Martin Jansa <[email protected]>

---

meta/recipes-extended/sysstat/sysstat.inc       |    7 ++++++-
meta/recipes-extended/sysstat/sysstat_10.0.3.bb |    2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
meta/recipes-extended/sysstat/sysstat.inc +0 -0
index 2936f96..ca40ab5 100644
@@ -22,7 +22,12 @@ do_install() {
 }

meta/recipes-extended/sysstat/sysstat.inc do_install() { · line 31

Quoted 10 lines
meta/recipes-extended/sysstat/sysstat.inc +6 -1
 
 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
 }

The subject commit message and the code match now, thanks :)

Quoted 4 lines

My only other question is whether we need to run this at first boot time? At first boot after rootfs, populate-volatile will run anyway. We therefore don't need to run the update as a postinst on device as part of first boot as well as it will always be covered if present.

How does that interact with the volatiles caching logic?

regards,

Koen

author
#11 lore raw

Re: [PATCH][oe-core 1/3] sysstat: don't run populate-volatile.sh update in do_rootfs or without populate-volatile.sh

In reply to Richard Purdie
Quoted 31 lines · Richard Purdie
Quoted 12 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-extended/sysstat/sysstat.inc       |    7 ++++++-
 meta/recipes-extended/sysstat/sysstat_10.0.3.bb |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
meta/recipes-extended/sysstat/sysstat.inc +0 -0
index 2936f96..ca40ab5 100644
@@ -22,7 +22,12 @@ do_install() {
 }

meta/recipes-extended/sysstat/sysstat.inc do_install() { · line 31

Quoted 10 lines
meta/recipes-extended/sysstat/sysstat.inc +6 -1
 
 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
 }

The subject commit message and the code match now, thanks :)

My only other question is whether we need to run this at first boot time? At first boot after rootfs, populate-volatile will run anyway. We therefore don't need to run the update as a postinst on device as part of first boot as well as it will always be covered if present.

Quoted 7 lines

I therefore think this should be an "exit 0" and the commit message should be:

"sysstat: don't run populate-volatile.sh update in do_rootfs, first boot or without populate-volatile.sh"

Does that make sense?

Ah, this can work as long as nobody tries to add some default /etc/volatile.cache to image to start image with default set of volatiles before opkg postinsts are started.

I'll send updated version as you want so you can pick better variant (and I'll be happy too with -e /etc/init.d/populate-volatile.sh false).

Cheers,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#12 lore raw

PATCH v2 1/1 sysstat: don't run populate-volatile.sh update in do_rootfs, first boot or without populate-volatile.sh

Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-extended/sysstat/sysstat.inc       |    7 ++++++-
 meta/recipes-extended/sysstat/sysstat_10.0.3.bb |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
meta/recipes-extended/sysstat/sysstat.inc +6 -1
index 2936f96..9da40a7 100644
@@ -22,7 +22,12 @@ do_install() {
 }
 
 pkg_postinst_${PN} () {
-        /etc/init.d/populate-volatile.sh update
+        if [ -n "$D" ]; then
+                exit 0
+        fi
+        if [ -e /etc/init.d/populate-volatile.sh ]; then
+                /etc/init.d/populate-volatile.sh update
+        fi
 }
meta/recipes-extended/sysstat/sysstat_10.0.3.bb +1 -1
index d445e88..7ef6c60 100644
@@ -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"
Signature · 1 line
1.7.8
#10 lore raw

Re: [PATCH][oe-core 1/3] sysstat: don't run populate-volatile.sh update in do_rootfs or without populate-volatile.sh

In reply to Koen Kooi
Quoted 28 lines · Koen Kooi

Op 7 dec. 2011, om 13:48 heeft Richard Purdie het volgende geschreven:

Quoted 26 lines · Martin Jansa
Quoted 12 lines
Signed-off-by Martin Jansa <[email protected]>

---

meta/recipes-extended/sysstat/sysstat.inc       |    7 ++++++-
meta/recipes-extended/sysstat/sysstat_10.0.3.bb |    2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
meta/recipes-extended/sysstat/sysstat.inc +0 -0
index 2936f96..ca40ab5 100644
@@ -22,7 +22,12 @@ do_install() {
 }

meta/recipes-extended/sysstat/sysstat.inc do_install() { · line 31

Quoted 10 lines
meta/recipes-extended/sysstat/sysstat.inc +6 -1
 
 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
 }

The subject commit message and the code match now, thanks :)

Quoted 6 lines
Quoted 4 lines

My only other question is whether we need to run this at first boot time? At first boot after rootfs, populate-volatile will run anyway. We therefore don't need to run the update as a postinst on device as part of first boot as well as it will always be covered if present.

How does that interact with the volatiles caching logic?

It should be fine as far as I can tell...

Cheers,

Richard

Applied
#13 lore raw

Re: [PATCHv2] sysstat: don't run populate-volatile.sh update in do_rootfs, first boot or without populate-volatile.sh

In reply to Martin Jansa
Quoted 5 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-extended/sysstat/sysstat.inc       |    7 ++++++-
 meta/recipes-extended/sysstat/sysstat_10.0.3.bb |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

Merged to master, thanks.

Richard