[meta-oe][meta-efl][PATCH 0/3] small fixes

[meta-oe][meta-efl][PATCH 0/3] small fixes

[Martin Jansa]

The following changes since commit 5b6549cd03b26c2cf300ab85ee6334f4d7389b1d:

  ubi-utils-klibc: clean ubiformat patch (2012-05-24 12:52:11 +0200)

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

Martin Jansa (3):
  gcalctool: remove older version and drop 'patch=1'
  systemd.bbclass: fix postinst/rdepends generation for recipes with
    SYSTEMD_SERVICE (without _PN suffix)
  recipes: bump PR to fix -systemd postinsts where SYSTEMD_SERVICE was
    used without PN* suffix

 meta-efl/recipes-efl/efl/elsa_svn.bb               |    2 ++
 .../recipes-gnome/gcalctool/gcalctool_5.7.32.bb    |   13 -------------
 .../recipes-gnome/gcalctool/gcalctool_5.8.17.bb    |    2 +-
 meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb         |    2 +-
 meta-oe/classes/systemd.bbclass                    |    3 ++-
 meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend   |    2 +-
 .../cherokee/cherokee_1.2.98.bb                    |    2 +-
 .../recipes-connectivity/gateone/gateone_git.bb    |    2 +-
 .../networkmanager/networkmanager_0.9.2.0.bb       |    2 +-
 .../openssh/openssh_6.0p1.bbappend                 |    2 +-
 .../systemd/systemd-machine-units_1.0.bb           |    2 ++
 meta-oe/recipes-extended/rsyslog/rsyslog.inc       |    2 +-
 .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |    2 +-
 meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb        |    2 ++
 meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb        |    2 ++
 meta-oe/recipes-navigation/gpsd/gpsd_git.bb        |    2 ++
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc    |    2 +-
 17 files changed, 22 insertions(+), 24 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gcalctool/gcalctool_5.7.32.bb

-- 
1.7.8.6

[meta-oe][meta-efl][PATCH 1/3] gcalctool: remove older version and drop 'patch=1'

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-gnome/gcalctool/gcalctool_5.7.32.bb    |   13 -------------
 .../recipes-gnome/gcalctool/gcalctool_5.8.17.bb    |    2 +-
 2 files changed, 1 insertions(+), 14 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gcalctool/gcalctool_5.7.32.bb

diff --git a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.7.32.bb b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.7.32.bb
deleted file mode 100644
index f12e6c4..0000000
--- a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.7.32.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11"
-DEPENDS = "gtk+"
-DESCRIPTION = "gcalctool is a powerful calculator"
-PR = "r2"
-
-SRC_URI = "http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz \
-        file://makefile-fix.diff;patch=1\
-	file://fix-includedir.patch;patch=1"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-gnome"
diff --git a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
index c72860c..981a073 100644
--- a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
+++ b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "gcalctool is a powerful calculator"
 PR = "r0"
 
 SRC_URI = "http://download.gnome.org/sources/${PN}/5.8/${PN}-${PV}.tar.gz \
-	file://fix-includedir.patch;patch=1"
+	file://fix-includedir.patch"
 
 inherit autotools pkgconfig
 
-- 
1.7.8.6

[meta-oe][meta-efl][PATCH 2/3] systemd.bbclass: fix postinst/rdepends generation for recipes with SYSTEMD_SERVICE (without _PN suffix)

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/classes/systemd.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
index db35717..e895021 100644
--- a/meta-oe/classes/systemd.bbclass
+++ b/meta-oe/classes/systemd.bbclass
@@ -201,7 +201,8 @@ python populate_packages_prepend () {
 	# run all modifications once when creating package
 	if os.path.exists('${D}'):
 		for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
-			if d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) and d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1).strip():
+			systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) or d.getVar('SYSTEMD_SERVICE', 1)
+			if systemd_services and systemd_services.strip():
 				systemd_generate_package_scripts(pkg_systemd)
 				systemd_add_rdepends(pkg_systemd)
 		systemd_check_services()
-- 
1.7.8.6

[meta-oe][meta-efl][PATCH 3/3] recipes: bump PR to fix -systemd postinsts where SYSTEMD_SERVICE was used without PN* suffix

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/efl/elsa_svn.bb               |    2 ++
 meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb         |    2 +-
 meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend   |    2 +-
 .../cherokee/cherokee_1.2.98.bb                    |    2 +-
 .../recipes-connectivity/gateone/gateone_git.bb    |    2 +-
 .../networkmanager/networkmanager_0.9.2.0.bb       |    2 +-
 .../openssh/openssh_6.0p1.bbappend                 |    2 +-
 .../systemd/systemd-machine-units_1.0.bb           |    2 ++
 meta-oe/recipes-extended/rsyslog/rsyslog.inc       |    2 +-
 .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |    2 +-
 meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb        |    2 ++
 meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb        |    2 ++
 meta-oe/recipes-navigation/gpsd/gpsd_git.bb        |    2 ++
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc    |    2 +-
 14 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/elsa_svn.bb
index 1f1032f..b8a4f63 100644
--- a/meta-efl/recipes-efl/efl/elsa_svn.bb
+++ b/meta-efl/recipes-efl/efl/elsa_svn.bb
@@ -4,6 +4,8 @@ LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SECTION = "e/apps"
 
+PR = "r1"
+
 inherit e gettext
 SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \
   file://0001-pam-use-common-auth-instead-of-system-auth.patch \
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index d71c7d8..6ebd587 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb"
 
-PR = "r7"
+PR = "r8"
 
 inherit gnome update-rc.d systemd
 
diff --git a/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend b/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
index b144e9f..cc6cb7c 100644
--- a/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
+++ b/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
@@ -1,5 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PRINC := "${@int(PRINC) + 4}"
+PRINC := "${@int(PRINC) + 5}"
 
 SRC_URI += " file://keymaps.service"
 
diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb b/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
index 0080195..a4835e0 100644
--- a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
+++ b/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
@@ -5,7 +5,7 @@ SECTION = "network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-PR = "r3"
+PR = "r4"
 
 DEPENDS = "libpcre openssl mysql5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
diff --git a/meta-oe/recipes-connectivity/gateone/gateone_git.bb b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
index d56c848..c737eae 100644
--- a/meta-oe/recipes-connectivity/gateone/gateone_git.bb
+++ b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "HTML5 (plugin-free) web-based terminal emulator and SSH client"
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ee5b168fc7de89a0cadc49e27830aa2c"
 
-PR = "r5"
+PR = "r6"
 
 PV = "1.1"
 SRCREV = "bb74e1095adb66b04b51ed6ff10ae0aa96afdd46"
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
index 474d98a..221dc2c 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
@@ -4,7 +4,7 @@ SECTION = "net/misc"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b"
 
-PR = "r5"
+PR = "r6"
 
 DEPENDS = "systemd libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp"
 inherit gnome gettext systemd
diff --git a/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend b/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend
index a459065..de7668f 100644
--- a/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend
+++ b/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 SYSTEMD_PACKAGES = "openssh-sshd-systemd"
 SYSTEMD_SERVICE = "sshd.socket"
diff --git a/meta-oe/recipes-core/systemd/systemd-machine-units_1.0.bb b/meta-oe/recipes-core/systemd/systemd-machine-units_1.0.bb
index f223364..f33b2a9 100644
--- a/meta-oe/recipes-core/systemd/systemd-machine-units_1.0.bb
+++ b/meta-oe/recipes-core/systemd/systemd-machine-units_1.0.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+PR = "r1"
+
 inherit systemd
 SYSTEMD_SERVICE = ""
 SYSTEMD_PACKAGES = "${PN}"
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog.inc b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
index d4552cf..97fd026 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog.inc
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.rsyslog.com/"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973"
 
-INC_PR = "r3"
+INC_PR = "r4"
 
 SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \
            file://rsyslog.conf"
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
index 765dcf2..fc5da49 100644
--- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
+++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc"
 DEPENDS = "virtual/libx11 libxi"
 
-PR = "r6"
+PR = "r7"
 
 inherit autotools systemd
 
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
index 7f6d0ba..4f00cf4 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native"
 PROVIDES = "virtual/gpsd"
 
+PR = "r1"
+
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch \
   file://0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch \
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
index 92060b2..60b30df 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus dbus-glib ncurses python libusb1"
 PROVIDES = "virtual/gpsd"
 
+PR = "r1"
+
 DEFAULT_PREFERENCE = "-1"
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch \
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
index 2d01a77..0cf0685 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus dbus-glib ncurses python libusb1"
 PROVIDES = "virtual/gpsd"
 
+PR = "r1"
+
 SRCREV = "f8744f4af8cef211de698df5d8e6caddfe33f29d"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index 3489ac5..50ce4a4 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7ec1bcc46f28b11f4722e20d9b7dd4d5"
 # update-rc.d and update-alternatives is important
 RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
 
-INC_PR = "r7"
+INC_PR = "r8"
 
 inherit autotools systemd
 
-- 
1.7.8.6

Re: [meta-oe][meta-efl][PATCH 2/3] systemd.bbclass: fix postinst/rdepends generation for recipes with SYSTEMD_SERVICE (without _PN suffix)

[Andreas Müller]

On Wed, May 30, 2012 at 4:21 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/classes/systemd.bbclass |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
> index db35717..e895021 100644
> --- a/meta-oe/classes/systemd.bbclass
> +++ b/meta-oe/classes/systemd.bbclass
> @@ -201,7 +201,8 @@ python populate_packages_prepend () {
>        # run all modifications once when creating package
>        if os.path.exists('${D}'):
>                for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
> -                       if d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) and d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1).strip():
> +                       systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) or d.getVar('SYSTEMD_SERVICE', 1)
> +                       if systemd_services and systemd_services.strip():
>                                systemd_generate_package_scripts(pkg_systemd)
>                                systemd_add_rdepends(pkg_systemd)
>                systemd_check_services()
> --
> 1.7.8.6
>
Two questions:

1. Did you see [1]?
2. What is that strip for?

Andreas

Re: [meta-oe][meta-efl][PATCH 2/3] systemd.bbclass: fix postinst/rdepends generation for recipes with SYSTEMD_SERVICE (without _PN suffix)

[Martin Jansa]

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

On Wed, May 30, 2012 at 05:14:58PM +0200, Andreas Müller wrote:
> On Wed, May 30, 2012 at 4:21 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta-oe/classes/systemd.bbclass |    3 ++-
> >  1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
> > index db35717..e895021 100644
> > --- a/meta-oe/classes/systemd.bbclass
> > +++ b/meta-oe/classes/systemd.bbclass
> > @@ -201,7 +201,8 @@ python populate_packages_prepend () {
> >        # run all modifications once when creating package
> >        if os.path.exists('${D}'):
> >                for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
> > -                       if d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) and d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1).strip():
> > +                       systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) or d.getVar('SYSTEMD_SERVICE', 1)
> > +                       if systemd_services and systemd_services.strip():
> >                                systemd_generate_package_scripts(pkg_systemd)
> >                                systemd_add_rdepends(pkg_systemd)
> >                systemd_check_services()
> > --
> > 1.7.8.6
> >
> Two questions:
> 
> 1. Did you see [1]?

no, did you forgot to attach it? :)

> 2. What is that strip for?

In one .bbappend I had something like

SERVICES = "foo"
SERVICES_bar = ""
SYSTEMD_SERVICE += "${SERVICES}"

And space was ending in SYSTEMD_SERVICE causing this to be executed
without any real service in it (and failing).

I can fix it by using _append but this .strip() looked like better
solution for other who don't notice extra whitespace.

Cheers,

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

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

Re: [meta-oe][meta-efl][PATCH 2/3] systemd.bbclass: fix postinst/rdepends generation for recipes with SYSTEMD_SERVICE (without _PN suffix)

[Andreas Müller]

On Wed, May 30, 2012 at 5:22 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, May 30, 2012 at 05:14:58PM +0200, Andreas Müller wrote:
>> On Wed, May 30, 2012 at 4:21 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> > ---
>> >  meta-oe/classes/systemd.bbclass |    3 ++-
>> >  1 files changed, 2 insertions(+), 1 deletions(-)
>> >
>> > diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
>> > index db35717..e895021 100644
>> > --- a/meta-oe/classes/systemd.bbclass
>> > +++ b/meta-oe/classes/systemd.bbclass
>> > @@ -201,7 +201,8 @@ python populate_packages_prepend () {
>> >        # run all modifications once when creating package
>> >        if os.path.exists('${D}'):
>> >                for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
>> > -                       if d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) and d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1).strip():
>> > +                       systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) or d.getVar('SYSTEMD_SERVICE', 1)
>> > +                       if systemd_services and systemd_services.strip():
>> >                                systemd_generate_package_scripts(pkg_systemd)
>> >                                systemd_add_rdepends(pkg_systemd)
>> >                systemd_check_services()
>> > --
>> > 1.7.8.6
>> >
>> Two questions:
>>
>> 1. Did you see [1]?
>
> no, did you forgot to attach it? :)
>
>> 2. What is that strip for?
>
> In one .bbappend I had something like
>
> SERVICES = "foo"
> SERVICES_bar = ""
> SYSTEMD_SERVICE += "${SERVICES}"
>
> And space was ending in SYSTEMD_SERVICE causing this to be executed
> without any real service in it (and failing).
>
> I can fix it by using _append but this .strip() looked like better
> solution for other who don't notice extra whitespace.
>
> Cheers,
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
Yes :)
http://patches.openembedded.org/patch/28841/

Re: [meta-oe][meta-efl][PATCH 2/3] systemd.bbclass: fix postinst/rdepends generation for recipes with SYSTEMD_SERVICE (without _PN suffix)

[Martin Jansa]

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

On Wed, May 30, 2012 at 05:26:46PM +0200, Andreas Müller wrote:
> On Wed, May 30, 2012 at 5:22 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Wed, May 30, 2012 at 05:14:58PM +0200, Andreas Müller wrote:
> >> On Wed, May 30, 2012 at 4:21 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> >> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> >> > ---
> >> >  meta-oe/classes/systemd.bbclass |    3 ++-
> >> >  1 files changed, 2 insertions(+), 1 deletions(-)
> >> >
> >> > diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
> >> > index db35717..e895021 100644
> >> > --- a/meta-oe/classes/systemd.bbclass
> >> > +++ b/meta-oe/classes/systemd.bbclass
> >> > @@ -201,7 +201,8 @@ python populate_packages_prepend () {
> >> >        # run all modifications once when creating package
> >> >        if os.path.exists('${D}'):
> >> >                for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
> >> > -                       if d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) and d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1).strip():
> >> > +                       systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) or d.getVar('SYSTEMD_SERVICE', 1)
> >> > +                       if systemd_services and systemd_services.strip():
> >> >                                systemd_generate_package_scripts(pkg_systemd)
> >> >                                systemd_add_rdepends(pkg_systemd)
> >> >                systemd_check_services()
> >> > --
> >> > 1.7.8.6
> >> >
> >> Two questions:
> >>
> >> 1. Did you see [1]?
> >
> > no, did you forgot to attach it? :)
> >
> >> 2. What is that strip for?
> >
> > In one .bbappend I had something like
> >
> > SERVICES = "foo"
> > SERVICES_bar = ""
> > SYSTEMD_SERVICE += "${SERVICES}"
> >
> > And space was ending in SYSTEMD_SERVICE causing this to be executed
> > without any real service in it (and failing).
> >
> > I can fix it by using _append but this .strip() looked like better
> > solution for other who don't notice extra whitespace.
> >
> > Cheers,
> >
> > --
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> Yes :)
> http://patches.openembedded.org/patch/28841/

Ah, sorry, I haven't noticed this, looks good too (I can fix that case
with extra whitespace in my .bbappend if needed).

both can fix this:
http://trac.shr-project.org/trac/ticket/2003

:)

Cheers,

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

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

Re: [meta-oe][meta-efl][PATCH 2/3] systemd.bbclass: fix postinst/rdepends generation for recipes with SYSTEMD_SERVICE (without _PN suffix)

[Andreas Müller]

On Wed, May 30, 2012 at 5:32 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, May 30, 2012 at 05:26:46PM +0200, Andreas Müller wrote:
>> On Wed, May 30, 2012 at 5:22 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > On Wed, May 30, 2012 at 05:14:58PM +0200, Andreas Müller wrote:
>> >> On Wed, May 30, 2012 at 4:21 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> >> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> >> > ---
>> >> >  meta-oe/classes/systemd.bbclass |    3 ++-
>> >> >  1 files changed, 2 insertions(+), 1 deletions(-)
>> >> >
>> >> > diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
>> >> > index db35717..e895021 100644
>> >> > --- a/meta-oe/classes/systemd.bbclass
>> >> > +++ b/meta-oe/classes/systemd.bbclass
>> >> > @@ -201,7 +201,8 @@ python populate_packages_prepend () {
>> >> >        # run all modifications once when creating package
>> >> >        if os.path.exists('${D}'):
>> >> >                for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
>> >> > -                       if d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) and d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1).strip():
>> >> > +                       systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) or d.getVar('SYSTEMD_SERVICE', 1)
>> >> > +                       if systemd_services and systemd_services.strip():
>> >> >                                systemd_generate_package_scripts(pkg_systemd)
>> >> >                                systemd_add_rdepends(pkg_systemd)
>> >> >                systemd_check_services()
>> >> > --
>> >> > 1.7.8.6
>> >> >
>> >> Two questions:
>> >>
>> >> 1. Did you see [1]?
>> >
>> > no, did you forgot to attach it? :)
>> >
>> >> 2. What is that strip for?
>> >
>> > In one .bbappend I had something like
>> >
>> > SERVICES = "foo"
>> > SERVICES_bar = ""
>> > SYSTEMD_SERVICE += "${SERVICES}"
>> >
>> > And space was ending in SYSTEMD_SERVICE causing this to be executed
>> > without any real service in it (and failing).
>> >
>> > I can fix it by using _append but this .strip() looked like better
>> > solution for other who don't notice extra whitespace.
>> >
>> > Cheers,
>> >
>> > --
>> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>> Yes :)
>> http://patches.openembedded.org/patch/28841/
>
> Ah, sorry, I haven't noticed this, looks good too (I can fix that case
> with extra whitespace in my .bbappend if needed).
>
> both can fix this:
> http://trac.shr-project.org/trac/ticket/2003
>
> :)
>
> Cheers,
>
I think yours is better for your use case - sorry I still do not yet
understand it - but don't worry for that. But my concern is that there
are other places in systemd.bbclass failing for space issue. Did you
check that?

Andreas

Re: [meta-oe][meta-efl][PATCH 2/3] systemd.bbclass: fix postinst/rdepends generation for recipes with SYSTEMD_SERVICE (without _PN suffix)

[Martin Jansa]

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

On Wed, May 30, 2012 at 05:38:14PM +0200, Andreas Müller wrote:
> On Wed, May 30, 2012 at 5:32 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Wed, May 30, 2012 at 05:26:46PM +0200, Andreas Müller wrote:
> >> On Wed, May 30, 2012 at 5:22 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> >> > On Wed, May 30, 2012 at 05:14:58PM +0200, Andreas Müller wrote:
> >> >> On Wed, May 30, 2012 at 4:21 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> >> >> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> >> >> > ---
> >> >> >  meta-oe/classes/systemd.bbclass |    3 ++-
> >> >> >  1 files changed, 2 insertions(+), 1 deletions(-)
> >> >> >
> >> >> > diff --git a/meta-oe/classes/systemd.bbclass b/meta-oe/classes/systemd.bbclass
> >> >> > index db35717..e895021 100644
> >> >> > --- a/meta-oe/classes/systemd.bbclass
> >> >> > +++ b/meta-oe/classes/systemd.bbclass
> >> >> > @@ -201,7 +201,8 @@ python populate_packages_prepend () {
> >> >> >        # run all modifications once when creating package
> >> >> >        if os.path.exists('${D}'):
> >> >> >                for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
> >> >> > -                       if d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) and d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1).strip():
> >> >> > +                       systemd_services = d.getVar('SYSTEMD_SERVICE' + "_" + pkg_systemd, 1) or d.getVar('SYSTEMD_SERVICE', 1)
> >> >> > +                       if systemd_services and systemd_services.strip():
> >> >> >                                systemd_generate_package_scripts(pkg_systemd)
> >> >> >                                systemd_add_rdepends(pkg_systemd)
> >> >> >                systemd_check_services()
> >> >> > --
> >> >> > 1.7.8.6
> >> >> >
> >> >> Two questions:
> >> >>
> >> >> 1. Did you see [1]?
> >> >
> >> > no, did you forgot to attach it? :)
> >> >
> >> >> 2. What is that strip for?
> >> >
> >> > In one .bbappend I had something like
> >> >
> >> > SERVICES = "foo"
> >> > SERVICES_bar = ""
> >> > SYSTEMD_SERVICE += "${SERVICES}"
> >> >
> >> > And space was ending in SYSTEMD_SERVICE causing this to be executed
> >> > without any real service in it (and failing).
> >> >
> >> > I can fix it by using _append but this .strip() looked like better
> >> > solution for other who don't notice extra whitespace.
> >> >
> >> > Cheers,
> >> >
> >> > --
> >> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> >> Yes :)
> >> http://patches.openembedded.org/patch/28841/
> >
> > Ah, sorry, I haven't noticed this, looks good too (I can fix that case
> > with extra whitespace in my .bbappend if needed).
> >
> > both can fix this:
> > http://trac.shr-project.org/trac/ticket/2003
> >
> > :)
> >
> > Cheers,
> >
> I think yours is better for your use case - sorry I still do not yet
> understand it - but don't worry for that. But my concern is that there
> are other places in systemd.bbclass failing for space issue. Did you
> check that?

Not specially for that, I know that I had this issue when introducing
systemd-machine-units and 2 machines were sharing same layer (same
.bbappend with different services)

I thought it was between om-gta02 and om-gta04, but current .bbappend in
meta-smartphone/meta-openmoko has only services for gta02 so maybe I had
this use-case only in progress and then pushed version without this..

Cheers,

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

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