diff options
Diffstat (limited to 'app-containers/flannel')
| -rw-r--r-- | app-containers/flannel/Manifest | 5 | ||||
| -rw-r--r-- | app-containers/flannel/flannel-0.16.0.ebuild | 54 | ||||
| -rw-r--r-- | app-containers/flannel/flannel-0.17.0.ebuild (renamed from app-containers/flannel/flannel-0.16.1.ebuild) | 4 | ||||
| -rw-r--r-- | app-containers/flannel/flannel-0.20.0.ebuild (renamed from app-containers/flannel/flannel-0.14.0.ebuild) | 6 | ||||
| -rw-r--r-- | app-containers/flannel/metadata.xml | 2 |
5 files changed, 8 insertions, 63 deletions
diff --git a/app-containers/flannel/Manifest b/app-containers/flannel/Manifest index 82af2aae9839..adad8566f465 100644 --- a/app-containers/flannel/Manifest +++ b/app-containers/flannel/Manifest @@ -1,3 +1,2 @@ -DIST flannel-0.14.0.tar.gz 8324790 BLAKE2B 47fd65d531f9fa10e602ccf1858549ede97d8f8c9afa32ffeb010d733060703262cafd02b5daddc65142dfa96b1c6b429eaff30b7fdaca27e2a5397c0d756e7c SHA512 a5d9f45d55f18c744e635b4d697200cf9d5a8c4387cd6d9c57220e652e3688337f2ee50fef193135dd0073b14edb8800fac8d5ca9f9d0d3e9ef70d09a52f259c -DIST flannel-0.16.0.tar.gz 8697548 BLAKE2B a307990554a6cf215bef6ac75a544d00d8c6cd702f02e98efaf80b89d0ecf4592c1c338d1f80cf22ee086355ee7edb77492e6af587cbf037f38b6e3dbc4ac252 SHA512 7b80fe1e282c312b8b242d2201ecd164d87b551f4bc02d8375ca856c0dcfad2d31bd1b4041663016130b0bd7ebaf0062afe59c0946e97f10478142ca8ffd94f0 -DIST flannel-0.16.1.tar.gz 8697974 BLAKE2B bff4d5a6fe179129fa9ae494291301b25bc3ff9d6f4049b990f50b01920dfd20d149eb85339e2930b66dd060aca57f269a3b21fa508a3c95f5d152bbfb91631f SHA512 699ba7e7b80dd60a03bb5c6ee384a582201d8167ef21e60816ca9942a9d70ba0fd7633a3d2a44802f9f0a0851a79709afe78bd46f15ca81641ff64d46859f928 +DIST flannel-0.17.0.tar.gz 9534647 BLAKE2B 03d6d036d5877641a2fc7b6654995822522d378943e4d7b2531be8197de6e7d6e0509143cd8d4dfd3d2ef11c9355011bfc44c834f966e14fd3aa774350bcab11 SHA512 f0625339e387a6ae81780d21025c282c2e0caf8b32ac778634a877a4e04ebf10d41fc10b50ae477c28815cedaf34af867b651ed5a8c5267177ea925abc6a1253 +DIST flannel-0.20.0.tar.gz 10737855 BLAKE2B d2e5821c4457a8c0781618a62245132f862d7877ce10467f8d9c72be2440f7b60f0866a3420a69d13bc53826407b0b653e6c2385f8e56d684ee1e09acf0528f0 SHA512 624a293607d3d4d5e53b41b5fd26a416f8499a763f8cfbe39c79796644a56d5eb3605664592d15eddde519f2dba55da241889be159644bbe40e78ae72ed5a43b diff --git a/app-containers/flannel/flannel-0.16.0.ebuild b/app-containers/flannel/flannel-0.16.0.ebuild deleted file mode 100644 index ec33f31625ba..000000000000 --- a/app-containers/flannel/flannel-0.16.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit go-module systemd tmpfiles - -KEYWORDS="~amd64 ~arm64" -DESCRIPTION="An etcd backed network fabric for containers" -HOMEPAGE="https://github.com/coreos/flannel" -SRC_URI="https://github.com/coreos/flannel/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT" -SLOT="0" -IUSE="hardened" - -RESTRICT+=" test" - -src_prepare() { - default - sed -e "s:^var Version =.*:var Version = \"${PV}\":" \ - -i "${S}/version/version.go" || die -} - -src_compile() { - CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\ - go build -o dist/flanneld -ldflags " - -X github.com/flannel-io/flannel/version.Version=v${PV} - -extldflags \"-static\"" . || die -} - -src_test() { - GOPATH="${WORKDIR}/${P}" \ - go test -v -work -x "${EGO_PN}" || die -} - -src_install() { - dobin dist/${PN}d - exeinto /usr/libexec/flannel - doexe dist/mk-docker-opts.sh - insinto /etc/systemd/system/docker.service.d - newins "${FILESDIR}/flannel-docker.conf" flannel.conf - newinitd "${FILESDIR}"/flanneld.initd flanneld - newconfd "${FILESDIR}"/flanneld.confd flanneld - keepdir /var/log/${PN} - insinto /etc/logrotate.d - newins "${FILESDIR}"/flanneld.logrotated flanneld - newtmpfiles "${FILESDIR}/flannel.tmpfilesd" flannel.conf - systemd_dounit "${FILESDIR}/flanneld.service" - dodoc README.md -} - -pkg_postinst() { - tmpfiles_process flannel.conf -} diff --git a/app-containers/flannel/flannel-0.16.1.ebuild b/app-containers/flannel/flannel-0.17.0.ebuild index ad8fbf25ad4e..18d922d3f1d3 100644 --- a/app-containers/flannel/flannel-0.16.1.ebuild +++ b/app-containers/flannel/flannel-0.17.0.ebuild @@ -6,8 +6,8 @@ inherit go-module systemd tmpfiles KEYWORDS="~amd64 ~arm64" DESCRIPTION="An etcd backed network fabric for containers" -HOMEPAGE="https://github.com/coreos/flannel" -SRC_URI="https://github.com/coreos/flannel/archive/v${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/flannel-io/flannel" +SRC_URI="https://github.com/flannel-io/flannel/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT" SLOT="0" diff --git a/app-containers/flannel/flannel-0.14.0.ebuild b/app-containers/flannel/flannel-0.20.0.ebuild index ec33f31625ba..18d922d3f1d3 100644 --- a/app-containers/flannel/flannel-0.14.0.ebuild +++ b/app-containers/flannel/flannel-0.20.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,8 +6,8 @@ inherit go-module systemd tmpfiles KEYWORDS="~amd64 ~arm64" DESCRIPTION="An etcd backed network fabric for containers" -HOMEPAGE="https://github.com/coreos/flannel" -SRC_URI="https://github.com/coreos/flannel/archive/v${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/flannel-io/flannel" +SRC_URI="https://github.com/flannel-io/flannel/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0 BSD ISC LGPL-3 MIT" SLOT="0" diff --git a/app-containers/flannel/metadata.xml b/app-containers/flannel/metadata.xml index 4ed5e4e641ed..7e0f71c1df52 100644 --- a/app-containers/flannel/metadata.xml +++ b/app-containers/flannel/metadata.xml @@ -5,6 +5,6 @@ <email>zmedico@gentoo.org</email> </maintainer> <upstream> - <remote-id type="github">coreos/flannel</remote-id> + <remote-id type="github">flannel-io/flannel</remote-id> </upstream> </pkgmetadata> |