From 7abe6c3f226ed3a63f3e024d6358874db8977780 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 25 Mar 2014 14:03:55 -0700 Subject: [PATCH 1/2] fix(coreos-base/update_engine): fixes postinst script --- ...engine-0.0.1-r384.ebuild => update_engine-0.0.1-r385.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-r384.ebuild => update_engine-0.0.1-r385.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r384.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r385.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r384.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r385.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 29401c3201..27130fa786 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="dda8b9cf029c02f1b53548f7c25b0d6e337e92d6" + CROS_WORKON_COMMIT="dba8a748e1da4d0bb85d2a0232b101906da80ae5" KEYWORDS="amd64 arm x86" fi From 6d02465cb4474bc58521003b7d88c14fd3af53dc Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 25 Mar 2014 19:37:45 -0700 Subject: [PATCH 2/2] bump(sys-kernel/bootengine): boot fixes for /usr images --- ...tengine-0.0.1-r31.ebuild => bootengine-0.0.1-r32.ebuild} | 0 .../sys-kernel/bootengine/bootengine-9999.ebuild | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.1-r31.ebuild => bootengine-0.0.1-r32.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r31.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r32.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r31.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r32.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index f5f1527a82..b90917aeae 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="d5520f16e8a1ea26c81264cc9d471f48493229e3" + CROS_WORKON_COMMIT="769724ddfc5137eafeca692ef77a4890885ec413" KEYWORDS="amd64 arm x86" fi @@ -45,6 +45,10 @@ src_install() { insinto /usr/lib/dracut/modules.d/ doins -r dracut/. dosbin update-bootengine + + # must be executable since dracut's install scripts just + # re-use existing filesystem permissions during initrd creation. + chmod +x "${D}/usr/lib/dracut/modules.d/10usr-generator/usr-generator" } # We are bad, we want to get around the sandbox. So do the creation of the