Revert "runc: depend on linux headers >= 3.11 for O_TMPFILE"

This reverts commit 905e976a6af224b3ed015c46fcea2d717c155f55.

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

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/docker-containerd/Config.in b/package/docker-containerd/Config.in
index 8d80d8623b29511b1e47dbd841eb3299532d3fa9..35867df21aa70b3afc2663cb98f6ba7cf1423852 100644 (file)
--- a/package/docker-containerd/Config.in
+++ b/package/docker-containerd/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_DOCKER_CONTAINERD
        depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
        depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
        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_USE_MMU # util-linux
        select BR2_PACKAGE_RUNC # runtime dependency
@@ -33,5 +32,4 @@ comment "docker-containerd needs a glibc or musl toolchain w/ threads"
        depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
        depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
        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_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC

diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
index 8364759ae1a1662b5c53aa982272dc04644160e4..1fd229fcbb392c32f385cdd9c9351587742f0b9a 100644 (file)
--- a/package/docker-engine/Config.in
+++ b/package/docker-engine/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_DOCKER_ENGINE
        depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
        depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
        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_USE_MMU # docker-containerd
        select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
@@ -51,9 +50,8 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS
 
 endif
 
-comment "docker-engine needs a glibc or musl toolchain w/ threads, headers >= 3.11"
+comment "docker-engine needs a glibc or musl toolchain w/ threads"
        depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
        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_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC
        depends on BR2_USE_MMU

diff --git a/package/runc/Config.in b/package/runc/Config.in
index 2f32bce2073f1b3730aea93e49d922b607f67055..f181ee334fa1ab7d663273cf4ba14d53f837073a 100644 (file)
--- a/package/runc/Config.in
+++ b/package/runc/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_RUNC
        depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
        depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
        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
        help
          runC is a CLI tool for spawning and running containers
@@ -11,8 +10,7 @@ config BR2_PACKAGE_RUNC
 
          https://github.com/opencontainers/runc
 
-comment "runc needs a glibc or musl toolchain w/ threads, headers >= 3.11"
+comment "runc needs a glibc or musl toolchain w/ threads"
        depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS && \
                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_HAS_THREADS || BR2_TOOLCHAN_USES_UCLIBC