Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 872440 Details for
Bug 915504
app-containers/skopeo: 1.13.3 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch from github pull 33124
33124.patch (text/plain), 9.60 KB, created by
Zac Medico
on 2023-10-09 23:24:15 UTC
(
hide
)
Description:
patch from github pull 33124
Filename:
MIME Type:
Creator:
Zac Medico
Created:
2023-10-09 23:24:15 UTC
Size:
9.60 KB
patch
obsolete
>From e25d5b9d8e9de1ea19d980c979fc5a838288bdf1 Mon Sep 17 00:00:00 2001 >From: Rahil Bhimjiani <rahil3108@gmail.com> >Date: Fri, 29 Sep 2023 21:20:20 +0530 >Subject: [PATCH] app-containers/skopeo: add live & latest > >builds more in line with upsteam's instructions >two new use flags - device-mapper rootless > >Bug: https://bugs.gentoo.org/694906 >Closes: https://bugs.gentoo.org/911537 >Signed-off-by: Rahil Bhimjiani <rahil3108@gmail.com> >--- > app-containers/skopeo/Manifest | 1 + > .../skopeo/files/makefile-1.13.3.patch | 38 ++++++++++ > app-containers/skopeo/metadata.xml | 12 ++++ > app-containers/skopeo/skopeo-1.13.3.ebuild | 71 +++++++++++++++++++ > app-containers/skopeo/skopeo-9999.ebuild | 71 +++++++++++++++++++ > 5 files changed, 193 insertions(+) > create mode 100644 app-containers/skopeo/files/makefile-1.13.3.patch > create mode 100644 app-containers/skopeo/skopeo-1.13.3.ebuild > create mode 100644 app-containers/skopeo/skopeo-9999.ebuild > >diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest >index fe73fbdd706e7..480cc37411874 100644 >--- a/app-containers/skopeo/Manifest >+++ b/app-containers/skopeo/Manifest >@@ -1,3 +1,4 @@ > DIST skopeo-1.10.0.tar.gz 6460856 BLAKE2B b904a161334ef0a3eaaab8c58f0c7e4c507fa68a09f8fa8235e8a9222d48c98874c9ce878a509e2816f210ffb37dbf707ff2653212e1efbd9ad6686efb97e147 SHA512 0d64e7f12a0d10c81074a04b6c74ed6e7213f598013f1ba672c4c696e9dad5827f41f41bb817263bf8606cd051b8e24e7eab65b95d73d8a1c8bbb3eaeb9defdb > DIST skopeo-1.11.1.tar.gz 8071084 BLAKE2B 2411db318e377cfcfa9a80523c0bd4900201b1c17a4fe0f875dd78033bd4241e6c806816746ef77304e2edbc3737a3b22cfa83b83d65eb3c462cd5437de4e0b8 SHA512 521a2c8ddf629e361340a51d95200ec67bc4fef814e0449b6d679725536ec9448827229d4f993276f084269c2ec73c1b4edf97c0ce29122d950d350ed623a4b9 >+DIST skopeo-1.13.3.tar.gz 7923961 BLAKE2B a1084e3b5c3b8624a9dfca3f473b131333b20839c1f5872426c6efb3b0c0c02584ee2c4076895af94e77cf6799583db271883115902a8887c3567a42a8b0c056 SHA512 3e706b9600ec295b4abe71a5f649535ff2642889331a2958408b4852eb366d8119ec65b1f40c8b2f79b0f28e1079e2b203370422af0cc92e9d3fcf0f83c151e4 > DIST skopeo-1.5.1.tar.gz 5636533 BLAKE2B 7f0e86cdee5c3250ec1280d7e71554ac2f8ad96ababe0e81dfabc00e8c128a13fc0c9c561b7a9be389d7386e9f664b95118bd2122612b9c2e8844db49769c03c SHA512 3f8c730eaa739bf2a29b82d3b04aa4eee1c09f957b61964fc8c48e59d1537bcb87b5bdf9c18fa48f9d36cf2b7ede3a1448918a20b5a3167f6ce09881a6cd3dde >diff --git a/app-containers/skopeo/files/makefile-1.13.3.patch b/app-containers/skopeo/files/makefile-1.13.3.patch >new file mode 100644 >index 0000000000000..ee3383925a2b8 >--- /dev/null >+++ b/app-containers/skopeo/files/makefile-1.13.3.patch >@@ -0,0 +1,38 @@ >+# Patch by Rahil Bhimjiani (IRC: rahilarious) (rahil3108@gmail.com) >+# >+# Rationale behind this patch: >+# 1. We don't install these files (policy.json default.yaml) as part of skopeo because podman, buildah, et. al need them as well, and there's no need for those to depend on skopeo just for configuration. Rely on app-containers/containers-common which has them split out instead. See https://bugs.gentoo.org/849863 >+# 2. Remove install-*: because it tries to (re)compile stuff (which we already built in src_compile) on install commands. src_install should only install, not compile >+# >+# >+--- a/Makefile >++++ b/Makefile >+@@ -158,23 +158,20 @@ >+ rm -rf bin docs/*.1 completions/ >+ >+ install: install-binary install-docs install-completions >+- install -d -m 755 ${DESTDIR}${LOOKASIDEDIR} >+ install -d -m 755 ${DESTDIR}${CONTAINERSCONFDIR} >+- install -m 644 default-policy.json ${DESTDIR}${CONTAINERSCONFDIR}/policy.json >+ install -d -m 755 ${DESTDIR}${REGISTRIESDDIR} >+- install -m 644 default.yaml ${DESTDIR}${REGISTRIESDDIR}/default.yaml >+ >+-install-binary: bin/skopeo >++install-binary: >+ install -d -m 755 ${DESTDIR}${BINDIR} >+ install -m 755 bin/skopeo ${DESTDIR}${BINDIR}/skopeo >+ >+-install-docs: docs >++install-docs: >+ ifneq ($(DISABLE_DOCS), 1) >+ install -d -m 755 ${DESTDIR}${MANDIR}/man1 >+ install -m 644 docs/*.1 ${DESTDIR}${MANDIR}/man1 >+ endif >+ >+-install-completions: completions >++install-completions: >+ install -d -m 755 ${DESTDIR}${BASHINSTALLDIR} >+ install -m 644 completions/bash/skopeo ${DESTDIR}${BASHINSTALLDIR} >+ install -d -m 755 ${DESTDIR}${ZSHINSTALLDIR} >+ install -m 644 completions/zsh/_skopeo ${DESTDIR}${ZSHINSTALLDIR} >+ install -d -m 755 ${DESTDIR}${FISHINSTALLDIR} >diff --git a/app-containers/skopeo/metadata.xml b/app-containers/skopeo/metadata.xml >index 21cb782a75cfa..215d3e1439209 100644 >--- a/app-containers/skopeo/metadata.xml >+++ b/app-containers/skopeo/metadata.xml >@@ -5,10 +5,22 @@ > <email>williamh@gentoo.org</email> > <name>William Hubbs</name> > </maintainer> >+ <maintainer type="person" proxied="yes"> >+ <email>rahil3108@gmail.com</email> >+ <name>Rahil Bhimjiani</name> >+ </maintainer> >+ <maintainer type="project" proxied="proxy"> >+ <email>proxy-maint@gentoo.org</email> >+ <name>Proxy Maintainers</name> >+ </maintainer> > <use> > <flag name="btrfs">Enables dependencies for the "btrfs" graph driver.</flag> >+ <flag name="device-mapper">Compiles with libdevmapper</flag> >+ <flag name="rootless">Compiles with libsubid</flag> > </use> > <upstream> > <remote-id type="github">containers/skopeo</remote-id> >+ <bugs-to>https://github.com/containers/skopeo/issues</bugs-to> >+ <doc>https://github.com/containers/skopeo/blob/main/README.md</doc> > </upstream> > </pkgmetadata> >diff --git a/app-containers/skopeo/skopeo-1.13.3.ebuild b/app-containers/skopeo/skopeo-1.13.3.ebuild >new file mode 100644 >index 0000000000000..134ed7a78fba3 >--- /dev/null >+++ b/app-containers/skopeo/skopeo-1.13.3.ebuild >@@ -0,0 +1,71 @@ >+# Copyright 2023 Gentoo Authors >+# Distributed under the terms of the GNU General Public License v2 >+ >+EAPI=8 >+inherit go-module linux-info >+ >+DESCRIPTION="Work with remote container images registries" >+HOMEPAGE="https://github.com/containers/skopeo" >+if [[ ${PV} == *9999* ]]; then >+ inherit git-r3 >+ EGIT_REPO_URI="https://github.com/containers/skopeo.git" >+else >+ SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" >+ KEYWORDS="~amd64 ~arm64" >+fi >+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" >+SLOT="0" >+IUSE="btrfs device-mapper rootless" >+ >+RDEPEND=" >+ app-containers/containers-common >+ >=app-crypt/gpgme-1.5.5:= >+ >=dev-libs/libassuan-2.4.3:= >+ btrfs? ( >=sys-fs/btrfs-progs-4.0.1 ) >+ device-mapper? ( >=sys-fs/lvm2-2.02.145:= ) >+ rootless? ( sys-apps/shadow:= ) >+" >+# TODO: Is this really needed? >+# dev-libs/libgpg-error:= >+DEPEND="${RDEPEND}" >+BDEPEND="dev-go/go-md2man" >+ >+RESTRICT="test" >+PATCHES=( "${FILESDIR}"/makefile-1.13.3.patch ) >+ >+pkg_setup() { >+ use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" >+ use device-mapper && CONFIG_CHECK+=" ~MD" >+ linux-info_pkg_setup >+} >+src_prepare() { >+ default >+ local file >+ for file in btrfs_installed_tag btrfs_tag libdm_tag libsubid_tag; do >+ [[ -f hack/"${file}".sh ]] || die >+ done >+ >+ echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die >+ cat <<-EOF > hack/btrfs_tag.sh || die >+ #!/usr/bin/env bash >+ $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion') >+EOF >+ >+ cat <<-EOF > hack/libdm_tag.sh || die >+ #!/usr/bin/env bash >+ $(usex device-mapper echo "echo libdm_no_deferred_remove") >+EOF >+ >+ cat <<-EOF > hack/libsubid_tag.sh || die >+ #!/usr/bin/env bash >+ $(usex rootless "echo libsubid" echo) >+EOF >+} >+ >+src_compile() { >+ # export variables which 'make install' is also going to use >+ export PREFIX="${EPREFIX}/usr" \ >+ CONTAINERSCONFDIR="${EPREFIX}/etc/containers" >+ # compile binary, docs, completions >+ emake all completions >+} >diff --git a/app-containers/skopeo/skopeo-9999.ebuild b/app-containers/skopeo/skopeo-9999.ebuild >new file mode 100644 >index 0000000000000..134ed7a78fba3 >--- /dev/null >+++ b/app-containers/skopeo/skopeo-9999.ebuild >@@ -0,0 +1,71 @@ >+# Copyright 2023 Gentoo Authors >+# Distributed under the terms of the GNU General Public License v2 >+ >+EAPI=8 >+inherit go-module linux-info >+ >+DESCRIPTION="Work with remote container images registries" >+HOMEPAGE="https://github.com/containers/skopeo" >+if [[ ${PV} == *9999* ]]; then >+ inherit git-r3 >+ EGIT_REPO_URI="https://github.com/containers/skopeo.git" >+else >+ SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" >+ KEYWORDS="~amd64 ~arm64" >+fi >+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" >+SLOT="0" >+IUSE="btrfs device-mapper rootless" >+ >+RDEPEND=" >+ app-containers/containers-common >+ >=app-crypt/gpgme-1.5.5:= >+ >=dev-libs/libassuan-2.4.3:= >+ btrfs? ( >=sys-fs/btrfs-progs-4.0.1 ) >+ device-mapper? ( >=sys-fs/lvm2-2.02.145:= ) >+ rootless? ( sys-apps/shadow:= ) >+" >+# TODO: Is this really needed? >+# dev-libs/libgpg-error:= >+DEPEND="${RDEPEND}" >+BDEPEND="dev-go/go-md2man" >+ >+RESTRICT="test" >+PATCHES=( "${FILESDIR}"/makefile-1.13.3.patch ) >+ >+pkg_setup() { >+ use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" >+ use device-mapper && CONFIG_CHECK+=" ~MD" >+ linux-info_pkg_setup >+} >+src_prepare() { >+ default >+ local file >+ for file in btrfs_installed_tag btrfs_tag libdm_tag libsubid_tag; do >+ [[ -f hack/"${file}".sh ]] || die >+ done >+ >+ echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die >+ cat <<-EOF > hack/btrfs_tag.sh || die >+ #!/usr/bin/env bash >+ $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion') >+EOF >+ >+ cat <<-EOF > hack/libdm_tag.sh || die >+ #!/usr/bin/env bash >+ $(usex device-mapper echo "echo libdm_no_deferred_remove") >+EOF >+ >+ cat <<-EOF > hack/libsubid_tag.sh || die >+ #!/usr/bin/env bash >+ $(usex rootless "echo libsubid" echo) >+EOF >+} >+ >+src_compile() { >+ # export variables which 'make install' is also going to use >+ export PREFIX="${EPREFIX}/usr" \ >+ CONTAINERSCONFDIR="${EPREFIX}/etc/containers" >+ # compile binary, docs, completions >+ emake all completions >+}
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 915504
: 872440