oci-runtime-tools: bump to git HEAD

Remove local patch which was merged upstream.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/utils/oci-runtime-tools/Makefile b/utils/oci-runtime-tools/Makefile
index 6621ece90a4c9102f1df3b9206101bf0a085a093..844fafe8b97031777c3279e136396916c75af770 100644 (file)
--- a/utils/oci-runtime-tools/Makefile
+++ b/utils/oci-runtime-tools/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oci-runtime-tools
-PKG_VERSION:=1.0.0-pre20210122
-PKG_RELEASE:=2
+PKG_VERSION:=1.0.0-pre20210326
+PKG_RELEASE:=$(AUTORELEASE)
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
@@ -10,8 +10,8 @@ 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_SOURCE_VERSION:=59cdde06764be8d761db120664020f0415f36045
+PKG_MIRROR_HASH:=ef331e3ad5f99220583399fe1c2ded243f4b01f8dabc7acd152d46304da70f6f
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 

diff --git a/utils/oci-runtime-tools/patches/001-fix-32-bit-build.patch b/utils/oci-runtime-tools/patches/001-fix-32-bit-build.patch
deleted file mode 100644 (file)
index 7bb6c9c..0000000
--- a/utils/oci-runtime-tools/patches/001-fix-32-bit-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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(-)
-
---- 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()
---- 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()