[meta-intel] [PATCH 2/2] dldt-inference-engine: remove trailing slash from patchdir params

Martin Jansa martin.jansa at gmail.com
Thu Oct 24 12:00:58 PDT 2019


* There is interesting issue in do_patch, I was debugging strange
  behavior with .bbappend where I've added another small patch.
  And it started failing to configure completely.
  bitbake -e shows that all .patch files are in SRC_URI and
  log.do_patch shows that all were applied, but git diff (as well as
  patches/series) shows only the last one added from the bbappend
  to be applied.

  This was caused by 8 existing patches in .bb file using ;patchdir=../
  and my patch in .bbappend using ;patchdir=.. without slash at the end,
  it should be fixed in quilt (or how do_patch is using it), but for
  now just drop the trailing slash, because 99.9% recipes use ;patchdir=..
  without the slash.

  It's easily reproducible by removing the slash from the last patch
  (without any bbappend).

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../opencv/dldt-inference-engine_2019r3.bb       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.bb
index 31055622..ff59b515 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.bb
@@ -8,14 +8,14 @@ SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2019 \
            https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_ma2450_759W.zip;name=ma2450 \
            https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_ma2x8x_mdk_R9.8.zip;name=ma2x8x \
            https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_mv0262_mdk_R9.8.zip;name=mv0262 \
-           file://0001-R2-Build-fixes.patch;patchdir=../ \
-           file://0002-R2-Install-DLDT-headers-libs-sample-Apps.patch;patchdir=../ \
-           file://0003-use-GNUInstallDirs-on-nix.patch;patchdir=../ \
-           file://0004-disable-werror.patch;patchdir=../ \
-           file://0005-point-to-correct-location-of-ngraph-headers.patch;patchdir=../ \
-           file://0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \
-           file://0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \
-           file://0008-Simplify-searching-for-firmware-files.patch;patchdir=../ \
+           file://0001-R2-Build-fixes.patch;patchdir=.. \
+           file://0002-R2-Install-DLDT-headers-libs-sample-Apps.patch;patchdir=.. \
+           file://0003-use-GNUInstallDirs-on-nix.patch;patchdir=.. \
+           file://0004-disable-werror.patch;patchdir=.. \
+           file://0005-point-to-correct-location-of-ngraph-headers.patch;patchdir=.. \
+           file://0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=.. \
+           file://0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=.. \
+           file://0008-Simplify-searching-for-firmware-files.patch;patchdir=.. \
            file://run-ptest \
            "
 SRCREV = "1c794d971cdd3c94de5ea4a6c9588eac63f4cc57"
-- 
2.17.1



More information about the meta-intel mailing list