From 1482cfe735de97eec6bc87cb653c92aef002bc10 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 12 Apr 2013 13:32:33 +0200 Subject: 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 --- meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.9.bbappend | 2 +- meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend | 2 +- meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-systemd/oe-core/recipes-extended') 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 @@ # look for files in the layer first FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 3}" +PRINC := "${@int(PRINC) + 4}" inherit systemd 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 1}" +PRINC := "${@int(PRINC) + 2}" inherit systemd 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 @@ -PRINC := "${@int(PRINC) + 1}" +PRINC := "${@int(PRINC) + 2}" # Register with logind to make screen/tmux/etc work do_install_append() { -- cgit v1.2.3-54-g00ecf