Hi Bruce, Bruce Ashfield <[email protected]> escreveu no dia terça, 20/09/2022 à(s) 13:45:
> Jose, > > There were a few typos in the patch, I've fixed them up, and tweaked > the shortlog. > Thanks for fixing my typos that is something I need to improve. > > I've relocated this to the .inc file, as both docker-moby and > docker-ce should be consistent with this possible tweak. > Relocating to the .inc seams more appropriate but I only test the patch with docker-ce on riscv. > > I also added a comment above the export to indicate that the default > value comes from go.bbclass and that currently only libnetwork / proxy > will leverage it. This kind of description always helps. > > The result is on master-next, have a look and let me know if it > addresses your issue. > Perfect, yours looks better. Jose > > Bruce > > On Tue, Sep 20, 2022 at 7:46 AM Jose Quaresma <[email protected]> > wrote: > > > > The linkshared is not supported in some machines like riscv64 and > > when supported we can use the GO_LINKSHARED instaed. > > So export GO_LINKSHARED on the recipe to be available for Makafile. > > > > Signed-off-by: Jose Quaresma <[email protected]> > > --- > > recipes-containers/docker/docker-ce_git.bb | 3 +++ > > .../docker/files/0001-libnetwork-use-GO-instead-of-go.patch | 4 ++-- > > 2 files changed, 5 insertions(+), 2 deletions(-) > > > > diff --git a/recipes-containers/docker/docker-ce_git.bb > b/recipes-containers/docker/docker-ce_git.bb > > index b36ac0d..f010648 100644 > > --- a/recipes-containers/docker/docker-ce_git.bb > > +++ b/recipes-containers/docker/docker-ce_git.bb > > @@ -55,3 +55,6 @@ DOCKER_VERSION = "20.10.17-ce" > > PV = "${DOCKER_VERSION}+git${SRCREV_docker}" > > > > CVE_PRODUCT = "docker" > > + > > +# to be used in the Makefile > > +export GO_LINKSHARED > > diff --git > a/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch > b/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch > > index d4f84e3..b9b41de 100644 > > --- > a/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch > > +++ > b/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch > > @@ -34,8 +34,8 @@ Index: git/libnetwork/Makefile > > @echo "🐳 $@" > > - go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet > > - go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy > > -+ @$(GO) build -trimpath -linkshared $(GOBUILDFLAGS) -o > "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy > > -+ @$(GO) build -trimpath -linkshared $(GOBUILDFLAGS) -o > "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet > > ++ @$(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o > "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy > > ++ @$(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o > "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet > > > > # Rebuild protocol buffers. > > # These may need to be rebuilt after vendoring updates, so .proto > files are declared .PHONY so they are always rebuilt. > > -- > > 2.34.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 > -- Best regards, José Quaresma
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7625): https://lists.yoctoproject.org/g/meta-virtualization/message/7625 Mute This Topic: https://lists.yoctoproject.org/mt/93801294/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
