diff options
author | Joey Hess <joey@kitenet.net> | 2013-05-05 13:32:18 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-05-05 13:32:18 -0400 |
commit | fd04390350046c0edc8f21c0c8baf4ae0313a00a (patch) | |
tree | 1ec6446e5dbf49d1c7ec4b589e365b4b756a324b /dh_installmodules | |
parent | 89c2e3111c13cd85942dd1063ae5a3ab365278e2 (diff) | |
download | debhelper-fd04390350046c0edc8f21c0c8baf4ae0313a00a.tar.gz |
dh: Skips running commands that it can tell do nothing.
This is determined by the presence of special PROMISE directives within
commands that provide a high-level description of the command.
Note that when dh is passed additional debhelper options, it cannot tell if
these change the behavior of commands, and so it stops skipping any
commands.
Diffstat (limited to 'dh_installmodules')
-rwxr-xr-x | dh_installmodules | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/dh_installmodules b/dh_installmodules index 9b3fc203..be31676f 100755 --- a/dh_installmodules +++ b/dh_installmodules @@ -2,8 +2,7 @@ =head1 NAME -dh_installmodules - register modules with modutils - +dh_installmodules - register kernel modules =cut @@ -34,11 +33,6 @@ L<dh_installdeb(1)>. Installed to etc/modprobe.d/I<package>.conf in the package build directory. -=item debian/I<package>.modules - -These files were installed for use by modutils, but are now not used -and B<dh_installmodules> will warn if these files are present. - =back =head1 OPTIONS @@ -89,19 +83,16 @@ sub find_kernel_modules { return keys %versions; } +# PROMISE: DH NOOP WITHOUT modprobe tmp(lib/modules) + foreach my $package (@{$dh{DOPACKAGES}}) { my $tmp=tmpdir($package); - my $modutils_file=pkgfile($package,"modules"); my $modprobe_file=pkgfile($package,"modprobe"); if (! -e $tmp) { doit("install","-d",$tmp); } - if ($modutils_file) { - warning("ignoring $modutils_file, since modutils is no longer in Debian"); - } - if ($modprobe_file) { if (! -e "$tmp/etc/modprobe.d") { doit("install","-d","$tmp/etc/modprobe.d"); |