diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-12 13:32:33 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-12 18:50:15 +0200 |
commit | 1482cfe735de97eec6bc87cb653c92aef002bc10 (patch) | |
tree | 20fdc86810b01f2f461aa124b41baf172b54ece4 /meta-systemd/meta-networking | |
parent | f195081bd0d52f72e0a8b54dc48d47624a1ebbbe (diff) | |
download | meta-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-networking')
4 files changed, 4 insertions, 4 deletions
diff --git a/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend b/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend index 708b7b2c3..f22f4df9f 100644 --- a/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend +++ b/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend | |||
@@ -1,6 +1,6 @@ | |||
1 | inherit systemd | 1 | inherit systemd |
2 | 2 | ||
3 | PRINC := "${@int(PRINC) + 1}" | 3 | PRINC := "${@int(PRINC) + 2}" |
4 | 4 | ||
5 | RPROVIDES_${PN} += "${PN}-systemd" | 5 | RPROVIDES_${PN} += "${PN}-systemd" |
6 | SYSTEMD_SERVICE_${PN} = "autofs.service" | 6 | SYSTEMD_SERVICE_${PN} = "autofs.service" |
diff --git a/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend b/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend index 410ad3a99..2fc03341b 100644 --- a/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend +++ b/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend | |||
@@ -1,6 +1,6 @@ | |||
1 | inherit systemd | 1 | inherit systemd |
2 | 2 | ||
3 | PRINC := "${@int(PRINC) + 1}" | 3 | PRINC := "${@int(PRINC) + 2}" |
4 | 4 | ||
5 | # look for files in the layer first | 5 | # look for files in the layer first |
6 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 6 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
diff --git a/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend b/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend index 23a9c99d2..9218b7ef1 100644 --- a/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend +++ b/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend | |||
@@ -1,6 +1,6 @@ | |||
1 | inherit systemd | 1 | inherit systemd |
2 | 2 | ||
3 | PRINC := "${@int(PRINC) + 1}" | 3 | PRINC := "${@int(PRINC) + 2}" |
4 | 4 | ||
5 | # look for files in the layer first | 5 | # look for files in the layer first |
6 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 6 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
diff --git a/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend b/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend index 82e8621b1..ccb3d457d 100644 --- a/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend +++ b/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend | |||
@@ -1,6 +1,6 @@ | |||
1 | inherit systemd | 1 | inherit systemd |
2 | 2 | ||
3 | PRINC := "${@int(PRINC) + 1}" | 3 | PRINC := "${@int(PRINC) + 2}" |
4 | 4 | ||
5 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 5 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
6 | 6 | ||