sablink
/
overlay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dump failure

This commit is contained in:
Mario Fetka 2011-12-26 19:20:30 +01:00
parent efa86ad1a0
commit 633c6317df
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
eclass/nas-kernel.eclass
View File

@ -382,18 +382,22 @@ nas-kernel_src_unpack() {
# unpack x-loader if required
if [ -n "${K_NASKERNEL_XLOADER_VER}" ]; then
pushd ${WORKDIR}
unpack x-loader-${K_NASKERNEL_XLOADER_VER}.orig.tar.gz
if [ -n "${K_NASKERNEL_XLOADER_PATCHES_VER}" ]; then
unpack x-loader-patches-${K_NASKERNEL_XLOADER_VER}-${K_NASKERNEL_XLOADER_PATCHES_VER}.tar.bz2
fi
popd
fi
# unpack u-boot if required
if [ -n "${K_NASKERNEL_UBOOT_VER}" ]; then
pushd ${WORKDIR}
unpack u-boot-${K_NASKERNEL_UBOOT_VER}.tar.bz2
if [ -n "${K_NASKERNEL_UBOOT_PATCHES_VER}" ]; then
unpack u-boot-patches-${K_NASKERNEL_UBOOT_VER}-${K_NASKERNEL_UBOOT_PATCHES_VER}.tar.bz2
fi
popd
fi
}
@ -451,17 +455,10 @@ _kernel_src_compile() {
# needed anyway, even if grub use flag is not used here
mkdir -p "${WORKDIR}"/boot
einfo "Starting to compile kernel..."
_kernel_copy_config "${WORKDIR}"/config
# do some cleanup
rm -rf "${WORKDIR}"/lib
rm -rf "${WORKDIR}"/cache
rm -rf "${S}"/temp
# compile x-loader if required
if [ -n "${K_NASKERNEL_XLOADER_VER}" ]; then
pushd "${WORKDIR}/x-loader-${K_NASKERNEL_XLOADER_VER}"
einfo "Starting to compile X Loader..."
pushd "${WORKDIR}/x-loader-${K_NASKERNEL_XLOADER_VER}"
if [ -n "${K_NASKERNEL_XLOADER_PATCHES_VER}" ]; then
EPATCH_SOURCE="${WORKDIR}/x-loader-patches" EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" epatch
@ -475,12 +472,13 @@ _kernel_src_compile() {
emake ${K_NASKERNEL_XLOADER_TARGET}
emake
fi
popd
popd
fi
# compile u-boot if required
if [ -n "${K_NASKERNEL_UBOOT_VER}" ]; then
pushd "${WORKDIR}/u-boot-${K_NASKERNEL_UBOOT_VER}"
einfo "Starting to compile U Boot..."
pushd "${WORKDIR}/u-boot-${K_NASKERNEL_UBOOT_VER}"
if [ -n "${K_KERNEL_UBOOT_PATCHES_VER}" ]; then
EPATCH_SOURCE="${WORKDIR}/u-boot-patches" EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" epatch
@ -494,9 +492,18 @@ _kernel_src_compile() {
emake ${K_NASKERNEL_UBOOT_TARGET}
emake
fi
popd
popd
fi
einfo "Starting to compile kernel..."
_kernel_copy_config "${WORKDIR}"/config
# do some cleanup
rm -rf "${WORKDIR}"/lib
rm -rf "${WORKDIR}"/cache
rm -rf "${S}"/temp
cd "${S}" || die
GKARGS="--no-save-config --disklabel"
use dracut && GKARGS="${GKARGS} --dracut"