On Mon, Aug 28, 2023 at 4:28 PM Javier Tia <[email protected]> wrote: > > Recipes that use multiple SCMs in the SRC_URI, must supply SRCREV_FORMAT > to avoid an expansion error. > > Signed-off-by: Javier Tia <[email protected]> > --- > recipes-devtools/go/go-build_git.bb | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/recipes-devtools/go/go-build_git.bb > b/recipes-devtools/go/go-build_git.bb > index 2337c9e1..2a78be01 100644 > --- a/recipes-devtools/go/go-build_git.bb > +++ b/recipes-devtools/go/go-build_git.bb > @@ -4,12 +4,12 @@ DESCRIPTION = "Xen Runtime for OCI" > > SRCREV_runx = "f24efd33fb18469e9cfe4d1bfe8e2c90ec8c4e93" > SRCREV_runc = "1e7bb5b773162b57333d57f612fd72e3f8612d94" > - > +SRCREV_FORMAT = "runx" > SRC_URI = "\ > - git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https \ > - > git://github.com/opencontainers/runc;branch=release-1.1;name=runc;protocol=https;destsuffix=git/src/import/gobuild/go/src/github.com/opencontainers/runc > \ > - file://0001-build-use-instead-of-go.patch \ > - " > + git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https \ > + > git://github.com/opencontainers/runc;branch=release-1.1;name=runc;protocol=https;destsuffix=git/src/import/gobuild/go/src/github.com/opencontainers/runc > \ > + file://0001-build-use-instead-of-go.patch \ > +"
There's some extra whitespace and formatting changes in the patch, it's a good policy to not mix them in with a fix. In a scenario like this, I tend to use the representative SCMs in the format. So in this case it should be runx_runc. There are some exceptions to this in the tree, and I need to fix them. I've spun a patch with just that for master-next. Bruce > SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b" > SRC_URI[sha256sum] = > "5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769" > > -- > 2.42.0 > > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8258): https://lists.yoctoproject.org/g/meta-virtualization/message/8258 Mute This Topic: https://lists.yoctoproject.org/mt/101018420/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/leave/6693005/21656/1014668956/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
