From 64a342a2d76c2397c5dff1815e6c78af9f86b9e5 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Thu, 16 Jun 2016 22:00:05 +1000 Subject: zynq7-platform-init.inc: Use the new SYSROOT_DIRS variable Convert the sysroot stage functions into paths in the SYSROOT_DIRS variable. This variable was added to OE-Core (commit id 80e7e7f). Signed-off-by: Nathan Rossi --- recipes-bsp/platform-init/zynq7-platform-init.inc | 6 ++---- recipes-bsp/reference-design/zybo-linux-bd.bb | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/recipes-bsp/platform-init/zynq7-platform-init.inc b/recipes-bsp/platform-init/zynq7-platform-init.inc index 9dfd94af..22824289 100644 --- a/recipes-bsp/platform-init/zynq7-platform-init.inc +++ b/recipes-bsp/platform-init/zynq7-platform-init.inc @@ -5,6 +5,8 @@ PROVIDES += "virtual/zynq7-platform-init" INHIBIT_DEFAULT_DEPS = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" +SYSROOT_DIRS += "${PLATFORM_INIT_DIR}" + do_compile() { : } @@ -13,10 +15,6 @@ do_install() { install -d ${D}${PLATFORM_INIT_DIR} } -python sysroot_stage_all () { - oe.path.copytree(d.expand("${D}${PLATFORM_INIT_DIR}"), d.expand("${SYSROOT_DESTDIR}${PLATFORM_INIT_DIR}")) -} - FILES_${PN} += " \ ${PLATFORM_INIT_DIR}/ps7_init_gpl.c \ ${PLATFORM_INIT_DIR}/ps7_init_gpl.h \ diff --git a/recipes-bsp/reference-design/zybo-linux-bd.bb b/recipes-bsp/reference-design/zybo-linux-bd.bb index e951f58e..a3968ac2 100644 --- a/recipes-bsp/reference-design/zybo-linux-bd.bb +++ b/recipes-bsp/reference-design/zybo-linux-bd.bb @@ -45,6 +45,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit zynq7-platform-paths +SYSROOT_DIRS += "${PLATFORM_INIT_DIR}" + do_install() { fn=$(unzip -l ${S}/${HDF} | awk '{print $NF}' | grep ".bit$") unzip -o ${S}/${HDF} ${fn} -d ${D} @@ -56,10 +58,6 @@ do_install() { done } -sysroot_stage_all () { - sysroot_stage_dir ${D}${PLATFORM_INIT_DIR} ${SYSROOT_DESTDIR}/${PLATFORM_INIT_DIR} -} - do_deploy () { if [ -e ${D}/download.bit ]; then install -d ${DEPLOY_DIR_IMAGE} -- cgit v1.2.3-54-g00ecf