From 9548f31b76ff38b803dae629dc3bcd8da1db5b91 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Fri, 28 Apr 2023 17:24:56 +0300 Subject: [PATCH] firmware-nexus: fix firmware-nexus* dependencies Rework the recipe dependecies to work with the recent bitbake/OE changes. Provide explicit dependencies for the do_extract task so that the syroot is fully staged and populated, otherwise some of the tools might be missing from the native sysroot at the do_extract time. Signed-off-by: Dmitry Baryshkov --- recipes-bsp/firmware-nexus/firmware-qcom-nexus.inc | 1 - recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc | 4 ++-- recipes-bsp/firmware-nexus/firmware-qcom-radio.inc | 4 +++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes-bsp/firmware-nexus/firmware-qcom-nexus.inc b/recipes-bsp/firmware-nexus/firmware-qcom-nexus.inc index 5e1393dee..892bf6dc8 100644 --- a/recipes-bsp/firmware-nexus/firmware-qcom-nexus.inc +++ b/recipes-bsp/firmware-nexus/firmware-qcom-nexus.inc @@ -15,7 +15,6 @@ do_extract() { tail -n +315 ${WORKDIR}/extract-qcom-${FW_QCOM_NAME}.sh | tar xzfv - -C ${S} } addtask extract after do_unpack before do_patch -do_extract[deptask] = "do_populate_sysroot" do_compile() { for fw in ${S}/vendor/qcom/${FW_QCOM_NAME}/proprietary/*.mdt ; do diff --git a/recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc b/recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc index 0c61e5402..c3546316c 100644 --- a/recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc +++ b/recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc @@ -10,7 +10,7 @@ PV = "${AOSP_BUILD}" require recipes-bsp/firmware/firmware-qcom.inc -DEPENDS += "pil-squasher-native rust-android-sparse-native e2fsprogs-native qc-image-unpacker-native mtools-native" +DEPENDS += "pil-squasher-native" VENDOR_IMG_SPARSE ?= "1" @@ -50,7 +50,7 @@ do_extract() { fi } addtask extract after do_unpack before do_patch -do_extract[deptask] = "do_populate_sysroot" +do_extract[depends] += "rust-android-sparse-native:do_populate_sysroot e2fsprogs-native:do_populate_sysroot qc-image-unpacker-native:do_populate_sysroot mtools-native:do_populate_sysroot" do_compile() { for fw in ${B}/firmware/*.mdt ; do diff --git a/recipes-bsp/firmware-nexus/firmware-qcom-radio.inc b/recipes-bsp/firmware-nexus/firmware-qcom-radio.inc index f771ff44d..431068492 100644 --- a/recipes-bsp/firmware-nexus/firmware-qcom-radio.inc +++ b/recipes-bsp/firmware-nexus/firmware-qcom-radio.inc @@ -1,7 +1,9 @@ FACTORY_NAME ?= "${FW_QCOM_NAME}" SRC_URI += "https://dl.google.com/dl/android/aosp/${FACTORY_NAME}-${AOSP_BUILD}-factory-${CHECKSUM_factory}.zip;name=factory" -DEPENDS += "pil-squasher-native qc-image-unpacker-native mtools-native" +DEPENDS += "pil-squasher-native qc-image-unpacker-native" + +do_extract[depends] += "mtools-native:do_populate_sysroot" do_extract:append() { mkdir -p ${B}/radio