From de2a22fcb3e7e8d7c4f695aeb0caf9cdc8f82c9a Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Thu, 9 Oct 2014 14:08:00 -0300 Subject: [PATCH] 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 Signed-off-by: Richard Yao Signed-off-by: Brian Behlendorf Closes #399 --- scripts/Makefile.am | 2 +- scripts/dkms.mkconf | 2 +- scripts/{dkms.postinst => dkms.postbuild} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename scripts/{dkms.postinst => dkms.postbuild} (100%) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 4c0d7ba4042f..f146ec6e674a 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 f9cf69692722..2fa3dd2b41e7 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 similarity index 100% rename from scripts/dkms.postinst rename to scripts/dkms.postbuild