diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20221106.0.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20221023.0.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/gst-editing-services/gst-editing-services_1.20.4.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-autosetup-cc-check-tools-check-only-the-name.patch | 30 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb | 1 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.13.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.12.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_1.0.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_0.7.bb) | 4 |
6 files changed, 36 insertions, 5 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20221023.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20221106.0.bb index b7703cef96..6ef767710e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20221023.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20221106.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "d8f5c062ea6ff484f4f1f5095a7d3c364f3019ea" +SRCREV = "bf0d53505856d4b3e662be22bbe5fcb740451ca1" SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/gst-editing-services/gst-editing-services_1.20.4.bb b/meta-openembedded/meta-oe/recipes-devtools/gst-editing-services/gst-editing-services_1.20.4.bb index 37f7746846..6f76013dbd 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/gst-editing-services/gst-editing-services_1.20.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/gst-editing-services/gst-editing-services_1.20.4.bb @@ -4,7 +4,7 @@ SUMMARY = "Gstreamer editing services" HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-editing-services/" -LICENSE = "GPL-2.0-on-later & LGPL-2.1-or-later" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d" diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-autosetup-cc-check-tools-check-only-the-name.patch b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-autosetup-cc-check-tools-check-only-the-name.patch new file mode 100644 index 0000000000..165c658d08 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-autosetup-cc-check-tools-check-only-the-name.patch @@ -0,0 +1,30 @@ +From 29e8dfae4593c91f11d7ea31a4722a6d82f6c950 Mon Sep 17 00:00:00 2001 +From: Kory Maincent <kory.maincent@bootlin.com> +Date: Wed, 2 Nov 2022 16:39:30 +0100 +Subject: [PATCH] autosetup: cc-check-tools: check only the name of the tool + without its params + +Update the tool existence check. Test only the first word of the +args to keep only the executable without its parameters. + +Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> +--- + autosetup/cc.tcl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jimtcl/autosetup/cc.tcl b/jimtcl/autosetup/cc.tcl +index 585d259..4c87854 100644 +--- a/jimtcl/autosetup/cc.tcl ++++ b/jimtcl/autosetup/cc.tcl +@@ -264,7 +264,7 @@ proc cc-check-tools {args} { + foreach tool $args { + set TOOL [string toupper $tool] + set exe [get-env $TOOL [get-define cross]$tool] +- if {[find-executable {*}$exe]} { ++ if {[find-executable {*}[regexp -inline {\S+} $exe]]} { + define $TOOL $exe + continue + } +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb index 1503bb6751..06d77b6a9e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -9,6 +9,7 @@ SRC_URI = " \ git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \ git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl;branch=master \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \ + file://0001-autosetup-cc-check-tools-check-only-the-name.patch \ " SRCREV_FORMAT = "openocd" diff --git a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.12.bb b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.13.bb index b09c46a66b..7df8fc43b8 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.12.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.13.bb @@ -10,7 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=d11b640daff611273752ec136394347c" SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[sha256sum] = "fd6922a4448ec2f3eb9db415d10a49660e5d84ce20ce66b8a07e72ffc84270a7" +SRC_URI[sha256sum] = "40c0b3914ec131485640fa57e55bf1136446026b41db91c1bef678186a12abbe" UPSTREAM_CHECK_URI = "https://github.com/zeux/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_0.7.bb b/meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_1.0.bb index 3bb89ee8f1..52475522ad 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_0.7.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_1.0.bb @@ -1,10 +1,10 @@ SUMMARY = "Header-only C++ library for JSON Schema validation" HOMEPAGE = "https://github.com/tristanpenman/valijson" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=015106c62262b2383f6c72063f0998f2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5c4583a434195e4f3b418e17c8ca2daf" SRC_URI = "git://github.com/tristanpenman/valijson.git;branch=master;protocol=https" -SRCREV = "94d3bfd39ad4dca1be0f700b5eea8e4234d0e7e8" +SRCREV = "78ac8a737df56b5334354efe104ea8f99e2a2f00" S = "${WORKDIR}/git" |