summaryrefslogtreecommitdiffstats
path: root/meta-systemd/meta-oe/recipes-support
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-12 13:32:33 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-12 18:50:15 +0200
commit1482cfe735de97eec6bc87cb653c92aef002bc10 (patch)
tree20fdc86810b01f2f461aa124b41baf172b54ece4 /meta-systemd/meta-oe/recipes-support
parentf195081bd0d52f72e0a8b54dc48d47624a1ebbbe (diff)
downloadmeta-openembedded-1482cfe735de97eec6bc87cb653c92aef002bc10.tar.gz
meta-systemd: bump PRINC in all .bbappends
* opkg upgrade will fail to upgrade every package PN when PN-system is installed * check_data_file_clashes: Package xserver-nodm-init wants to install file /lib/systemd/system/xserver-nodm.service But that file is already provided by package * xserver-nodm-init-systemd You need to manually remove all PN-systemd packages on your target opkg remove -force-depends -force-remove `opkg list-installed | grep "\-systemd"` be careful with stuff like openssh-sshd-systemd or wpa-supplicant-systemd when you have access to target only over network * this PRINC bump will force you to do it now even for people not using OEBasicHash or PR service Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-systemd/meta-oe/recipes-support')
-rw-r--r--meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend2
-rw-r--r--meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend2
-rw-r--r--meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend2
-rw-r--r--meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend2
4 files changed, 4 insertions, 4 deletions
diff --git a/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend b/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend
index 230a5832f1..7763727d6b 100644
--- a/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend
+++ b/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend
@@ -1,6 +1,6 @@
1inherit systemd 1inherit systemd
2 2
3PRINC := "${@int(PRINC) + 1}" 3PRINC := "${@int(PRINC) + 2}"
4 4
5EXTRA_OECONF += " \ 5EXTRA_OECONF += " \
6 --enable-systemd \ 6 --enable-systemd \
diff --git a/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend b/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend
index 91e5e3f659..7f1c6825ff 100644
--- a/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend
+++ b/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend
@@ -1,6 +1,6 @@
1inherit systemd 1inherit systemd
2 2
3PRINC := "${@int(PRINC) + 1}" 3PRINC := "${@int(PRINC) + 2}"
4 4
5RPROVIDES_${PN} += "${PN}-systemd" 5RPROVIDES_${PN} += "${PN}-systemd"
6SYSTEMD_SERVICE_${PN} = "pcscd.socket" 6SYSTEMD_SERVICE_${PN} = "pcscd.socket"
diff --git a/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend b/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend
index 45b7e26bf0..31db08a780 100644
--- a/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend
+++ b/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend
@@ -1,6 +1,6 @@
1inherit systemd 1inherit systemd
2 2
3PRINC := "${@int(PRINC) + 1}" 3PRINC := "${@int(PRINC) + 2}"
4 4
5SYSTEMD_UNITDIR = "${systemd_unitdir}/system" 5SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
6 6
diff --git a/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend b/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend
index 5dc6f426bf..a6b4da0eac 100644
--- a/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend
+++ b/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend
@@ -1,6 +1,6 @@
1inherit systemd 1inherit systemd
2 2
3PRINC := "${@int(PRINC) + 2}" 3PRINC := "${@int(PRINC) + 3}"
4 4
5# look for files in the layer first 5# look for files in the layer first
6FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 6FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"