Skip to contentSkip to conversation

yq_git: add back apply=no for SRC_URI diff

PATCH Applied [email protected] 2 participants 2 messages Jun 4, 2025 – Jun 5, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 yq_git: add back apply=no for SRC_URI diff

From: Chen Qi <[email protected]>

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

---
 recipes-devtools/yq/yq_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-devtools/yq/yq_git.bb +1 -1
index 9682ec95..b1700bd2 100644
@@ -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"
Signature · 1 line
2.34.1
#1 lore raw

merged to walnascar

Bruce

In message: [meta-virtualization][walnascar][PATCH] yq_git: add back apply=no for SRC_URI diff

Quoted 41 lines · on 04/06/2025 Chen Qi via lists.yoctoproject.org wrote:

From: Chen Qi <[email protected]>

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

---
 recipes-devtools/yq/yq_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-devtools/yq/yq_git.bb +1 -1
index 9682ec95..b1700bd2 100644
@@ -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"
Signature · 11 lines
2.34.1



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