[meta-systemd][PATCH 1/3] util-linux: rename bbappend to match new version from oe-core

[meta-systemd][PATCH 1/3] util-linux: rename bbappend to match new version from oe-core

[Martin Jansa]

* removed PRINC to make it easier to remove .bbappend if this
  functionality is moved to oe-core

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../{util-linux_2.22.2.bbappend => util-linux_2.23.bbappend}          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-systemd/oe-core/recipes-core/util-linux/{util-linux_2.22.2.bbappend => util-linux_2.23.bbappend} (90%)

diff --git a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.23.bbappend
similarity index 90%
rename from meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend
rename to meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.23.bbappend
index fae15a0..c6a97ca 100644
--- a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend
+++ b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.23.bbappend
@@ -1,10 +1,10 @@
 inherit systemd
 
-PRINC := "${@int(PRINC) + 2}"
-
 SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
 EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
+
 RPROVIDES_${PN} += "${PN}-systemd"
 RREPLACES_${PN} += "${PN}-systemd"
 RCONFLICTS_${PN} += "${PN}-systemd"
+
 SYSTEMD_SERVICE_${PN} = "uuidd.socket"
-- 
1.8.2.1

[meta-systemd][PATCH 2/3] systemd: rename bbappend to match new version from oe-core

[Martin Jansa]

* removed PRINC to make it easier to remove .bbappend if this
  functionality is moved to oe-core

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-core/systemd/{systemd_199.bbappend => systemd_204.bbappend} | 2 --
 1 file changed, 2 deletions(-)
 rename meta-systemd/oe-core/recipes-core/systemd/{systemd_199.bbappend => systemd_204.bbappend} (76%)

diff --git a/meta-systemd/oe-core/recipes-core/systemd/systemd_199.bbappend b/meta-systemd/oe-core/recipes-core/systemd/systemd_204.bbappend
similarity index 76%
rename from meta-systemd/oe-core/recipes-core/systemd/systemd_199.bbappend
rename to meta-systemd/oe-core/recipes-core/systemd/systemd_204.bbappend
index c530e02..f5aa547 100644
--- a/meta-systemd/oe-core/recipes-core/systemd/systemd_199.bbappend
+++ b/meta-systemd/oe-core/recipes-core/systemd/systemd_204.bbappend
@@ -1,5 +1,3 @@
-PRINC := "${@int(PRINC) + 1}"
-
 RPROVIDES_udev += "udev-systemd"
 RREPLACES_udev += "udev-systemd"
 RCONFLICTS_udev += "udev-systemd"
-- 
1.8.2.1

[meta-systemd][PATCH 3/3] connman: rename bbappend to match new version from oe-core

[Martin Jansa]

* removed PRINC to make it easier to remove .bbappend if this
  functionality is moved to oe-core
* removed SYSTEMD_SERVICE already set in oe-core's .inc file

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../connman/{connman_1.13.bbappend => connman_1.14.bbappend}           | 3 ---
 1 file changed, 3 deletions(-)
 rename meta-systemd/oe-core/recipes-connectivity/connman/{connman_1.13.bbappend => connman_1.14.bbappend} (59%)

diff --git a/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.13.bbappend b/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.14.bbappend
similarity index 59%
rename from meta-systemd/oe-core/recipes-connectivity/connman/connman_1.13.bbappend
rename to meta-systemd/oe-core/recipes-connectivity/connman/connman_1.14.bbappend
index 61292ad..f006b3f 100644
--- a/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.13.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.14.bbappend
@@ -1,6 +1,3 @@
-PRINC := "${@int(PRINC) + 2}"
-
 RPROVIDES_${PN} += "${PN}-systemd"
 RREPLACES_${PN} += "${PN}-systemd"
 RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "connman.service"
-- 
1.8.2.1