mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
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>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
PRINC := "${@int(PRINC) + 6}"
|
||||
PRINC := "${@int(PRINC) + 7}"
|
||||
|
||||
SRC_URI += " file://keymaps.service"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
inherit systemd
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
inherit systemd
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
inherit systemd
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
inherit systemd
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
inherit systemd
|
||||
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
# look for files in the layer first
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
inherit systemd
|
||||
|
||||
PRINC := "${@int(PRINC) + 3}"
|
||||
PRINC := "${@int(PRINC) + 4}"
|
||||
|
||||
# look for files in the layer first
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
RDEPENDS_${PN} += "\
|
||||
systemd-compat-units \
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
PRINC := "${@int(PRINC) + 3}"
|
||||
|
||||
inherit systemd
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
inherit systemd
|
||||
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
# look for files in the layer first
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
inherit systemd
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
inherit systemd
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
POLKITAUTH = "systemd"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
inherit systemd
|
||||
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
# look for files in the layer first
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
inherit systemd
|
||||
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
DEPENDS += "systemd"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
inherit systemd
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
inherit systemd
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
PRINC := "${@int(PRINC) + 3}"
|
||||
|
||||
inherit systemd
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
PRINC := "${@int(PRINC) + 3}"
|
||||
|
||||
inherit systemd
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
inherit systemd
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
inherit systemd
|
||||
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
EXTRA_OECONF += " \
|
||||
--enable-systemd \
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
inherit systemd
|
||||
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
RPROVIDES_${PN} += "${PN}-systemd"
|
||||
SYSTEMD_SERVICE_${PN} = "pcscd.socket"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
inherit systemd
|
||||
|
||||
PRINC := "${@int(PRINC) + 1}"
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
|
||||
SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
inherit systemd
|
||||
|
||||
PRINC := "${@int(PRINC) + 2}"
|
||||
PRINC := "${@int(PRINC) + 3}"
|
||||
|
||||
# look for files in the layer first
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
|
||||
|
||||
Reference in New Issue
Block a user