MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

runc-docker: Disable building recvtty

Browse Source 
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 <pbarker@toganlabs.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Paul Barker 2017-10-12 16:49:56 +00:00 committed by Bruce Ashfield
parent 638ba96208
commit c1cd2d4c69
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
recipes-containers/runc/runc-docker/0001-Disable-building-recvtty.patch Normal file
View File

@ -0,0 +1,26 @@
From aa2fc7b0eacba61175f083cc8d8adc233bcd0575 Mon Sep 17 00:00:00 2001
From: Paul Barker <pbarker@toganlabs.com>
Date: Thu, 12 Oct 2017 11:34:24 +0000
Subject: [PATCH] Disable building recvtty
Signed-off-by: Paul Barker <pbarker@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

1
recipes-containers/runc/runc-docker_git.bb
View File

@ -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://0003-Update-memory-specs-to-use-int64-not-uint64.patch \
file://0001-runc-Add-console-socket-dev-null.patch \ file://0001-runc-Add-console-socket-dev-null.patch \
file://0001-Use-correct-go-cross-compiler.patch \ file://0001-Use-correct-go-cross-compiler.patch \
file://0001-Disable-building-recvtty.patch \
" "
GO_IMPORT = "import" GO_IMPORT = "import"