[PATCH][oe-core 0/3] Small fixes sysstat, squashfs-tools, gconf

[PATCH][oe-core 0/3] Small fixes sysstat, squashfs-tools, gconf

[Martin Jansa]

The following changes since commit 36654d6d393cb8c8a545835184a96be4ae0c885d:

  grub: Use COMPATIBLE_HOST (2011-11-30 22:21:53 +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

Martin Jansa (3):
  sysstat: don't run populate-volatile.sh update in do_rootfs or
    without populate-volatile.sh
  squashfs-tools: fix PR, those should start with 'r'
  gconf: add polkit to DEPENDS only for target recipe and disable
    default-service for native

 .../squashfs-tools/squashfs-tools_4.2.bb           |    2 +-
 meta/recipes-extended/sysstat/sysstat.inc          |    6 +++++-
 meta/recipes-extended/sysstat/sysstat_10.0.2.bb    |    2 +-
 meta/recipes-gnome/gnome/gconf_3.2.3.bb            |   10 +++++++---
 4 files changed, 14 insertions(+), 6 deletions(-)

-- 
1.7.8.rc4

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

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-extended/sysstat/sysstat.inc       |    6 +++++-
 meta/recipes-extended/sysstat/sysstat_10.0.2.bb |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index 2936f96..5e0f7af 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -22,7 +22,11 @@ do_install() {
 }
 
 pkg_postinst_${PN} () {
-        /etc/init.d/populate-volatile.sh update
+        if [ "x$D" != "x" ]; then
+                if [ -e /etc/init.d/populate-volatile.sh ]; then
+                        /etc/init.d/populate-volatile.sh update
+                fi
+        fi
 }
 
 
diff --git a/meta/recipes-extended/sysstat/sysstat_10.0.2.bb b/meta/recipes-extended/sysstat/sysstat_10.0.2.bb
index bd559d8..7b57bc8 100644
--- a/meta/recipes-extended/sysstat/sysstat_10.0.2.bb
+++ b/meta/recipes-extended/sysstat/sysstat_10.0.2.bb
@@ -2,7 +2,7 @@ require sysstat.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-PR = "r0"
+PR = "r1"
 
 
 
-- 
1.7.8.rc4

[PATCH][oe-core 2/3] squashfs-tools: fix PR, those should start with 'r'

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../squashfs-tools/squashfs-tools_4.2.bb           |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb
index 6691797..a2ed8ba 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://../../7zC.txt;beginline=12;endline=16;md5=2056cd6d919ebc3807602143c7449a7c \
                    "
 DEPENDS = "attr zlib xz"
-PR = "0"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${PV}.tar.gz;name=squashfs \
            http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2;name=lzma \
-- 
1.7.8.rc4

[PATCH][oe-core 3/3] gconf: add polkit to DEPENDS only for target recipe and disable default-service for native

[Martin Jansa]

* gnome-common-native is needed because gnomebase.bbclass does only
  DEPENDS += "gnome-common"

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-gnome/gnome/gconf_3.2.3.bb |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index aa9da78..cdc7a35 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -3,9 +3,10 @@ SECTION = "x11/gnome"
 LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 
-DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native"
+DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit"
+DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnomebase
 
@@ -18,7 +19,10 @@ SRC_URI[archive.sha256sum] = "52008a82a847527877d9e1e549a351c86cc53cada4733b8a70
 
 S = "${WORKDIR}/GConf-${PV}"
 
-EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes --disable-introspection --disable-orbit --with-openldap=no"
+POLKIT_OECONF = "--enable-defaults-service"
+POLKIT_OECONF_virtclass-native = "--disable-defaults-service"
+EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes \
+                --disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF}"
 
 do_configure_prepend () {
 	touch gtk-doc.make
-- 
1.7.8.rc4

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

[Richard Purdie]

On Wed, 2011-11-30 at 23:56 +0100, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-extended/sysstat/sysstat.inc       |    6 +++++-
>  meta/recipes-extended/sysstat/sysstat_10.0.2.bb |    2 +-
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
> index 2936f96..5e0f7af 100644
> --- a/meta/recipes-extended/sysstat/sysstat.inc
> +++ b/meta/recipes-extended/sysstat/sysstat.inc
> @@ -22,7 +22,11 @@ do_install() {
>  }
>  
>  pkg_postinst_${PN} () {
> -        /etc/init.d/populate-volatile.sh update
> +        if [ "x$D" != "x" ]; then

Is that really what you mean?

> +                if [ -e /etc/init.d/populate-volatile.sh ]; then
> +                        /etc/init.d/populate-volatile.sh update
> +                fi
> +        fi
>  }
>  

Cheers,

Richard

[PATCH] sysstat: don't run populate-volatile.sh update in do_rootfs or without populate-volatile.sh

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-extended/sysstat/sysstat.inc       |    7 ++++++-
 meta/recipes-extended/sysstat/sysstat_10.0.2.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.2.bb b/meta/recipes-extended/sysstat/sysstat_10.0.2.bb
index bd559d8..7b57bc8 100644
--- a/meta/recipes-extended/sysstat/sysstat_10.0.2.bb
+++ b/meta/recipes-extended/sysstat/sysstat_10.0.2.bb
@@ -2,7 +2,7 @@ require sysstat.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-PR = "r0"
+PR = "r1"
 
 
 
-- 
1.7.8.rc4

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

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1409 bytes --]

On Wed, Nov 30, 2011 at 11:33:53PM +0000, Richard Purdie wrote:
> On Wed, 2011-11-30 at 23:56 +0100, Martin Jansa wrote:
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta/recipes-extended/sysstat/sysstat.inc       |    6 +++++-
> >  meta/recipes-extended/sysstat/sysstat_10.0.2.bb |    2 +-
> >  2 files changed, 6 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
> > index 2936f96..5e0f7af 100644
> > --- a/meta/recipes-extended/sysstat/sysstat.inc
> > +++ b/meta/recipes-extended/sysstat/sysstat.inc
> > @@ -22,7 +22,11 @@ do_install() {
> >  }
> >  
> >  pkg_postinst_${PN} () {
> > -        /etc/init.d/populate-volatile.sh update
> > +        if [ "x$D" != "x" ]; then
> 
> Is that really what you mean?

Ah, sorry, you're right. Fixed in branch and sent here.

> 
> > +                if [ -e /etc/init.d/populate-volatile.sh ]; then
> > +                        /etc/init.d/populate-volatile.sh update
> > +                fi
> > +        fi
> >  }
> >  
> 
> Cheers,
> 
> Richard
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

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

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 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"
-- 
1.7.8

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

[Richard Purdie]

On Tue, 2011-12-06 at 09:35 +0100, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  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
>  }

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

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

[Koen Kooi]

[-- Attachment #1: Type: text/plain, Size: 1416 bytes --]


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

> On Tue, 2011-12-06 at 09:35 +0100, Martin Jansa wrote:
>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> ---
>> 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
>> }
> 
> 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.

How does that interact with the volatiles caching logic?

regards,

Koen

[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]

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

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1986 bytes --]

On Wed, Dec 07, 2011 at 12:48:54PM +0000, Richard Purdie wrote:
> On Tue, 2011-12-06 at 09:35 +0100, Martin Jansa wrote:
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  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
> >  }
> 
> 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?

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,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

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

[Richard Purdie]

On Wed, 2011-12-07 at 13:50 +0100, Koen Kooi wrote:
> Op 7 dec. 2011, om 13:48 heeft Richard Purdie het volgende geschreven:
> 
> > On Tue, 2011-12-06 at 09:35 +0100, Martin Jansa wrote:
> >> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> >> ---
> >> 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
> >> }
> > 
> > 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.
> 
> How does that interact with the volatiles caching logic?

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

Cheers,

Richard