summaryrefslogtreecommitdiff
path: root/app-containers/docker
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-06-26 00:12:24 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-06-26 00:12:24 +0100
commit9f6a82a85d400d6ae7de04c43cee88dbc6bc4da0 (patch)
tree2d53ee03e360a9c66a5d8dd8986eee286514336b /app-containers/docker
parent996a2bda06cb164877d5d952774a6db1b271c2f3 (diff)
gentoo auto-resync : 26:06:2024 - 00:12:24
Diffstat (limited to 'app-containers/docker')
-rw-r--r--app-containers/docker/Manifest4
-rw-r--r--app-containers/docker/docker-26.1.0-r1.ebuild4
-rw-r--r--app-containers/docker/metadata.xml4
3 files changed, 4 insertions, 8 deletions
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 8a2ff52a3645..5e2d6e31e261 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1,5 +1,5 @@
AUX 0001-Openrc-Depend-on-containerd-init-script.patch 774 BLAKE2B a7ac6f6a1e9ee88751e8e0471cd33429b8141cbea07a3a56c61eccd63c796c9135edafaf5977571a4413e5d71931aac44b5313110af94c3206e286b15394f637 SHA512 bc709b6f0dd8685fbf2404be589743f32a5f4deb24dec8ed6aeec18f0fcd1db4c5d59587209c28f62d964d78ec9ab3a3fdbb795dc4b7e3fabd00a06a002af34e
AUX docker-26.1.0-automagic-systemd.patch 355 BLAKE2B 95d2367d5450a15214939c0a080b81a07d3ea3fdaaee921b2fc221949f3737652182366e54af499da5a1597fb1353a29d8935ed0a5e60a805920d3375aa594a1 SHA512 ba694ac1ca135fadc39d1afe0b8fdfaef8d6b9c75cbe4177a51422f972022f3502625c5e5467cd54fe33b2e83acdfe2c524da2a4d37f74376f365d7baaa12bec
DIST docker-26.1.0.tar.gz 16390376 BLAKE2B 6703e9b153c430bc28aed2e7de7bada0203353d61f0a2ce3d49ddbd017eab196a685dd1ab1e719a6b287813eb5fa4f2c612e2cf1ab95789d6e79ebe5dac7ace3 SHA512 47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50
-EBUILD docker-26.1.0-r1.ebuild 7532 BLAKE2B 4ea141e681d5db35248a0411f9ad0601d1cd8e25be77c217138e0d90709a122405d200d4351a57a77dadbbc18e953a395c9223c2954dc850efc6bb90dfe3c797 SHA512 5797b7045a5dc8c94e65abf46bbcd0ff14c35e5c1940997a4f510eb3c04cb6549e54c9f357ffd575a4c41d6a1ab1739a6ce00245099ac332f090d2edd4f3482f
-MISC metadata.xml 1238 BLAKE2B 66ba70d18bda5204db7a3a11ce1b258d5f3c3679ee5e9271033b04eeb9a23891632c5fb55a1bbd4d549b865261c9f05e9515879e989001b8b8e84e082dca8fb9 SHA512 ed304e622873eb5cb5e5f6e79955b19c4d660d8d3348ebc632b7c2ec996680ce43a53ee920c0f124525911836aa08e6cdaf942c9a856f68d31632a955930b271
+EBUILD docker-26.1.0-r1.ebuild 7522 BLAKE2B 9b02ddf1d1a68847be4541e93a01cddbe486907e68eef51c3a87e6012ed5be52c4e31af675ed718ad0e911acbdb856fdc9b127edeaec92f879c778b4bff79bcf SHA512 a3e351d6c33cdea4584c4444902b0277543b7f6f573716225ed0ed8f68aa50422902d03958cce3b1a2ca0d128d1d1edd94247e8d32e063f75990985fa18726f3
+MISC metadata.xml 1100 BLAKE2B d7a5f93051eb7d087cadd9788a1607f115deb9e7bb73929efad1815a25633f7c9f66c6e797e0283ba975f573e7a8729b48a70d1b2384c392fab1f7b1e4842a17 SHA512 7637097ccfdcc4d07099d54de4eacbac42cfc0f84aa7da78aa5547fe9c42b3c77e853d15492d0fea467c0c53514068b35c0d34dbe6668c285212d8e2bb5371dc
diff --git a/app-containers/docker/docker-26.1.0-r1.ebuild b/app-containers/docker/docker-26.1.0-r1.ebuild
index 6aec21b30a71..980c31950f3d 100644
--- a/app-containers/docker/docker-26.1.0-r1.ebuild
+++ b/app-containers/docker/docker-26.1.0-r1.ebuild
@@ -242,8 +242,8 @@ src_compile() {
# setup CFLAGS and LDFLAGS for separate build target
# see https://github.com/tianon/docker-overlay/pull/10
- export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
- export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
+ CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
+ CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
# let's set up some optional features :)
export DOCKER_BUILDTAGS=''
diff --git a/app-containers/docker/metadata.xml b/app-containers/docker/metadata.xml
index 5c680bb1005b..63036f19e3e5 100644
--- a/app-containers/docker/metadata.xml
+++ b/app-containers/docker/metadata.xml
@@ -21,10 +21,6 @@
Makes the a staticly-linked init system tini available inside a
container.
</flag>
- <flag name="device-mapper">
- Enables dependencies for the "devicemapper" graph driver, including
- necessary kernel flags.
- </flag>
<flag name="overlay">
Enables dependencies for the "overlay" graph driver, including
necessary kernel flags.