From 9f453bc519265b252c72b2d17506a927361e57c5 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 12 Mar 2014 11:54:10 -0700 Subject: [PATCH] fix(sys-kernel/coreos-kernel): Install kernel image to /usr/boot /boot is not included in /usr images --- .../coreos-overlay/eclass/cros-kernel2.eclass | 12 +++++++----- ...-3.13.6.ebuild => coreos-kernel-3.13.6-r1.ebuild} | 0 2 files changed, 7 insertions(+), 5 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-3.13.6.ebuild => coreos-kernel-3.13.6-r1.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 b89890bf8f..b9905d285b 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 @@ -14,7 +14,7 @@ DEPEND="sys-apps/debianutils sys-kernel/bootengine " -IUSE="-source" +IUSE="-source symlink-usr" RESTRICT="binchecks" STRIP_MASK="/usr/lib/debug/lib/modules/*/vmlinux" @@ -195,15 +195,17 @@ cros-kernel2_src_compile() { } cros-kernel2_src_install() { - dodir /boot - kmake INSTALL_PATH="${D}/boot" install + dodir /usr/boot + kmake INSTALL_PATH="${D}/usr/boot" install # Install firmware to a temporary (bogus) location. # The linux-firmware package will be used instead. kmake INSTALL_MOD_PATH="${D}" INSTALL_FW_PATH="${T}/fw" modules_install local version=$(kernelversion) - if [ ! -e "${D}/boot/vmlinuz" ]; then - ln -sf "vmlinuz-${version}" "${D}/boot/vmlinuz" || die + dosym "vmlinuz-${version}" /usr/boot/vmlinuz + + if ! use symlink-usr; then + dosym ../usr/boot/vmlinuz /boot/vmlinuz fi # Install uncompressed kernel for debugging purposes. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.13.6.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.13.6-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.13.6.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.13.6-r1.ebuild