Skip to contentSkip to conversation

Small fixes sysstat, squashfs-tools, gconf

PATCH In review Martin Jansa 2 participants 7 messages Nov 30, 2011

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

cover Small fixes sysstat, squashfs-tools, gconf

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(-)
Signature · 1 line
1.7.8.rc4
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       |    6 +++++-
 meta/recipes-extended/sysstat/sysstat_10.0.2.bb |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
meta/recipes-extended/sysstat/sysstat.inc +5 -1
index 2936f96..5e0f7af 100644
@@ -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
 }
meta/recipes-extended/sysstat/sysstat_10.0.2.bb +1 -1
index bd559d8..7b57bc8 100644
@@ -2,7 +2,7 @@ require sysstat.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-PR = "r0"
+PR = "r1"
Signature · 1 line
1.7.8.rc4
author
#2 lore raw

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

Signed-off-by Martin Jansa <[email protected]>
---
 .../squashfs-tools/squashfs-tools_4.2.bb           |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-devtools/squashfs-tools/squashfs-tools_4.2.bb +1 -1
index 6691797..a2ed8ba 100644
@@ -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 \
Signature · 1 line
1.7.8.rc4
author
#3 lore raw

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

In reply to Martin Jansa

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

Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-gnome/gnome/gconf_3.2.3.bb |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
meta/recipes-gnome/gnome/gconf_3.2.3.bb +7 -3
index aa9da78..cdc7a35 100644
@@ -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
Signature · 1 line
1.7.8.rc4
#4 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 11 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-extended/sysstat/sysstat.inc       |    6 +++++-
 meta/recipes-extended/sysstat/sysstat_10.0.2.bb |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
meta/recipes-extended/sysstat/sysstat.inc +0 -0
index 2936f96..5e0f7af 100644

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

Quoted 5 lines
meta/recipes-extended/sysstat/sysstat.inc +1 -1
@@ -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?

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

Quoted 6 lines
meta/recipes-extended/sysstat/sysstat.inc +4 -0
+                if [ -e /etc/init.d/populate-volatile.sh ]; then
+                        /etc/init.d/populate-volatile.sh update
+                fi
+        fi
 }

Cheers,

Richard

author
#5 lore raw

PATCH 1/1 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.2.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.2.bb +1 -1
index bd559d8..7b57bc8 100644
@@ -2,7 +2,7 @@ require sysstat.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-PR = "r0"
+PR = "r1"
Signature · 1 line
1.7.8.rc4
author
#6 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 14 lines · Richard Purdie
Quoted 13 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
---
 meta/recipes-extended/sysstat/sysstat.inc       |    6 +++++-
 meta/recipes-extended/sysstat/sysstat_10.0.2.bb |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
meta/recipes-extended/sysstat/sysstat.inc +0 -0
index 2936f96..5e0f7af 100644
@@ -22,7 +22,11 @@ do_install() {
 }
Quoted 5 lines

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

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

Quoted 17 lines

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

Quoted 7 lines
meta/recipes-extended/sysstat/sysstat.inc +4 -0
+                if [ -e /etc/init.d/populate-volatile.sh ]; then
+                        /etc/init.d/populate-volatile.sh update
+                fi
+        fi
 }

Cheers,

Richard

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]