From ca186261af07bd979d4889a7b98a467b639c608c Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 18 Mar 2014 19:48:18 -0700 Subject: [PATCH] fix(sys-kernel/bootengine): Add explicit sub-slot This allows coreos-kernel to use a slot depend operator to force a kernel rebuild every time the bootengine version changes even if bootengine got build in a different emerge job. --- .../src/third_party/coreos-overlay/eclass/cros-kernel2.eclass | 2 +- ...ootengine-0.0.1-r28.ebuild => bootengine-0.0.1-r29.ebuild} | 0 .../sys-kernel/bootengine/bootengine-9999.ebuild | 4 ++-- ...kernel-3.13.6-r2.ebuild => coreos-kernel-3.13.6-r3.ebuild} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.1-r28.ebuild => bootengine-0.0.1-r29.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-3.13.6-r2.ebuild => coreos-kernel-3.13.6-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass index b9905d285b..d7f771c080 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass @@ -11,7 +11,7 @@ SLOT="0/${PVR}" DEPEND="sys-apps/debianutils sys-devel/bc - sys-kernel/bootengine + sys-kernel/bootengine:= " IUSE="-source symlink-usr" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r28.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r29.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r28.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r29.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 c38d5aa636..9042735562 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 @@ -1,7 +1,7 @@ # Copyright (c) 2013 CoreOS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=5 CROS_WORKON_PROJECT="coreos/bootengine" CROS_WORKON_LOCALNAME="bootengine" CROS_WORKON_OUTOFTREE_BUILD=1 @@ -20,7 +20,7 @@ DESCRIPTION="CoreOS Bootengine" SRC_URI="" LICENSE="BSD" -SLOT="0" +SLOT="0/${PVR}" DEPEND=" app-arch/gzip diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.13.6-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.13.6-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.13.6-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.13.6-r3.ebuild