systemd related fixes and qconnman bump

The following changes since commit 7ad9db8b3b6dd8fb9f85032b02344036015a9698:

gnome-panel : Fix format of LICENSE field. (2011-12-12 18:45:06 +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 (4):
systemd-systemctl-native: add support to recursive services
dropbear: convert PR to use PRINC on bbappend
dropbear: bump epoch to ensure an upgrade path and cleanup packaging
qconnman: bump SRCREV

 .../dropbear/dropbear_2011.54.bbappend             |   13 ++++---------
 .../systemd/systemd-systemctl-native.bb            |    2 ++
 .../systemd/systemd-systemctl-native/systemctl     |    8 ++++++++
 meta-oe/recipes-qt/qconnman/qconnman.inc           |    2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

1.7.2.5

Some services can reference others for installation thought the Also key; systemctl now handles it calling itself recursively for each service.

---
 .../systemd/systemd-systemctl-native.bb            |    2 ++
 .../systemd/systemd-systemctl-native/systemctl     |    8 ++++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

index 3ee757e..dcd67ee 100644
@@ -3,6 +3,8 @@ DESCRIPTION = "Wrapper to enable of systemd services"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
+PR = "r1"
+
 inherit native
 
 SRC_URI = "file://systemctl"

index 1fc77fd..54c1a18 100755
@@ -49,3 +49,11 @@ for r in $wanted_by; do
 	ln -s $service_file $ROOT/etc/systemd/system/$r.wants
 	echo "Enabled $service for $wanted_by."
 done
+
+# call us for the other required scripts
+also=$(grep Also $ROOT/$service_file \
+           | sed 's,Also=,,g' \
+           | tr ',' '\n')
+for a in $also; do
+	$0 --root=$ROOT enable $a
+done

1.7.2.5

---
 .../dropbear/dropbear_2011.54.bbappend             |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index a642235..874a7d4 100644
@@ -1,6 +1,6 @@
 inherit systemd
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 1}"
 
 # look for files in the layer first
 FILESEXTRAPATHS := "${THISDIR}/${PN}"

1.7.2.5

An old package called dropbear-systemd, at version v1, might be available on the feed and thus our binary package won't be used. To fix this the epoch has been bumped to 1.

The symbolic link required to disable the sysvinit init script is now done during the do_install task so making the recipe simple.

---
 .../dropbear/dropbear_2011.54.bbappend             |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

index 874a7d4..3f2fa29 100644
@@ -1,5 +1,7 @@
 inherit systemd
 
+PE = "1"
+
 PRINC := "${@int(PRINC) + 1}"
 
 # look for files in the layer first

@@ -17,17 +19,10 @@ do_install_append() {
 	install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${base_libdir}/systemd/system/
 	install -m 0644 ${WORKDIR}/[email protected] ${D}${base_libdir}/systemd/system/
 	install -m 0644 ${WORKDIR}/dropbear.socket ${D}${base_libdir}/systemd/system/
+	ln -sf /dev/null ${D}${base_libdir}/systemd/system/dropbear.service
 }
 
 PACKAGES += "${PN}-systemd"
 
 RDEPENDS_${PN}-systemd += "dropbear"
 FILES_${PN}-systemd = "${base_libdir}/systemd"
-
-pkg_postinst_${PN}-systemd_append() {
-ln -sf /dev/null $D${base_libdir}/systemd/system/dropbear.service
-}
-
-pkg_postrm_${PN}-systemd_append() {
-rm -f ${base_libdir}/systemd/system/dropbear.service
-}

1.7.2.5

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 13-12-11 10:43, Otavio Salvador schreef:

I'd really like to avoid PE in bbappends for obvious reasons. Can we get this into OE-core instead?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk7nnT8ACgkQMkyGM64RGpFQvwCgnk3I8913J+gJDNvLyseDcPvo a94Anji8g64EOfO/dGvomaPUybz0O412
=iKue
-----END PGP SIGNATURE-----

I can send a patch to them for this but in meanwhile this ought to be merged as currently dropbear is at broken state.

Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 13-12-11 19:51, Otavio Salvador schreef:

No, a PE should only get added once and with care. -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk7pr6IACgkQMkyGM64RGpHgjwCfZeKt8oSrufiyWEMlWOTnp6D3 lIAAn0MKN4wpytvMSiyfbg0dkYnN2O5V
=86zF
-----END PGP SIGNATURE-----

* add translation support
* doesn't allow simultaneous connections

---
 meta-oe/recipes-qt/qconnman/qconnman.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 280a002..06ad5fd 100644
@@ -9,7 +9,7 @@ PR = "r1"
 inherit autotools
 
 PV = "0.0+gitr${SRCPV}"
-SRCREV = "9bab120f426e41552c369b7030414c792dd25a91"
+SRCREV = "f976b18c7c5584627224784801803e9fd3ebe0ff"
 SRC_URI = "git://github.com/OSSystems/qconnman.git"
 
 S = "${WORKDIR}/git/"

1.7.2.5