From e8751fac879a969b17ce0156ab2a97dfccc774d4 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 10 Dec 2014 18:25:13 -0800 Subject: [PATCH 1/2] profiles: fix some ebuilds that depend on CROS_SDK_HOST being set At some point this variable stopped getting set properly in SDK ebuild environments. It is currently used to filter out some build time files from target images. Could be done cleaner but that can come later. --- .../coreos-overlay/profiles/coreos/targets/sdk/make.defaults | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults index 8713254e09..676b831a14 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults @@ -1 +1,5 @@ USE="-pam" + +# Used by some old goo in profiles/coreos/base/profile.bashrc +# TODO: clean up that old goo +CROS_SDK_HOST="cros-sdk-host" From 436ef1afb917e86b7666ba9915457f22246554b5 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 10 Dec 2014 18:32:23 -0800 Subject: [PATCH 2/2] coreos-base/coreos: add xfs-progs to base image Was requested *AGES* ago but kept forgetting to actually do it. :( --- .../{coreos-0.0.1-r241.ebuild => coreos-0.0.1-r242.ebuild} | 0 .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 1 + 2 files changed, 1 insertion(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r241.ebuild => coreos-0.0.1-r242.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r241.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r242.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r241.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r242.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 9d501f0762..f26851ecac 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -127,6 +127,7 @@ RDEPEND="${RDEPEND} sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm + sys-fs/xfs-progs sys-kernel/coreos-firmware sys-kernel/coreos-kernel sys-libs/glibc