Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/7] Revert "package/runc: blacklist Codesourcery ARM toolchain"
Date: Mon,  1 Apr 2019 20:23:46 +0200	[thread overview]
Message-ID: <20190401182352.26342-3-peter@korsgaard.com> (raw)
In-Reply-To: <20190401182352.26342-1-peter@korsgaard.com>

This reverts commit ce76a989022baa6395b874ed44b9246bba053f8a.

With the bump to 1.0.0-rc7, runc no longer needs O_TMPFILE.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/docker-containerd/Config.in | 2 --
 package/docker-engine/Config.in     | 2 --
 package/runc/Config.in              | 2 --
 3 files changed, 6 deletions(-)

diff --git a/package/docker-containerd/Config.in b/package/docker-containerd/Config.in
index ffa2b208f2..8d80d8623b 100644
--- a/package/docker-containerd/Config.in
+++ b/package/docker-containerd/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_DOCKER_CONTAINERD
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # runc
 	depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc
-	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # runc
 	depends on BR2_USE_MMU # util-linux
 	select BR2_PACKAGE_RUNC # runtime dependency
 	select BR2_PACKAGE_UTIL_LINUX # runtime dependency
@@ -36,4 +35,3 @@ comment "docker-containerd needs a glibc or musl toolchain w/ threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAIN_USES_UCLIBC
-	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM
diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
index bc36b05bed..8364759ae1 100644
--- a/package/docker-engine/Config.in
+++ b/package/docker-engine/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_DOCKER_ENGINE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # docker-containerd -> runc
 	depends on !BR2_TOOLCHAIN_USES_UCLIBC # docker-containerd -> runc
-	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # docker-containerd -> runc
 	depends on BR2_USE_MMU # docker-containerd
 	select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
 	select BR2_PACKAGE_DOCKER_PROXY # runtime dependency
@@ -57,5 +56,4 @@ comment "docker-engine needs a glibc or musl toolchain w/ threads, headers >= 3.
 	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAIN_USES_UCLIBC
-	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM
 	depends on BR2_USE_MMU
diff --git a/package/runc/Config.in b/package/runc/Config.in
index 8939193048..2f32bce207 100644
--- a/package/runc/Config.in
+++ b/package/runc/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_RUNC
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # O_TMPFILE
 	depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve
-	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # glibc < 2.19
 	help
 	  runC is a CLI tool for spawning and running containers
 	  according to the OCP specification.
@@ -17,4 +16,3 @@ comment "runc needs a glibc or musl toolchain w/ threads, headers >= 3.11"
 		BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAN_USES_UCLIBC
-	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM
-- 
2.11.0

  parent reply	other threads:[~2019-04-01 18:23 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-01 18:23 [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4 Peter Korsgaard
2019-04-01 18:23 ` [Buildroot] [PATCH 1/7] package/runc: bump to version 1.0.0-rc7 Peter Korsgaard
2019-04-01 18:23 ` Peter Korsgaard [this message]
2019-04-01 18:23 ` [Buildroot] [PATCH 3/7] Revert "runc: depend on linux headers >= 3.11 for O_TMPFILE" Peter Korsgaard
2019-04-01 18:23 ` [Buildroot] [PATCH 4/7] package/docker-containerd: bump version to v1.2.5 Peter Korsgaard
2019-04-01 18:23 ` [Buildroot] [PATCH 5/7] package/docker-containerd: refer to official website Peter Korsgaard
2019-04-01 18:23 ` [Buildroot] [PATCH 6/7] package/docker-engine: bump to version v18.09.4 Peter Korsgaard
2019-04-01 18:23 ` [Buildroot] [PATCH 7/7] package/docker-cli: " Peter Korsgaard
     [not found] ` <87mul8vgj8.fsf@paral.in>
2019-04-02 15:24   ` [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4 Peter Korsgaard
2019-04-07  7:20   ` Peter Korsgaard
2019-04-07  8:56     ` Christian Stewart
2019-04-07  9:28       ` Peter Korsgaard
2019-04-08  4:35         ` Christian Stewart
2019-04-08  6:12           ` Peter Korsgaard
2019-04-14 21:15 ` Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190401182352.26342-3-peter@korsgaard.com \
    --to=peter@korsgaard.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox