Skip to contentSkip to conversation

systemd related fixes

PATCH In review Otavio Salvador 2 participants 4 messages Nov 8, 2011

lore
Share & tools
lore

Otavio Salvador

author
#0 lore raw

cover systemd related fixes

The following changes since commit bae85652e5fc8e78afe54e593686d5f74c933cb9:

udev: update to 175 (2011-11-08 09:13:23 +0100)

are available in the git repository at:
git://github.com/OSSystems/meta-oe master
https://github.com/OSSystems/meta-oe/tree/master

Otavio Salvador (2):
systemd.bbclass: stop using SYSTEMDPN to rdepends addition
connman: bump PR due systemd.bbclass fixes

 meta-oe/classes/systemd.bbclass                    |   10 ++++++----
 .../recipes-connectivity/connman/connman_0.77.bb   |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.2.5
author
#1 lore raw

PATCH 1/2 systemd.bbclass: stop using SYSTEMDPN to rdepends addition

The systemd runtime dependency needs to be add dynamically onto each package that has the postinst generate thus removing the SYSTEMDPN use et all.

Signed-off-by Otavio Salvador <[email protected]>
---
 meta-oe/classes/systemd.bbclass |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
meta-oe/classes/systemd.bbclass +6 -4
index 83833db..2ca7bfc 100644
@@ -1,7 +1,4 @@
-SYSTEMDPN ?= "${PN}"
-
 DEPENDS_append = " systemd-systemctl-native"
-RDEPENDS_${SYSTEMDPN}_append = " systemd"
 
 systemd_postinst() {
 OPTS=""

@@ -67,9 +64,14 @@ python populate_packages_prepend () {
                 postrm += bb.data.getVar('systemd_postrm', localdata, 1)
 		bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
 
+		rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "")
+		rdepends.append("systemd")
+		bb.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d)
+
+
 	pkgs = bb.data.getVar('SYSTEMD_PACKAGES', d, 1)
 	if pkgs == None:
-		pkgs = bb.data.getVar('SYSTEMDPN', d, 1)
+		pkgs = bb.data.getVar('PN', d, 1)
 		packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
 		if not pkgs in packages and packages != []:
 			pkgs = packages[0]
Signature · 1 line
1.7.2.5
author
#2 lore raw

PATCH 2/2 connman: bump PR due systemd.bbclass fixes

In reply to Otavio Salvador
Signed-off-by Otavio Salvador <[email protected]>
---
 .../recipes-connectivity/connman/connman_0.77.bb   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta-oe/recipes-connectivity/connman/connman_0.77.bb +1 -1
index 9c93e51..9ef368b 100644
@@ -1,5 +1,5 @@
 require connman.inc
-PR = "r3"
+PR = "r4"
 
 EXTRA_OECONF += "\
   --disable-gtk-doc \
Signature · 1 line
1.7.2.5
#3 lore raw
In reply to Otavio Salvador
Quoted 11 lines · Otavio Salvador

The following changes since commit bae85652e5fc8e78afe54e593686d5f74c933cb9:

udev: update to 175 (2011-11-08 09:13:23 +0100)

are available in the git repository at:
git://github.com/OSSystems/meta-oe master
https://github.com/OSSystems/meta-oe/tree/master

Otavio Salvador (2):
systemd.bbclass: stop using SYSTEMDPN to rdepends addition
connman: bump PR due systemd.bbclass fixes

Cannot test, but looks like better fix then mine..

Quoted 13 lines
 meta-oe/classes/systemd.bbclass                    |   10 ++++++----
 .../recipes-connectivity/connman/connman_0.77.bb   |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
Signature · 7 lines
1.7.2.5


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]