From bed7142c26c2bff1eb690c42eed07ac0ed535ba2 Mon Sep 17 00:00:00 2001 From: Adrian Freihofer Date: Fri, 8 Apr 2022 14:33:46 +0200 Subject: 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 Signed-off-by: Bruce Ashfield --- recipes-containers/k3s/k3s_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-containers') 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 # github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 # [1] git ls-remote https://github.com/andreyvit/diff c7f18ee00883bfd3b00e0a2bf7607827e0148ad4 SRCREV_diff="c7f18ee00883bfd3b00e0a2bf7607827e0148ad4" -SRC_URI += "git://github.com/andreyvit/diff;name=diff;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/andreyvit/diff" +SRC_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" # github.com/andybalholm/cascadia v1.0.0 # [1] git ls-remote https://github.com/andybalholm/cascadia 901648c87902174f774fac311d7f176f8647bdaa -- cgit v1.2.3-54-g00ecf