oci-runtime-tools: add package
Package oci-runtime-tool itself as well as oci-runtime-tests containing runtime validation test executables as well as rootfs tarballs used by the tests. oci-runtime-tool can be used to generate OCI spec files or validate OCI bundles. To validate the OCI runtime (runc, crun, uxc, maybe others) itself, install the 'oci-runtime-tests' package as well as 'node-npm', use npm to install node-tap and symlink the tap executable to /usr/bin. Then cd /usr/libexec/oci-runtime-tests tap *.t Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
parent
702216588d
commit
6b9fdf2e77
2 changed files with 126 additions and 0 deletions
83
utils/oci-runtime-tools/Makefile
Normal file
83
utils/oci-runtime-tools/Makefile
Normal file
|
|
@ -0,0 +1,83 @@
|
||||||
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
|
PKG_NAME:=oci-runtime-tools
|
||||||
|
PKG_VERSION:=1.0.0-pre20210122
|
||||||
|
PKG_RELEASE:=1
|
||||||
|
PKG_LICENSE:=Apache-2.0
|
||||||
|
PKG_LICENSE_FILES:=LICENSE
|
||||||
|
|
||||||
|
PKG_SOURCE_PROTO:=git
|
||||||
|
PKG_SOURCE_NAME:=runtime-tools
|
||||||
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
|
PKG_SOURCE_URL:=https://github.com/opencontainers/runtime-tools.git
|
||||||
|
PKG_SOURCE_VERSION:=453547deb724af135587e654f52d86b8619f21b9
|
||||||
|
PKG_MIRROR_HASH:=34f3aefc4f6f3bb93330ec7cbeb2eb987b82184da53d453e8b04b5750faa8728
|
||||||
|
|
||||||
|
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
|
||||||
|
|
||||||
|
PKG_BUILD_DEPENDS:=golang/host
|
||||||
|
PKG_BUILD_PARALLEL:=1
|
||||||
|
PKG_USE_MIPS16:=0
|
||||||
|
|
||||||
|
GO_PKG:=github.com/opencontainers/runtime-tools/
|
||||||
|
GO_PKG_LDFLAGS_X:=main.gitCommit=$(PKG_SOURCE_VERSION) main.version=$(PKG_SOURCE_VERSION)
|
||||||
|
|
||||||
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
include ../../lang/golang/golang-package.mk
|
||||||
|
|
||||||
|
define Package/oci-runtime-tool
|
||||||
|
SECTION:=utils
|
||||||
|
CATEGORY:=Utilities
|
||||||
|
TITLE:=oci-runtime-tool
|
||||||
|
URL:=https://github.com/opencontainers/runtime-tools
|
||||||
|
DEPENDS:=$(GO_ARCH_DEPENDS)
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/oci-runtime-tool/description
|
||||||
|
OCI (Open Container Initiative) runtime tools
|
||||||
|
Generate OCI runtime spec configuration files and validate OCI bundles.
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/oci-runtime-tests
|
||||||
|
SECTION:=utils
|
||||||
|
CATEGORY:=Utilities
|
||||||
|
TITLE:=OCI runtimetest tool
|
||||||
|
URL:=https://github.com/opencontainers/runtime-tools
|
||||||
|
DEPENDS:=@(i386||i686||x86_64) oci-runtime-tool +tar
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/oci-runtime-tests/description
|
||||||
|
OCI (Open Container Initiative) runtime tools
|
||||||
|
This package provides test cases as well as artifacts required to
|
||||||
|
validate an OCI runtime.
|
||||||
|
Best used in combination with a TAP consumer like 'node-tap',
|
||||||
|
installable via npm.
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Build/Compile
|
||||||
|
$(call GoPackage/Build/Compile)
|
||||||
|
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/oci-runtime-tool/install
|
||||||
|
$(INSTALL_DIR) $(1)/usr/bin
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/oci-runtime-tool $(1)/usr/bin
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/oci-runtime-tests/install
|
||||||
|
$(INSTALL_DIR) $(1)/usr/libexec/oci-runtime-test
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/runtimetest $(1)/usr/libexec/oci-runtime-test/
|
||||||
|
( cd $(PKG_BUILD_DIR) ; $(FIND) ./validation/ -name *.go | grep -v util | \
|
||||||
|
xargs -I'%' -n 1 basename % .go | while read testbin; do \
|
||||||
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$$$${testbin} \
|
||||||
|
$(1)/usr/libexec/oci-runtime-test/$$$${testbin}.t ; \
|
||||||
|
done )
|
||||||
|
ifdef CONFIG_x86_64
|
||||||
|
$(INSTALL_DATA) $(PKG_BUILD_DIR)/rootfs-amd64.tar.gz $(1)/usr/libexec/oci-runtime-test
|
||||||
|
endif
|
||||||
|
$(INSTALL_DATA) $(PKG_BUILD_DIR)/rootfs-386.tar.gz $(1)/usr/libexec/oci-runtime-test
|
||||||
|
endef
|
||||||
|
|
||||||
|
$(eval $(call GoBinPackage,oci-runtime-tools))
|
||||||
|
$(eval $(call BuildPackage,oci-runtime-tool))
|
||||||
|
$(eval $(call BuildPackage,oci-runtime-tests))
|
||||||
43
utils/oci-runtime-tools/patches/001-fix-32-bit-build.patch
Normal file
43
utils/oci-runtime-tools/patches/001-fix-32-bit-build.patch
Normal file
|
|
@ -0,0 +1,43 @@
|
||||||
|
From 6502e57dbebcacd9b55fc7a80655c8f31d7dae8f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daniel Golle <daniel@makrotopia.org>
|
||||||
|
Date: Mon, 8 Feb 2021 01:26:31 +0000
|
||||||
|
Subject: [PATCH] Fix build of hugetlb tests on 32-bit platforms
|
||||||
|
|
||||||
|
https://github.com/opencontainers/runtime-tools/pull/712
|
||||||
|
|
||||||
|
Use explicit 64-bit types to avoid fall-back on incompatible 32-bit
|
||||||
|
types on 32-bit platforms.
|
||||||
|
|
||||||
|
Fixes: #711
|
||||||
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||||
|
---
|
||||||
|
validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go | 2 +-
|
||||||
|
.../linux_cgroups_relative_hugetlb.go | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go b/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go
|
||||||
|
index d71dfb9e..e1db3f1b 100644
|
||||||
|
--- a/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go
|
||||||
|
+++ b/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go
|
||||||
|
@@ -24,7 +24,7 @@ func testHugetlbCgroups() error {
|
||||||
|
// When setting the limit just for checking if writing works, the amount of memory
|
||||||
|
// requested does not matter, as all insigned integers will be accepted.
|
||||||
|
// Use 2GiB as an example
|
||||||
|
- const limit = 2 * (1 << 30)
|
||||||
|
+ var limit uint64 = 2 * (1 << 30)
|
||||||
|
|
||||||
|
for _, pageSize := range pageSizes {
|
||||||
|
g, err := util.GetDefaultGenerator()
|
||||||
|
diff --git a/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go b/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go
|
||||||
|
index b6d7ae81..583a9fa8 100644
|
||||||
|
--- a/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go
|
||||||
|
+++ b/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go
|
||||||
|
@@ -21,7 +21,7 @@ func main() {
|
||||||
|
// When setting the limit just for checking if writing works, the amount of memory
|
||||||
|
// requested does not matter, as all insigned integers will be accepted.
|
||||||
|
// Use 2GiB as an example
|
||||||
|
- const limit = 2 * (1 << 30)
|
||||||
|
+ var limit uint64 = 2 * (1 << 30)
|
||||||
|
|
||||||
|
for _, pageSize := range pageSizes {
|
||||||
|
g, err := util.GetDefaultGenerator()
|
||||||
Loading…
Reference in a new issue