correct split config create

This commit is contained in:
Mario Fetka 2012-10-29 22:13:01 +01:00
parent b7fd8745c1
commit 7af89d4157

View File

@ -417,10 +417,11 @@ _kernel_copy_config() {
cp "${FILESDIR}/${PF/-r0/}-${ARCH}.config" "${1}" || die "cannot copy kernel config" cp "${FILESDIR}/${PF/-r0/}-${ARCH}.config" "${1}" || die "cannot copy kernel config"
else else
if [ -n "${K_NASCONFIGS_VER}" ]; then if [ -n "${K_NASCONFIGS_VER}" ]; then
mv "${WORKDIR}"/sablink "${S}" cp "${WORKDIR}"/sablink "${S}"
pushd "${S}" pushd "${S}"
sablink/scripts/prepareconfig ${K_NASKERNEL_NAME}-${CHOST/-*/} sablink/scripts/prepareconfig ${K_NASKERNEL_NAME}-${CHOST/-*/}
mv .config "${1}" mv .config "${1}"
rm -rf "${S}/sablink"
popd popd
else else
cp "${DISTDIR}/${K_NASKERNEL_CONFIG_FILE}" "${1}" || die "cannot copy kernel config" 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 -d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/initrd-genkernel-${ARCH}-${KV_FULL}.buffalo
else else
pushd "${S}" pushd "${S}"
cp "${WORKDIR}/config" .config
make ${K_NASKERNEL_DTB} make ${K_NASKERNEL_DTB}
rm .config
popd popd
einfo "Append the device-tree-blob to the Kenel Image" 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 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 fi
# cleanup # 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} rm "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL}
} }