sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

runc: update to 1.0.0-rc91 (#193)

Browse Source
This commit is contained in:
Leonid Pliushch 2020-07-19 17:04:06 +03:00 committed by Yaksh Bariya
parent 4371a6f9fe
commit 5689001ee5
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
root-packages/runc/build.sh
View File

@ -2,10 +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 Pliushch <leonid.pliushch@gmail.com>"
TERMUX_PKG_VERSION=1.0.0-rc10
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=1.0.0-rc91
TERMUX_PKG_SRCURL=https://github.com/opencontainers/runc/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=6b44985023347fb9c5a2cc6f761df8c41cc2c84a7a68a6e6acf834dff6653a9a
TERMUX_PKG_SHA256=1f4cd908e3d8582e2709aadcb6e6038f545a04679187cb5c3a137505873ae7c4
TERMUX_PKG_DEPENDS="libseccomp"
termux_step_make() {

12
root-packages/runc/main.go.patch
View File

@ -1,12 +0,0 @@
diff -uNr runc-1.0.0-rc8/main.go runc-1.0.0-rc8.mod/main.go
--- runc-1.0.0-rc8/main.go 2019-04-25 00:48:25.000000000 +0300
+++ runc-1.0.0-rc8.mod/main.go 2019-07-14 15:25:25.741022025 +0300
@@ -62,7 +62,7 @@
v = append(v, fmt.Sprintf("spec: %s", specs.Version))
app.Version = strings.Join(v, "\n")
- root := "/run/runc"
+ root := "@TERMUX_PREFIX@/tmp/runc"
if shouldHonorXDGRuntimeDir() {
if runtimeDir := os.Getenv("XDG_RUNTIME_DIR"); runtimeDir != "" {
root = runtimeDir + "/runc"

24
root-packages/runc/root-dir-path.patch Normal file
View File

@ -0,0 +1,24 @@
diff -uNr runc-1.0.0-rc91/list.go runc-1.0.0-rc91.mod/list.go
--- runc-1.0.0-rc91/list.go 2020-06-30 18:24:30.000000000 +0300
+++ runc-1.0.0-rc91.mod/list.go 2020-07-19 16:40:06.617429259 +0300
@@ -51,7 +51,7 @@
ArgsUsage: `
Where the given root is specified via the global option "--root"
-(default: "/run/runc").
+(default: "@TERMUX_PREFIX@/tmp/runc").
EXAMPLE 1:
To list containers created via the default "--root":
diff -uNr runc-1.0.0-rc91/main.go runc-1.0.0-rc91.mod/main.go
--- runc-1.0.0-rc91/main.go 2020-06-30 18:24:30.000000000 +0300
+++ runc-1.0.0-rc91.mod/main.go 2020-07-19 16:39:37.309287649 +0300
@@ -65,7 +65,7 @@
app.Version = strings.Join(v, "\n")
xdgRuntimeDir := ""
- root := "/run/runc"
+ root := "@TERMUX_PREFIX@/tmp/runc"
if shouldHonorXDGRuntimeDir() {
if runtimeDir := os.Getenv("XDG_RUNTIME_DIR"); runtimeDir != "" {
root = runtimeDir + "/runc"