denes
/
genkernel_fork
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug 113287

Browse Source 
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@328 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Eric Edgar 19 years ago
parent 313aee56e3
commit 87ca0a54ba
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
gen_initramfs.sh
Unescape View File

@ -515,7 +515,7 @@ merge_initramfs_cpio_archives(){
# Pegasos hack for merging the initramfs into the kernel at compile time # Pegasos hack for merging the initramfs into the kernel at compile time
[ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] || [ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] ||
[ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] && [ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] &&
cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz &&
rm ${TMPDIR}/initramfs-${KV} rm ${TMPDIR}/initramfs-${KV}
# Mips also mimics Pegasos to merge the initramfs into the kernel # Mips also mimics Pegasos to merge the initramfs into the kernel

2
gen_initrd.sh
Unescape View File

@ -397,7 +397,7 @@ create_initrd() {
# Pegasos hack for merging the initrd into the kernel at compile time # Pegasos hack for merging the initrd into the kernel at compile time
[ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] || [ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] ||
[ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] && [ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] &&
cp ${TMPDIR}/initrd-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz cp ${TMPDIR}/initrd-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz &&
rm ${TMPDIR}/initrd-${KV} rm ${TMPDIR}/initrd-${KV}
# Mips also mimics Pegasos to merge the initrd into the kernel # Mips also mimics Pegasos to merge the initrd into the kernel

Write Preview
Loading…
Cancel
Save