On Fri, Apr 8, 2022 at 8:53 AM Bruce Ashfield via lists.yoctoproject.org <[email protected]> wrote:
> > > On Fri, Apr 8, 2022 at 8:34 AM Adrian Freihofer < > [email protected]> wrote: > >> Compiling k3s failed with: >> do_patch: Importing patch 'github.com.andreyvit.diff' with striplevel '1' >> >> The problem is that github.com/andreyvit/diff ends up as >> github.com.andreyvit.diff >> in the download folder which than matches the test in patch.py. >> >> > I've built this K3S hundreds of times, and have never seen this, so I > won't apply this until I figure out what is the difference between your > environment and mine. > > Can you share more details about your build environment, etc. > I am seeing a different fetch issue on a new/fresh machine I brought up this morning, using the -tip of master for all layers. My cached downloads were keeping it working on my other machines. I'll get past that issue and see if I get the patch issue. Cheers, Bruce > > > >> Not sure how you create this huge SRC_URI list. Probably it would be the >> best to add the apply=no to all urls. >> >> > Eh, no. I'm not going to append that to all the URIs just because of one > outlier that matched. > > Bruce > > > >> Signed-off-by: Adrian Freihofer <[email protected]> >> --- >> recipes-containers/k3s/k3s_git.bb | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/recipes-containers/k3s/k3s_git.bb b/recipes-containers/k3s/ >> k3s_git.bb >> index e2a3ffc..53a8677 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 >> <http://github.com/andreyvit/diff;name=diff;protocol=https;nobranch=1;destsuffix=$%7BWORKDIR%7D/$%7BBP%7D/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 >> <http://github.com/andreyvit/diff;name=diff;protocol=https;nobranch=1;destsuffix=$%7BWORKDIR%7D/$%7BBP%7D/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 >> -- >> 2.35.1 >> >> >> >> >> > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await thee > at its end > - "Use the force Harry" - Gandalf, Star Trek II > > > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7136): https://lists.yoctoproject.org/g/meta-virtualization/message/7136 Mute This Topic: https://lists.yoctoproject.org/mt/90334188/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
