diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2024-06-19 01:54:32 -0700 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-07-10 15:59:26 +0000 |
commit | affb2252f4be6d5fcaaa46d34690593bc3b99f55 (patch) | |
tree | 66beff04e74571786e9ddf94c76e0c135d1317ce | |
parent | 93113db99cb4f05dd2bd391a3e10b7600dba3d28 (diff) | |
download | meta-virtualization-affb2252f4be6d5fcaaa46d34690593bc3b99f55.tar.gz |
yq_git: Set apply=no for SRC_URI diff
Fixed a do_patch error use git shallow tarball (BB_GIT_SHALLOW = "1"):
$ bitbake yp -cpatch
ERROR: do_patch: Importing patch 'github.com.pkg.diff' with striplevel '1'
The github.com.pkg.diff is ud.clonedir of git://github.com/pkg/diff:
* When use regular git repo as source, oe.patch.patch_path() will NOT
handle it as a patch since the directory github.com.pkg.diff exists,
and nothing is wrong.
* When use git shallow tarball, the github.com.pkg.diff doesn't exist since
it is fetched as a tarball, then oe.patch.patch_path() will handle it
as a patch, then the error happens.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r-- | recipes-devtools/yq/yq_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-devtools/yq/yq_git.bb b/recipes-devtools/yq/yq_git.bb index 014101ba..a1adfc96 100644 --- a/recipes-devtools/yq/yq_git.bb +++ b/recipes-devtools/yq/yq_git.bb | |||
@@ -41,7 +41,7 @@ SRC_URI = "git://${GO_IMPORT};name=yq;branch=master;protocol=https;destsuffix=${ | |||
41 | git://github.com/magiconair/properties;name=properties;destsuffix=build/vendor/src/github.com/magiconair/properties;branch=main;protocol=https \ | 41 | git://github.com/magiconair/properties;name=properties;destsuffix=build/vendor/src/github.com/magiconair/properties;branch=main;protocol=https \ |
42 | git://github.com/golang/net;name=net;destsuffix=build/vendor/src/golang.org/x/net;branch=master;protocol=https \ | 42 | git://github.com/golang/net;name=net;destsuffix=build/vendor/src/golang.org/x/net;branch=master;protocol=https \ |
43 | git://github.com/golang/text;name=text;destsuffix=build/vendor/src/golang.org/x/text;branch=master;protocol=https \ | 43 | git://github.com/golang/text;name=text;destsuffix=build/vendor/src/golang.org/x/text;branch=master;protocol=https \ |
44 | git://github.com/pkg/diff;name=diff;destsuffix=build/vendor/src/github.com/pkg/diff;branch=main;protocol=https \ | 44 | git://github.com/pkg/diff;name=diff;destsuffix=build/vendor/src/github.com/pkg/diff;branch=main;protocol=https;apply=no \ |
45 | file://run-ptest \ | 45 | file://run-ptest \ |
46 | " | 46 | " |
47 | 47 | ||