Skip to content

Commit

Permalink
Install header during post-build rather than post-install.
Browse files Browse the repository at this point in the history
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 openzfs#399
  • Loading branch information
Tom Prince authored and behlendorf committed Oct 9, 2014
1 parent 81857a3 commit de2a22f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion scripts/Makefile.am
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion scripts/dkms.mkconf
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
File renamed without changes.

0 comments on commit de2a22f

Please sign in to comment.