From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9422515808B for ; Thu, 15 Feb 2024 15:47:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC276E2A24; Thu, 15 Feb 2024 15:47:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98BBCE2A24 for ; Thu, 15 Feb 2024 15:47:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B4A13343025 for ; Thu, 15 Feb 2024 15:47:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 551EB13DB for ; Thu, 15 Feb 2024 15:47:24 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1708011645.e32c81b6dd523b0339eca5dc75129b6e0b8f1c0f.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/docker/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/docker/docker-25.0.1.ebuild X-VCS-Directories: app-containers/docker/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: e32c81b6dd523b0339eca5dc75129b6e0b8f1c0f X-VCS-Branch: master Date: Thu, 15 Feb 2024 15:47:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c343234e-8ce3-4500-b7ac-86633fe04f45 X-Archives-Hash: 1e8a3fb7f6b74cd51bc901549f21ce6c commit: e32c81b6dd523b0339eca5dc75129b6e0b8f1c0f Author: William Hubbs gentoo org> AuthorDate: Wed Feb 14 23:07:29 2024 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Feb 15 15:40:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e32c81b6 app-containers/docker: drop device-mapper use flag Closes: https://bugs.gentoo.org/924445 Signed-off-by: William Hubbs gentoo.org> app-containers/docker/docker-25.0.1.ebuild | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/app-containers/docker/docker-25.0.1.ebuild b/app-containers/docker/docker-25.0.1.ebuild index 337dae24e290..92c7e31beb2d 100644 --- a/app-containers/docker/docker-25.0.1.ebuild +++ b/app-containers/docker/docker-25.0.1.ebuild @@ -14,14 +14,13 @@ SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="apparmor btrfs +container-init device-mapper overlay seccomp selinux" +IUSE="apparmor btrfs +container-init overlay seccomp selinux" DEPEND=" acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) - device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) " @@ -34,7 +33,7 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl - >=app-containers/containerd-1.7.3[apparmor?,btrfs?,device-mapper?,seccomp?] + >=app-containers/containerd-1.7.3[apparmor?,btrfs?,seccomp?] >=app-containers/runc-1.1.9[apparmor?,seccomp?] !app-containers/docker-proxy container-init? ( >=sys-process/tini-0.19.0[static] ) @@ -227,12 +226,6 @@ pkg_setup() { " fi - if use device-mapper; then - CONFIG_CHECK+=" - ~BLK_DEV_DM ~DM_THIN_PROVISIONING - " - fi - CONFIG_CHECK+=" ~OVERLAY_FS " @@ -252,7 +245,7 @@ src_compile() { # let's set up some optional features :) export DOCKER_BUILDTAGS='' - for gd in btrfs device-mapper overlay; do + for gd in btrfs overlay; do if ! use $gd; then DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" fi @@ -307,12 +300,6 @@ pkg_postinst() { elog ' usermod -aG docker ' elog - if use device-mapper; then - elog " Devicemapper storage driver has been deprecated" - elog " It will be removed in a future release" - elog - fi - if use overlay; then elog " Overlay storage driver/USEflag has been deprecated" elog " in favor of overlay2 (enabled unconditionally)"