Message ID | 20250604022059.2192970-1-Qi.Chen@windriver.com |
---|---|
State | Not Applicable |
Delegated to: | Steve Sakoman |
Headers | show |
Series | [walnascar] yq_git: add back apply=no for SRC_URI diff | expand |
Sorry, wrong mailing list. Recall this patch. Regards, Qi On 6/4/25 10:20, Chen Qi via lists.openembedded.org wrote: > From: Chen Qi <Qi.Chen@windriver.com> > > This apply=no was dropped during last upgrade. This causes > do_patch error when using git shallow tarball. > > The original patch that added apply=no is: > https://lists.yoctoproject.org/g/meta-virtualization/message/8804 > > Signed-off-by: Chen Qi <Qi.Chen@windriver.com> > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> > Signed-off-by: Chen Qi <Qi.Chen@windriver.com> > --- > recipes-devtools/yq/yq_git.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/recipes-devtools/yq/yq_git.bb b/recipes-devtools/yq/yq_git.bb > index 9682ec95..b1700bd2 100644 > --- a/recipes-devtools/yq/yq_git.bb > +++ b/recipes-devtools/yq/yq_git.bb > @@ -25,7 +25,7 @@ SRCREV_text = "566b44fc931e2542778a18423c655ce99b4f1402" > SRC_URI += "git://go.googlesource.com/text;name=text;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/golang.org/x/text" > > SRCREV_diff = "20ebb0f2a09e612109b224b32f79370409108bcc" > -SRC_URI += "git://github.com/pkg/diff;name=diff;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/pkg/diff" > +SRC_URI += "git://github.com/pkg/diff;name=diff;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/pkg/diff;apply=no" > > SRCREV_color = "1c8d8706604ee5fb9a464e5097ba113101828a75" > SRC_URI += "git://github.com/fatih/color;name=color;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/fatih/color" > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#217830): https://lists.openembedded.org/g/openembedded-core/message/217830 > Mute This Topic: https://lists.openembedded.org/mt/113460032/7304865 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [Qi.Chen@eng.windriver.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/recipes-devtools/yq/yq_git.bb b/recipes-devtools/yq/yq_git.bb index 9682ec95..b1700bd2 100644 --- a/recipes-devtools/yq/yq_git.bb +++ b/recipes-devtools/yq/yq_git.bb @@ -25,7 +25,7 @@ SRCREV_text = "566b44fc931e2542778a18423c655ce99b4f1402" SRC_URI += "git://go.googlesource.com/text;name=text;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/golang.org/x/text" SRCREV_diff = "20ebb0f2a09e612109b224b32f79370409108bcc" -SRC_URI += "git://github.com/pkg/diff;name=diff;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/pkg/diff" +SRC_URI += "git://github.com/pkg/diff;name=diff;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/pkg/diff;apply=no" SRCREV_color = "1c8d8706604ee5fb9a464e5097ba113101828a75" SRC_URI += "git://github.com/fatih/color;name=color;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor/github.com/fatih/color"