From e00d0089796bc6fd207ff632fdffdfaf5ae13786 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 7 Jul 2014 15:29:06 -0700 Subject: [PATCH 1/2] Revert "profiles: add udev to default USE flags" Turns out there is a circular dependency here. :( This reverts commit 943574b4041b116f5722fcacd0071acbdd853c79. --- .../coreos-overlay/profiles/features/systemd/make.defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults index ded4466d96..76a820ac5b 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults @@ -1,2 +1,2 @@ -USE="systemd udev" +USE="systemd" BOOTSTRAP_USE="$BOOTSTRAP_USE udev" From 8206208bb5efea73c93d9510fea00cf1bae01c29 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 7 Jul 2014 15:30:46 -0700 Subject: [PATCH 2/2] bootengine: disable nic device renaming in initrd --- ...{bootengine-0.0.1-r37.ebuild => bootengine-0.0.1-r38.ebuild} | 0 .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.1-r37.ebuild => bootengine-0.0.1-r38.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r37.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r38.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r37.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r38.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 4d399d86e3..bc81e8e520 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="79d407f7164a38a7dc12fee85a7fbab4a9534ce2" + CROS_WORKON_COMMIT="94909b0593d68f428c364d992238741f454e455c" KEYWORDS="amd64 arm x86" fi