mirror of
				https://github.com/torvalds/linux.git
				synced 2025-10-31 16:48:26 +02:00 
			
		
		
		
	kbuild: verify that $DEPMOD is installed
Verify that 'depmod' ($DEPMOD) is installed.
This is a partial revert of commit 620c231c7a
("kbuild: do not check for ancient modutils tools").
Also update Documentation/process/changes.rst to refer to
kmod instead of module-init-tools.
Fixes kernel bugzilla #198965:
https://bugzilla.kernel.org/show_bug.cgi?id=198965
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Cc: Lucas De Marchi <lucas.de.marchi@gmail.com>
Cc: Michal Marek <michal.lkml@markovi.net>
Cc: Jessica Yu <jeyu@kernel.org>
Cc: Chih-Wei Huang <cwhuang@linux.org.tw>
Cc: stable@vger.kernel.org # any kernel since 2012
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
			
			
This commit is contained in:
		
							parent
							
								
									c417fbce98
								
							
						
					
					
						commit
						934193a654
					
				
					 2 changed files with 14 additions and 13 deletions
				
			
		|  | @ -35,7 +35,7 @@ binutils               2.20             ld -v | ||||||
| flex                   2.5.35           flex --version | flex                   2.5.35           flex --version | ||||||
| bison                  2.0              bison --version | bison                  2.0              bison --version | ||||||
| util-linux             2.10o            fdformat --version | util-linux             2.10o            fdformat --version | ||||||
| module-init-tools      0.9.10           depmod -V | kmod                   13               depmod -V | ||||||
| e2fsprogs              1.41.4           e2fsck -V | e2fsprogs              1.41.4           e2fsck -V | ||||||
| jfsutils               1.1.3            fsck.jfs -V | jfsutils               1.1.3            fsck.jfs -V | ||||||
| reiserfsprogs          3.6.3            reiserfsck -V | reiserfsprogs          3.6.3            reiserfsck -V | ||||||
|  | @ -156,12 +156,6 @@ is not build with ``CONFIG_KALLSYMS`` and you have no way to rebuild and | ||||||
| reproduce the Oops with that option, then you can still decode that Oops | reproduce the Oops with that option, then you can still decode that Oops | ||||||
| with ksymoops. | with ksymoops. | ||||||
| 
 | 
 | ||||||
| Module-Init-Tools |  | ||||||
| ----------------- |  | ||||||
| 
 |  | ||||||
| A new module loader is now in the kernel that requires ``module-init-tools`` |  | ||||||
| to use.  It is backward compatible with the 2.4.x series kernels. |  | ||||||
| 
 |  | ||||||
| Mkinitrd | Mkinitrd | ||||||
| -------- | -------- | ||||||
| 
 | 
 | ||||||
|  | @ -371,16 +365,17 @@ Util-linux | ||||||
| 
 | 
 | ||||||
| - <https://www.kernel.org/pub/linux/utils/util-linux/> | - <https://www.kernel.org/pub/linux/utils/util-linux/> | ||||||
| 
 | 
 | ||||||
|  | Kmod | ||||||
|  | ---- | ||||||
|  | 
 | ||||||
|  | - <https://www.kernel.org/pub/linux/utils/kernel/kmod/> | ||||||
|  | - <https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git> | ||||||
|  | 
 | ||||||
| Ksymoops | Ksymoops | ||||||
| -------- | -------- | ||||||
| 
 | 
 | ||||||
| - <https://www.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/> | - <https://www.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/> | ||||||
| 
 | 
 | ||||||
| Module-Init-Tools |  | ||||||
| ----------------- |  | ||||||
| 
 |  | ||||||
| - <https://www.kernel.org/pub/linux/utils/kernel/module-init-tools/> |  | ||||||
| 
 |  | ||||||
| Mkinitrd | Mkinitrd | ||||||
| -------- | -------- | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -10,10 +10,16 @@ fi | ||||||
| DEPMOD=$1 | DEPMOD=$1 | ||||||
| KERNELRELEASE=$2 | KERNELRELEASE=$2 | ||||||
| 
 | 
 | ||||||
| if ! test -r System.map -a -x "$DEPMOD"; then | if ! test -r System.map ; then | ||||||
| 	exit 0 | 	exit 0 | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
|  | if [ -z $(command -v $DEPMOD) ]; then | ||||||
|  | 	echo "'make modules_install' requires $DEPMOD. Please install it." >&2 | ||||||
|  | 	echo "This is probably in the kmod package." >&2 | ||||||
|  | 	exit 1 | ||||||
|  | fi | ||||||
|  | 
 | ||||||
| # older versions of depmod require the version string to start with three | # older versions of depmod require the version string to start with three | ||||||
| # numbers, so we cheat with a symlink here | # numbers, so we cheat with a symlink here | ||||||
| depmod_hack_needed=true | depmod_hack_needed=true | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Randy Dunlap
						Randy Dunlap