Summary: | app-containers/containers-common-0.57.0: file collision with app-containers/containers-image-5.29.2-r1 | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Azamat H. Hackimov <azamat.hackimov> |
Component: | Current packages | Assignee: | Rahil Bhimjiani <me> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | proxy-maint, zmedico |
Priority: | Normal | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
URL: | https://github.com/containers/common/pull/1757 | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Bug Depends on: | |||
Bug Blocks: | 921771 |
Description
Azamat H. Hackimov
2024-04-14 17:57:38 UTC
(In reply to Azamat H. Hackimov from comment #0) > [...] > Need to add '>=app-containers/containers-image-5.30.0' to > app-containers/containers-common and stabilize it. > A blocker will be needed *as well* to say "yes, I know there'll be a file collision, but it's OK." The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445d9f92ddafad40e2a2c0bbc22945dda89d9b47 commit 445d9f92ddafad40e2a2c0bbc22945dda89d9b47 Author: Zac Medico <zmedico@gentoo.org> AuthorDate: 2024-04-14 18:59:13 +0000 Commit: Zac Medico <zmedico@gentoo.org> CommitDate: 2024-04-14 19:14:26 +0000 app-containers/containers-image: Block older containers-common In 5.29.2 (commit 3ce5be3e30a8d60756b3685d1069788ec801f7f8) the policy.json and registries.d/default.yaml files moved to the containers-image package. Bug: https://bugs.gentoo.org/930027 Signed-off-by: Zac Medico <zmedico@gentoo.org> app-containers/containers-image/containers-image-5.29.2-r1.ebuild | 1 + app-containers/containers-image/containers-image-5.30.0.ebuild | 1 + app-containers/containers-image/containers-image-9999.ebuild | 1 + 3 files changed, 3 insertions(+) The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e85fee1101fc083159109f10a6cdf9a242280e4f commit e85fee1101fc083159109f10a6cdf9a242280e4f Author: Zac Medico <zmedico@gentoo.org> AuthorDate: 2024-04-14 19:27:45 +0000 Commit: Zac Medico <zmedico@gentoo.org> CommitDate: 2024-04-14 19:42:05 +0000 app-containers/containers-common: 0.57.0-r1 stable revbump resolves file collisions Use a 0.57.0-r1 stable revbump to resolve file collisions with app-containers/containers-image-5.29.2-r1 which was stabilized for bug 921771. These files have migrated to containers-image: /etc/containers/policy.json /etc/containers/registries.d/default.yaml This file is no longer installed but there is another copy installed in /usr/share/containers: /etc/containers/containers.conf Closes: https://bugs.gentoo.org/930027 Bug: https://bugs.gentoo.org/921771 Signed-off-by: Zac Medico <zmedico@gentoo.org> .../containers-common-0.57.0-r1.ebuild | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad1a02c2fa34c183bf564623d5bc4ca7ad7bd10 commit 4ad1a02c2fa34c183bf564623d5bc4ca7ad7bd10 Author: Zac Medico <zmedico@gentoo.org> AuthorDate: 2024-04-14 19:59:04 +0000 Commit: Zac Medico <zmedico@gentoo.org> CommitDate: 2024-04-14 20:06:41 +0000 app-containers/containers-common: Make 0.57.0 require older containers-image This version requires a version of containers-image less than 5.29.2 which provides these files that collide with newer versions of containers-common: /etc/containers/policy.json /etc/containers/registries.d/default.yaml Bug: https://bugs.gentoo.org/930027 Signed-off-by: Zac Medico <zmedico@gentoo.org> app-containers/containers-common/containers-common-0.57.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4764a9acb220d0c847225c35d76ce86f5cc6ecab commit 4764a9acb220d0c847225c35d76ce86f5cc6ecab Author: Zac Medico <zmedico@gentoo.org> AuthorDate: 2024-04-14 20:31:29 +0000 Commit: Zac Medico <zmedico@gentoo.org> CommitDate: 2024-04-14 20:39:10 +0000 app-containers/containers-common: destabilize 0.57.0 for ~arm64 (resolve NonsolvableDepsInStable) This version requires containers-image-5.29.0 in order to avoid a file collsion, but that version was never stabilized for arm64. Fixes: 4ad1a02c2fa3 ("app-containers/containers-common: Make 0.57.0 require older containers-image") Bug: https://bugs.gentoo.org/930027 Signed-off-by: Zac Medico <zmedico@gentoo.org> app-containers/containers-common/containers-common-0.57.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) |