Attachment #872440 for bug #915504

View | Details | Raw Unified | Return to bug 915504
Collapse All | Expand All

Lines 1-3 Link Here

(-)a/app-containers/skopeo/Manifest (+1 lines)
1	DIST skopeo-1.10.0.tar.gz 6460856 BLAKE2B b904a161334ef0a3eaaab8c58f0c7e4c507fa68a09f8fa8235e8a9222d48c98874c9ce878a509e2816f210ffb37dbf707ff2653212e1efbd9ad6686efb97e147 SHA512 0d64e7f12a0d10c81074a04b6c74ed6e7213f598013f1ba672c4c696e9dad5827f41f41bb817263bf8606cd051b8e24e7eab65b95d73d8a1c8bbb3eaeb9defdb	1	DIST skopeo-1.10.0.tar.gz 6460856 BLAKE2B b904a161334ef0a3eaaab8c58f0c7e4c507fa68a09f8fa8235e8a9222d48c98874c9ce878a509e2816f210ffb37dbf707ff2653212e1efbd9ad6686efb97e147 SHA512 0d64e7f12a0d10c81074a04b6c74ed6e7213f598013f1ba672c4c696e9dad5827f41f41bb817263bf8606cd051b8e24e7eab65b95d73d8a1c8bbb3eaeb9defdb
2	DIST skopeo-1.11.1.tar.gz 8071084 BLAKE2B 2411db318e377cfcfa9a80523c0bd4900201b1c17a4fe0f875dd78033bd4241e6c806816746ef77304e2edbc3737a3b22cfa83b83d65eb3c462cd5437de4e0b8 SHA512 521a2c8ddf629e361340a51d95200ec67bc4fef814e0449b6d679725536ec9448827229d4f993276f084269c2ec73c1b4edf97c0ce29122d950d350ed623a4b9	2	DIST skopeo-1.11.1.tar.gz 8071084 BLAKE2B 2411db318e377cfcfa9a80523c0bd4900201b1c17a4fe0f875dd78033bd4241e6c806816746ef77304e2edbc3737a3b22cfa83b83d65eb3c462cd5437de4e0b8 SHA512 521a2c8ddf629e361340a51d95200ec67bc4fef814e0449b6d679725536ec9448827229d4f993276f084269c2ec73c1b4edf97c0ce29122d950d350ed623a4b9
		3	DIST skopeo-1.13.3.tar.gz 7923961 BLAKE2B a1084e3b5c3b8624a9dfca3f473b131333b20839c1f5872426c6efb3b0c0c02584ee2c4076895af94e77cf6799583db271883115902a8887c3567a42a8b0c056 SHA512 3e706b9600ec295b4abe71a5f649535ff2642889331a2958408b4852eb366d8119ec65b1f40c8b2f79b0f28e1079e2b203370422af0cc92e9d3fcf0f83c151e4
3	DIST skopeo-1.5.1.tar.gz 5636533 BLAKE2B 7f0e86cdee5c3250ec1280d7e71554ac2f8ad96ababe0e81dfabc00e8c128a13fc0c9c561b7a9be389d7386e9f664b95118bd2122612b9c2e8844db49769c03c SHA512 3f8c730eaa739bf2a29b82d3b04aa4eee1c09f957b61964fc8c48e59d1537bcb87b5bdf9c18fa48f9d36cf2b7ede3a1448918a20b5a3167f6ce09881a6cd3dde	4	DIST skopeo-1.5.1.tar.gz 5636533 BLAKE2B 7f0e86cdee5c3250ec1280d7e71554ac2f8ad96ababe0e81dfabc00e8c128a13fc0c9c561b7a9be389d7386e9f664b95118bd2122612b9c2e8844db49769c03c SHA512 3f8c730eaa739bf2a29b82d3b04aa4eee1c09f957b61964fc8c48e59d1537bcb87b5bdf9c18fa48f9d36cf2b7ede3a1448918a20b5a3167f6ce09881a6cd3dde




# 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}

Lines 5-14 Link Here

(-)a/app-containers/skopeo/metadata.xml (+12 lines)
5	<email>williamh@gentoo.org</email>	5	<email>williamh@gentoo.org</email>
6	<name>William Hubbs</name>	6	<name>William Hubbs</name>
7	</maintainer>	7	</maintainer>
		8	<maintainer type="person" proxied="yes">
		9	<email>rahil3108@gmail.com</email>
		10	<name>Rahil Bhimjiani</name>
		11	</maintainer>
		12	<maintainer type="project" proxied="proxy">
		13	<email>proxy-maint@gentoo.org</email>
		14	<name>Proxy Maintainers</name>
		15	</maintainer>
8	<use>	16	<use>
9	<flag name="btrfs">Enables dependencies for the "btrfs" graph driver.</flag>	17	<flag name="btrfs">Enables dependencies for the "btrfs" graph driver.</flag>
		18	<flag name="device-mapper">Compiles with libdevmapper</flag>
		19	<flag name="rootless">Compiles with libsubid</flag>
10	</use>	20	</use>
11	<upstream>	21	<upstream>
12	<remote-id type="github">containers/skopeo</remote-id>	22	<remote-id type="github">containers/skopeo</remote-id>
		23	<bugs-to>https://github.com/containers/skopeo/issues</bugs-to>
		24	<doc>https://github.com/containers/skopeo/blob/main/README.md</doc>
13	</upstream>	25	</upstream>
14	</pkgmetadata>	26	</pkgmetadata>




# 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
}




# 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
}

Return to bug 915504

Line 0 Link Here

(-)a/app-containers/skopeo/files/makefile-1.13.3.patch (+38 lines)
	1	# Patch by Rahil Bhimjiani (IRC: rahilarious) (rahil3108@gmail.com)
	2	#
	3	# Rationale behind this patch:
	4	# 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
	5	# 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
	6	#
	7	#
	8	--- a/Makefile
	9	+++ b/Makefile
	10	@@ -158,23 +158,20 @@
	11	rm -rf bin docs/*.1 completions/
	12
	13	install: install-binary install-docs install-completions
	14	- install -d -m 755 ${DESTDIR}${LOOKASIDEDIR}
	15	install -d -m 755 ${DESTDIR}${CONTAINERSCONFDIR}
	16	- install -m 644 default-policy.json ${DESTDIR}${CONTAINERSCONFDIR}/policy.json
	17	install -d -m 755 ${DESTDIR}${REGISTRIESDDIR}
	18	- install -m 644 default.yaml ${DESTDIR}${REGISTRIESDDIR}/default.yaml
	19
	20	-install-binary: bin/skopeo
	21	+install-binary:
	22	install -d -m 755 ${DESTDIR}${BINDIR}
	23	install -m 755 bin/skopeo ${DESTDIR}${BINDIR}/skopeo
	24
	25	-install-docs: docs
	26	+install-docs:
	27	ifneq ($(DISABLE_DOCS), 1)
	28	install -d -m 755 ${DESTDIR}${MANDIR}/man1
	29	install -m 644 docs/*.1 ${DESTDIR}${MANDIR}/man1
	30	endif
	31
	32	-install-completions: completions
	33	+install-completions:
	34	install -d -m 755 ${DESTDIR}${BASHINSTALLDIR}
	35	install -m 644 completions/bash/skopeo ${DESTDIR}${BASHINSTALLDIR}
	36	install -d -m 755 ${DESTDIR}${ZSHINSTALLDIR}
	37	install -m 644 completions/zsh/_skopeo ${DESTDIR}${ZSHINSTALLDIR}
	38	install -d -m 755 ${DESTDIR}${FISHINSTALLDIR}

Line 0 Link Here

(-)a/app-containers/skopeo/skopeo-1.13.3.ebuild (+71 lines)
		1	# Copyright 2023 Gentoo Authors
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=8
		5	inherit go-module linux-info
		6
		7	DESCRIPTION="Work with remote container images registries"
		8	HOMEPAGE="https://github.com/containers/skopeo"
		9	if [[ ${PV} == 9999 ]]; then
		10	inherit git-r3
		11	EGIT_REPO_URI="https://github.com/containers/skopeo.git"
		12	else
		13	SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
		14	KEYWORDS="~amd64 ~arm64"
		15	fi
		16	LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
		17	SLOT="0"
		18	IUSE="btrfs device-mapper rootless"
		19
		20	RDEPEND="
		21	app-containers/containers-common
		22	>=app-crypt/gpgme-1.5.5:=
		23	>=dev-libs/libassuan-2.4.3:=
		24	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
		25	device-mapper? ( >=sys-fs/lvm2-2.02.145:= )
		26	rootless? ( sys-apps/shadow:= )
		27	"
		28	# TODO: Is this really needed?
		29	# dev-libs/libgpg-error:=
		30	DEPEND="${RDEPEND}"
		31	BDEPEND="dev-go/go-md2man"
		32
		33	RESTRICT="test"
		34	PATCHES=( "${FILESDIR}"/makefile-1.13.3.patch )
		35
		36	pkg_setup() {
		37	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
		38	use device-mapper && CONFIG_CHECK+=" ~MD"
		39	linux-info_pkg_setup
		40	}
		41	src_prepare() {
		42	default
		43	local file
		44	for file in btrfs_installed_tag btrfs_tag libdm_tag libsubid_tag; do
		45	[[ -f hack/"${file}".sh ]] \|\| die
		46	done
		47
		48	echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh \|\| die
		49	cat <<-EOF > hack/btrfs_tag.sh \|\| die
		50	#!/usr/bin/env bash
		51	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
		52	EOF
		53
		54	cat <<-EOF > hack/libdm_tag.sh \|\| die
		55	#!/usr/bin/env bash
		56	$(usex device-mapper echo "echo libdm_no_deferred_remove")
		57	EOF
		58
		59	cat <<-EOF > hack/libsubid_tag.sh \|\| die
		60	#!/usr/bin/env bash
		61	$(usex rootless "echo libsubid" echo)
		62	EOF
		63	}
		64
65	src_compile() {
66	# export variables which 'make install' is also going to use
67	export PREFIX="${EPREFIX}/usr" \
68	CONTAINERSCONFDIR="${EPREFIX}/etc/containers"
69	# compile binary, docs, completions
70	emake all completions
71	}

Line 0 Link Here

(-)a/app-containers/skopeo/skopeo-9999.ebuild (+71 lines)
		1	# Copyright 2023 Gentoo Authors
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=8
		5	inherit go-module linux-info
		6
		7	DESCRIPTION="Work with remote container images registries"
		8	HOMEPAGE="https://github.com/containers/skopeo"
		9	if [[ ${PV} == 9999 ]]; then
		10	inherit git-r3
		11	EGIT_REPO_URI="https://github.com/containers/skopeo.git"
		12	else
		13	SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
		14	KEYWORDS="~amd64 ~arm64"
		15	fi
		16	LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
		17	SLOT="0"
		18	IUSE="btrfs device-mapper rootless"
		19
		20	RDEPEND="
		21	app-containers/containers-common
		22	>=app-crypt/gpgme-1.5.5:=
		23	>=dev-libs/libassuan-2.4.3:=
		24	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
		25	device-mapper? ( >=sys-fs/lvm2-2.02.145:= )
		26	rootless? ( sys-apps/shadow:= )
		27	"
		28	# TODO: Is this really needed?
		29	# dev-libs/libgpg-error:=
		30	DEPEND="${RDEPEND}"
		31	BDEPEND="dev-go/go-md2man"
		32
		33	RESTRICT="test"
		34	PATCHES=( "${FILESDIR}"/makefile-1.13.3.patch )
		35
		36	pkg_setup() {
		37	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
		38	use device-mapper && CONFIG_CHECK+=" ~MD"
		39	linux-info_pkg_setup
		40	}
		41	src_prepare() {
		42	default
		43	local file
		44	for file in btrfs_installed_tag btrfs_tag libdm_tag libsubid_tag; do
		45	[[ -f hack/"${file}".sh ]] \|\| die
		46	done
		47
		48	echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh \|\| die
		49	cat <<-EOF > hack/btrfs_tag.sh \|\| die
		50	#!/usr/bin/env bash
		51	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
		52	EOF
		53
		54	cat <<-EOF > hack/libdm_tag.sh \|\| die
		55	#!/usr/bin/env bash
		56	$(usex device-mapper echo "echo libdm_no_deferred_remove")
		57	EOF
		58
		59	cat <<-EOF > hack/libsubid_tag.sh \|\| die
		60	#!/usr/bin/env bash
		61	$(usex rootless "echo libsubid" echo)
		62	EOF
		63	}
		64
65	src_compile() {
66	# export variables which 'make install' is also going to use
67	export PREFIX="${EPREFIX}/usr" \
68	CONTAINERSCONFDIR="${EPREFIX}/etc/containers"
69	# compile binary, docs, completions
70	emake all completions
71	}