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/oe-core/recipes-extended | |
| 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/oe-core/recipes-extended')
3 files changed, 3 insertions, 3 deletions
diff --git a/meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.9.bbappend b/meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.9.bbappend index 418836fc2d..dc06af9a51 100644 --- a/meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.9.bbappend +++ b/meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.9.bbappend | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # look for files in the layer first | 1 | # look for files in the layer first |
| 2 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 2 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 3 | 3 | ||
| 4 | PRINC := "${@int(PRINC) + 3}" | 4 | PRINC := "${@int(PRINC) + 4}" |
| 5 | 5 | ||
| 6 | inherit systemd | 6 | inherit systemd |
| 7 | 7 | ||
diff --git a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend index 0c7548a862..b6ec2aa01a 100644 --- a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend +++ b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.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/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend b/meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend index 7c4bcd88f7..640fa371a7 100644 --- a/meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend +++ b/meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | PRINC := "${@int(PRINC) + 1}" | 1 | PRINC := "${@int(PRINC) + 2}" |
| 2 | 2 | ||
| 3 | # Register with logind to make screen/tmux/etc work | 3 | # Register with logind to make screen/tmux/etc work |
| 4 | do_install_append() { | 4 | do_install_append() { |