From f634bea1cb4715fb8b91fc4212afd45a7985167a Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 16 Aug 2013 16:04:29 +0200 Subject: DEPENDS: replace ${RDEPENDS} with the explicit deps DEPENDS lists required built recipes at build time, whereas RDEPENDS does list required packages at runtime. So don't confuse the two namespaces by using one to define the other. --- recipes-lxde/lxde-common/lxde-common_0.5.5.bb | 2 +- recipes-lxde/lxpanel/lxpanel_0.5.8.bb | 2 +- recipes-lxde/lxterminal/lxterminal_0.1.11.bb | 4 ++-- recipes-lxde/menu-cache/menu-cache_0.3.2.bb | 2 +- recipes-lxde/openbox/openbox_3.5.0.bb | 5 ++--- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/recipes-lxde/lxde-common/lxde-common_0.5.5.bb b/recipes-lxde/lxde-common/lxde-common_0.5.5.bb index d75da33..fae229f 100644 --- a/recipes-lxde/lxde-common/lxde-common_0.5.5.bb +++ b/recipes-lxde/lxde-common/lxde-common_0.5.5.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=597980c597fe9ce16d7b6b19c44cfced" PR = "r1" RDEPENDS_{PN} = "gtk+ lxde-icon-theme" -DEPENDS = "${RDEPENDS}" +DEPENDS = "gtk+ lxde-icon-theme" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz \ file://lxde-common-0.5.5-logout.patch" diff --git a/recipes-lxde/lxpanel/lxpanel_0.5.8.bb b/recipes-lxde/lxpanel/lxpanel_0.5.8.bb index 43ea7ce..dbcd76b 100644 --- a/recipes-lxde/lxpanel/lxpanel_0.5.8.bb +++ b/recipes-lxde/lxpanel/lxpanel_0.5.8.bb @@ -8,7 +8,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=9d19a9495cc76dc96b703fb4aa157183" RDEPENDS_{PN} = "gtk+ menu-cache lxmenu-data libxmu libxpm alsa-lib" -DEPENDS = "${RDEPENDS}" +DEPENDS = "gtk+ menu-cache lxmenu-data libxmu libxpm alsa-lib" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz \ file://lxpanel-0.5.6-broken-apps.patch \ diff --git a/recipes-lxde/lxterminal/lxterminal_0.1.11.bb b/recipes-lxde/lxterminal/lxterminal_0.1.11.bb index f3729da..9afc637 100644 --- a/recipes-lxde/lxterminal/lxterminal_0.1.11.bb +++ b/recipes-lxde/lxterminal/lxterminal_0.1.11.bb @@ -4,8 +4,8 @@ SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -RDEPENDS_{PN} = "gtk+ vte glib-2.0" -DEPENDS = "${RDEPENDS} intltool-native" +RDEPENDS_{PN} = "gtk+ libvte glib-2.0" +DEPENDS = "gtk+ vte glib-2.0 intltool-native" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz" SRC_URI[md5sum] = "fd9140b45c0f28d021253c4aeb8c4aea" diff --git a/recipes-lxde/menu-cache/menu-cache_0.3.2.bb b/recipes-lxde/menu-cache/menu-cache_0.3.2.bb index 6be3633..1cf2695 100644 --- a/recipes-lxde/menu-cache/menu-cache_0.3.2.bb +++ b/recipes-lxde/menu-cache/menu-cache_0.3.2.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" RDEPENDS_{PN} = "glib-2.0" -DEPENDS = "${RDEPENDS} intltool-native" +DEPENDS = "glib-2.0 intltool-native" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz" SRC_URI[md5sum] = "ac4a9ea77db68d3db3f9f53cc75af66a" diff --git a/recipes-lxde/openbox/openbox_3.5.0.bb b/recipes-lxde/openbox/openbox_3.5.0.bb index 286361d..68c5712 100644 --- a/recipes-lxde/openbox/openbox_3.5.0.bb +++ b/recipes-lxde/openbox/openbox_3.5.0.bb @@ -6,9 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PR = "r5" -RDEPENDS_{PN} = "glib-2.0 libxml2 pango imlib2 startup-notification libxft libxrandr libxt" -DEPENDS = "${RDEPENDS} xextproto xf86vidmodeproto" -RDEPENDS_${PN} = "openbox-theme-clearlooks" +RDEPENDS_{PN} = "glib-2.0 libxml2 pango imlib2 startup-notification libxft libxrandr libxt openbox-theme-clearlooks" +DEPENDS = "glib-2.0 libxml2 pango imlib2 startup-notification libxft libxrandr libxt xextproto xf86vidmodeproto" SRC_URI = "http://openbox.org/dist/openbox/openbox-${PV}.tar.gz" SRC_URI[md5sum] = "00441b53cf14c03566c8e82643544ff9" -- cgit v1.2.3