From fbf4fc98984bf755ceaaefcaa25ca25d172a34b6 Mon Sep 17 00:00:00 2001 From: Appana Durga Kedareswara rao Date: Wed, 22 Jan 2020 19:40:38 +0530 Subject: meta-xilinx-standalone: recipes-libraries: libxil: Cleanup the recipe There is no need to create an additional task do_create_dtb. script mentioned in the do_generate_cmake needs to be called before do_configure(), we can use do_configure_prepend() for this instead of adding own task. This patch updates the recipe for the same. Signed-off-by: Appana Durga Kedareswara rao --- .../recipes-libraries/libxil_git.bb | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-libraries/libxil_git.bb b/meta-xilinx-standalone/recipes-libraries/libxil_git.bb index a455c384..49437a9b 100644 --- a/meta-xilinx-standalone/recipes-libraries/libxil_git.bb +++ b/meta-xilinx-standalone/recipes-libraries/libxil_git.bb @@ -3,9 +3,9 @@ inherit esw python3native ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/" ESW_COMPONENT_NAME = "libxil.a" -DEPENDS += "dtc-native python3-pyyaml-native xilmem device-tree" +DEPENDS += "dtc-native python3-pyyaml-native xilstandalone xilmem device-tree" -do_generate_cmake (){ +do_configure_prepend() { # This will generate CMakeLists.txt which contains # drivers for the libxil cd ${S} @@ -16,19 +16,12 @@ do_generate_cmake (){ # everything in libxil, which is undesired. DRIVERS_LIST=$(nativepython3 ${S}/scripts/getdrvlist.py -d ${DTBFILE}) } -do_generate_driver_data (){ + +do_generate_driver_data() { # This script should also not rely on relative paths and such cd ${S} nativepython3 ${S}/scripts/generate_drvdata.py -d ${DTBFILE} } -# Task dependencies might need to be fixed after unifying the DTB flow -do_create_dtb(){ - : -} - -addtask do_generate_cmake before do_configure after do_create_dtb - -addtask do_generate_driver_data before do_compile after do_create_dtb - -addtask do_create_dtb before do_compile after do_prepare_recipe_sysroot +addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot +do_prepare_recipe_sysroot[rdeptask] = "do_unpack" -- cgit v1.2.3-54-g00ecf