[patch] Adds support for INSTALL_MOD_PATH in genkernel

genkernel-install_mod_path.patch (text/plain), 3.70 KB, created by Martin Parm on 2004-07-20 10:25:46 UTC

diff -uNr genkernel-3.0.2c/work/genkernel-3.0.2c/gen_cmdline.sh /root/genkernel-3.0.2c-new1/gen_cmdline.sh
--- genkernel-3.0.2c/work/genkernel-3.0.2c/gen_cmdline.sh	2004-07-12 22:45:57.000000000 +0200
+++ /root/genkernel-3.0.2c-new1/gen_cmdline.sh	2004-07-20 14:39:04.000000000 +0200
@@ -38,6 +38,8 @@
   echo "  Kernel settings"
   echo "	--kerneldir=<dir>	Location of the kernel sources"
   echo "	--kernel-config=<file>	Kernel configuration file to use for compilation"
+  echo "	--module-prefix=<dir>	Prefix to kernel module destination, modules will"
+  echo "				be installed in <prefix>/lib/modules"
   echo "  Low-Level Compile settings"
   echo "	--kernel-cc=<compiler>	Compiler to use for kernel (e.g. distcc)"
   echo "	--kernel-as=<assembler>	Assembler to use for kernel"
@@ -238,6 +240,10 @@
 		      CMD_KERNEL_CONFIG=`parse_opt "$*"`
 		      print_info 2 "CMD_KERNEL_CONFIG: $CMD_KERNEL_CONFIG"
 	      ;;
+	      --module-prefix*)
+		      CMD_INSTALL_MOD_PATH=`parse_opt "$*"`
+		      print_info 2 "CMD_INSTALL_MOD_PATH: $CMD_INSTALL_MOD_PATH"
+	      ;;
 	      --busybox-config*)
 		      CMD_BUSYBOX_CONFIG=`parse_opt "$*"`
 		      print_info 2 "CMD_BUSYBOX_CONFIG: $CMD_BUSYBOX_CONFIG"
diff -uNr genkernel-3.0.2c/work/genkernel-3.0.2c/gen_compile.sh /root/genkernel-3.0.2c-new1/gen_compile.sh
--- genkernel-3.0.2c/work/genkernel-3.0.2c/gen_compile.sh	2004-07-12 22:45:57.000000000 +0200
+++ /root/genkernel-3.0.2c-new1/gen_compile.sh	2004-07-20 18:02:18.000000000 +0200
@@ -184,6 +184,10 @@
 		MAKEOPTS_SAVE="${MAKEOPTS}"
 		MAKEOPTS='-j1'
 	fi
+	if [ "${INSTALL_MOD_PATH}" != '' ]
+	then
+		export INSTALL_MOD_PATH
+	fi
 	compile_generic "modules_install" kernel
 	if [ "${VER}" -eq '2' -a "${PAT}" -le '4' ]
 	then
diff -uNr genkernel-3.0.2c/work/genkernel-3.0.2c/gen_determineargs.sh /root/genkernel-3.0.2c-new1/gen_determineargs.sh
--- genkernel-3.0.2c/work/genkernel-3.0.2c/gen_determineargs.sh	2004-07-12 22:45:57.000000000 +0200
+++ /root/genkernel-3.0.2c-new1/gen_determineargs.sh	2004-07-20 14:42:23.000000000 +0200
@@ -137,4 +137,9 @@
 	then
 		NOINITRDMODULES="${CMD_NOINITRDMODULES}"
 	fi
+  
+	if [ "${CMD_INSTALL_MOD_PATH}" != '' ]
+	then
+		INSTALL_MOD_PATH="${CMD_INSTALL_MOD_PATH}"
+	fi
 }
diff -uNr genkernel-3.0.2c/work/genkernel-3.0.2c/gen_initrd.sh /root/genkernel-3.0.2c-new1/gen_initrd.sh
--- genkernel-3.0.2c/work/genkernel-3.0.2c/gen_initrd.sh	2004-07-12 22:45:58.000000000 +0200
+++ /root/genkernel-3.0.2c-new1/gen_initrd.sh	2004-07-20 14:43:37.000000000 +0200
@@ -115,9 +115,15 @@
 	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`
+		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..."
@@ -127,7 +133,7 @@
 		cp -ax --parents "${mymod}" "${TEMP}/initrd-temp"
 	done
 
-	cp -ax --parents /lib/modules/${KV}/modules* ${TEMP}/initrd-temp
+	cp -ax --parents ./lib/modules/${KV}/modules* ${TEMP}/initrd-temp
 
 	mkdir -p "${TEMP}/initrd-temp/etc/modules"
 	for group_modules in ${!MODULES_*}; do
diff -uNr genkernel-3.0.2c/work/genkernel-3.0.2c/gen_moddeps.sh /root/genkernel-3.0.2c-new1/gen_moddeps.sh
--- genkernel-3.0.2c/work/genkernel-3.0.2c/gen_moddeps.sh	2004-07-12 22:45:57.000000000 +0200
+++ /root/genkernel-3.0.2c-new1/gen_moddeps.sh	2004-07-19 11:24:26.000000000 +0200
@@ -8,7 +8,7 @@
 	else
 		KEXT=".o"
 	fi
-        cat /lib/modules/${KV}/modules.dep | grep ${1}${KEXT}\: | cut -d\:  -f2
+	cat ${INSTALL_MOD_PATH}/lib/modules/${KV}/modules.dep | grep ${1}${KEXT}\: | cut -d\:  -f2
 }
 
 # Pass module deps list