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 D1B3F15838E for ; Sat, 20 Jan 2024 13:33:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96019E29D6; Sat, 20 Jan 2024 13:33:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 4BB6FE29D2 for ; Sat, 20 Jan 2024 13:33:52 +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 23E1C3432D2 for ; Sat, 20 Jan 2024 13:33:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8680214B6 for ; Sat, 20 Jan 2024 13:33:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1705757241.3564a689658ef0dd2e4cd8b92aaea9d3a4d21446.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/containers-common/containers-common-9999.ebuild X-VCS-Directories: app-containers/containers-common/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3564a689658ef0dd2e4cd8b92aaea9d3a4d21446 X-VCS-Branch: master Date: Sat, 20 Jan 2024 13:33:49 +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: c444e5f4-ea7d-4a68-bcb9-a2b86e6953d1 X-Archives-Hash: 4088dc4836f63aaa4977490057ffba7c commit: 3564a689658ef0dd2e4cd8b92aaea9d3a4d21446 Author: Rahil Bhimjiani rahil rocks> AuthorDate: Thu Jan 11 09:48:19 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jan 20 13:27:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3564a689 app-containers/containers-common: update live Because of upstream changes policy.json and default.yaml has to be moved from containers-common to containers-image Upstream commit: https://github.com/containers/image/commit/45441676e34e6410ae8af6dbb46b6161c5c81a7c Signed-off-by: Rahil Bhimjiani rahil.rocks> Closes: https://github.com/gentoo/gentoo/pull/34743 Signed-off-by: Sam James gentoo.org> app-containers/containers-common/containers-common-9999.ebuild | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app-containers/containers-common/containers-common-9999.ebuild b/app-containers/containers-common/containers-common-9999.ebuild index f96e1c184a69..5eca915dd606 100644 --- a/app-containers/containers-common/containers-common-9999.ebuild +++ b/app-containers/containers-common/containers-common-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -53,14 +53,6 @@ src_compile() { src_install() { emake DESTDIR="${ED}" install - insinto /etc/containers - # https://github.com/containers/skopeo/raw/main/default-policy.json - doins pkg/config/containers.conf "${FILESDIR}/policy.json" - - insinto /etc/containers/registries.d - # https://github.com/containers/skopeo/raw/main/default.yaml - doins "${FILESDIR}/default.yaml" - insinto /usr/share/containers doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf