From 625f25e70ffad151e49b2f147b28fc53d0eb7c08 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 6 Jan 2014 23:34:45 -0800 Subject: [PATCH] fix(sys-kernel/coreos-kernel): Fix initramfs in /usr builds. Properly handle when /lib in bootengine is a symlink to /usr/lib64 in addition to the /lib64. mv needs /usr to exist first :) --- .../src/third_party/coreos-overlay/eclass/cros-kernel2.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 0f0f6fcc22..7ee8a5b104 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 @@ -184,7 +184,9 @@ cros-kernel2_src_compile() { local bootengine_lib=$(get_bootengine_lib) if [[ -n "${bootengine_lib}" ]]; then - mv "${bootengine_root}/lib" "${bootengine_root}/${bootengine_lib}" + mkdir -p "${bootengine_root}/${bootengine_lib%/*}" || die + mv "${bootengine_root}/lib" \ + "${bootengine_root}/${bootengine_lib}" || die fi update_bootengine_cpio "${bootengine_root}"