From 21b85f3426b5f3e0c937bfaa53e331fac0894110 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 1 Jun 2012 09:20:26 +0000 Subject: recipes: bump PR to fix -systemd postinsts where SYSTEMD_SERVICE was used without PN* suffix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Jansa Signed-off-by: Andreas Müller Signed-off-by: Koen Kooi --- meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend | 2 +- meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb | 2 +- meta-oe/recipes-connectivity/gateone/gateone_git.bb | 2 +- meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb | 2 +- meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend | 2 +- meta-oe/recipes-core/systemd/systemd-machine-units_1.0.bb | 2 ++ meta-oe/recipes-extended/rsyslog/rsyslog.inc | 2 +- meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb | 2 +- meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb | 2 ++ meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb | 2 ++ meta-oe/recipes-navigation/gpsd/gpsd_git.bb | 2 ++ meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 2 +- 12 files changed, 16 insertions(+), 8 deletions(-) (limited to 'meta-oe') diff --git a/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend b/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend index b144e9f164..cc6cb7c184 100644 --- a/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend +++ b/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend @@ -1,5 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 4}" +PRINC := "${@int(PRINC) + 5}" SRC_URI += " file://keymaps.service" diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb b/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb index 0080195dee..a4835e071e 100644 --- a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb +++ b/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb @@ -5,7 +5,7 @@ SECTION = "network" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r3" +PR = "r4" DEPENDS = "libpcre openssl mysql5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" diff --git a/meta-oe/recipes-connectivity/gateone/gateone_git.bb b/meta-oe/recipes-connectivity/gateone/gateone_git.bb index d56c848472..c737eae1a1 100644 --- a/meta-oe/recipes-connectivity/gateone/gateone_git.bb +++ b/meta-oe/recipes-connectivity/gateone/gateone_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "HTML5 (plugin-free) web-based terminal emulator and SSH client" LICENSE = "AGPLv3" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ee5b168fc7de89a0cadc49e27830aa2c" -PR = "r5" +PR = "r6" PV = "1.1" SRCREV = "bb74e1095adb66b04b51ed6ff10ae0aa96afdd46" diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb index 474d98a3c6..221dc2c7aa 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb @@ -4,7 +4,7 @@ SECTION = "net/misc" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b" -PR = "r5" +PR = "r6" DEPENDS = "systemd libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp" inherit gnome gettext systemd diff --git a/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend b/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend index a4590657d8..de7668fb54 100644 --- a/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend +++ b/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 1}" +PRINC := "${@int(PRINC) + 2}" SYSTEMD_PACKAGES = "openssh-sshd-systemd" SYSTEMD_SERVICE = "sshd.socket" diff --git a/meta-oe/recipes-core/systemd/systemd-machine-units_1.0.bb b/meta-oe/recipes-core/systemd/systemd-machine-units_1.0.bb index f223364d43..f33b2a9833 100644 --- a/meta-oe/recipes-core/systemd/systemd-machine-units_1.0.bb +++ b/meta-oe/recipes-core/systemd/systemd-machine-units_1.0.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 PACKAGE_ARCH = "${MACHINE_ARCH}" +PR = "r1" + inherit systemd SYSTEMD_SERVICE = "" SYSTEMD_PACKAGES = "${PN}" diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog.inc b/meta-oe/recipes-extended/rsyslog/rsyslog.inc index d4552cfe81..97fd026d62 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog.inc +++ b/meta-oe/recipes-extended/rsyslog/rsyslog.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.rsyslog.com/" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973" -INC_PR = "r3" +INC_PR = "r4" SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \ file://rsyslog.conf" diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb index 765dcf2dbb..fc5da49427 100644 --- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb +++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb @@ -4,7 +4,7 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc" DEPENDS = "virtual/libx11 libxi" -PR = "r6" +PR = "r7" inherit autotools systemd diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb index 7f6d0ba319..4f00cf4602 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native" PROVIDES = "virtual/gpsd" +PR = "r1" + SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ file://0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch \ file://0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch \ diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb index 92060b2b2c..60b30df15e 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" DEPENDS = "dbus dbus-glib ncurses python libusb1" PROVIDES = "virtual/gpsd" +PR = "r1" + DEFAULT_PREFERENCE = "-1" SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ file://0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch \ diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb index 2d01a77244..0cf0685465 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" DEPENDS = "dbus dbus-glib ncurses python libusb1" PROVIDES = "virtual/gpsd" +PR = "r1" + SRCREV = "f8744f4af8cef211de698df5d8e6caddfe33f29d" DEFAULT_PREFERENCE = "-1" diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 3489ac5efa..50ce4a4e2e 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7ec1bcc46f28b11f4722e20d9b7dd4d5" # update-rc.d and update-alternatives is important RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" -INC_PR = "r7" +INC_PR = "r8" inherit autotools systemd -- cgit 1.2.3-korg