From 05856d1789a9acc214672250e82cf3593fde9f91 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 12 May 2016 21:28:01 -0700 Subject: [PATCH] app-emulation/rkt: use CoreOS alpha 1010.1.0 without PAM CoreOS 1029.0.0 introduced PAM which was linked into systemd. rkt copies files and libraries out of CoreOS images with a static manifest to construct the CoreOS stage1. since this manifest lacks PAM libraries in rkt 1.5.1, we can't use CoreOS 1032.0.0, so fall back to a CoreOS version without PAM linked into systemd. --- .../src/third_party/coreos-overlay/app-emulation/rkt/Manifest | 2 +- .../rkt/{rkt-1.5.1.ebuild => rkt-1.5.1-r1.ebuild} | 0 .../coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/{rkt-1.5.1.ebuild => rkt-1.5.1-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/Manifest index 2c89d1f9f0..1e43355f71 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/Manifest @@ -1 +1 @@ -DIST rkt-pxe-1032.0.0.img 233166273 SHA256 2e34b18dc6d8a7f89ab6dd64ed405299171067f4d9f0bb2cf18b15be9985bed2 SHA512 e6dd5b2329894c54d1d5c6b0d700a6e5aab5001c754a043de461bf0335c946690933d7b93897f681c82c99778fdbddd75efe777535dfc7dda1f11834d0a6e8d2 WHIRLPOOL df5af345546339bb245884900cda7f246de58d6d0fc21c8f8f9dfb16bf7375263f455526d9c3d2330b4693b7c015029987edc9c5843201ca6b51482a2b3fdef7 +DIST rkt-pxe-1010.1.0.img 227897633 SHA256 6785ea1fe4e6540a9dc78b9187fa57157b96c682dcdafd0d61e6d452b592b848 SHA512 f1bcad7c9cdb65d171674adf75fb09854f416d055f6d75775724e59ce384ebe9e1fece28f73770fc4b7c7962f16470679e672be907d867917cfdd57759a28c05 WHIRLPOOL 677a22892d15cffb05cd6ed340be980c7e32251a9ccfa8a5caf98683c34f9ccaaaa51a85ef70eac4f0871cc783263f579dafd60b6d76a84a5c47aa989e03eb5f diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.5.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.5.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.5.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.5.1-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index 18fc1a7af8..e901585a66 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -21,8 +21,8 @@ else CROS_WORKON_COMMIT="ba45abd0afc0afaae16f3fdd5e6894461a42cbeb" # v1.5.1 fi -PXE_VERSION="1032.0.0" -PXE_SYSTEMD_VERSION="v229" +PXE_VERSION="1010.1.0" +PXE_SYSTEMD_VERSION="v225" PXE_URI="https://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz" PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"