d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate Buildroot 2019.02.9 (#539)

Browse Source
This commit is contained in:
Pascal Vizeli
2020-01-13 14:47:52 +01:00
committed by GitHub
parent d6a700565e
commit 13e4578b7a
139 changed files with 898 additions and 1178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
buildroot/package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch
View File

@@ -1,45 +0,0 @@
From 324e7be4b252c13002bca6a9d82e7b2e43664634 Mon Sep 17 00:00:00 2001
From: Christian Stewart <christian@paral.in>
Date: Mon, 26 Nov 2018 22:59:32 -0800
Subject: [PATCH] Fix faulty runc version commit scrape
This commit replaces faulty logic to determine the runc version commit hash.
The original logic takes the second line of the output of "runc --version" and
does not work if there are a different number of lines printed from the command
than expected. The buildroot version of runc outputs two lines instead of the
expected three, causing the error:
unknown output format: runc version commit: ...
This patch replaces this logic with a simple scan of the "runc --version"
output, searching for the "runc version commit" prefixed line.
Signed-off-by: Christian Stewart <christian@paral.in>
---
daemon/info_unix.go | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/daemon/info_unix.go b/daemon/info_unix.go
index 60b2f99870..688a510796 100644
--- a/daemon/info_unix.go
+++ b/daemon/info_unix.go
@@ -32,10 +32,11 @@ func (daemon *Daemon) fillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo)
defaultRuntimeBinary := daemon.configStore.GetRuntime(v.DefaultRuntime).Path
if rv, err := exec.Command(defaultRuntimeBinary, "--version").Output(); err == nil {
parts := strings.Split(strings.TrimSpace(string(rv)), "\n")
- if len(parts) == 3 {
- parts = strings.Split(parts[1], ": ")
- if len(parts) == 2 {
- v.RuncCommit.ID = strings.TrimSpace(parts[1])
+ for _, pt := range parts {
+ ptKv := strings.Split(pt, ":")
+ if strings.HasSuffix(strings.TrimSpace(ptKv[0]), "commit") {
+ v.RuncCommit.ID = strings.TrimSpace(ptKv[1])
+ break
}
}
--
2.18.1

4
buildroot/package/docker-engine/docker-engine.hash
View File

@@ -1,3 +1,3 @@
# Locally calculated
sha256 fa3a9e998627418d648495d06d168c4d26ed07859c9370d5fddbfd29c26d8592 docker-engine-18.09.9.tar.gz
sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE
sha256 bc5d1ac503e44593be8003ed0ad9c75bf0da535db19837a9338429c438bd4637 docker-engine-19.03.5.tar.gz
sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE

2
buildroot/package/docker-engine/docker-engine.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
DOCKER_ENGINE_VERSION = 18.09.9
DOCKER_ENGINE_VERSION = 19.03.5
DOCKER_ENGINE_SITE = $(call github,docker,engine,v$(DOCKER_ENGINE_VERSION))
DOCKER_ENGINE_LICENSE = Apache-2.0