From 01611bdf3e86808bd1a19ed98b1f60c46f5e246e Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 29 Dec 2021 16:45:16 +0100 Subject: [PATCH] hardknott: tensorflow-lite: rename to tensorflow-lite-coral This makes it possible to distinguish between two different packages: * NXP's tensorflow-lite, which contains modifications for i.MX platforms * Our tensorflow-lite, which is meant to be used with Google Coral Since tensorflow-lite-coral provides a subset of the files provided by tensorflow-lite (specifically, the python libraries), make the packages conflict during runtime. Signed-off-by: Gabriel Valcazar --- ...tensorflow-lite_2.5.0.bb => tensorflow-lite-coral_2.5.0.bb} | 3 +++ meta-digi-dey/conf/distro/dey.conf | 3 --- .../recipes-devtools/python3-pycoral/python3-pycoral_1.0.1.bb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename meta-digi-arm/recipes-bsp/tensorflow-lite/{tensorflow-lite_2.5.0.bb => tensorflow-lite-coral_2.5.0.bb} (93%) diff --git a/meta-digi-arm/recipes-bsp/tensorflow-lite/tensorflow-lite_2.5.0.bb b/meta-digi-arm/recipes-bsp/tensorflow-lite/tensorflow-lite-coral_2.5.0.bb similarity index 93% rename from meta-digi-arm/recipes-bsp/tensorflow-lite/tensorflow-lite_2.5.0.bb rename to meta-digi-arm/recipes-bsp/tensorflow-lite/tensorflow-lite-coral_2.5.0.bb index 8a4fbab12..491972e4b 100644 --- a/meta-digi-arm/recipes-bsp/tensorflow-lite/tensorflow-lite_2.5.0.bb +++ b/meta-digi-arm/recipes-bsp/tensorflow-lite/tensorflow-lite-coral_2.5.0.bb @@ -42,5 +42,8 @@ FILES_${PN} += "\ INSANE_SKIP_${PN} += "already-stripped" +# This package provides the same python files as NXP's tensorflow-lite +RCONFLICTS_${PN} = "tensorflow-lite" + COMPATIBLE_MACHINE = "(-)" COMPATIBLE_MACHINE_aarch64 = "(.*)" diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index e1ed654c5..f0bfa362d 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -77,9 +77,6 @@ PREFERRED_PROVIDER_opencl-headers ?= "imx-gpu-viv" # Use the FDO backend for WPE WebKit PREFERRED_PROVIDER_virtual/wpebackend = "wpebackend-fdo" -# Use recipe from our meta-digi layer -PREFERRED_VERSION_tensorflow-lite ?= "2.5.0" - SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}/${MACHINE}" diff --git a/meta-digi-dey/recipes-devtools/python3-pycoral/python3-pycoral_1.0.1.bb b/meta-digi-dey/recipes-devtools/python3-pycoral/python3-pycoral_1.0.1.bb index a4c39d351..a089a3331 100644 --- a/meta-digi-dey/recipes-devtools/python3-pycoral/python3-pycoral_1.0.1.bb +++ b/meta-digi-dey/recipes-devtools/python3-pycoral/python3-pycoral_1.0.1.bb @@ -22,7 +22,7 @@ RDEPENDS_${PN} = "${PYTHON_PN} \ ${PYTHON_PN}-pygobject \ ${PYTHON_PN}-pillow \ libedgetpu \ - tensorflow-lite \ + tensorflow-lite-coral \ " inherit python3native