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#2776
  • Loading branch information
tomprince authored and behlendorf committed Oct 9, 2014
1 parent 971808e commit fee48fd
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,6 +1,6 @@
SUBDIRS = zpool-config zpios-test zpios-profile

EXTRA_DIST = dkms.mkconf dkms.postinst kmodtool zfs2zol-patch.sed cstyle.pl
EXTRA_DIST = dkms.mkconf dkms.postbuild kmodtool zfs2zol-patch.sed cstyle.pl

pkgdatadir = $(datadir)/@PACKAGE@
dist_pkgdata_SCRIPTS = \
Expand Down
2 changes: 1 addition & 1 deletion scripts/dkms.mkconf
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,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 fee48fd

Please sign in to comment.