From 7595f03e1cb5be2a531fb43c837758bb056bf501 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 22 Feb 2020 21:26:13 +0100 Subject: [PATCH] runc: update to 1.0.0 rc10 --- root-packages/runc/build.sh | 4 +-- .../runc/cg-cpuset-noprefix-compat.patch | 27 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/root-packages/runc/build.sh b/root-packages/runc/build.sh index 1d35dae00d..7c25fde652 100644 --- a/root-packages/runc/build.sh +++ b/root-packages/runc/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.opencontainers.org/ TERMUX_PKG_DESCRIPTION="A tool for spawning and running containers according to the OCI specification" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " -TERMUX_PKG_VERSION=1.0.0-rc9 +TERMUX_PKG_VERSION=1.0.0-rc10 TERMUX_PKG_SRCURL=https://github.com/opencontainers/runc/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=2ec69c25df9f02c6fd38eb287145f8afba6772f809abe01df4534b5bfd68e8d4 +TERMUX_PKG_SHA256=6b44985023347fb9c5a2cc6f761df8c41cc2c84a7a68a6e6acf834dff6653a9a TERMUX_PKG_DEPENDS="libseccomp" termux_step_make() { diff --git a/root-packages/runc/cg-cpuset-noprefix-compat.patch b/root-packages/runc/cg-cpuset-noprefix-compat.patch index 4510f74aa3..69d82709c9 100644 --- a/root-packages/runc/cg-cpuset-noprefix-compat.patch +++ b/root-packages/runc/cg-cpuset-noprefix-compat.patch @@ -1,22 +1,21 @@ -diff -uNr runc-1.0.0-rc8/libcontainer/cgroups/fs/cpuset.go runc-1.0.0-rc8.mod/libcontainer/cgroups/fs/cpuset.go ---- runc-1.0.0-rc8/libcontainer/cgroups/fs/cpuset.go 2019-04-25 00:48:25.000000000 +0300 -+++ runc-1.0.0-rc8.mod/libcontainer/cgroups/fs/cpuset.go 2019-07-14 14:25:08.973734249 +0300 -@@ -31,12 +31,12 @@ +--- ./libcontainer/cgroups/fs/cpuset.go.orig 2020-01-22 17:19:15.000000000 +0100 ++++ ./libcontainer/cgroups/fs/cpuset.go 2020-02-22 21:17:22.474879849 +0100 +@@ -32,12 +32,12 @@ func (s *CpusetGroup) Set(path string, cgroup *configs.Cgroup) error { if cgroup.Resources.CpusetCpus != "" { -- if err := writeFile(path, "cpuset.cpus", cgroup.Resources.CpusetCpus); err != nil { -+ if err := writeFile(path, "cpus", cgroup.Resources.CpusetCpus); err != nil { +- if err := fscommon.WriteFile(path, "cpuset.cpus", cgroup.Resources.CpusetCpus); err != nil { ++ if err := fscommon.WriteFile(path, "cpus", cgroup.Resources.CpusetCpus); err != nil { return err } } if cgroup.Resources.CpusetMems != "" { -- if err := writeFile(path, "cpuset.mems", cgroup.Resources.CpusetMems); err != nil { -+ if err := writeFile(path, "mems", cgroup.Resources.CpusetMems); err != nil { +- if err := fscommon.WriteFile(path, "cpuset.mems", cgroup.Resources.CpusetMems); err != nil { ++ if err := fscommon.WriteFile(path, "mems", cgroup.Resources.CpusetMems); err != nil { return err } } -@@ -88,10 +88,10 @@ +@@ -89,10 +89,10 @@ } func (s *CpusetGroup) getSubsystemSettings(parent string) (cpus []byte, mems []byte, err error) { @@ -29,18 +28,18 @@ diff -uNr runc-1.0.0-rc8/libcontainer/cgroups/fs/cpuset.go runc-1.0.0-rc8.mod/li return } return cpus, mems, nil -@@ -135,12 +135,12 @@ +@@ -136,12 +136,12 @@ } if s.isEmpty(currentCpus) { -- if err := writeFile(current, "cpuset.cpus", string(parentCpus)); err != nil { -+ if err := writeFile(current, "cpus", string(parentCpus)); err != nil { +- if err := fscommon.WriteFile(current, "cpuset.cpus", string(parentCpus)); err != nil { ++ if err := fscommon.WriteFile(current, "cpus", string(parentCpus)); err != nil { return err } } if s.isEmpty(currentMems) { -- if err := writeFile(current, "cpuset.mems", string(parentMems)); err != nil { -+ if err := writeFile(current, "mems", string(parentMems)); err != nil { +- if err := fscommon.WriteFile(current, "cpuset.mems", string(parentMems)); err != nil { ++ if err := fscommon.WriteFile(current, "mems", string(parentMems)); err != nil { return err } }