From 7af89d415756fa38f250e3e57248b0dda375d01d Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Mon, 29 Oct 2012 22:13:01 +0100 Subject: [PATCH] correct split config create --- eclass/nas-kernel.eclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eclass/nas-kernel.eclass b/eclass/nas-kernel.eclass index 34665e9..76918e3 100644 --- a/eclass/nas-kernel.eclass +++ b/eclass/nas-kernel.eclass @@ -417,10 +417,11 @@ _kernel_copy_config() { cp "${FILESDIR}/${PF/-r0/}-${ARCH}.config" "${1}" || die "cannot copy kernel config" else if [ -n "${K_NASCONFIGS_VER}" ]; then - mv "${WORKDIR}"/sablink "${S}" + cp "${WORKDIR}"/sablink "${S}" pushd "${S}" sablink/scripts/prepareconfig ${K_NASKERNEL_NAME}-${CHOST/-*/} mv .config "${1}" + rm -rf "${S}/sablink" popd else cp "${DISTDIR}/${K_NASKERNEL_CONFIG_FILE}" "${1}" || die "cannot copy kernel config" @@ -611,7 +612,9 @@ _kernel_src_compile() { -d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/initrd-genkernel-${ARCH}-${KV_FULL}.buffalo else pushd "${S}" + cp "${WORKDIR}/config" .config make ${K_NASKERNEL_DTB} + rm .config popd einfo "Append the device-tree-blob to the Kenel Image" cat "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} "${S}"/arch/arm/boot/${K_NASKERNEL_DTB} > zImage.new @@ -625,7 +628,7 @@ _kernel_src_compile() { fi # cleanup - rm foo zImage.new + rm -rf foo zImage.new rm "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL} }