diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2019-10-24 19:00:58 +0000 |
|---|---|---|
| committer | Anuj Mittal <anuj.mittal@intel.com> | 2019-10-25 10:05:24 +0800 |
| commit | 93105b15d143afccf474f160ba2d25226d284a88 (patch) | |
| tree | 4b0f0636a113a2f347d39a35ec9bb1c283ac5629 | |
| parent | 1a669124ecfa4bcd9182cde2ea0465b8f62305e9 (diff) | |
| download | meta-intel-93105b15d143afccf474f160ba2d25226d284a88.tar.gz | |
dldt-inference-engine: remove trailing slash from patchdir params
* 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@gmail.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
| -rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.bb | 16 |
1 files 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 \ | |||
| 8 | https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_ma2450_759W.zip;name=ma2450 \ | 8 | https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_ma2450_759W.zip;name=ma2450 \ |
| 9 | https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_ma2x8x_mdk_R9.8.zip;name=ma2x8x \ | 9 | https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_ma2x8x_mdk_R9.8.zip;name=ma2x8x \ |
| 10 | https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_mv0262_mdk_R9.8.zip;name=mv0262 \ | 10 | https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_mv0262_mdk_R9.8.zip;name=mv0262 \ |
| 11 | file://0001-R2-Build-fixes.patch;patchdir=../ \ | 11 | file://0001-R2-Build-fixes.patch;patchdir=.. \ |
| 12 | file://0002-R2-Install-DLDT-headers-libs-sample-Apps.patch;patchdir=../ \ | 12 | file://0002-R2-Install-DLDT-headers-libs-sample-Apps.patch;patchdir=.. \ |
| 13 | file://0003-use-GNUInstallDirs-on-nix.patch;patchdir=../ \ | 13 | file://0003-use-GNUInstallDirs-on-nix.patch;patchdir=.. \ |
| 14 | file://0004-disable-werror.patch;patchdir=../ \ | 14 | file://0004-disable-werror.patch;patchdir=.. \ |
| 15 | file://0005-point-to-correct-location-of-ngraph-headers.patch;patchdir=../ \ | 15 | file://0005-point-to-correct-location-of-ngraph-headers.patch;patchdir=.. \ |
| 16 | file://0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \ | 16 | file://0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=.. \ |
| 17 | file://0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \ | 17 | file://0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=.. \ |
| 18 | file://0008-Simplify-searching-for-firmware-files.patch;patchdir=../ \ | 18 | file://0008-Simplify-searching-for-firmware-files.patch;patchdir=.. \ |
| 19 | file://run-ptest \ | 19 | file://run-ptest \ |
| 20 | " | 20 | " |
| 21 | SRCREV = "1c794d971cdd3c94de5ea4a6c9588eac63f4cc57" | 21 | SRCREV = "1c794d971cdd3c94de5ea4a6c9588eac63f4cc57" |
