public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/
Date: Sat, 20 Jan 2024 13:33:49 +0000 (UTC)	[thread overview]
Message-ID: <1705757241.3564a689658ef0dd2e4cd8b92aaea9d3a4d21446.sam@gentoo> (raw)

commit:     3564a689658ef0dd2e4cd8b92aaea9d3a4d21446
Author:     Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Thu Jan 11 09:48:19 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <me <AT> rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/34743
Signed-off-by: Sam James <sam <AT> 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
 


             reply	other threads:[~2024-01-20 13:33 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-20 13:33 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-11 23:37 [gentoo-commits] repo/gentoo:master commit in: app-containers/containers-common/ Zac Medico
2024-08-22  8:55 WANG Xuerui
2024-08-22  8:55 WANG Xuerui
2024-06-30  5:23 Sam James
2024-06-30  5:10 Sam James
2024-06-13 19:10 Zac Medico
2024-06-13 19:10 Zac Medico
2024-04-14 20:39 Zac Medico
2024-04-14 20:06 Zac Medico
2024-04-14 19:42 Zac Medico
2024-03-23  8:29 Sam James
2024-03-19  1:04 Zac Medico
2024-03-18 15:41 Zac Medico
2024-02-02  6:37 Zac Medico
2024-01-07  6:52 Joonas Niilola
2024-01-07  6:14 Sam James
2023-11-29  6:16 Zac Medico
2023-10-31 19:53 Sam James
2023-10-31 19:21 Sam James
2023-09-27 15:00 Yixun Lan
2023-09-25  4:48 Sam James

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=1705757241.3564a689658ef0dd2e4cd8b92aaea9d3a4d21446.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /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