Attachment #119865 for bug #179294

Lines 1-9 Link Here

(-)genkernel-3.4.8.orig/alpha/config.sh (-3 / +3 lines)
1	#!/bin/bash	1	#!/bin/bash
2	# x86/config.sh	2	# x86/config.sh
3		3
4	KERNEL_MAKE_DIRECTIVE="boot"	4	KERNEL_DEFAULT_MAKE_DIRECTIVE="boot"
5	KERNEL_MAKE_DIRECTIVE_2=""	5	KERNEL_PATH_TO_BINARY="arch/alpha/boot/"
6	KERNEL_BINARY="arch/alpha/boot/vmlinux.gz"	6	KERNEL_ALT_BINARY_NAME="vmlinux.gz"
7		7
8	# The dietlibc portion of busybox is commented out right now	8	# The dietlibc portion of busybox is commented out right now
9	# other stuff seems to compile fine though	9	# other stuff seems to compile fine though

Lines 43-48 longusage() { Link Here

(-)genkernel-3.4.8.orig/gen_cmdline.sh (-6 / +11 lines)
43	echo " --no-devfs Disable devfs support"	43	echo " --no-devfs Disable devfs support"
44	echo " --callback=<...> Run the specified arguments after the"	44	echo " --callback=<...> Run the specified arguments after the"
45	echo " kernel and modules have been compiled"	45	echo " kernel and modules have been compiled"
		46	echo " --ktarget=<...> Specify a kernel make target (default=vmlinux)"
46	echo " --static Build a static (monolithic kernel)."	47	echo " --static Build a static (monolithic kernel)."
47	echo " --initramfs Builds initramfs before kernel and embeds it"	48	echo " --initramfs Builds initramfs before kernel and embeds it"
48	echo " into the kernel."	49	echo " into the kernel."
Lines 398-403 parse_cmdline() { Link Here
398	CMD_CALLBACK=`parse_opt "$*"`	399	CMD_CALLBACK=`parse_opt "$*"`
399	print_info 2 "CMD_CALLBACK: $CMD_CALLBACK/$*"	400	print_info 2 "CMD_CALLBACK: $CMD_CALLBACK/$*"
400	;;	401	;;
		402	--ktarget=*)
		403	CMD_KTARGET=`parse_opt "$*"`
		404	print_info 2 "CMD_KTARGET: $CMD_KTARGET/$*"
		405	;;
401	--static)	406	--static)
402	CMD_STATIC=1	407	CMD_STATIC=1
403	print_info 2 "CMD_STATIC: $CMD_STATIC"	408	print_info 2 "CMD_STATIC: $CMD_STATIC"
Lines 485-498 parse_cmdline() { Link Here
485	print_info 2 "CMD_INITRAMFS_OVERLAY: $CMD_INITRAMFS_OVERLAY"	490	print_info 2 "CMD_INITRAMFS_OVERLAY: $CMD_INITRAMFS_OVERLAY"
486	;;	491	;;
487	--linuxrc=*)	492	--linuxrc=*)
488	CMD_LINUXRC=`parse_opt "$*"`	493	CMD_LINUXRC=`parse_opt "$*"`
489	print_info 2 "CMD_LINUXRC: $CMD_LINUXRC"	494	print_info 2 "CMD_LINUXRC: $CMD_LINUXRC"
490	;;	495	;;
491	--genzimage)	496	--genzimage)
492	KERNEL_MAKE_DIRECTIVE_2='zImage.initrd'	497	ENABLE_PEGASOS_HACKS="godshelpme"
493	KERNEL_BINARY_2='arch/powerpc/boot/zImage.initrd'	498	KERNEL_DEFAULT_MAKE_DIRECTIVE='zImage.initrd'
494	GENERATE_Z_IMAGE=1	499	KERNEL_PATH_TO_BINARY='arch/powerpc/boot/'
495	print_info 2 "GENERATE_Z_IMAGE: $GENERATE_Z_IMAGE"	500	print_info 2 "ENABLE_PEGASOS_HACKS: $ENABLE_PEGASOS_HACKS"
496	;;	501	;;
497	--disklabel)	502	--disklabel)
498	CMD_DISKLABEL=1	503	CMD_DISKLABEL=1




	[ "${KERNEL_MAKE}" = '' ] &&
		gen_die "KERNEL_MAKE undefined - I don't know how to compile a kernel for this arch!"
	cd ${KERNEL_DIR}
	print_info 1 "        >> Compiling ${KV} ${CMD_KTARGET/_install/ [ install ]/}..."
	compile_generic "${CMD_KTARGET}" kernel
##	if [ "${CMD_KTARGET}" != '' ]
##	then
##		print_info 1 "        >> Starting supplimental compile of ${KV}: ${CMD_KTARGET}..."
##		compile_generic "${CMD_KTARGET}" kernel
##	fi
	if ! isTrue "${CMD_NOINSTALL}"
	then
		copy_image_with_preserve "kernel" \

			"System.map" \
			"System.map-${KNAME}-${ARCH}-${KV}"

		if [ "${ENABLE_PEGASOS_HACKS}" = 'godshelpme' ]
		then
			copy_image_with_preserve "kernelz" \
				"${KERNEL_BINARY}" \
			"kernelz-${KV}"
		fi
	else
		cp "${KERNEL_BINARY}" "${TMPDIR}/kernel-${KNAME}-${ARCH}-${KV}" ||
			gen_die "Could not copy the kernel binary to ${TMPDIR}!"
		cp "System.map" "${TMPDIR}/System.map-${KNAME}-${ARCH}-${KV}" ||
			gen_die "Could not copy System.map to ${TMPDIR}!"
		if [ "${ENABLE_PEGASOS_HACKS}" = 'godshelpme' ]
		then
			cp "${KERNEL_BINARY}" "${TMPDIR}/kernelz-${KV}" ||
				gen_die "Could not copy the kernelz binary to ${TMPDIR}!"
		fi
	fi




		BUILD_INITRAMFS=0
	fi

	if [ "${CMD_KTARGET}" != '' ]
	then
		KERNEL_TARGET="${CMD_KTARGET}"
	else
		KERNEL_TARGET="${KERNEL_DEFAULT_MAKE_DIRECTIVE}"
	fi

	if [ "${KERNEL_TARGET}" != '' ]
	then
		if [ "${KERNEL_ALT_BINARY_NAME}" = "" ]
		then
			KERNEL_BINARY="${KERNEL_PATH_TO_BINARY}/${KERNEL_TARGET}"
		else
			KERNEL_BINARY="${KERNEL_PATH_TO_BINARY}/${KERNEL_ALT_BINARY_NAME}"
		fi
	fi

	if [ "${CMD_SAVE_CONFIG}" != '' ]
	then
		SAVE_CONFIG="${CMD_SAVE_CONFIG}"




	gzip -9 "${CPIO}"
	mv -f "${CPIO}.gz" "${CPIO}"

	if [ "${CMD_KTARGET}" == 'zImage.initrd' -a "${ENABLE_PEGASOS_HACKS}" = 'godshelpme' ]
	then
		# Pegasos hack for merging the initramfs into the kernel at compile time
		cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/powerpc/boot/ramdisk.image.gz &&
		rm ${TMPDIR}/initramfs-${KV}
	elif [ ${BUILD_INITRAMFS} -eq 1 ]; then
		# Assume standard initramfs build
	if [ ${BUILD_INITRAMFS} -eq 1 ]; then
		cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/initramfs.cpio.gz
		gunzip -f ${KERNEL_DIR}/initramfs.cpio.gz
	fi

	if ! isTrue "${CMD_NOINSTALL}"
	then
		if [ "${ENABLE_PEGASOS_HACKS}" != 'godshelpme' ]
		then
			copy_image_with_preserve "initramfs" \
				"${TMPDIR}/initramfs-${KV}" \




	then
	    /bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} kernel-${ARCH}-${KV}
	    /bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} config-${ARCH}-${KV}
	    if [ "${ENABLE_PEGASOS_HACKS}" = 'godshelpme' ]
            then
	    	/bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} kernelz-${ARCH}-${KV}
            fi

	    cd "${KERNEL_DIR}"
	    cp "${KERNEL_BINARY}" "${TEMP}/minkernpackage/kernel-${KV}" || gen_die 'Could not the copy kernel for the min kernel package!'
	    cp ".config" "${TEMP}/minkernpackage/config-${ARCH}-${KV}" || gen_die 'Could not the copy kernel config for the min kernel package!'
	    if [ "${ENABLE_PEGASOS_HACKS}" = 'godshelpme' ]
            then
            	cp "${KERNEL_BINARY}" "${TEMP}/minkernpackage/kernelz-${KV}" || gen_die "Could not copy the kernelz for the min kernel package"
            fi

	fi
	
	if [ "${ENABLE_PEGASOS_HACKS}" != 'godshelpme' ]
	then
	    if [ "${KERN_24}" != '1' -a  "${CMD_BOOTSPLASH}" != '1' ]
	    then

	cp "${KERNEL_BINARY}" "${TEMP}/kerncache/kernel-${ARCH}-${KV}" || gen_die 'Could not the copy kernel for the kernel package!'
	cp "${KERNEL_DIR}/.config" "${TEMP}/kerncache/config-${ARCH}-${KV}"
	cp "${KERNEL_DIR}/System.map" "${TEMP}/kerncache/System.map-${ARCH}-${KV}"
	if [ "${ENABLE_PEGASOS_HACKS}" = 'godshelpme' ]
        then
        	cp "${KERNEL_BINARY}" "${TEMP}/kerncache/kernelz-${ARCH}-${KV}" || gen_die "Could not copy the kernelz for the kernel package"
        fi
	
	echo "VERSION = ${VER}" > "${TEMP}/kerncache/kerncache.config"

		"${TEMP}/kernel-${ARCH}-${KV}" \
		"kernel-${KNAME}-${ARCH}-${KV}"

	if [ "${ENABLE_PEGASOS_HACKS}" = 'godshelpme']
	then
		copy_image_with_preserve "kernelz" \
			"${TEMP}/kernelz-${ARCH}-${KV}" \
			"kernelz-${KNAME}-${ARCH}-${KV}"
	fi
    
	copy_image_with_preserve "System.map" \
		"${TEMP}/System.map-${ARCH}-${KV}" \





	# Compile kernel; If using --genzimage, or building a mips kernel, skip compile
	# till after initrd/initramfs is done
	[ "${ENABLE_PEGASOS_HACKS}" != 'godshelpme' -a ${BUILD_INITRAMFS} -eq 0 ] && compile_kernel

	# Compile modules
	if [ ${BUILD_MODULES} -eq 1 -a ${BUILD_STATIC} -eq 0 ]

	fi
	if [ "${KERNCACHE}" != "" ]
	then
		if [ "${ENABLE_PEGASOS_HACKS}" != 'godshelpme' -a ${BUILD_INITRAMFS} -eq 0 ]
		then
			gen_kerncache
		fi

fi

# Pegasos fix
if [ "${ENABLE_PEGASOS_HACKS}" = 'godshelpme' -o ${BUILD_INITRAMFS} -eq 1 ]
then
	# Compile kernel, intergrating the initrd into it for Pegasos & mips
	compile_kernel

Lines 1-9 Link Here

(-)genkernel-3.4.8.orig/ia64/config.sh (-3 / +3 lines)
1	#!/bin/bash	1	#!/bin/bash
2	# x86/config.sh	2	# x86/config.sh
3		3
4	KERNEL_MAKE_DIRECTIVE=""	4	KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinux.gz"
5	KERNEL_MAKE_DIRECTIVE_2=""	5	KERNEL_ALT_BINARY_NAME=""
6	KERNEL_BINARY="vmlinux.gz"	6	KERNEL_PATH_TO_BINARY="./"
7		7
8	# The dietlibc portion of busybox is commented out right now	8	# The dietlibc portion of busybox is commented out right now
9	# other stuff seems to compile fine though	9	# other stuff seems to compile fine though

Lines 3-11 Link Here

(-)genkernel-3.4.8.orig/mips/config.sh (-3 / +3 lines)
3		3
4	# Kernel Build Info	4	# Kernel Build Info
5	KERNEL_MAKE=make	5	KERNEL_MAKE=make
6	KERNEL_MAKE_DIRECTIVE="vmlinux"	6	KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinux"
7	KERNEL_MAKE_DIRECTIVE_2=""	7	KERNEL_ALT_BINARY_NAME=""
8	KERNEL_BINARY="./vmlinux"	8	KERNEL_PATH_TO_BINARY="./"
9		9
10	# Utils Build Info	10	# Utils Build Info
11	UTILS_MAKE=make	11	UTILS_MAKE=make

Lines 1-9 Link Here

(-)genkernel-3.4.8.orig/parisc/config.sh (-3 / +3 lines)
1	#!/bin/bash	1	#!/bin/bash
2	# parisc/config.sh	2	# parisc/config.sh
3		3
4	KERNEL_MAKE_DIRECTIVE="vmlinux"	4	KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinux"
5	KERNEL_MAKE_DIRECTIVE_2=""	5	KERNEL_ALT_BINARY_NAME=""
6	KERNEL_BINARY="vmlinux"	6	KERNEL_PATH_TO_BINARY="./"
7		7
8	USE_DIETLIBC=0	8	USE_DIETLIBC=0
9		9

Lines 1-9 Link Here

(-)genkernel-3.4.8.orig/parisc64/config.sh (-3 / +3 lines)
1	#!/bin/bash	1	#!/bin/bash
2	# parisc/config.sh	2	# parisc/config.sh
3		3
4	KERNEL_MAKE_DIRECTIVE="vmlinux"	4	KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinux"
5	KERNEL_MAKE_DIRECTIVE_2=""	5	KERNEL_ALT_BINARY_NAME=""
6	KERNEL_BINARY="vmlinux"	6	KERNEL_PATH_TO_BINARY="./"
7		7
8	USE_DIETLIBC=0	8	USE_DIETLIBC=0
9		9

Lines 1-8 Link Here

(-)genkernel-3.4.8.orig/ppc/config.sh (-2 / +3 lines)
1	#!/bin/bash	1	#!/bin/bash
2	# ppc/config.sh	2	# ppc/config.sh
3		3
4	KERNEL_MAKE_DIRECTIVE="vmlinux"	4	KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinux"
5	KERNEL_BINARY="vmlinux"	5	KERNEL_ALT_BINARY_NAME=""
		6	KERNEL_PATH_TO_BINARY="./"
6		7
7	# The dietlibc portion of busybox is commented out right now	8	# The dietlibc portion of busybox is commented out right now
8	# other stuff seems to compile fine though	9	# other stuff seems to compile fine though

Lines 1-8 Link Here

(-)genkernel-3.4.8.orig/ppc64/config.sh (-2 / +3 lines)
1	#!/bin/bash	1	#!/bin/bash
2	# ppc/config.sh	2	# ppc/config.sh
3		3
4	KERNEL_MAKE_DIRECTIVE="vmlinux"	4	KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinux"
5	KERNEL_BINARY="vmlinux"	5	KERNEL_ALT_BINARY_NAME=""
		6	KERNEL_PATH_TO_BINARY="./"
6		7
7	# The dietlibc portion of busybox is commented out right now	8	# The dietlibc portion of busybox is commented out right now
8	# other stuff seems to compile fine though	9	# other stuff seems to compile fine though

Lines 1-9 Link Here

(-)genkernel-3.4.8.orig/sparc/config.sh (-3 / +3 lines)
1	#!/bin/bash	1	#!/bin/bash
2	# sparc/config.sh	2	# sparc/config.sh
3		3
4	KERNEL_MAKE_DIRECTIVE="vmlinux"	4	KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinux"
5	KERNEL_MAKE_DIRECTIVE_2=""	5	KERNEL_ALT_BINARY_NAME=""
6	KERNEL_BINARY="vmlinux"	6	KERNEL_PATH_TO_BINARY="./"
7		7
8	# The dietlibc portion of busybox is commented out right now	8	# The dietlibc portion of busybox is commented out right now
9	# other stuff seems to compile fine though	9	# other stuff seems to compile fine though

Lines 1-9 Link Here

(-)genkernel-3.4.8.orig/sparc64/config.sh (-3 / +3 lines)
1	#!/bin/bash	1	#!/bin/bash
2	#sparc64-config.sh	2	#sparc64-config.sh
3		3
4	KERNEL_MAKE_DIRECTIVE="vmlinux"	4	KERNEL_DEFAULT_MAKE_DIRECTIVE="image"
5	KERNEL_MAKE_DIRECTIVE_2="image"	5	KERNEL_ALT_BINARY_NAME=""
6	KERNEL_BINARY="arch/sparc64/boot/image"	6	KERNEL_PATH_TO_BINARY="arch/sparc64/boot/"
7		7
8	# Busybox 1.00-pre3 won't build with dietlibc, when it does we	8	# Busybox 1.00-pre3 won't build with dietlibc, when it does we
9	# can turn this flag on	9	# can turn this flag on

Lines 1-9 Link Here

(-)genkernel-3.4.8.orig/um/config.sh (-3 / +3 lines)
1	#!/bin/bash	1	#!/bin/bash
2	# x86/config.sh	2	# x86/config.sh
3		3
4	KERNEL_MAKE_DIRECTIVE="linux"	4	KERNEL_DEFAULT_MAKE_DIRECTIVE="linux"
5	KERNEL_MAKE_DIRECTIVE_2=""	5	KERNEL_ALT_BINARY_NAME=""
6	KERNEL_BINARY="linux"	6	KERNEL_PATH_TO_BINARY="./"
7		7
8	# The dietlibc portion of busybox is commented out right now	8	# The dietlibc portion of busybox is commented out right now
9	# other stuff seems to compile fine though	9	# other stuff seems to compile fine though

Lines 1-9 Link Here

(-)genkernel-3.4.8.orig/x86/config.sh (-3 / +3 lines)
1	#!/bin/bash	1	#!/bin/bash
2	# x86/config.sh	2	# x86/config.sh
3		3
4	KERNEL_MAKE_DIRECTIVE="bzImage"	4	KERNEL_DEFAULT_MAKE_DIRECTIVE="bzImage"
5	KERNEL_MAKE_DIRECTIVE_2=""	5	KERNEL_ALT_BINARY_NAME=""
6	KERNEL_BINARY="arch/i386/boot/bzImage"	6	KERNEL_PATH_TO_BINARY="arch/i386/boot/"
7		7
8	# The dietlibc portion of busybox is commented out right now	8	# The dietlibc portion of busybox is commented out right now
9	# other stuff seems to compile fine though	9	# other stuff seems to compile fine though

Lines 1-9 Link Here

(-)genkernel-3.4.8.orig/x86_64/config.sh (-3 / +3 lines)
1	#!/bin/bash	1	#!/bin/bash
2	# x86_64/config.sh	2	# x86_64/config.sh
3		3
4	KERNEL_MAKE_DIRECTIVE="bzImage"	4	KERNEL_DEFAULT_MAKE_DIRECTIVE="bzImage"
5	KERNEL_MAKE_DIRECTIVE_2=""	5	KERNEL_ALT_BINARY_NAME=""
6	KERNEL_BINARY="arch/x86_64/boot/bzImage"	6	KERNEL_PATH_TO_BINARY="arch/x86_64/boot/"
7		7
8	USE_DIETLIBC=1	8	USE_DIETLIBC=1
9		9

Lines 1-9 Link Here

(-)genkernel-3.4.8.orig/xen0/config.sh (-3 / +3 lines)
1	#!/bin/bash	1	#!/bin/bash
2	# x86/config.sh	2	# x86/config.sh
3		3
4	KERNEL_MAKE_DIRECTIVE=""	4	KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinuz"
5	KERNEL_MAKE_DIRECTIVE_2=""	5	KERNEL_ALT_BINARY_NAME=""
6	KERNEL_BINARY="vmlinuz"	6	KERNEL_PATH_TO_BINARY="./"
7		7
8	# The dietlibc portion of busybox is commented out right now	8	# The dietlibc portion of busybox is commented out right now
9	# other stuff seems to compile fine though	9	# other stuff seems to compile fine though

Lines 1-9 Link Here

(-)genkernel-3.4.8.orig/xenU/config.sh (-3 / +3 lines)
1	#!/bin/bash	1	#!/bin/bash
2	# x86/config.sh	2	# x86/config.sh
3		3
4	KERNEL_MAKE_DIRECTIVE=""	4	KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinuz"
5	KERNEL_MAKE_DIRECTIVE_2=""	5	KERNEL_ALT_BINARY_NAME=""
6	KERNEL_BINARY="vmlinuz"	6	KERNEL_PATH_TO_BINARY="./"
7		7
8	# The dietlibc portion of busybox is commented out right now	8	# The dietlibc portion of busybox is commented out right now
9	# other stuff seems to compile fine though	9	# other stuff seems to compile fine though

Return to bug 179294

Lines 290-302 compile_kernel() { Link Here

(-)genkernel-3.4.8.orig/gen_compile.sh (-12 / +12 lines)
290	[ "${KERNEL_MAKE}" = '' ] &&	290	[ "${KERNEL_MAKE}" = '' ] &&
291	gen_die "KERNEL_MAKE undefined - I don't know how to compile a kernel for this arch!"	291	gen_die "KERNEL_MAKE undefined - I don't know how to compile a kernel for this arch!"
292	cd ${KERNEL_DIR}	292	cd ${KERNEL_DIR}
293	print_info 1 " >> Compiling ${KV} ${KERNEL_MAKE_DIRECTIVE/_install/ [ install ]/}..."	293	print_info 1 " >> Compiling ${KV} ${CMD_KTARGET/_install/ [ install ]/}..."
294	compile_generic "${KERNEL_MAKE_DIRECTIVE}" kernel	294	compile_generic "${CMD_KTARGET}" kernel
295	if [ "${KERNEL_MAKE_DIRECTIVE_2}" != '' ]	295	## if [ "${CMD_KTARGET}" != '' ]
296	then	296	## then
297	print_info 1 " >> Starting supplimental compile of ${KV}: ${KERNEL_MAKE_DIRECTIVE_2}..."	297	## print_info 1 " >> Starting supplimental compile of ${KV}: ${CMD_KTARGET}..."
298	compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel	298	## compile_generic "${CMD_KTARGET}" kernel
299	fi	299	## fi
300	if ! isTrue "${CMD_NOINSTALL}"	300	if ! isTrue "${CMD_NOINSTALL}"
301	then	301	then
302	copy_image_with_preserve "kernel" \	302	copy_image_with_preserve "kernel" \
Lines 307-326 compile_kernel() { Link Here
307	"System.map" \	307	"System.map" \
308	"System.map-${KNAME}-${ARCH}-${KV}"	308	"System.map-${KNAME}-${ARCH}-${KV}"
309		309
310	if [ "${KERNEL_BINARY_2}" != '' -a "${GENERATE_Z_IMAGE}" = '1' ]	310	if [ "${ENABLE_PEGASOS_HACKS}" = 'godshelpme' ]
311	then	311	then
312	copy_image_with_preserve "kernelz" \	312	copy_image_with_preserve "kernelz" \
313	"${KERNEL_BINARY_2}" \	313	"${KERNEL_BINARY}" \
314	"kernelz-${KV}"	314	"kernelz-${KV}"
315	fi	315	fi
316	else	316	else
317	cp "${KERNEL_BINARY}" "${TMPDIR}/kernel-${KNAME}-${ARCH}-${KV}" \|\|	317	cp "${KERNEL_BINARY}" "${TMPDIR}/kernel-${KNAME}-${ARCH}-${KV}" \|\|
318	gen_die "Could not copy the kernel binary to ${TMPDIR}!"	318	gen_die "Could not copy the kernel binary to ${TMPDIR}!"
319	cp "System.map" "${TMPDIR}/System.map-${KNAME}-${ARCH}-${KV}" \|\|	319	cp "System.map" "${TMPDIR}/System.map-${KNAME}-${ARCH}-${KV}" \|\|
320	gen_die "Could not copy System.map to ${TMPDIR}!"	320	gen_die "Could not copy System.map to ${TMPDIR}!"
321	if [ "${KERNEL_BINARY_2}" != '' -a "${GENERATE_Z_IMAGE}" = '1' ]	321	if [ "${ENABLE_PEGASOS_HACKS}" = 'godshelpme' ]
322	then	322	then
323	cp "${KERNEL_BINARY_2}" "${TMPDIR}/kernelz-${KV}" \|\|	323	cp "${KERNEL_BINARY}" "${TMPDIR}/kernelz-${KV}" \|\|
324	gen_die "Could not copy the kernelz binary to ${TMPDIR}!"	324	gen_die "Could not copy the kernelz binary to ${TMPDIR}!"
325	fi	325	fi
326	fi	326	fi

Lines 351-356 determine_real_args() { Link Here

(-)genkernel-3.4.8.orig/gen_determineargs.sh (+17 lines)
351	BUILD_INITRAMFS=0	351	BUILD_INITRAMFS=0
352	fi	352	fi
353		353
		354	if [ "${CMD_KTARGET}" != '' ]
		355	then
		356	KERNEL_TARGET="${CMD_KTARGET}"
		357	else
		358	KERNEL_TARGET="${KERNEL_DEFAULT_MAKE_DIRECTIVE}"
		359	fi
		360
		361	if [ "${KERNEL_TARGET}" != '' ]
		362	then
		363	if [ "${KERNEL_ALT_BINARY_NAME}" = "" ]
		364	then
		365	KERNEL_BINARY="${KERNEL_PATH_TO_BINARY}/${KERNEL_TARGET}"
		366	else
		367	KERNEL_BINARY="${KERNEL_PATH_TO_BINARY}/${KERNEL_ALT_BINARY_NAME}"
		368	fi
		369	fi
		370
354	if [ "${CMD_SAVE_CONFIG}" != '' ]	371	if [ "${CMD_SAVE_CONFIG}" != '' ]
355	then	372	then
356	SAVE_CONFIG="${CMD_SAVE_CONFIG}"	373	SAVE_CONFIG="${CMD_SAVE_CONFIG}"

Lines 521-541 create_initramfs() { Link Here

(-)genkernel-3.4.8.orig/gen_initramfs.sh (-9 / +8 lines)
521	gzip -9 "${CPIO}"	521	gzip -9 "${CPIO}"
522	mv -f "${CPIO}.gz" "${CPIO}"	522	mv -f "${CPIO}.gz" "${CPIO}"
523		523
524	# Pegasos hack for merging the initramfs into the kernel at compile time	524	if [ "${CMD_KTARGET}" == 'zImage.initrd' -a "${ENABLE_PEGASOS_HACKS}" = 'godshelpme' ]
525	[ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] \|\|	525	then
526	[ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] &&	526	# Pegasos hack for merging the initramfs into the kernel at compile time
527	cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/powerpc/boot/ramdisk.image.gz &&	527	cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/powerpc/boot/ramdisk.image.gz &&
528	rm ${TMPDIR}/initramfs-${KV}	528	rm ${TMPDIR}/initramfs-${KV}
529		529	elif [ ${BUILD_INITRAMFS} -eq 1 ]; then
530	# Mips also mimics Pegasos to merge the initramfs into the kernel	530	# Assume standard initramfs build
531	if [ ${BUILD_INITRAMFS} -eq 1 ]; then
532	cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/initramfs.cpio.gz	531	cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/initramfs.cpio.gz
533	gunzip -f ${KERNEL_DIR}/initramfs.cpio.gz	532	gunzip -f ${KERNEL_DIR}/initramfs.cpio.gz
534	fi	533	fi
535		534
536	if ! isTrue "${CMD_NOINSTALL}"	535	if ! isTrue "${CMD_NOINSTALL}"
537	then	536	then
538	if [ "${GENERATE_Z_IMAGE}" != '1' ]	537	if [ "${ENABLE_PEGASOS_HACKS}" != 'godshelpme' ]
539	then	538	then
540	copy_image_with_preserve "initramfs" \	539	copy_image_with_preserve "initramfs" \
541	"${TMPDIR}/initramfs-${KV}" \	540	"${TMPDIR}/initramfs-${KV}" \

Lines 211-217 then Link Here

(-)genkernel-3.4.8.orig/genkernel (-3 / +3 lines)
211		211
212	# Compile kernel; If using --genzimage, or building a mips kernel, skip compile	212	# Compile kernel; If using --genzimage, or building a mips kernel, skip compile
213	# till after initrd/initramfs is done	213	# till after initrd/initramfs is done
214	[ "${GENERATE_Z_IMAGE}" = '' -a ${BUILD_INITRAMFS} -eq 0 ] && compile_kernel	214	[ "${ENABLE_PEGASOS_HACKS}" != 'godshelpme' -a ${BUILD_INITRAMFS} -eq 0 ] && compile_kernel
215		215
216	# Compile modules	216	# Compile modules
217	if [ ${BUILD_MODULES} -eq 1 -a ${BUILD_STATIC} -eq 0 ]	217	if [ ${BUILD_MODULES} -eq 1 -a ${BUILD_STATIC} -eq 0 ]
Lines 227-233 then Link Here
227	fi	227	fi
228	if [ "${KERNCACHE}" != "" ]	228	if [ "${KERNCACHE}" != "" ]
229	then	229	then
230	if [ "${GENERATE_Z_IMAGE}" = '' -a ${BUILD_INITRAMFS} -eq 0 ]	230	if [ "${ENABLE_PEGASOS_HACKS}" != 'godshelpme' -a ${BUILD_INITRAMFS} -eq 0 ]
231	then	231	then
232	gen_kerncache	232	gen_kerncache
233	fi	233	fi
Lines 328-334 else Link Here
328	fi	328	fi
329		329
330	# Pegasos fix	330	# Pegasos fix
331	if [ "${GENERATE_Z_IMAGE}" != '' -o ${BUILD_INITRAMFS} -eq 1 ]	331	if [ "${ENABLE_PEGASOS_HACKS}" = 'godshelpme' -o ${BUILD_INITRAMFS} -eq 1 ]
332	then	332	then
333	# Compile kernel, intergrating the initrd into it for Pegasos & mips	333	# Compile kernel, intergrating the initrd into it for Pegasos & mips
334	compile_kernel	334	compile_kernel

Lines 9-15 gen_minkernpackage() Link Here

(-)genkernel-3.4.8.orig/gen_package.sh (-9 / +9 lines)
9	then	9	then
10	/bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} kernel-${ARCH}-${KV}	10	/bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} kernel-${ARCH}-${KV}
11	/bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} config-${ARCH}-${KV}	11	/bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} config-${ARCH}-${KV}
12	if [ "${KERNEL_BINARY_2}" != '' -a "${GENERATE_Z_IMAGE}" = '1' ]	12	if [ "${ENABLE_PEGASOS_HACKS}" = 'godshelpme' ]
13	then	13	then
14	/bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} kernelz-${ARCH}-${KV}	14	/bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} kernelz-${ARCH}-${KV}
15	fi	15	fi
Lines 17-30 gen_minkernpackage() Link Here
17	cd "${KERNEL_DIR}"	17	cd "${KERNEL_DIR}"
18	cp "${KERNEL_BINARY}" "${TEMP}/minkernpackage/kernel-${KV}" \|\| gen_die 'Could not the copy kernel for the min kernel package!'	18	cp "${KERNEL_BINARY}" "${TEMP}/minkernpackage/kernel-${KV}" \|\| gen_die 'Could not the copy kernel for the min kernel package!'
19	cp ".config" "${TEMP}/minkernpackage/config-${ARCH}-${KV}" \|\| gen_die 'Could not the copy kernel config for the min kernel package!'	19	cp ".config" "${TEMP}/minkernpackage/config-${ARCH}-${KV}" \|\| gen_die 'Could not the copy kernel config for the min kernel package!'
20	if [ "${KERNEL_BINARY_2}" != '' -a "${GENERATE_Z_IMAGE}" = '1' ]	20	if [ "${ENABLE_PEGASOS_HACKS}" = 'godshelpme' ]
21	then	21	then
22	cp "${KERNEL_BINARY_2}" "${TEMP}/minkernpackage/kernelz-${KV}" \|\| gen_die "Could not copy the kernelz for the min kernel package"	22	cp "${KERNEL_BINARY}" "${TEMP}/minkernpackage/kernelz-${KV}" \|\| gen_die "Could not copy the kernelz for the min kernel package"
23	fi	23	fi
24		24
25	fi	25	fi
26		26
27	if [ "${GENERATE_Z_IMAGE}" != '1' ]	27	if [ "${ENABLE_PEGASOS_HACKS}" != 'godshelpme' ]
28	then	28	then
29	if [ "${KERN_24}" != '1' -a "${CMD_BOOTSPLASH}" != '1' ]	29	if [ "${KERN_24}" != '1' -a "${CMD_BOOTSPLASH}" != '1' ]
30	then	30	then
Lines 66-74 gen_kerncache() Link Here
66	cp "${KERNEL_BINARY}" "${TEMP}/kerncache/kernel-${ARCH}-${KV}" \|\| gen_die 'Could not the copy kernel for the kernel package!'	66	cp "${KERNEL_BINARY}" "${TEMP}/kerncache/kernel-${ARCH}-${KV}" \|\| gen_die 'Could not the copy kernel for the kernel package!'
67	cp "${KERNEL_DIR}/.config" "${TEMP}/kerncache/config-${ARCH}-${KV}"	67	cp "${KERNEL_DIR}/.config" "${TEMP}/kerncache/config-${ARCH}-${KV}"
68	cp "${KERNEL_DIR}/System.map" "${TEMP}/kerncache/System.map-${ARCH}-${KV}"	68	cp "${KERNEL_DIR}/System.map" "${TEMP}/kerncache/System.map-${ARCH}-${KV}"
69	if [ "${KERNEL_BINARY_2}" != '' -a "${GENERATE_Z_IMAGE}" = '1' ]	69	if [ "${ENABLE_PEGASOS_HACKS}" = 'godshelpme' ]
70	then	70	then
71	cp "${KERNEL_BINARY_2}" "${TEMP}/kerncache/kernelz-${ARCH}-${KV}" \|\| gen_die "Could not copy the kernelz for the kernel package"	71	cp "${KERNEL_BINARY}" "${TEMP}/kerncache/kernelz-${ARCH}-${KV}" \|\| gen_die "Could not copy the kernelz for the kernel package"
72	fi	72	fi
73		73
74	echo "VERSION = ${VER}" > "${TEMP}/kerncache/kerncache.config"	74	echo "VERSION = ${VER}" > "${TEMP}/kerncache/kerncache.config"
Lines 95-106 gen_kerncache_extract_kernel() Link Here
95	"${TEMP}/kernel-${ARCH}-${KV}" \	95	"${TEMP}/kernel-${ARCH}-${KV}" \
96	"kernel-${KNAME}-${ARCH}-${KV}"	96	"kernel-${KNAME}-${ARCH}-${KV}"
97		97
98	if [ "${KERNEL_BINARY_2}" != '' -a "${GENERATE_Z_IMAGE}" = '1' ]	98	if [ "${ENABLE_PEGASOS_HACKS}" = 'godshelpme']
99	then	99	then
100	copy_image_with_preserve "kernelz" \	100	copy_image_with_preserve "kernelz" \
101	"${TEMP}/kernelz-${ARCH}-${KV}" \	101	"${TEMP}/kernelz-${ARCH}-${KV}" \
102	"kernelz-${KNAME}-${ARCH}-${KV}"	102	"kernelz-${KNAME}-${ARCH}-${KV}"
103	fi	103	fi
104		104
105	copy_image_with_preserve "System.map" \	105	copy_image_with_preserve "System.map" \
106	"${TEMP}/System.map-${ARCH}-${KV}" \	106	"${TEMP}/System.map-${ARCH}-${KV}" \