On Thu, Oct 12, 2017 at 11:49 AM, Paul Barker <pbar...@toganlabs.com> wrote:
> The recvtty demo/reference application has cross compilation issues when > targeting aarch64 platforms. As it is just a demo application and is not > usually > used, we can just patch the Makefile to disable building this application. > > Signed-off-by: Paul Barker <pbar...@toganlabs.com> > Acked-by: Aníbal Limón <anibal.li...@linaro.org> > --- > .../0001-Disable-building-recvtty.patch | 26 > ++++++++++++++++++++++ > recipes-containers/runc/runc-docker_git.bb | 1 + > 2 files changed, 27 insertions(+) > create mode 100644 recipes-containers/runc/runc- > docker/0001-Disable-building-recvtty.patch > > diff --git > a/recipes-containers/runc/runc-docker/0001-Disable-building-recvtty.patch > b/recipes-containers/runc/runc-docker/0001-Disable-building-recvtty.patch > new file mode 100644 > index 0000000..fa1f695 > --- /dev/null > +++ b/recipes-containers/runc/runc-docker/0001-Disable- > building-recvtty.patch > @@ -0,0 +1,26 @@ > +From aa2fc7b0eacba61175f083cc8d8adc233bcd0575 Mon Sep 17 00:00:00 2001 > +From: Paul Barker <pbar...@toganlabs.com> > +Date: Thu, 12 Oct 2017 11:34:24 +0000 > +Subject: [PATCH] Disable building recvtty > + > +Signed-off-by: Paul Barker <pbar...@toganlabs.com> > +Upstream-status: Inappropriate > +--- > + Makefile | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/Makefile b/Makefile > +index 0fcf508..24f47dc 100644 > +--- a/src/import/Makefile > ++++ b/src/import/Makefile > +@@ -38,7 +38,6 @@ contrib/cmd/recvtty/recvtty: $(SOURCES) > + > + static: $(SOURCES) > + CGO_ENABLED=1 $(GO) build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) > cgo static_build" -ldflags "-w -extldflags -static -X > main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o > runc . > +- CGO_ENABLED=1 $(GO) build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) > cgo static_build" -ldflags "-w -extldflags -static -X > main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o > contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty > + > + release: > + @flag_list=(seccomp selinux apparmor static); \ > +-- > +2.7.4 > + > diff --git a/recipes-containers/runc/runc-docker_git.bb > b/recipes-containers/runc/runc-docker_git.bb > index 0198652..28232d9 100644 > --- a/recipes-containers/runc/runc-docker_git.bb > +++ b/recipes-containers/runc/runc-docker_git.bb > @@ -9,6 +9,7 @@ SRC_URI = "git://github.com/docker/runc. > git;nobranch=1;name=runc-docker \ > file://0003-Update-memory-specs-to-use-int64-not-uint64.patch > \ > file://0001-runc-Add-console-socket-dev-null.patch \ > file://0001-Use-correct-go-cross-compiler.patch \ > + file://0001-Disable-building-recvtty.patch \ > " > > GO_IMPORT = "import" > -- > 2.7.4 > > -- > _______________________________________________ > meta-virtualization mailing list > meta-virtualization@yoctoproject.org > https://lists.yoctoproject.org/listinfo/meta-virtualization >
-- _______________________________________________ meta-virtualization mailing list meta-virtualization@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-virtualization