From patchwork Sun Mar 11 22:00:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Hardin X-Patchwork-Id: 884290 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=storagecraft.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zzw6l5qfPz9sST for ; Mon, 12 Mar 2018 09:01:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 64A4886B8E; Sun, 11 Mar 2018 22:01:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OMJtbYTUzeaC; Sun, 11 Mar 2018 22:00:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BFFF286BC9; Sun, 11 Mar 2018 22:00:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 831A31C0415 for ; Sun, 11 Mar 2018 22:00:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8027E86BC9 for ; Sun, 11 Mar 2018 22:00:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M59Jl58z1p2f for ; Sun, 11 Mar 2018 22:00:56 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-delivery-103.mimecast.com (us-smtp-delivery-103.mimecast.com [63.128.21.103]) by whitealder.osuosl.org (Postfix) with ESMTPS id 78F3086B8E for ; Sun, 11 Mar 2018 22:00:56 +0000 (UTC) Received: from STC-EXCH.stc.local (autodiscover.storagecraft.sg [198.135.233.15]) (Using TLS) by us-smtp-1.mimecast.com with ESMTP id us-mta-232-ofGmXKFsMHGV32CbZHqghA-1; Sun, 11 Mar 2018 18:00:52 -0400 Received: from localhost.localdomain (50.1.97.2) by webmail.storagecraft.com (10.1.0.30) with Microsoft SMTP Server id 14.3.382.0; Sun, 11 Mar 2018 16:00:51 -0600 From: To: Date: Sun, 11 Mar 2018 15:00:37 -0700 Message-ID: <20180311220039.11021-1-charles.hardin@storagecraft.com> X-Mailer: git-send-email 2.14.3 (Apple Git-98) MIME-Version: 1.0 X-MC-Unique: ofGmXKFsMHGV32CbZHqghA-1 Subject: [Buildroot] [PATCH 1/3] docker-containerd: bump to version 1.0.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Charles Hardin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Charles Hardin This is a runtime dependency of docker-engine in version 17.12.1-ce Signed-off-by: Charles Hardin --- package/docker-containerd/docker-containerd.hash | 2 +- package/docker-containerd/docker-containerd.mk | 25 ++++++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash index 992eb5b01a..147b60e3f8 100644 --- a/package/docker-containerd/docker-containerd.hash +++ b/package/docker-containerd/docker-containerd.hash @@ -1,2 +1,2 @@ # Computed locally -sha256 da89086a7c643702a2ddecec67a45d3d8e4b0d610dd19036be63e6bd54cc1a85 docker-containerd-9048e5e50717ea4497b757314bad98ea3763c145.tar.gz +sha256 89584cadef009e046c195f76a9cd3c4c8a4524f3beae552f78238493f2444dd4 docker-containerd-v1.0.1.tar.gz diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index ffbadb0c3f..da538e84b6 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -4,8 +4,9 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = 9048e5e50717ea4497b757314bad98ea3763c145 -DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION)) +DOCKER_CONTAINERD_VERSION = v1.0.1 +DOCKET_CONTAINERD_COMMIT = 9b55aab90508bd389d7654c4baf173a981477d55 +DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code @@ -18,15 +19,25 @@ DOCKER_CONTAINERD_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ GOPATH="$(DOCKER_CONTAINERD_GOPATH)" DOCKER_CONTAINERD_GLDFLAGS = \ - -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) + -X github.com/containerd/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) + +DOCKER_CONTAINERD_BUILD_TAGS = + +# XXX - Reusing the "docker-engine" config for now +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) +DOCKER_CONTAINERD_DEPENDENCIES += btrfs-progs +else +DOCKER_CONTAINERD_BUILD_TAGS = no_btrfs +endif + ifeq ($(BR2_STATIC_LIBS),y) DOCKER_CONTAINERD_GLDFLAGS += -extldflags '-static' endif define DOCKER_CONTAINERD_CONFIGURE_CMDS - mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker - ln -s $(@D) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker/containerd + mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/containerd + ln -s $(@D) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/containerd/containerd mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers ln -s $(RUNC_SRCDIR) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers/runc endef @@ -34,7 +45,9 @@ endef define DOCKER_CONTAINERD_BUILD_CMDS $(foreach d,ctr containerd containerd-shim,\ cd $(@D); $(DOCKER_CONTAINERD_MAKE_ENV) $(HOST_DIR)/bin/go build \ - -v -o $(@D)/bin/$(d) -ldflags "$(DOCKER_CONTAINERD_GLDFLAGS)" ./$(d)$(sep)) + -tags "$(DOCKER_CONTAINERD_BUILD_TAGS)" \ + -v -o $(@D)/bin/$(d) -ldflags "$(DOCKER_CONTAINERD_GLDFLAGS)" \ + github.com/containerd/containerd/cmd/$(d)$(sep)) endef define DOCKER_CONTAINERD_INSTALL_TARGET_CMDS From patchwork Sun Mar 11 22:00:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Hardin X-Patchwork-Id: 884292 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=storagecraft.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zzw760SdQz9sST for ; Mon, 12 Mar 2018 09:01:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0484786E6F; Sun, 11 Mar 2018 22:01:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TxPi9GQRQenF; Sun, 11 Mar 2018 22:01:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8D1CA86CB9; Sun, 11 Mar 2018 22:01:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E355C1C0415 for ; Sun, 11 Mar 2018 22:01:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E09C42217F for ; Sun, 11 Mar 2018 22:01:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M-3EHqqG0fac for ; Sun, 11 Mar 2018 22:01:13 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-delivery-103.mimecast.com (us-smtp-delivery-103.mimecast.com [63.128.21.103]) by silver.osuosl.org (Postfix) with ESMTPS id B1E2B2202E for ; Sun, 11 Mar 2018 22:01:13 +0000 (UTC) Received: from STC-EXCH.stc.local (webmail.storagecraft.com [198.135.233.15]) (Using TLS) by us-smtp-1.mimecast.com with ESMTP id us-mta-16-NzxsHZwAOPSxHgYKj6sqIg-1; Sun, 11 Mar 2018 18:01:10 -0400 Received: from localhost.localdomain (50.1.97.2) by webmail.storagecraft.com (10.1.0.30) with Microsoft SMTP Server id 14.3.382.0; Sun, 11 Mar 2018 16:01:09 -0600 From: To: Date: Sun, 11 Mar 2018 15:00:38 -0700 Message-ID: <20180311220039.11021-2-charles.hardin@storagecraft.com> X-Mailer: git-send-email 2.14.3 (Apple Git-98) In-Reply-To: <20180311220039.11021-1-charles.hardin@storagecraft.com> References: <20180311220039.11021-1-charles.hardin@storagecraft.com> MIME-Version: 1.0 X-MC-Unique: NzxsHZwAOPSxHgYKj6sqIg-1 Subject: [Buildroot] [PATCH 2/3] docker-engine: bump to version 17.12.1-ce X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Charles Hardin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Charles Hardin Signed-off-by: Charles Hardin --- package/docker-engine/S70docker | 46 ++++++++++++++++++++++++++++++++ package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 24 ++++++++++++----- 3 files changed, 64 insertions(+), 8 deletions(-) create mode 100755 package/docker-engine/S70docker diff --git a/package/docker-engine/S70docker b/package/docker-engine/S70docker new file mode 100755 index 0000000000..3bcc381c95 --- /dev/null +++ b/package/docker-engine/S70docker @@ -0,0 +1,46 @@ +#!/bin/sh +# +# docker Starts dockerd. +# + +start() { + printf "Starting dockerd: " + start-stop-daemon -S -b -m \ + -x /usr/bin/dockerd \ + -p /var/run/dockerd.pid \ + -- \ + --log-driver=syslog --log-opt syslog-facility=user \ + --log-level debug --raw-logs \ + >> /var/log/dockerd.log 2>&1 + [ $? = 0 ] && echo "OK" || echo "FAIL" +} + +stop() { + printf "Stopping dockerd: " + start-stop-daemon -K -p /var/run/dockerd.pid -R 10 + [ $? = 0 ] && echo "OK" || echo "FAIL" +} + +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 + ;; +esac + +exit $? + diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 6c0ed338a5..16c994736d 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4716df117d867b82ddab2e82395cd40aa3d0925a689eedcec8919729e4c9f121 docker-engine-v17.05.0-ce.tar.gz +sha256 e4b58c26c05a800d96d3e5d76375654751d4d1367b5727c798369cf3c78a590e docker-engine-v17.12.1-ce.tar.gz diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 8928f072e7..96b3267fe4 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,9 +4,9 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = v17.05.0-ce -DOCKER_ENGINE_COMMIT = 89658bed64c2a8fe05a978e5b87dbec409d57a0f -DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION)) +DOCKER_ENGINE_VERSION = v17.12.1-ce +DOCKER_ENGINE_COMMIT = 7390fc6103da41cf98ae66cfac80fa143268bf60 +DOCKER_ENGINE_SITE = $(call github,docker,docker-ce,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE @@ -19,6 +19,8 @@ DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ CGO_NO_EMULATION=1 \ GOBIN="$(@D)/bin" \ GOPATH="$(DOCKER_ENGINE_GOPATH)" \ + CLI_DIR="$(@D)/components/cli" \ + ENGINE_DIR="$(@D)/components/engine" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ $(TARGET_MAKE_ENV) @@ -36,6 +38,7 @@ endif DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen DOCKER_ENGINE_BUILD_TARGETS = docker +DOCKER_ENGINE_CMD_DOCKER = github.com/docker/cli/cmd/docker ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) DOCKER_ENGINE_BUILD_TAGS += seccomp @@ -50,6 +53,7 @@ endif ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) DOCKER_ENGINE_BUILD_TAGS += daemon DOCKER_ENGINE_BUILD_TARGETS += dockerd +DOCKER_ENGINE_CMD_DOCKERD = github.com/docker/docker/cmd/dockerd endif ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y) @@ -76,8 +80,9 @@ endif define DOCKER_ENGINE_CONFIGURE_CMDS mkdir -p $(DOCKER_ENGINE_GOPATH)/src/github.com/docker - ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker - cd $(@D) && \ + ln -fs $(@D)/components/cli $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/cli + ln -fs $(@D)/components/engine $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker + cd $(@D)/components/engine && \ GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \ BUILDTIME="$$(date)" \ VERSION="$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))" \ @@ -87,6 +92,11 @@ endef ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) +define DOCKER_ENGINE_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/docker-engine/S70docker \ + $(TARGET_DIR)/etc/init.d/S70docker +endef + define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \ $(TARGET_DIR)/usr/lib/systemd/system/docker.service @@ -105,13 +115,13 @@ endif define DOCKER_ENGINE_BUILD_CMDS $(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \ - cd $(@D)/gopath/src/github.com/docker/docker; \ + cd $(@D)/gopath/src/github.com/docker; \ $(DOCKER_ENGINE_MAKE_ENV) \ $(HOST_DIR)/bin/go build -v \ -o $(@D)/bin/$(target) \ -tags "$(DOCKER_ENGINE_BUILD_TAGS)" \ -ldflags "$(DOCKER_ENGINE_GLDFLAGS) $(DOCKER_ENGINE_GLDFLAGS_$(call UPPERCASE,$(target)))" \ - github.com/docker/docker/cmd/$(target) + $(DOCKER_ENGINE_CMD_$(call UPPERCASE,$(target))) ) endef From patchwork Sun Mar 11 22:00:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Hardin X-Patchwork-Id: 884291 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=storagecraft.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zzw745HZyz9sST for ; Mon, 12 Mar 2018 09:01:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 27EC52202E; Sun, 11 Mar 2018 22:01:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iK1BNFyHtsMV; Sun, 11 Mar 2018 22:01:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 490F92217F; Sun, 11 Mar 2018 22:01:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 8097F1C0415 for ; Sun, 11 Mar 2018 22:01:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7DD322217F for ; Sun, 11 Mar 2018 22:01:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BzZFLK2h+w1S for ; Sun, 11 Mar 2018 22:01:17 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-delivery-103.mimecast.com (us-smtp-delivery-103.mimecast.com [63.128.21.103]) by silver.osuosl.org (Postfix) with ESMTPS id C6CD42202E for ; Sun, 11 Mar 2018 22:01:16 +0000 (UTC) Received: from STC-EXCH.stc.local (autodiscover.storagecraft.sg [198.135.233.15]) (Using TLS) by us-smtp-1.mimecast.com with ESMTP id us-mta-242-Q7xgExSLNQKfwRRSF9W96A-1; Sun, 11 Mar 2018 18:01:14 -0400 Received: from localhost.localdomain (50.1.97.2) by webmail.storagecraft.com (10.1.0.30) with Microsoft SMTP Server id 14.3.382.0; Sun, 11 Mar 2018 16:01:13 -0600 From: To: Date: Sun, 11 Mar 2018 15:00:39 -0700 Message-ID: <20180311220039.11021-3-charles.hardin@storagecraft.com> X-Mailer: git-send-email 2.14.3 (Apple Git-98) In-Reply-To: <20180311220039.11021-1-charles.hardin@storagecraft.com> References: <20180311220039.11021-1-charles.hardin@storagecraft.com> MIME-Version: 1.0 X-MC-Unique: Q7xgExSLNQKfwRRSF9W96A-1 Subject: [Buildroot] [PATCH 3/3] runc: bump to v1.0.0-rc5 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Charles Hardin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Charles Hardin This is a dependency of docker-engine v2017.12.1-ce. Signed-off-by: Charles Hardin --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 3e188c5c79..f403b6d9e2 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 b5c50d7d9a5f610d5424f96196efa306ec708fd9299302dd919545099c16b7c1 runc-9c2d8d184e5da67c95d601382adf14862e4f2228.tar.gz +sha256 770e180d1cca1f3c1a67512ebf9720caafe97af4fc2fe12fa43a3cf7bfa77522 runc-v1.0.0-rc5.tar.gz diff --git a/package/runc/runc.mk b/package/runc/runc.mk index fb3fec20f5..21271cd7a3 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 9c2d8d184e5da67c95d601382adf14862e4f2228 +RUNC_VERSION = v1.0.0-rc5 RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE @@ -38,7 +38,8 @@ define RUNC_CONFIGURE_CMDS endef define RUNC_BUILD_CMDS - cd $(@D) && $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \ + cd $(RUNC_GOPATH)/src/github.com/opencontainers/runc && + $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \ build -v -o $(@D)/bin/runc \ -tags "$(RUNC_GOTAGS)" -ldflags "$(RUNC_GLDFLAGS)" . endef