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-oe/recipes-connectivity | |
| 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-oe/recipes-connectivity')
4 files changed, 4 insertions, 4 deletions
diff --git a/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend b/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend index 38ef27242..22aa5631b 100644 --- a/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend +++ b/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PRINC := "${@int(PRINC) + 1}" | 3 | PRINC := "${@int(PRINC) + 2}" |
| 4 | 4 | ||
| 5 | inherit systemd | 5 | inherit systemd |
| 6 | 6 | ||
diff --git a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend b/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend index 1982243d7..bc584462e 100644 --- a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend +++ b/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PRINC := "${@int(PRINC) + 1}" | 3 | PRINC := "${@int(PRINC) + 2}" |
| 4 | 4 | ||
| 5 | inherit systemd | 5 | inherit systemd |
| 6 | 6 | ||
diff --git a/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend b/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend index 489528b6a..8ec9dfafd 100644 --- a/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend +++ b/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | PRINC := "${@int(PRINC) + 1}" | 3 | PRINC := "${@int(PRINC) + 2}" |
| 4 | 4 | ||
| 5 | inherit systemd | 5 | inherit systemd |
| 6 | 6 | ||
diff --git a/meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend b/meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend index 0510b232c..5508fb29c 100644 --- a/meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend +++ b/meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | PRINC := "${@int(PRINC) + 1}" | 1 | PRINC := "${@int(PRINC) + 2}" |
| 2 | 2 | ||
| 3 | inherit systemd | 3 | inherit systemd |
| 4 | 4 | ||