diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/Manifest similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/Manifest rename to sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/Manifest diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.5.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.5.3.ebuild new file mode 120000 index 0000000000..e476440198 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-0.5.3.ebuild @@ -0,0 +1 @@ +rkt-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/rocket-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild similarity index 72% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/rocket-9999.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index d9a78bcd56..727f3554ca 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/rocket-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -2,37 +2,37 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -CROS_WORKON_PROJECT="coreos/rocket" -CROS_WORKON_LOCALNAME="rocket" +CROS_WORKON_PROJECT="coreos/rkt" +CROS_WORKON_LOCALNAME="rkt" CROS_WORKON_REPO="git://github.com" inherit cros-workon if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" else - CROS_WORKON_COMMIT="258f946e3c85918e2dbf1920ae3c2bfe64ab2a14" # v0.4.1 + CROS_WORKON_COMMIT="a8afce77b694ea7e4923dd04bae680da8fb34ec6" # v0.5.3 KEYWORDS="amd64" fi -# Must be in sync with stage1/rootfs/usr/cache.sh +# Must be in sync with stage1/rootfs/usr_from_coreos/cache.sh IMG_RELEASE="444.5.0" IMG_URL="http://stable.release.core-os.net/amd64-usr/${IMG_RELEASE}/coreos_production_pxe_image.cpio.gz" -DESCRIPTION="rocket" -HOMEPAGE="https://github.com/coreos/rocket" +DESCRIPTION="App Container runtime" +HOMEPAGE="https://github.com/coreos/rkt" SRC_URI="${IMG_URL} -> pxe-${IMG_RELEASE}.img" LICENSE="Apache-2.0" SLOT="0" IUSE="" -DEPEND=">=dev-lang/go-1.2 +DEPEND=">=dev-lang/go-1.3 app-arch/cpio sys-fs/squashfs-tools" RDEPEND="" src_unpack() { - local cache="${S}/stage1/rootfs/usr/cache" + local cache="${S}/stage1/rootfs/usr_from_coreos/cache" cros-workon_src_unpack diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/rocket-0.4.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/rocket-0.4.1.ebuild deleted file mode 120000 index 028dd8e644..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rocket/rocket-0.4.1.ebuild +++ /dev/null @@ -1 +0,0 @@ -rocket-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/updates/2Q-2015 b/sdk_container/src/third_party/coreos-overlay/profiles/updates/2Q-2015 new file mode 100644 index 0000000000..2adcf28aa0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/updates/2Q-2015 @@ -0,0 +1 @@ +move app-emulation/rocket app-emulation/rkt