From a9dca85a2dea7d8dc38bce734beb255ecd9280fd Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 2 Jan 2015 14:27:14 -0800 Subject: [PATCH] coreos-kernel: always install .config to kernel build directory --- .../coreos-overlay/eclass/coreos-kernel.eclass | 13 ++++++++++++- ...3.18.1.ebuild => coreos-kernel-3.18.1-r1.ebuild} | 0 2 files changed, 12 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-3.18.1.ebuild => coreos-kernel-3.18.1-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass index 75931898c3..4cd4833821 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass @@ -165,8 +165,19 @@ coreos-kernel_src_install() { local version=$(kmake -s --no-print-directory kernelrelease) dosym "vmlinuz-${version}" /usr/boot/vmlinuz + dosym "config-${version}" /usr/boot/config shred_keys } -EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_install +coreos-kernel_pkg_postinst() { + # linux-info always expects to be able to find the current .config + # so copy it into the build tree if it isn't already there. + if ! cmp --quiet "${ROOT}/usr/boot/config" "${KBUILD_OUTPUT}/.config"; then + cp "${ROOT}/usr/boot/config" "${KBUILD_OUTPUT}/.config" + chown ${PORTAGE_USERNAME:-portage}:${PORTAGE_GRPNAME:-portage} \ + "${KBUILD_OUTPUT}/.config" + fi +} + +EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_install pkg_postinst diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.18.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.18.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.18.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.18.1-r1.ebuild