summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2010-12-23 20:23:33 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-30 10:03:10 +0000
commit0e8f0f0a033c79611a15914fde5826876502af2e (patch)
tree6eaed12c3fbab03d9adf193e923b6e20e2937f0d /meta/recipes-extended
parent35e3443b57d009bffd8904c7c6c3a4769193c1b4 (diff)
downloadpoky-0e8f0f0a033c79611a15914fde5826876502af2e.tar.gz
RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
For these recipes the dependencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN} Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/libzypp/libzypp_git.bb4
-rw-r--r--meta/recipes-extended/man-pages/man-pages_3.25.bb4
-rw-r--r--meta/recipes-extended/mc/mc_4.7.3.bb4
-rw-r--r--meta/recipes-extended/polkit/polkit_0.99.bb4
-rw-r--r--meta/recipes-extended/shadow/shadow.inc2
-rw-r--r--meta/recipes-extended/shadow/shadow_4.1.4.2.bb2
-rw-r--r--meta/recipes-extended/zypper/zypper_git.bb4
7 files changed, 13 insertions, 11 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index e29556925a..6918263296 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -9,11 +9,11 @@ inherit cmake
9DEPENDS = "rpm boost gettext curl libxml2 zlib sat-solver expat openssl udev" 9DEPENDS = "rpm boost gettext curl libxml2 zlib sat-solver expat openssl udev"
10 10
11# rpmdb2solv from sat-solver is run from libzypp 11# rpmdb2solv from sat-solver is run from libzypp
12RDEPENDS = "sat-solver" 12RDEPENDS_${PN} = "sat-solver"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15PV = "0.0-git${SRCPV}" 15PV = "0.0-git${SRCPV}"
16PR = "r3" 16PR = "r4"
17 17
18SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ 18SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
19 file://no-doc.patch \ 19 file://no-doc.patch \
diff --git a/meta/recipes-extended/man-pages/man-pages_3.25.bb b/meta/recipes-extended/man-pages/man-pages_3.25.bb
index b5b200c98a..358f78dc76 100644
--- a/meta/recipes-extended/man-pages/man-pages_3.25.bb
+++ b/meta/recipes-extended/man-pages/man-pages_3.25.bb
@@ -4,7 +4,7 @@ SECTION = "console/utils"
4PRIORITY = "required" 4PRIORITY = "required"
5HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" 5HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages"
6LICENSE = "GPL" 6LICENSE = "GPL"
7PR = "r0" 7PR = "r1"
8 8
9LIC_FILES_CHKSUM = "file://README;md5=9dab010c5baa416669e5d17381799dd5" 9LIC_FILES_CHKSUM = "file://README;md5=9dab010c5baa416669e5d17381799dd5"
10SRC_URI = "http://www.kernel.org/pub/linux/docs/man-pages/Archive/${PN}-${PV}.tar.gz" 10SRC_URI = "http://www.kernel.org/pub/linux/docs/man-pages/Archive/${PN}-${PV}.tar.gz"
@@ -12,7 +12,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/docs/man-pages/Archive/${PN}-${PV}.ta
12SRC_URI[md5sum] = "98ec2324abea77d7a992470dd44d140c" 12SRC_URI[md5sum] = "98ec2324abea77d7a992470dd44d140c"
13SRC_URI[sha256sum] = "474242842a78dc2121687b7db6c32b6c78af5458f2bd809e23563dd185e2b169" 13SRC_URI[sha256sum] = "474242842a78dc2121687b7db6c32b6c78af5458f2bd809e23563dd185e2b169"
14 14
15RDEPENDS = "man" 15RDEPENDS_${PN} = "man"
16 16
17do_configure_prepend() { 17do_configure_prepend() {
18 rm -rf not_installed 18 rm -rf not_installed
diff --git a/meta/recipes-extended/mc/mc_4.7.3.bb b/meta/recipes-extended/mc/mc_4.7.3.bb
index 22a1a9397d..537aa05e37 100644
--- a/meta/recipes-extended/mc/mc_4.7.3.bb
+++ b/meta/recipes-extended/mc/mc_4.7.3.bb
@@ -4,7 +4,9 @@ LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" 4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
5SECTION = "console/utils" 5SECTION = "console/utils"
6DEPENDS = "ncurses glib-2.0" 6DEPENDS = "ncurses glib-2.0"
7RDEPENDS = "ncurses-terminfo" 7RDEPENDS_${PN} = "ncurses-terminfo"
8
9PR = "r1"
8 10
9SRC_URI = "http://www.midnight-commander.org/downloads/${PN}-${PV}.tar.bz2" 11SRC_URI = "http://www.midnight-commander.org/downloads/${PN}-${PV}.tar.bz2"
10 12
diff --git a/meta/recipes-extended/polkit/polkit_0.99.bb b/meta/recipes-extended/polkit/polkit_0.99.bb
index f578ccad6b..7f969792ea 100644
--- a/meta/recipes-extended/polkit/polkit_0.99.bb
+++ b/meta/recipes-extended/polkit/polkit_0.99.bb
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
7 file://docs/polkit/html/license.html;md5=54750ec6ece444c50b823234d445dd99" 7 file://docs/polkit/html/license.html;md5=54750ec6ece444c50b823234d445dd99"
8 8
9SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz" 9SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz"
10PR = "r0" 10PR = "r1"
11DEPENDS = "libpam expat dbus-glib eggdbus intltool" 11DEPENDS = "libpam expat dbus-glib eggdbus intltool"
12RDEPENDS = "libpam" 12RDEPENDS_${PN} = "libpam"
13EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection" 13EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
14 14
15inherit autotools pkgconfig 15inherit autotools pkgconfig
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index fcbcb3eb75..42f92a7f4e 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -20,7 +20,7 @@ PAM_PLUGINS = " libpam-runtime \
20 pam-plugin-rootok" 20 pam-plugin-rootok"
21 21
22DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 22DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
23RDEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" 23RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
24 24
25# since we deduce from ${SERIAL_CONSOLE} 25# since we deduce from ${SERIAL_CONSOLE}
26PACKAGE_ARCH = "${MACHINE_ARCH}" 26PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.2.bb b/meta/recipes-extended/shadow/shadow_4.1.4.2.bb
index ca5f533f92..224ae5e38f 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.2.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.2.bb
@@ -1,6 +1,6 @@
1require shadow.inc 1require shadow.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5SRC_URI += "file://shadow.automake-1.11.patch \ 5SRC_URI += "file://shadow.automake-1.11.patch \
6 file://shadow-4.1.3-dots-in-usernames.patch \ 6 file://shadow-4.1.3-dots-in-usernames.patch \
diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb
index 8caf4db39e..c8895e5806 100644
--- a/meta/recipes-extended/zypper/zypper_git.bb
+++ b/meta/recipes-extended/zypper/zypper_git.bb
@@ -5,8 +5,8 @@ LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413" 5LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413"
6 6
7DEPENDS = "libzypp augeas" 7DEPENDS = "libzypp augeas"
8RRECOMMENDS = "procps" 8RRECOMMENDS_${PN} = "procps"
9PR = "r1" 9PR = "r2"
10 10
11inherit cmake 11inherit cmake
12 12