Attachment #92295 for bug #141153

View | Details | Raw Unified | Return to bug 141153
Collapse All | Expand All

Lines 468-474 Link Here

(-)gen_cmdline.sh.orig (-1 / +1 lines)
468	;;	468	;;
469	--genzimage)	469	--genzimage)
470	KERNEL_MAKE_DIRECTIVE_2='zImage.initrd'	470	KERNEL_MAKE_DIRECTIVE_2='zImage.initrd'
471	KERNEL_BINARY_2='arch/ppc/boot/images/zImage.initrd.chrp'	471	KERNEL_BINARY_2='arch/powerpc/boot/zImage.initrd'
472	GENERATE_Z_IMAGE=1	472	GENERATE_Z_IMAGE=1
473	print_info 2 "GENERATE_Z_IMAGE: $GENERATE_Z_IMAGE"	473	print_info 2 "GENERATE_Z_IMAGE: $GENERATE_Z_IMAGE"
474	;;	474	;;

Lines 549-555 Link Here

(-)gen_initramfs.sh.orig (-1 / +1 lines)
549	# Pegasos hack for merging the initramfs into the kernel at compile time	549	# Pegasos hack for merging the initramfs into the kernel at compile time
550	[ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] \|\|	550	[ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] \|\|
551	[ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] &&	551	[ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] &&
552	cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz &&	552	cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/powerpc/boot/ramdisk.image.gz &&
553	rm ${TMPDIR}/initramfs-${KV}	553	rm ${TMPDIR}/initramfs-${KV}
554		554
555	# Mips also mimics Pegasos to merge the initramfs into the kernel	555	# Mips also mimics Pegasos to merge the initramfs into the kernel

Return to bug 141153