diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild index f01a766cf5..502ea45632 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild @@ -29,7 +29,7 @@ SLOT="0" IUSE="+btrfs hardened" DEPEND="btrfs? ( sys-fs/btrfs-progs )" -RDEPEND="~app-emulation/docker-runc-1.0.0_rc95 +RDEPEND="~app-emulation/docker-runc-1.0.0 sys-libs/libseccomp" S=${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE} diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest index f42e5c39c8..d4e667d65a 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/Manifest @@ -1,2 +1,2 @@ +DIST docker-runc-1.0.0.tar.gz 2368557 BLAKE2B 9dfbae7b08adbc861878db6bc021ed67c81e5456a16bb40ad73b45523052dfa5f8132662f4c682e3b68f1d40236d86e0ba569f939af3d328f5ffc66b8fb38ae7 SHA512 a467979b8366ef0bb27588831b7f2eb097603162ef22050549be2f5a51fe6e924561ea9617800d68cb9bb577132a5f95f4fc4eafd7215e0550c8094bc0d2370d DIST docker-runc-1.0.0_rc2_p136.tar.gz 561705 BLAKE2B 4dd5dc689db1ac632bf10a5060f5681c7e44716caf8d3730683aad9df29c7b2628fa9e7253d86d87e9dfd7d27b545713154fa0f2984ca52908b16ab089be5646 SHA512 6052b95042082c3345caf25d3646f47b82c151ff3aca2ca4510dbf72ee80056d8c4077f2a1b48a9f4178c41185835ff51461e52ad47969534ea6febf7cac74f1 -DIST docker-runc-1.0.0_rc95.tar.gz 2311555 BLAKE2B 1e40d2c8bf915d2643326d68990f5ce5496348436ae818970c7df414a4db143cc495917cd3187fc1e25044791abdaa47e540050cf83a0409f71b83f9e18552a2 SHA512 2a5e6eaa4f7eb447dd276099f9c7062f09e68740f84e1be6d1cd6a715dc3cb1998f5c40c11aaa8f9458189293a5424b6d589d8cc413bdd991646c85558bb5fca diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc95.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0.ebuild similarity index 91% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc95.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0.ebuild index 9fcf13d54a..d0b6222380 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc95.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0.ebuild @@ -11,8 +11,8 @@ COREOS_GO_VERSION="go1.13" # Update the patch number when this commit is changed (i.e. the _p in the ebuild). # The patch version is arbitrarily the number of commits since the tag version # specified in the ebuild name. For example: -# $ git log --oneline v1.0.0-rc95..${COMMIT_ID} | wc -l -COMMIT_ID="7cc3ad87e3130ba1fed6c3fd7a756e88e2aac066" +# $ git log --oneline v1.0.0..${COMMIT_ID} | wc -l +COMMIT_ID="60cd6da6ef9fbf689682922617efff01c5f221c0" inherit eutils flag-o-matic coreos-go vcs-snapshot @@ -59,7 +59,7 @@ src_compile() { ) GOPATH="${WORKDIR}/${P}" emake BUILDTAGS="${options[*]}" \ - VERSION=1.0.0-rc95+dev.docker-19.03 \ + VERSION=1.0.0+dev.docker-19.03 \ COMMIT="${COMMIT_ID}" } diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 06c563ecaf..63e0b5c4d8 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -65,7 +65,7 @@ RDEPEND=" >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.1.2 - ~app-emulation/docker-runc-1.0.0_rc95[apparmor?,seccomp?] + ~app-emulation/docker-runc-1.0.0[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.18.0 ) " diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild index 33f5fd9503..f7fe6f5374 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild @@ -14,7 +14,7 @@ RDEPEND=" ~app-emulation/docker-19.03.15 ~app-emulation/containerd-1.5.2 ~app-emulation/docker-proxy-0.8.0_p20180709 - ~app-emulation/docker-runc-1.0.0_rc95 + ~app-emulation/docker-runc-1.0.0 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.18.0 "