821df34312
This reverts commit 3861ce09d0.
As reported on IRC, runc v1.0.0-rc4 is not compatible with the docker-engine
version we are using, so lets revert for 2017.11:
20:27 < eschu> It looks like 25 days ago buildroot had runc updated to
1.0.0-rc4, which breaks compatibility with the docker-engine
version 17.05. Is there somewhere issues like this are
reported? Or is it just expected on non-release versions of
buildroot?
20:47 < Jacmet> eschu: ahh, so the new runc doesn't work with the old
docker-engine? what kind of errors do you get exactly?
20:49 < eschu> Jacmet: yes, runc made a change from -console to
--console-socket, which results in "Incorrect Usage" error
"flag provided but not defined: -console"
20:51 < eschu> Jacmet: basically docker-engine 17.05 uses -console, but
support for that was cut off in runc around the first 1.0.0
versions. I'll check the patches out, or might just
downgrade to buildroot 2017.08 release
20:51 < agb> Jacmet: unfortunately this issue has hit a number of distributions
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=877146
20:53 < Jacmet> agb: thanks. I'll send a revert for 2017.11 and hopefully
we can make progress on the other docker packages for
2018.02
Cc: Christian Stewart <christian@paral.in>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
51 lines
1.2 KiB
Makefile
51 lines
1.2 KiB
Makefile
################################################################################
|
|
#
|
|
# runc
|
|
#
|
|
################################################################################
|
|
|
|
RUNC_VERSION = 9c2d8d184e5da67c95d601382adf14862e4f2228
|
|
RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION))
|
|
RUNC_LICENSE = Apache-2.0
|
|
RUNC_LICENSE_FILES = LICENSE
|
|
|
|
RUNC_DEPENDENCIES = host-go
|
|
|
|
RUNC_GOPATH = "$(@D)/Godeps/_workspace"
|
|
RUNC_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
|
|
CGO_ENABLED=1 \
|
|
GOBIN="$(@D)/bin" \
|
|
GOPATH="$(RUNC_GOPATH)" \
|
|
PATH=$(BR_PATH)
|
|
|
|
RUNC_GLDFLAGS = \
|
|
-X main.gitCommit=$(RUNC_VERSION)
|
|
|
|
ifeq ($(BR2_STATIC_LIBS),y)
|
|
RUNC_GLDFLAGS += -extldflags '-static'
|
|
endif
|
|
|
|
RUNC_GOTAGS = cgo static_build
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
|
|
RUNC_GOTAGS += seccomp
|
|
RUNC_DEPENDENCIES += libseccomp host-pkgconf
|
|
endif
|
|
|
|
define RUNC_CONFIGURE_CMDS
|
|
mkdir -p $(RUNC_GOPATH)/src/github.com/opencontainers
|
|
ln -s $(@D) $(RUNC_GOPATH)/src/github.com/opencontainers/runc
|
|
endef
|
|
|
|
define RUNC_BUILD_CMDS
|
|
cd $(@D) && $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \
|
|
build -v -o $(@D)/bin/runc \
|
|
-tags "$(RUNC_GOTAGS)" -ldflags "$(RUNC_GLDFLAGS)" .
|
|
endef
|
|
|
|
define RUNC_INSTALL_TARGET_CMDS
|
|
$(INSTALL) -D -m 0755 $(@D)/bin/runc $(TARGET_DIR)/usr/bin/runc
|
|
endef
|
|
|
|
$(eval $(generic-package))
|