tidl-utils: bump SRCREV and remove patch
PATCH 1/1 tidl-utils: bump SRCREV and remove patch
* Pick up tidl related developments for 6.0
* Remove tidl-import patch with source fix to disable static linking
* Consolidate "PV" and "PR" to tidl-utils.inc
Signed-off-by Jianzhong Xu <[email protected]>
--- .../tidl-utils/tidl-import/disable_static.patch | 16 ---------------- .../recipes-ti/tidl-utils/tidl-import_git.bb | 5 ----- .../recipes-ti/tidl-utils/tidl-utils.bb | 5 ----- .../recipes-ti/tidl-utils/tidl-utils.inc | 6 +++++- 4 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 meta-arago-extras/recipes-ti/tidl-utils/tidl-import/disable_static.patch
meta-arago-extras/recipes-ti/tidl-utils/tidl-import/disable_static.patch deleted +0 -16
@@ -1,16 +0,0 @@ -diff --git a/src/importTool/modules/ti_dl/utils/tidlModelImport/makefile b/src/importTool/modules/ti_dl/utils/tidlModelImport/makefile -index 374f862..521f0dc 100644 ---- a/src/importTool/modules/ti_dl/utils/tidlModelImport/makefile -+++ b/src/importTool/modules/ti_dl/utils/tidlModelImport/makefile -@@ -103,9 +103,9 @@ ifeq ($(PLATFORM_BUILD), x86) - ifeq ($(LINUX_IMPORT_TOOL), 64BIT) - CFLAGS+= -DPLATFORM_64BIT - endif --LDFLAGS+= -lstdc++ -static -+LDFLAGS+= -lstdc++ - else --LDFLAGS+= -lstdc++ -lz -static -+LDFLAGS+= -lstdc++ -lz - endif - endif -
meta-arago-extras/recipes-ti/tidl-utils/tidl-import_git.bb +0 -5
@@ -7,11 +7,6 @@ require ./tidl-utils.inc LICENSE = "BSD-3" LIC_FILES_CHKSUM = "file://modules/ti_dl/inc/itidl_ti.h;beginline=1;endline=34;md5=cabe1fdaabfa0d85dc5544566b0e2425" -PV = "01.01.00.00" -PR = "r1" - -SRC_URI_append = " file://disable_static.patch;pnum=3" - S = "${WORKDIR}/git/src/importTool/" DEPENDS = "protobuf zlib protobuf-native"
meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb +0 -5
@@ -5,15 +5,10 @@ LICENSE = "TI-TFL" require ./tidl-utils.inc -PV = "1.0.1.0" -INC_PR = "r0" - LIC_FILES_CHKSUM = "file://docs/LICENSE.txt;md5=a93aa5af7a3bbbb6fb34c8df59efaa5c" RDEPENDS_${PN}_class-target += "tidl-api tidl-examples" -PR = "${INC_PR}.0" - S = "${WORKDIR}/git" TARGET_class-target = "arm"
meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.inc +5 -1
@@ -1,2 +1,6 @@ SRC_URI = "git://git.ti.com/tidl/tidl-utils.git;protocol=git;branch=master" -SRCREV = "057984b05e143a4740ecec3dd28cfa082927b897" +SRCREV = "0c52c82a2aed1a27ca2a9b4b11effb426842b6ab" + +PV = "01.01.01.00" +PR = "r0" +
Signature · 1 line
2.17.1
Denys,
Can you backport this to ti2019.01?
Thank you,
Jake
Quoted 83 lines · Jianzhong Xu
* Pick up tidl related developments for 6.0
* Remove tidl-import patch with source fix to disable static linking
* Consolidate "PV" and "PR" to tidl-utils.incSigned-off-by Jianzhong Xu <[email protected]>--- .../tidl-utils/tidl-import/disable_static.patch | 16 ---------------- .../recipes-ti/tidl-utils/tidl-import_git.bb | 5 ----- .../recipes-ti/tidl-utils/tidl-utils.bb | 5 ----- .../recipes-ti/tidl-utils/tidl-utils.inc | 6 +++++- 4 files changed, 5 insertions(+), 27 deletions(-)delete mode 100644
meta-arago-extras/recipes-ti/tidl-utils/tidl-import/disable_static.patchmeta-arago-extras/recipes-ti/tidl-utils/tidl-import/disable_static.patch deleted +0
-16@@ -1,16 +0,0 @@ -diff --git a/src/importTool/modules/ti_dl/utils/tidlModelImport/makefile b/src/importTool/modules/ti_dl/utils/tidlModelImport/makefile -index 374f862..521f0dc 100644 ---- a/src/importTool/modules/ti_dl/utils/tidlModelImport/makefile -+++ b/src/importTool/modules/ti_dl/utils/tidlModelImport/makefile -@@ -103,9 +103,9 @@ ifeq ($(PLATFORM_BUILD), x86) - ifeq ($(LINUX_IMPORT_TOOL), 64BIT) - CFLAGS+= -DPLATFORM_64BIT - endif --LDFLAGS+= -lstdc++ -static -+LDFLAGS+= -lstdc++ - else --LDFLAGS+= -lstdc++ -lz -static -+LDFLAGS+= -lstdc++ -lz - endif - endif -meta-arago-extras/recipes-ti/tidl-utils/tidl-import_git.bb +0
-5@@ -7,11 +7,6 @@ require ./tidl-utils.inc LICENSE = "BSD-3" LIC_FILES_CHKSUM = "file://modules/ti_dl/inc/itidl_ti.h;beginline=1;endline=34;md5=cabe1fdaabfa0d85dc5544566b0e2425" -PV = "01.01.00.00" -PR = "r1" - -SRC_URI_append = " file://disable_static.patch;pnum=3" - S = "${WORKDIR}/git/src/importTool/" DEPENDS = "protobuf zlib protobuf-native"meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb +0
-5@@ -5,15 +5,10 @@ LICENSE = "TI-TFL" require ./tidl-utils.inc -PV = "1.0.1.0" -INC_PR = "r0" - LIC_FILES_CHKSUM = "file://docs/LICENSE.txt;md5=a93aa5af7a3bbbb6fb34c8df59efaa5c" RDEPENDS_${PN}_class-target += "tidl-api tidl-examples" -PR = "${INC_PR}.0" - S = "${WORKDIR}/git" TARGET_class-target = "arm"meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.inc +5
-1@@ -1,2 +1,6 @@ SRC_URI = "git://git.ti.com/tidl/tidl-utils.git;protocol=git;branch=master" -SRCREV = "057984b05e143a4740ecec3dd28cfa082927b897" +SRCREV = "0c52c82a2aed1a27ca2a9b4b11effb426842b6ab" + +PV = "01.01.01.00" +PR = "r0" +