From 4a96e72f1aa11e5a5d28d28fb0168abc32bd07b6 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 4 Dec 2018 20:39:21 -0500 Subject: [PATCH 1/2] coreos-base/coreos-init: add ${PVR} to SLOT for coreos-kernel. --- ...s-init-0.0.1-r161.ebuild => coreos-init-0.0.1-r162.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r161.ebuild => coreos-init-0.0.1-r162.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r161.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r162.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r161.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r162.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index 1a25613f88..2d2a1b1b24 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -2,7 +2,7 @@ # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI="5" CROS_WORKON_PROJECT="coreos/init" CROS_WORKON_LOCALNAME="init" CROS_WORKON_REPO="git://github.com" @@ -21,7 +21,7 @@ HOMEPAGE="http://www.coreos.com/" SRC_URI="" LICENSE="BSD" -SLOT="0" +SLOT="0/${PVR}" IUSE="test symlink-usr" REQUIRED_USE="symlink-usr" From bf65d45727184be9dba58e68fe66ee62516c8287 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 4 Dec 2018 20:41:45 -0500 Subject: [PATCH 2/2] sys-kernel/coreos-kernel: depend on coreos-init bootengine wants to copy in udev rules it provides. --- ...oreos-kernel-4.19.6.ebuild => coreos-kernel-4.19.6-r1.ebuild} | 1 + ...eos-modules-4.19.6.ebuild => coreos-modules-4.19.6-r1.ebuild} | 0 2 files changed, 1 insertion(+) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.19.6.ebuild => coreos-kernel-4.19.6-r1.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.19.6.ebuild => coreos-modules-4.19.6-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.6.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.6-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.6.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.6-r1.ebuild index 48c59fc36e..6981197793 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.6.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.6-r1.ebuild @@ -12,6 +12,7 @@ RDEPEND="=sys-kernel/coreos-modules-${PVR}" DEPEND="${RDEPEND} app-arch/gzip app-shells/bash + coreos-base/coreos-init:= sys-apps/coreutils sys-apps/findutils sys-apps/grep diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.6.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.6-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.6.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.6-r1.ebuild