Skip to contentSkip to conversation

yq: Update to 4.45.1

PATCH In review Peter Kjellerstedt 2 participants 2 messages Apr 14, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 yq: Update to 4.45.1

Refactor the recipe to use the gomod fetcher.

---

Bruce, I know you prefer to do things your own way, so feel free to ignore this. However, the current version of yq does not build with go 1.24 that comes with Walnascar so the yq recipe needs to be updated one way or the other. Since I have no idea how you update the dependencies in the current version of the recipe, it was easiest for me to generate a new recipe using one of our tools.

 recipes-devtools/yq/yq-go-mods.inc  | 37 ++++++++++++
 recipes-devtools/yq/yq-licenses.inc | 24 ++++++++
 recipes-devtools/yq/yq_4.45.1.bb    | 40 +++++++++++++
 recipes-devtools/yq/yq_git.bb       | 87 -----------------------------
 4 files changed, 101 insertions(+), 87 deletions(-)
 create mode 100644 recipes-devtools/yq/yq-go-mods.inc
 create mode 100644 recipes-devtools/yq/yq-licenses.inc
 create mode 100644 recipes-devtools/yq/yq_4.45.1.bb
 delete mode 100644 recipes-devtools/yq/yq_git.bb
recipes-devtools/yq/yq-go-mods.inc new file +37 -0
new file mode 100644
index 00000000..0ba399f3
@@ -0,0 +1,37 @@
+SRC_URI += "\
+    gomod://github.com/a8m/envsubst;version=v1.4.2;sha256sum=231eedf3a12c110a43c95f1658b26fba66f24ab289cbd249605b48c5544897ad \
+    gomod://github.com/alecthomas/participle/v2;version=v2.1.1;sha256sum=bea6113340aa301c0cc73d0a12cbd3453853ecad9bcec0eefae78eff15d67441 \
+    gomod://github.com/alecthomas/repr;version=v0.4.0;sha256sum=e4d4ec046c3ad7425c8e78352dc114ab34b1dd7f3a42c640e19cb51c94484c36 \
+    gomod://github.com/cpuguy83/go-md2man/v2;version=v2.0.4;mod=1;sha256sum=14c3afa2ef623555c1b4834d1f88b14df77549afee85e5750c19102465b78aba \
+    gomod://github.com/davecgh/go-spew;version=v1.1.0;mod=1;sha256sum=bcb29393251237b79a17b6c19bf29134f43e8f438c3198988fcd461a1cdf05cc \
+    gomod://github.com/dimchansky/utfbom;version=v1.1.1;sha256sum=0c1a11101602d5f57ac3e790c0b72e09ff87d8d535535f43fbee9e6a42327350 \
+    gomod://github.com/elliotchance/orderedmap;version=v1.7.1;sha256sum=86680515eff3f3d3944149ef3e054dfdd8e6b9bad8fe00ee0a862893754c6a39 \
+    gomod://github.com/fatih/color;version=v1.18.0;sha256sum=4dc6907b7f6807b37c21ad527d966437d398f03472115f471eaa8fe5875363d3 \
+    gomod://github.com/goccy/go-json;version=v0.10.4;sha256sum=d89fa5215f5c2e0077b67dbc6e043db1b6427e93bdf5faacb7c536afca95e454 \
+    gomod://github.com/goccy/go-yaml;version=v1.13.3;sha256sum=0d2c0c516c9aa022bc448ed4b8056340c4ccfb3ba70e3f873c319d4b66e75f59 \
+    gomod://github.com/inconshreveable/mousetrap;version=v1.1.0;mod=1;sha256sum=1c1b15911aa8a0bd5cd0f6670ec23d1086496f3615fdf53306aff2b476ce9be1 \
+    gomod://github.com/jinzhu/copier;version=v0.4.0;sha256sum=45a9bad09e85195732f408f9d505dc2b7f8868f9ddc3a1a7188999e5ca2d0775 \
+    gomod://github.com/magiconair/properties;version=v1.8.9;sha256sum=8361b76b967090e33192173d91fb3de5f5ea43f6b8d23e927bf6d698fc8a0250 \
+    gomod://github.com/mattn/go-colorable;version=v0.1.13;sha256sum=08be322dcc584a9fcfde5caf0cf878b4e11cd98f252e32bc704e92c5a4ba9d15 \
+    gomod://github.com/mattn/go-isatty;version=v0.0.16;mod=1;sha256sum=714766ec82d67db895ade8af6b8054ad430c3cea5e15b3a888f23ed2f3e1b863 \
+    gomod://github.com/mattn/go-isatty;version=v0.0.20;sha256sum=f2d5f89ca451577e17464b9bb596dc0d0ecececb5eaa63622c41b57cd0b7b8cc \
+    gomod://github.com/pelletier/go-toml/v2;version=v2.2.3;sha256sum=a51f4dc7b62bd7c26b387d912dfae87ca1449082f26574c9f614ae640318b092 \
+    gomod://github.com/pkg/diff;version=v0.0.0-20210226163009-20ebb0f2a09e;sha256sum=f35b23fdd2b9522ddd46cc5c0161b4f0765c514475d5d4ca2a86aca31388c8bd \
+    gomod://github.com/pmezard/go-difflib;version=v1.0.0;mod=1;sha256sum=74b2e766eb215377864d587badf57e95521f692d2a7860b3c7759093f9c9bec2 \
+    gomod://github.com/russross/blackfriday/v2;version=v2.1.0;mod=1;sha256sum=c39547cce6e866e8cfa395d2937bce30801cd07f0b901c2133248f1fba12f58d \
+    gomod://github.com/spf13/cobra;version=v1.8.1;sha256sum=bf27a276f87257c93bc057309df30265a19beefc3d5fc887cbd8fc99ad35466a \
+    gomod://github.com/spf13/pflag;version=v1.0.5;sha256sum=fc6e704f2f6a84ddcdce6de0404e5340fa20c8676181bf5d381b17888107ba84 \
+    gomod://github.com/stretchr/objx;version=v0.1.0;mod=1;sha256sum=1350354d52d2287a62336ecc0d56232d4c47699af9bba49c67c2b48254da98f1 \
+    gomod://github.com/stretchr/testify;version=v1.7.0;mod=1;sha256sum=fff8168d98e6a07156c454a1b6e925509f3177e96c155516d7f96b4079cca3bf \
+    gomod://github.com/yuin/gopher-lua;version=v1.1.1;sha256sum=ac45a1524a39049167f1bb2334b67f728559cb1e60c535c54b3a09f1fc772b45 \
+    gomod://golang.org/toolchain;version=v0.0.1-go1.22.5.linux-amd64;sha256sum=0eb73889fac3ef46a759ca3f8079a7ff656158ee6aedfe127221101824001a77 \
+    gomod://golang.org/x/net;version=v0.33.0;sha256sum=a85014e77369f99c3f9eebe1289b4d0757d58248ca12337642923818ae22ca19 \
+    gomod://golang.org/x/sys;version=v0.0.0-20220811171246-fbc7d0a398ab;mod=1;sha256sum=f033333096fe198f3151deed93f2deba74e50bbfe7739134045bc3b7ce4a5024 \
+    gomod://golang.org/x/sys;version=v0.28.0;sha256sum=0ed47a83fe7d7a7e743e815172bc10c1ac0ed0d31ebb095e75717428e09aa895 \
+    gomod://golang.org/x/sys;version=v0.6.0;mod=1;sha256sum=f033333096fe198f3151deed93f2deba74e50bbfe7739134045bc3b7ce4a5024 \
+    gomod://golang.org/x/text;version=v0.21.0;sha256sum=be3db791651af6f2cb0225aa5d5578c23149b2017246ba8e59586080baadd612 \
+    gomod://gopkg.in/check.v1;version=v0.0.0-20161208181325-20d25e280405;mod=1;sha256sum=5c306e0d633cd66a11b40e2e5fbbc6da42110db7d72ea3c1524ceb45ee40c33f \
+    gomod://gopkg.in/op/go-logging.v1;version=v1.0.0-20160211212156-b2cb9fa56473;sha256sum=028f2b859f2d7800d07a6fb36ef1562a95219941f3b1421cdad5e95c44986ab3 \
+    gomod://gopkg.in/yaml.v3;version=v3.0.0-20200313102051-9f266ea9e77c;mod=1;sha256sum=21579860a20306fcf43b1bd234d1fba319499c77611b71c05f9bf3ba90dab939 \
+    gomod://gopkg.in/yaml.v3;version=v3.0.1;sha256sum=aab8fbc4e6300ea08e6afe1caea18a21c90c79f489f52c53e2f20431f1a9a015 \
+"
recipes-devtools/yq/yq-licenses.inc new file +24 -0
new file mode 100644
index 00000000..80ddb5e7
@@ -0,0 +1,24 @@
+GO_MOD_LICENSES = "Apache-2.0 & BSD-2-Clause & BSD-3-Clause & MIT"
+
+LIC_FILES_CHKSUM += "\
+    file://pkg/mod/github.com/a8m/[email protected]/LICENSE;md5=20cbf74752fb062bc260b078d71d7e30 \
+    file://pkg/mod/github.com/alecthomas/participle/[email protected]/COPYING;md5=c9b197062ffa2eb27eed3d8ef59c1a56 \
+    file://pkg/mod/github.com/dimchansky/[email protected]/LICENSE;md5=d5b81a403268b5ea485b4a2579630c17 \
+    file://pkg/mod/github.com/elliotchance/[email protected]/LICENSE;md5=47a0bd50edb1474747d074fc0ba1ead5 \
+    file://pkg/mod/github.com/fatih/[email protected]/LICENSE.md;md5=316e6d590bdcde7993fb175662c0dd5a \
+    file://pkg/mod/github.com/goccy/[email protected]/LICENSE;md5=33a07164132d795872805bfc53f6097d \
+    file://pkg/mod/github.com/goccy/[email protected]/LICENSE;md5=346470d8ac0a6ffe1eb8635a452cec2b \
+    file://pkg/mod/github.com/magiconair/[email protected]/LICENSE.md;md5=714beb7325ffa89d5a68d936a3bb04e5 \
+    file://pkg/mod/github.com/mattn/[email protected]/LICENSE;md5=24ce168f90aec2456a73de1839037245 \
+    file://pkg/mod/github.com/mattn/[email protected]/LICENSE;md5=f509beadd5a11227c27b5d2ad6c9f2c6 \
+    file://pkg/mod/github.com/pelletier/go-toml/[email protected]/LICENSE;md5=390892c6562af0d807e527b06d635f94 \
+    file://pkg/mod/github.com/pkg/[email protected]/LICENSE;md5=d0250703509998b3201f5dd7f26e8c35 \
+    file://pkg/mod/github.com/spf13/[email protected]/LICENSE.txt;md5=920d76114a32b0fb75b3f2718c5a91be \
+    file://pkg/mod/github.com/spf13/[email protected]/LICENSE;md5=1e8b7dc8b906737639131047a590f21d \
+    file://pkg/mod/github.com/yuin/[email protected]/LICENSE;md5=5ea59bf62229a35ae7b2c7208524163e \
+    file://pkg/mod/golang.org/x/[email protected]/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a \
+    file://pkg/mod/golang.org/x/[email protected]/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a \
+    file://pkg/mod/golang.org/x/[email protected]/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a \
+    file://pkg/mod/gopkg.in/op/[email protected]/LICENSE;md5=d01d49c2816e0112c83b3a9f77029b8a \
+    file://pkg/mod/gopkg.in/[email protected]/LICENSE;md5=3c91c17266710e16afdbb2b6d15c761c \
+"
recipes-devtools/yq/yq_4.45.1.bb new file +40 -0
new file mode 100644
index 00000000..b942ca0b
@@ -0,0 +1,40 @@
+SUMMARY = "A lightweight and portable command-line YAML processor"
+HOMEPAGE = "https://github.com/mikefarah/yq"
+
+LICENSE = "MIT & ${GO_MOD_LICENSES}"
+LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=e40a0dcd62f8269b9bff37fe9aa7dcc2"
+require ${BPN}-licenses.inc
+
+SRCREV = "8bf425b4d1344db7cd469a8d10a390876e0c77fd"
+SRCREV_FORMAT = "default"
+
+SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master;destsuffix=${GO_SRCURI_DESTSUFFIX}"
+SRC_URI += "file://run-ptest"
+require ${BPN}-go-mods.inc
+
+S = "${WORKDIR}/git"
+
+GO_IMPORT = "github.com/mikefarah/yq"
+
+inherit go-mod ptest
+
+do_install:append() {
+    # these bring in dependencies for the -dev package on bash, and we don't
+    # need them .. so we remove them to avoid needing that rdepends
+    rm -rf ${D}/${libdir}/go/src/${GO_IMPORT}/debian/rules
+    rm -rf ${D}/${libdir}/go/src/${GO_IMPORT}/scripts
+    rm -rf ${D}/${libdir}/go/src/${GO_IMPORT}/acceptance_tests
+}
+
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests
+    cp -r ${S}/src/${GO_IMPORT}/scripts/* ${D}${PTEST_PATH}/tests
+    cp -r ${S}/src/${GO_IMPORT}/acceptance_tests/* ${D}${PTEST_PATH}/tests
+    cp -r ${S}/src/${GO_IMPORT}/examples ${D}${PTEST_PATH}/tests
+}
+
+RDEPENDS:${PN}-ptest += " \
+    bash \
+"
+
+BBCLASSEXTEND = "native"
recipes-devtools/yq/yq_git.bb deleted +0 -87

87 lines not on this page · raw message

#1 lore raw
Quoted 12 lines · Peter Kjellerstedt via lists.yoctoproject.org

Refactor the recipe to use the gomod fetcher.

---

Bruce, I know you prefer to do things your own way, so feel free to ignore this. However, the current version of yq does not build with go 1.24 that comes with Walnascar so the yq recipe needs to be updated one way or the other. Since I have no idea how you update the dependencies in the current version of the recipe, it was easiest for me to generate a new recipe using one of our tools.

Yes, I'll do the update myself in the next few days.

I have no interest in using the oe mod fetchers, given the flux and my inability to debug and support them.

Bruce

Quoted 389 lines
 recipes-devtools/yq/yq-go-mods.inc  | 37 ++++++++++++
 recipes-devtools/yq/yq-licenses.inc | 24 ++++++++
 recipes-devtools/yq/yq_4.45.1.bb    | 40 +++++++++++++
 recipes-devtools/yq/yq_git.bb       | 87 -----------------------------
 4 files changed, 101 insertions(+), 87 deletions(-)
 create mode 100644 recipes-devtools/yq/yq-go-mods.inc
 create mode 100644 recipes-devtools/yq/yq-licenses.inc
 create mode 100644 recipes-devtools/yq/yq_4.45.1.bb
 delete mode 100644 recipes-devtools/yq/yq_git.bb
recipes-devtools/yq/yq-go-mods.inc new file +2 -0
new file mode 100644
index 00000000..0ba399f3
@@ -0,0 +1,37 @@
+SRC_URI += "\
+    gomod://

github.com/a8m/envsubst;version=v1.4.2;sha256sum=231eedf3a12c110a43c95f1658b26fba66f24ab289cbd249605b48c5544897ad
\
+ gomod://
github.com/alecthomas/participle/v2;version=v2.1.1;sha256sum=bea6113340aa301c0cc73d0a12cbd3453853ecad9bcec0eefae78eff15d67441 \
+ gomod://
github.com/alecthomas/repr;version=v0.4.0;sha256sum=e4d4ec046c3ad7425c8e78352dc114ab34b1dd7f3a42c640e19cb51c94484c36
\
+ gomod://
github.com/cpuguy83/go-md2man/v2;version=v2.0.4;mod=1;sha256sum=14c3afa2ef623555c1b4834d1f88b14df77549afee85e5750c19102465b78aba \
+ gomod://
github.com/davecgh/go-spew;version=v1.1.0;mod=1;sha256sum=bcb29393251237b79a17b6c19bf29134f43e8f438c3198988fcd461a1cdf05cc \
+ gomod://
github.com/dimchansky/utfbom;version=v1.1.1;sha256sum=0c1a11101602d5f57ac3e790c0b72e09ff87d8d535535f43fbee9e6a42327350
\
+ gomod://
github.com/elliotchance/orderedmap;version=v1.7.1;sha256sum=86680515eff3f3d3944149ef3e054dfdd8e6b9bad8fe00ee0a862893754c6a39 \
+ gomod://
github.com/fatih/color;version=v1.18.0;sha256sum=4dc6907b7f6807b37c21ad527d966437d398f03472115f471eaa8fe5875363d3
\
+ gomod://
github.com/goccy/go-json;version=v0.10.4;sha256sum=d89fa5215f5c2e0077b67dbc6e043db1b6427e93bdf5faacb7c536afca95e454
\
+ gomod://
github.com/goccy/go-yaml;version=v1.13.3;sha256sum=0d2c0c516c9aa022bc448ed4b8056340c4ccfb3ba70e3f873c319d4b66e75f59
\
+ gomod://
github.com/inconshreveable/mousetrap;version=v1.1.0;mod=1;sha256sum=1c1b15911aa8a0bd5cd0f6670ec23d1086496f3615fdf53306aff2b476ce9be1 \
+ gomod://
github.com/jinzhu/copier;version=v0.4.0;sha256sum=45a9bad09e85195732f408f9d505dc2b7f8868f9ddc3a1a7188999e5ca2d0775
\
+ gomod://
github.com/magiconair/properties;version=v1.8.9;sha256sum=8361b76b967090e33192173d91fb3de5f5ea43f6b8d23e927bf6d698fc8a0250 \
+ gomod://
github.com/mattn/go-colorable;version=v0.1.13;sha256sum=08be322dcc584a9fcfde5caf0cf878b4e11cd98f252e32bc704e92c5a4ba9d15 \
+ gomod://
github.com/mattn/go-isatty;version=v0.0.16;mod=1;sha256sum=714766ec82d67db895ade8af6b8054ad430c3cea5e15b3a888f23ed2f3e1b863 \
+ gomod://
github.com/mattn/go-isatty;version=v0.0.20;sha256sum=f2d5f89ca451577e17464b9bb596dc0d0ecececb5eaa63622c41b57cd0b7b8cc
\
+ gomod://
github.com/pelletier/go-toml/v2;version=v2.2.3;sha256sum=a51f4dc7b62bd7c26b387d912dfae87ca1449082f26574c9f614ae640318b092 \
+ gomod://
github.com/pkg/diff;version=v0.0.0-20210226163009-20ebb0f2a09e;sha256sum=f35b23fdd2b9522ddd46cc5c0161b4f0765c514475d5d4ca2a86aca31388c8bd \
+ gomod://
github.com/pmezard/go-difflib;version=v1.0.0;mod=1;sha256sum=74b2e766eb215377864d587badf57e95521f692d2a7860b3c7759093f9c9bec2 \
+ gomod://
github.com/russross/blackfriday/v2;version=v2.1.0;mod=1;sha256sum=c39547cce6e866e8cfa395d2937bce30801cd07f0b901c2133248f1fba12f58d \
+ gomod://
github.com/spf13/cobra;version=v1.8.1;sha256sum=bf27a276f87257c93bc057309df30265a19beefc3d5fc887cbd8fc99ad35466a
\
+ gomod://
github.com/spf13/pflag;version=v1.0.5;sha256sum=fc6e704f2f6a84ddcdce6de0404e5340fa20c8676181bf5d381b17888107ba84
\
+ gomod://
github.com/stretchr/objx;version=v0.1.0;mod=1;sha256sum=1350354d52d2287a62336ecc0d56232d4c47699af9bba49c67c2b48254da98f1 \
+ gomod://
github.com/stretchr/testify;version=v1.7.0;mod=1;sha256sum=fff8168d98e6a07156c454a1b6e925509f3177e96c155516d7f96b4079cca3bf \
+ gomod://
github.com/yuin/gopher-lua;version=v1.1.1;sha256sum=ac45a1524a39049167f1bb2334b67f728559cb1e60c535c54b3a09f1fc772b45
\
+ gomod://
golang.org/toolchain;version=v0.0.1-go1.22.5.linux-amd64;sha256sum=0eb73889fac3ef46a759ca3f8079a7ff656158ee6aedfe127221101824001a77 \
+ gomod://
golang.org/x/net;version=v0.33.0;sha256sum=a85014e77369f99c3f9eebe1289b4d0757d58248ca12337642923818ae22ca19
\
+ gomod://
golang.org/x/sys;version=v0.0.0-20220811171246-fbc7d0a398ab;mod=1;sha256sum=f033333096fe198f3151deed93f2deba74e50bbfe7739134045bc3b7ce4a5024 \
+ gomod://
golang.org/x/sys;version=v0.28.0;sha256sum=0ed47a83fe7d7a7e743e815172bc10c1ac0ed0d31ebb095e75717428e09aa895
\
+ gomod://
golang.org/x/sys;version=v0.6.0;mod=1;sha256sum=f033333096fe198f3151deed93f2deba74e50bbfe7739134045bc3b7ce4a5024
\
+ gomod://
golang.org/x/text;version=v0.21.0;sha256sum=be3db791651af6f2cb0225aa5d5578c23149b2017246ba8e59586080baadd612
\
+ gomod://
gopkg.in/check.v1;version=v0.0.0-20161208181325-20d25e280405;mod=1;sha256sum=5c306e0d633cd66a11b40e2e5fbbc6da42110db7d72ea3c1524ceb45ee40c33f \
+ gomod://
gopkg.in/op/go-logging.v1;version=v1.0.0-20160211212156-b2cb9fa56473;sha256sum=028f2b859f2d7800d07a6fb36ef1562a95219941f3b1421cdad5e95c44986ab3 \
+ gomod://
gopkg.in/yaml.v3;version=v3.0.0-20200313102051-9f266ea9e77c;mod=1;sha256sum=21579860a20306fcf43b1bd234d1fba319499c77611b71c05f9bf3ba90dab939 \
+ gomod://
gopkg.in/yaml.v3;version=v3.0.1;sha256sum=aab8fbc4e6300ea08e6afe1caea18a21c90c79f489f52c53e2f20431f1a9a015
\
+"

recipes-devtools/yq/yq-licenses.inc new file +4 -0
new file mode 100644
index 00000000..80ddb5e7
@@ -0,0 +1,24 @@
+GO_MOD_LICENSES = "Apache-2.0 & BSD-2-Clause & BSD-3-Clause & MIT"
+
+LIC_FILES_CHKSUM += "\
+    file://pkg/mod/

github.com/a8m/[email protected]/LICENSE;md5=20cbf74752fb062bc260b078d71d7e30
\
+ file://pkg/mod/
github.com/alecthomas/participle/[email protected]/COPYING;md5=c9b197062ffa2eb27eed3d8ef59c1a56 \
+ file://pkg/mod/
github.com/dimchansky/[email protected]/LICENSE;md5=d5b81a403268b5ea485b4a2579630c17
\
+ file://pkg/mod/
github.com/elliotchance/[email protected]/LICENSE;md5=47a0bd50edb1474747d074fc0ba1ead5
\
+ file://pkg/mod/
github.com/fatih/[email protected]/LICENSE.md;md5=316e6d590bdcde7993fb175662c0dd5a
\
+ file://pkg/mod/
github.com/goccy/[email protected]/LICENSE;md5=33a07164132d795872805bfc53f6097d
\
+ file://pkg/mod/
github.com/goccy/[email protected]/LICENSE;md5=346470d8ac0a6ffe1eb8635a452cec2b
\
+ file://pkg/mod/
github.com/magiconair/[email protected]/LICENSE.md;md5=714beb7325ffa89d5a68d936a3bb04e5 \
+ file://pkg/mod/
github.com/mattn/[email protected]/LICENSE;md5=24ce168f90aec2456a73de1839037245
\
+ file://pkg/mod/
github.com/mattn/[email protected]/LICENSE;md5=f509beadd5a11227c27b5d2ad6c9f2c6
\
+ file://pkg/mod/
github.com/pelletier/go-toml/[email protected]/LICENSE;md5=390892c6562af0d807e527b06d635f94
\
+ file://pkg/mod/
github.com/pkg/[email protected]/LICENSE;md5=d0250703509998b3201f5dd7f26e8c35 \
+ file://pkg/mod/
github.com/spf13/[email protected]/LICENSE.txt;md5=920d76114a32b0fb75b3f2718c5a91be
\
+ file://pkg/mod/
github.com/spf13/[email protected]/LICENSE;md5=1e8b7dc8b906737639131047a590f21d
\
+ file://pkg/mod/
github.com/yuin/[email protected]/LICENSE;md5=5ea59bf62229a35ae7b2c7208524163e
\
+ file://pkg/mod/
golang.org/x/[email protected]/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a \
+ file://pkg/mod/
golang.org/x/[email protected]/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a \
+ file://pkg/mod/
golang.org/x/[email protected]/LICENSE;md5=7998cb338f82d15c0eff93b7004d272a \
+ file://pkg/mod/
gopkg.in/op/[email protected]/LICENSE;md5=d01d49c2816e0112c83b3a9f77029b8a \
+ file://pkg/mod/
gopkg.in/[email protected]/LICENSE;md5=3c91c17266710e16afdbb2b6d15c761c \
+"

recipes-devtools/yq/ renamed from recipes-devtools/yq/yq_4.45.1.bb +0 -0

yq_4.45.1.bb
new file mode 100644
index 00000000..b942ca0b

recipes-devtools/yq/yq_4.45.1.bb new file +5 -0
@@ -0,0 +1,40 @@
+SUMMARY = "A lightweight and portable command-line YAML processor"
+HOMEPAGE = "https://github.com/mikefarah/yq"
+
+LICENSE = "MIT & ${GO_MOD_LICENSES}"
+LIC_FILES_CHKSUM =

"file://src/${GO_IMPORT}/LICENSE;md5=e40a0dcd62f8269b9bff37fe9aa7dcc2"

recipes-devtools/yq/yq_4.45.1.bb new file +6 -0
+require ${BPN}-licenses.inc
+
+SRCREV = "8bf425b4d1344db7cd469a8d10a390876e0c77fd"
+SRCREV_FORMAT = "default"
+
+SRC_URI =

"git://${GO_IMPORT}.git;protocol=https;branch=master;destsuffix=${GO_SRCURI_DESTSUFFIX}"

recipes-devtools/yq/yq_4.45.1.bb new file +11 -0
+SRC_URI += "file://run-ptest"
+require ${BPN}-go-mods.inc
+
+S = "${WORKDIR}/git"
+
+GO_IMPORT = "github.com/mikefarah/yq"
+
+inherit go-mod ptest
+
+do_install:append() {
+    # these bring in dependencies for the -dev package on bash, and we

don't

recipes-devtools/yq/yq_4.45.1.bb new file +18 -0
+    # need them .. so we remove them to avoid needing that rdepends
+    rm -rf ${D}/${libdir}/go/src/${GO_IMPORT}/debian/rules
+    rm -rf ${D}/${libdir}/go/src/${GO_IMPORT}/scripts
+    rm -rf ${D}/${libdir}/go/src/${GO_IMPORT}/acceptance_tests
+}
+
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests
+    cp -r ${S}/src/${GO_IMPORT}/scripts/* ${D}${PTEST_PATH}/tests
+    cp -r ${S}/src/${GO_IMPORT}/acceptance_tests/* ${D}${PTEST_PATH}/tests
+    cp -r ${S}/src/${GO_IMPORT}/examples ${D}${PTEST_PATH}/tests
+}
+
+RDEPENDS:${PN}-ptest += " \
+    bash \
+"
+
+BBCLASSEXTEND = "native"
recipes-devtools/yq/yq_git.bb deleted +0 -5
deleted file mode 100644
index 3d0714c7..00000000
@@ -1,87 +0,0 @@
-SUMMARY = "a lightweight and portable command-line YAML processor "
-HOMEPAGE = "https://github.com/mikefarah/yq"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM =

"file://src/${GO_IMPORT}/LICENSE;md5=e40a0dcd62f8269b9bff37fe9aa7dcc2"

recipes-devtools/yq/yq_git.bb deleted +0 -22
-
-SRCREV_yq = "dd6cf3df146f3e2c0f8c765a6ef9e35780ad8cc1"
-SRCREV_color = "daf2830f2741ebb735b21709a520c5f37d642d85"
-SRCREV_lexer = "6cdefc42e112ac71cbe316e1eed264ea62f58e25"
-SRCREV_cobra = "b43be995ebb4bee335a787bd44498b91aef7619c"
-SRCREV_pflag = "2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab"
-SRCREV_logging = "b2cb9fa56473e98db8caba80237377e83fe44db5"
-SRCREV_yaml = "f6f7691b1fdeb513f56608cd2c32c51f8194bf51"
-SRCREV_xerrors = "65e65417b02f28de84b55f16b46a1e789149973a"
-SRCREV_envsubst = "16035fe3571ad42c7796bf554f978bb2df64231b"
-SRCREV_participle = "49f4822ed012d9818c80ca4fcdeb7e2d55c04806"
-SRCREV_utfbom = "6ae8f945ca96f30defc7e8ab12ec5d10cf86ded4"
-SRCREV_orderedmap = "1e43e194ff533a346bab5f9b66b738256f199c8a"
-SRCREV_go-json = "5efc7d07eeeba186df630d9ab4ac78c761938c27"
-SRCREV_copier = "d132b069fe1a77d09e4c260852b389a730bbe9ba"
-SRCREV_properties = "c9a06e8f8f0164e4e16c0d5c4793cbed4ac90264"
-SRCREV_net = "f3363e06e74cdc304618bf31d898b78590103527"
-SRCREV_text = "434eadcdbc3b0256971992e8c70027278364c72c"
-SRCREV_diff = "20ebb0f2a09e612109b224b32f79370409108bcc"
-
-SRCREV_FORMAT = "yq_color"
-SRC_URI =

"git://${GO_IMPORT};name=yq;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}
\
- git://
github.com/fatih/color;name=color;destsuffix=build/vendor/src/github.com/fatih/color;branch=main;protocol=https
\
- git://
github.com/goccy/go-yaml;name=lexer;destsuffix=build/vendor/src/github.com/goccy/go-yaml/;branch=master;protocol=https \
- git://
github.com/spf13/cobra;name=cobra;nobranch=1;destsuffix=build/vendor/src/github.com/spf13/cobra;branch=main;protocol=https \
- git://
github.com/spf13/pflag;name=pflag;destsuffix=build/vendor/src/github.com/spf13/pflag;branch=master;protocol=https
\
- git://
github.com/op/go-logging.git;name=logging;destsuffix=build/vendor/src/gopkg.in/op/go-logging.v1;branch=master;protocol=https \
- git://
github.com/go-yaml/yaml.git;name=yaml;branch=v3;destsuffix=build/vendor/src/gopkg.in/yaml.v3;protocol=https
\
- git://
github.com/golang/xerrors;name=xerrors;protocol=https;nobranch=1;destsuffix=build/vendor/src/golang.org/x/xerrors
\
- git://
github.com/a8m/envsubst;name=envsubst;destsuffix=build/vendor/src/github.com/a8m/envsubst;branch=master;protocol=https \
- git://
github.com/alecthomas/participle;name=participle;destsuffix=build/vendor/src/github.com/alecthomas/participle;branch=master;protocol=https \
- git://
github.com/dimchansky/utfbom;name=utfbom;destsuffix=build/vendor/src/github.com/dimchansky/utfbom;branch=master;protocol=https \
- git://
github.com/elliotchance/orderedmap;name=orderedmap;destsuffix=build/vendor/src/github.com/elliotchance/orderedmap;branch=master;protocol=https \
- git://
github.com/goccy/go-json;name=go-json;destsuffix=build/vendor/src/github.com/goccy/go-json;branch=master;protocol=https \
- git://
github.com/jinzhu/copier;name=copier;destsuffix=build/vendor/src/github.com/jinzhu/copier;branch=master;protocol=https \
- git://
github.com/magiconair/properties;name=properties;destsuffix=build/vendor/src/github.com/magiconair/properties;branch=main;protocol=https \
- git://
github.com/golang/net;name=net;destsuffix=build/vendor/src/golang.org/x/net;branch=master;protocol=https
\
- git://
github.com/golang/text;name=text;destsuffix=build/vendor/src/golang.org/x/text;branch=master;protocol=https
\
- git://
github.com/pkg/diff;name=diff;destsuffix=build/vendor/src/github.com/pkg/diff;branch=main;protocol=https;apply=no
\

recipes-devtools/yq/yq_git.bb deleted +0 -13
-           file://run-ptest \
-           "
-
-PV = "4.30.8+git${SRCREV_yq}"
-GO_IMPORT = "github.com/mikefarah/yq"
-
-inherit go ptest
-
-do_compile:prepend() {
-    # arrange for some of the golang built ins to be found
-    (
-       cd ${WORKDIR}/build/src/
-       ln -sf ${STAGING_DIR_TARGET}/${prefix}/lib/go/src/cmd/vendor/

golang.org .

recipes-devtools/yq/yq_git.bb deleted +0 -12
-
-       cd ${WORKDIR}/build/
-       ln -sf ${UNPACKDIR}/build/vendor .
-    )
-
-    # arrange for the fetched dependencies to be found
-    export GOPATH="${GOPATH}:${WORKDIR}/build/vendor/"
-    export GO111MODULE=off
-}
-
-do_install:append() {
-    # these bring in dependencies for the -dev package on bash, and we

don't

recipes-devtools/yq/yq_git.bb deleted +0 -9
-    # need them .. so we remove them to avoid needing that rdepends
-    rm -rf ${D}/${libdir}/go/src/${GO_IMPORT}/debian/rules
-    rm -rf ${D}/${libdir}/go/src/${GO_IMPORT}/scripts
-    rm -rf ${D}/${libdir}/go/src/${GO_IMPORT}/acceptance_tests
-}
-
-do_install_ptest() {
-    install -d ${D}${PTEST_PATH}/tests
-    cp -r ${S}/src/github.com/mikefarah/yq/scripts/*

${D}${PTEST_PATH}/tests
- cp -r ${S}/src/github.com/mikefarah/yq/acceptance_tests/*
${D}${PTEST_PATH}/tests
- cp -r ${S}/src/github.com/mikefarah/yq/examples
${D}${PTEST_PATH}/tests

recipes-devtools/yq/yq_git.bb deleted +0 -8
-}
-
-RDEPENDS:${PN}-ptest += " \
-    bash \
-"
-
-BBCLASSEXTEND = "native"
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group. View/Reply Online (#9223):
https://lists.yoctoproject.org/g/meta-virtualization/message/9223
Mute This Topic: https://lists.yoctoproject.org/mt/112264276/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II