mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

meta-systemd: bump PRINC in all .bbappends

Browse Source 
* 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:
Martin Jansa
2013-04-12 13:32:33 +02:00
parent f195081bd0
commit 1482cfe735
44 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 2}"
PRINC := "${@int(PRINC) + 3}"
inherit systemd
meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
+1 -1
View File
@@ -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
meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend
+1 -1
View File
@@ -1,4 +1,4 @@
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
inherit systemd
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
RPROVIDES_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "autofs.service"
meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
inherit systemd
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
# look for files in the layer first
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
inherit systemd
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
# look for files in the layer first
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
inherit systemd
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
+1 -1
View File
@@ -1,5 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 6}"
PRINC := "${@int(PRINC) + 7}"
SRC_URI += " file://keymaps.service"
meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend
+1 -1
View File
@@ -1,4 +1,4 @@
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend
+1 -1
View File
@@ -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}:"
meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend
+1 -1
View File
@@ -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}:"
meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend
+1 -1
View File
@@ -1,4 +1,4 @@
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
RDEPENDS_${PN} += "\
systemd-compat-units \
meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 2}"
PRINC := "${@int(PRINC) + 3}"
inherit systemd
meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend
+1 -1
View File
@@ -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}:"
meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
+1 -1
View File
@@ -1,3 +1,3 @@
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
POLKITAUTH = "systemd"
meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend
+1 -1
View File
@@ -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}:"
meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
inherit systemd
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
DEPENDS += "systemd"
meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
+1 -1
View File
@@ -1,5 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 2}"
PRINC := "${@int(PRINC) + 3}"
inherit systemd
meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 2}"
PRINC := "${@int(PRINC) + 3}"
inherit systemd
meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend
+1 -1
View File
@@ -1,4 +1,4 @@
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
inherit systemd
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
EXTRA_OECONF += " \
--enable-systemd \
meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
inherit systemd
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
RPROVIDES_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "pcscd.socket"
meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
inherit systemd
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend
+1 -1
View File
@@ -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}:"
meta-systemd/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bbappend
+1 -1
View File
@@ -3,6 +3,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
DEPENDS += "systemd"
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
SRC_URI += "file://0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch"
meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend
+1 -1
View File
@@ -1,4 +1,4 @@
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend
+1 -1
View File
@@ -1,4 +1,4 @@
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/oe-core/recipes-connectivity/connman/connman_1.12.bbappend
+1 -1
View File
@@ -1,4 +1,4 @@
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
RPROVIDES_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "connman.service"
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5.bbappend
+1 -1
View File
@@ -3,7 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
inherit systemd
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client"
SYSTEMD_SERVICE_dhcp-server = "dhcpd.service"
meta-systemd/oe-core/recipes-connectivity/ofono/ofono_1.12.bbappend
+1 -1
View File
@@ -1,4 +1,4 @@
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.1p1.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
SYSTEMD_PACKAGES = "openssh-sshd"
SYSTEMD_SERVICE_openssh-sshd = "sshd.socket"
meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
FILESEXTRAPATHS := "${THISDIR}/${PN}"
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend
+1 -1
View File
@@ -1,3 +1,3 @@
PRINC := "${@int(PRINC) + 3}"
PRINC := "${@int(PRINC) + 4}"
RPROVIDES_${PN} += "${PN}-systemd"
meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.22.2.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
inherit systemd
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
meta-systemd/oe-core/recipes-extended/cronie/cronie_1.4.9.bbappend
+1 -1
View File
@@ -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
meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
+1 -1
View File
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
inherit systemd
meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend
+1 -1
View File
@@ -1,4 +1,4 @@
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
# Register with logind to make screen/tmux/etc work
do_install_append() {