summaryrefslogtreecommitdiffstats
path: root/recipes-containers
diff options
context:
space:
mode:
authorAdrian Freihofer <adrian.freihofer@gmail.com>2022-04-08 14:33:46 +0200
committerBruce Ashfield <bruce.ashfield@gmail.com>2022-04-11 10:27:14 -0400
commitbed7142c26c2bff1eb690c42eed07ac0ed535ba2 (patch)
tree399613b506a1e77a902b64b4dd428919cc993b01 /recipes-containers
parentd4f84ae3cda7618c70b2853aea28f5084ff2effd (diff)
downloadmeta-virtualization-bed7142c26c2bff1eb690c42eed07ac0ed535ba2.tar.gz
k3s: do not use a go file as patch
On some build hosts, one of our downloaded depedencies matches patch.bbclass' regex, and is then thought to be a patch. That leads to errors as follows: Compiling k3s failed with: do_patch: Importing patch 'github.com.andreyvit.diff' with striplevel '1' We add a noapply to the SRC_URI to ensure that it is not considered a patch. Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers')
-rw-r--r--recipes-containers/k3s/k3s_git.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/k3s_git.bb
index e2a3ffc5..53a86777 100644
--- a/recipes-containers/k3s/k3s_git.bb
+++ b/recipes-containers/k3s/k3s_git.bb
@@ -219,7 +219,7 @@ SRC_URI += "git://github.com/alexflint/go-filemutex;name=go-filemutex;protocol=h
219# github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 219# github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
220# [1] git ls-remote https://github.com/andreyvit/diff c7f18ee00883bfd3b00e0a2bf7607827e0148ad4 220# [1] git ls-remote https://github.com/andreyvit/diff c7f18ee00883bfd3b00e0a2bf7607827e0148ad4
221SRCREV_diff="c7f18ee00883bfd3b00e0a2bf7607827e0148ad4" 221SRCREV_diff="c7f18ee00883bfd3b00e0a2bf7607827e0148ad4"
222SRC_URI += "git://github.com/andreyvit/diff;name=diff;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/andreyvit/diff" 222SRC_URI += "git://github.com/andreyvit/diff;name=diff;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/andreyvit/diff;apply=no"
223 223
224# github.com/andybalholm/cascadia v1.0.0 224# github.com/andybalholm/cascadia v1.0.0
225# [1] git ls-remote https://github.com/andybalholm/cascadia 901648c87902174f774fac311d7f176f8647bdaa 225# [1] git ls-remote https://github.com/andybalholm/cascadia 901648c87902174f774fac311d7f176f8647bdaa