From 62b22e7d646f7ab34a21055092a9e2545ebcc9f2 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 19 Feb 2015 14:50:39 -0800 Subject: [PATCH 1/2] update_engine: fix cgpt call in postinst script --- ...engine-0.0.1-r411.ebuild => update_engine-0.0.1-r412.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.0.1-r411.ebuild => update_engine-0.0.1-r412.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r411.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r412.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r411.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r412.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index 94b4eae0ef..f288c6146a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -8,7 +8,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="eff2143fdd9bac7e94eef69d627e49eab286e15d" + CROS_WORKON_COMMIT="fa62c26931c3650c6ceb28a3028e167d30985490" KEYWORDS="amd64 arm x86" fi From 2771158a36d68306b0a59bb9250aef3b4552b159 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 18 Feb 2015 15:48:36 -0800 Subject: [PATCH 2/2] profiles: unmask glibc 2.19 Upgrading libc should be safe now that coreos-postinst is fixed. --- .../coreos-overlay/profiles/coreos/base/package.mask | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask index 6765aead14..a58a51a895 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask @@ -15,7 +15,3 @@ # Require our ca-certificates package based directly on Mozilla's # certificate store provided in NSS rather than the Gentoo/Debian package. >=app-misc/ca-certificates-20000000 - -# Stick with glibc-2.17 for now ->=sys-libs/glibc-2.19 ->=cross-x86_64-cros-linux-gnu/glibc-2.19