Attachment #35826 for bug #57752

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

Lines 38-43 Link Here

(-)genkernel-3.0.2c/work/genkernel-3.0.2c/gen_cmdline.sh (+6 lines)
38	echo " Kernel settings"	38	echo " Kernel settings"
39	echo " --kerneldir=<dir> Location of the kernel sources"	39	echo " --kerneldir=<dir> Location of the kernel sources"
40	echo " --kernel-config=<file> Kernel configuration file to use for compilation"	40	echo " --kernel-config=<file> Kernel configuration file to use for compilation"
		41	echo " --module-prefix=<dir> Prefix to kernel module destination, modules will"
		42	echo " be installed in <prefix>/lib/modules"
41	echo " Low-Level Compile settings"	43	echo " Low-Level Compile settings"
42	echo " --kernel-cc=<compiler> Compiler to use for kernel (e.g. distcc)"	44	echo " --kernel-cc=<compiler> Compiler to use for kernel (e.g. distcc)"
43	echo " --kernel-as=<assembler> Assembler to use for kernel"	45	echo " --kernel-as=<assembler> Assembler to use for kernel"
Lines 238-243 Link Here
238	CMD_KERNEL_CONFIG=`parse_opt "$*"`	240	CMD_KERNEL_CONFIG=`parse_opt "$*"`
239	print_info 2 "CMD_KERNEL_CONFIG: $CMD_KERNEL_CONFIG"	241	print_info 2 "CMD_KERNEL_CONFIG: $CMD_KERNEL_CONFIG"
240	;;	242	;;
		243	--module-prefix*)
		244	CMD_INSTALL_MOD_PATH=`parse_opt "$*"`
		245	print_info 2 "CMD_INSTALL_MOD_PATH: $CMD_INSTALL_MOD_PATH"
		246	;;
241	--busybox-config*)	247	--busybox-config*)
242	CMD_BUSYBOX_CONFIG=`parse_opt "$*"`	248	CMD_BUSYBOX_CONFIG=`parse_opt "$*"`
243	print_info 2 "CMD_BUSYBOX_CONFIG: $CMD_BUSYBOX_CONFIG"	249	print_info 2 "CMD_BUSYBOX_CONFIG: $CMD_BUSYBOX_CONFIG"

Lines 184-189 Link Here

(-)genkernel-3.0.2c/work/genkernel-3.0.2c/gen_compile.sh (+4 lines)
184	MAKEOPTS_SAVE="${MAKEOPTS}"	184	MAKEOPTS_SAVE="${MAKEOPTS}"
185	MAKEOPTS='-j1'	185	MAKEOPTS='-j1'
186	fi	186	fi
		187	if [ "${INSTALL_MOD_PATH}" != '' ]
		188	then
		189	export INSTALL_MOD_PATH
		190	fi
187	compile_generic "modules_install" kernel	191	compile_generic "modules_install" kernel
188	if [ "${VER}" -eq '2' -a "${PAT}" -le '4' ]	192	if [ "${VER}" -eq '2' -a "${PAT}" -le '4' ]
189	then	193	then

Lines 137-140 Link Here

(-)genkernel-3.0.2c/work/genkernel-3.0.2c/gen_determineargs.sh (+5 lines)
137	then	137	then
138	NOINITRDMODULES="${CMD_NOINITRDMODULES}"	138	NOINITRDMODULES="${CMD_NOINITRDMODULES}"
139	fi	139	fi
		140
		141	if [ "${CMD_INSTALL_MOD_PATH}" != '' ]
		142	then
		143	INSTALL_MOD_PATH="${CMD_INSTALL_MOD_PATH}"
		144	fi
140	}	145	}




	fi

	print_info 2 "initrd: >> Searching for modules..."
	if [ "${INSTALL_MOD_PATH}" != '' ]
	then
	  cd ${INSTALL_MOD_PATH}
	else
	  cd /
	fi
	for i in `gen_dep_list`
	do
		mymod=`find ./lib/modules/${KV} -name "${i}${MOD_EXT}" | head -n 1`
		if [ -z "${mymod}" ]
		then
			print_warning 2 "Warning :: ${i}${MOD_EXT} not found; skipping..."

		cp -ax --parents "${mymod}" "${TEMP}/initrd-temp"
	done

	cp -ax --parents ./lib/modules/${KV}/modules* ${TEMP}/initrd-temp

	mkdir -p "${TEMP}/initrd-temp/etc/modules"
	for group_modules in ${!MODULES_*}; do

Lines 8-14 Link Here

(-)genkernel-3.0.2c/work/genkernel-3.0.2c/gen_moddeps.sh (-1 / +1 lines)
8	else	8	else
9	KEXT=".o"	9	KEXT=".o"
10	fi	10	fi
11	cat /lib/modules/${KV}/modules.dep \| grep ${1}${KEXT}\: \| cut -d\: -f2	11	cat ${INSTALL_MOD_PATH}/lib/modules/${KV}/modules.dep \| grep ${1}${KEXT}\: \| cut -d\: -f2
12	}	12	}
13		13
14	# Pass module deps list	14	# Pass module deps list

Return to bug 57752

Lines 115-123 Link Here

(-)genkernel-3.0.2c/work/genkernel-3.0.2c/gen_initrd.sh (-2 / +8 lines)
115	fi	115	fi
116		116
117	print_info 2 "initrd: >> Searching for modules..."	117	print_info 2 "initrd: >> Searching for modules..."
		118	if [ "${INSTALL_MOD_PATH}" != '' ]
		119	then
		120	cd ${INSTALL_MOD_PATH}
		121	else
		122	cd /
		123	fi
118	for i in `gen_dep_list`	124	for i in `gen_dep_list`
119	do	125	do
120	mymod=`find /lib/modules/${KV} -name "${i}${MOD_EXT}" \| head -n 1`	126	mymod=`find ./lib/modules/${KV} -name "${i}${MOD_EXT}" \| head -n 1`
121	if [ -z "${mymod}" ]	127	if [ -z "${mymod}" ]
122	then	128	then
123	print_warning 2 "Warning :: ${i}${MOD_EXT} not found; skipping..."	129	print_warning 2 "Warning :: ${i}${MOD_EXT} not found; skipping..."
Lines 127-133 Link Here
127	cp -ax --parents "${mymod}" "${TEMP}/initrd-temp"	133	cp -ax --parents "${mymod}" "${TEMP}/initrd-temp"
128	done	134	done
129		135
130	cp -ax --parents /lib/modules/${KV}/modules* ${TEMP}/initrd-temp	136	cp -ax --parents ./lib/modules/${KV}/modules* ${TEMP}/initrd-temp
131		137
132	mkdir -p "${TEMP}/initrd-temp/etc/modules"	138	mkdir -p "${TEMP}/initrd-temp/etc/modules"
133	for group_modules in ${!MODULES_*}; do	139	for group_modules in ${!MODULES_*}; do