[oe-commits] Martin Jansa : systemd: add .bbappend to fix upgrade-path

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: b4cb81b1c9be83fb50342d5ba6ba29aa2ce721a6
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=b4cb81b1c9be83fb50342d5ba6ba29aa2ce721a6

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Apr 14 17:29:57 2013 +0200

systemd: add .bbappend to fix upgrade-path

 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/sysinit.target.wants/systemd-udevd.service
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/sysinit.target.wants/systemd-udev-trigger.service
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/systemd-udevd.service
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/systemd-udev-settle.service
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/systemd-udev-trigger.service
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/sockets.target.wants/systemd-udevd-control.socket
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/sockets.target.wants/systemd-udevd-kernel.socket
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/systemd-udevd-control.socket
        But that file is already provided by package  * udev-systemd
 * check_data_file_clashes: Package udev wants to install file /lib/systemd/system/systemd-udevd-kernel.socket
        But that file is already provided by package  * udev-systemd

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../recipes-core/systemd/systemd_199.bbappend      |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/meta-systemd/oe-core/recipes-core/systemd/systemd_199.bbappend b/meta-systemd/oe-core/recipes-core/systemd/systemd_199.bbappend
new file mode 100644
index 0000000..c530e02
--- /dev/null
+++ b/meta-systemd/oe-core/recipes-core/systemd/systemd_199.bbappend
@@ -0,0 +1,5 @@
+PRINC := "${@int(PRINC) + 1}"
+
+RPROVIDES_udev += "udev-systemd"
+RREPLACES_udev += "udev-systemd"
+RCONFLICTS_udev += "udev-systemd"