aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Prince <[email protected]>2014-10-09 14:08:00 -0300
committerBrian Behlendorf <[email protected]>2014-10-09 12:00:25 -0700
commitde2a22fcb3e7e8d7c4f695aeb0caf9cdc8f82c9a (patch)
tree6bcfae0c12531bbb8c4b28fee0a07c299a5f1efb
parent81857a34d1d767abf40aea7e6db074d8cbf7b49f (diff)
Install header during post-build rather than post-install.
New versions of dkms clean up the build directory after installing. It appears that this was always intended, but had rm -rf "/path/to/build/*" (note the quotes), which prevented it from working. Also, the build step is already installing stuff into the directory where these files go, so installing our stuff there as part of build rather than install makes sense. Signed-off-by: Tom Prince <[email protected]> Signed-off-by: Richard Yao <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #399
-rw-r--r--scripts/Makefile.am2
-rwxr-xr-xscripts/dkms.mkconf2
-rwxr-xr-xscripts/dkms.postbuild (renamed from scripts/dkms.postinst)0
3 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 4c0d7ba40..f146ec6e6 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = check.sh dkms.mkconf dkms.postinst kmodtool
+EXTRA_DIST = check.sh dkms.mkconf dkms.postbuild kmodtool
check:
$(top_srcdir)/scripts/check.sh
diff --git a/scripts/dkms.mkconf b/scripts/dkms.mkconf
index f9cf69692..2fa3dd2b4 100755
--- a/scripts/dkms.mkconf
+++ b/scripts/dkms.mkconf
@@ -56,7 +56,7 @@ PRE_BUILD="configure
}
)
"
-POST_INSTALL="scripts/dkms.postinst
+POST_BUILD="scripts/dkms.postbuild
-n \${PACKAGE_NAME}
-v \${PACKAGE_VERSION}
-a \${arch}
diff --git a/scripts/dkms.postinst b/scripts/dkms.postbuild
index a23bbdabb..a23bbdabb 100755
--- a/scripts/dkms.postinst
+++ b/scripts/dkms.postbuild