From 0c04811d6805f0d12261fe31e90a40905820ac05 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 17 Dec 2013 21:17:11 -0500 Subject: horizon: move arch specific RDEPENDS to variables Assigning to the python-horizon REDENDS in arch specific variables AFTER the main RDEPENDS exposes and issue with bitbake parsing, and we end up with a singular RDEPEND of "nodejs". Assigning to a variable, and using that variable in the main RDEPENDS, fixes the issue. Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-horizon_git.bb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'meta-openstack/recipes-devtools/python/python-horizon_git.bb') diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb index 281264c..b94d1bf 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb +++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb @@ -75,6 +75,12 @@ FILES_${SRCNAME} = "${bindir}/* \ ${datadir}/* \ " +RDEP_ARCH_VAR = "" +RDEP_ARCH_VAR_arm = "nodejs" +RDEP_ARCH_VAR_i686 = "nodejs" +RDEP_ARCH_VAR_x86-64 = "nodejs" +RDEP_ARCH_VAR_ia32 = "nodejs" + RDEPENDS_${PN} += " python-django \ python-django-appconf \ python-django-compressor \ @@ -93,13 +99,9 @@ RDEPENDS_${PN} += " python-django \ python-swiftclient \ python-lockfile \ python-pyyaml \ + ${RDEP_ARCH_VAR} \ " -RDEPENDS_${PN}_arm += " nodejs" -RDEPENDS_${PN}_i686 += " nodejs" -RDEPENDS_${PN}_x86-64 += " nodejs" -RDEPENDS_${PN}_ia32 += " nodejs" - RDEPENDS_${SRCNAME} = "${PN}" INITSCRIPT_PACKAGES = "${SRCNAME}" -- cgit v1.2.3-54-g00ecf