From fdf8ea8f8ecc3866d4d49cf357dc71e293cd532e Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 6 Jan 2016 12:42:33 -0800 Subject: [PATCH] coreos-kernel: fix check for unclean source tree and check earlier This check was broken in when the source symlinks were moved from `${S}` to `${S}/source`. Also, since it is a environment sanity check running the check as early as possible in `pkg_pretend` is appropriate. --- .../coreos-overlay/eclass/coreos-kernel.eclass | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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 35742e1040..c7d00403de 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 @@ -175,6 +175,15 @@ prepare-lib-modules-release-dirs() { "${D}/usr/lib/modules/${version}" || die } +coreos-kernel_pkg_pretend() { + [[ "${MERGE_TYPE}" == binary ]] && return + + if [[ -f "${KERNEL_DIR}/.config" || -d "${KERNEL_DIR}/include/config" ]] + then + die "Source is not clean! Run make mrproper in ${KERNEL_DIR}" + fi +} + coreos-kernel_src_unpack() { # we more or less reproduce the layout in /lib/modules/$(uname -r)/ mkdir -p "${S}/build" || die @@ -183,11 +192,6 @@ coreos-kernel_src_unpack() { } coreos-kernel_src_prepare() { - if [[ -f ".config" || -d "include/config" ]] - then - die "Source is not clean! Run make mrproper in ${KERNEL_DIR}" - fi - restore_config build/.config if [[ ! -f build/.config ]]; then local config="$(find_defconfig)" @@ -275,4 +279,4 @@ coreos-kernel_pkg_setup() { fi } -EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_setup +EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_install