summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-06-01 09:20:26 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-06-05 10:46:52 +0200
commit21b85f3426b5f3e0c937bfaa53e331fac0894110 (patch)
tree62c9f36eeef76839eec39708a7ceec4d11b19fca /meta-oe
parentb52a74b7a245a28dcdd91c3336e1cd86604befac (diff)
downloadmeta-openembedded-21b85f3426b5f3e0c937bfaa53e331fac0894110.tar.gz
recipes: bump PR to fix -systemd postinsts where SYSTEMD_SERVICE was used without PN* suffix
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend2
-rw-r--r--meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb2
-rw-r--r--meta-oe/recipes-connectivity/gateone/gateone_git.bb2
-rw-r--r--meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb2
-rw-r--r--meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend2
-rw-r--r--meta-oe/recipes-core/systemd/systemd-machine-units_1.0.bb2
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog.inc2
-rw-r--r--meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb2
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb2
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb2
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd_git.bb2
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng.inc2
12 files changed, 16 insertions, 8 deletions
diff --git a/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend b/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
index b144e9f16..cc6cb7c18 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 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2PRINC := "${@int(PRINC) + 4}" 2PRINC := "${@int(PRINC) + 5}"
3 3
4SRC_URI += " file://keymaps.service" 4SRC_URI += " file://keymaps.service"
5 5
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 0080195de..a4835e071 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"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7 7
8PR = "r3" 8PR = "r4"
9 9
10DEPENDS = "libpcre openssl mysql5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 10DEPENDS = "libpcre openssl mysql5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
11 11
diff --git a/meta-oe/recipes-connectivity/gateone/gateone_git.bb b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
index d56c84847..c737eae1a 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"
2LICENSE = "AGPLv3" 2LICENSE = "AGPLv3"
3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ee5b168fc7de89a0cadc49e27830aa2c" 3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ee5b168fc7de89a0cadc49e27830aa2c"
4 4
5PR = "r5" 5PR = "r6"
6 6
7PV = "1.1" 7PV = "1.1"
8SRCREV = "bb74e1095adb66b04b51ed6ff10ae0aa96afdd46" 8SRCREV = "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 474d98a3c..221dc2c7a 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"
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b" 5LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b"
6 6
7PR = "r5" 7PR = "r6"
8 8
9DEPENDS = "systemd libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp" 9DEPENDS = "systemd libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp"
10inherit gnome gettext systemd 10inherit 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 a4590657d..de7668fb5 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 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3PRINC := "${@int(PRINC) + 1}" 3PRINC := "${@int(PRINC) + 2}"
4 4
5SYSTEMD_PACKAGES = "openssh-sshd-systemd" 5SYSTEMD_PACKAGES = "openssh-sshd-systemd"
6SYSTEMD_SERVICE = "sshd.socket" 6SYSTEMD_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 f223364d4..f33b2a983 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
5 5
6PACKAGE_ARCH = "${MACHINE_ARCH}" 6PACKAGE_ARCH = "${MACHINE_ARCH}"
7 7
8PR = "r1"
9
8inherit systemd 10inherit systemd
9SYSTEMD_SERVICE = "" 11SYSTEMD_SERVICE = ""
10SYSTEMD_PACKAGES = "${PN}" 12SYSTEMD_PACKAGES = "${PN}"
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog.inc b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
index d4552cfe8..97fd026d6 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/"
4LICENSE = "GPLv3" 4LICENSE = "GPLv3"
5LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973" 5LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973"
6 6
7INC_PR = "r3" 7INC_PR = "r4"
8 8
9SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \ 9SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \
10 file://rsyslog.conf" 10 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 765dcf2db..fc5da4942 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"
4LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc" 4LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc"
5DEPENDS = "virtual/libx11 libxi" 5DEPENDS = "virtual/libx11 libxi"
6 6
7PR = "r6" 7PR = "r7"
8 8
9inherit autotools systemd 9inherit autotools systemd
10 10
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
index 7f6d0ba31..4f00cf460 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"
5DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native" 5DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native"
6PROVIDES = "virtual/gpsd" 6PROVIDES = "virtual/gpsd"
7 7
8PR = "r1"
9
8SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ 10SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
9 file://0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch \ 11 file://0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch \
10 file://0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch \ 12 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 92060b2b2..60b30df15 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"
5DEPENDS = "dbus dbus-glib ncurses python libusb1" 5DEPENDS = "dbus dbus-glib ncurses python libusb1"
6PROVIDES = "virtual/gpsd" 6PROVIDES = "virtual/gpsd"
7 7
8PR = "r1"
9
8DEFAULT_PREFERENCE = "-1" 10DEFAULT_PREFERENCE = "-1"
9SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ 11SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
10 file://0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch \ 12 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 2d01a7724..0cf068546 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"
5DEPENDS = "dbus dbus-glib ncurses python libusb1" 5DEPENDS = "dbus dbus-glib ncurses python libusb1"
6PROVIDES = "virtual/gpsd" 6PROVIDES = "virtual/gpsd"
7 7
8PR = "r1"
9
8SRCREV = "f8744f4af8cef211de698df5d8e6caddfe33f29d" 10SRCREV = "f8744f4af8cef211de698df5d8e6caddfe33f29d"
9 11
10DEFAULT_PREFERENCE = "-1" 12DEFAULT_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 3489ac5ef..50ce4a4e2 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"
7# update-rc.d and update-alternatives is important 7# update-rc.d and update-alternatives is important
8RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" 8RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
9 9
10INC_PR = "r7" 10INC_PR = "r8"
11 11
12inherit autotools systemd 12inherit autotools systemd
13 13