]>
Commit | Line | Data |
---|---|---|
def393bb AX |
1 | Description: Block manual building in the DKMS source tree. |
2 | To avoid messing up future DKMS builds and the zfs installation, | |
3 | block manual building of the DKMS source tree. | |
4 | Author: unknown | |
5 | Origin: ubuntu | |
6 | Forwarded: no | |
7 | Reviewed-By: Petter Reinholdtsen <pere@hungry.com> | |
1c416e32 | 8 | Last-Update: 2017-10-06 |
def393bb | 9 | |
1c416e32 | 10 | Index: zfs/config/dkms.m4 |
312f9b0c PR |
11 | =================================================================== |
12 | --- /dev/null | |
1c416e32 | 13 | +++ zfs/config/dkms.m4 |
312f9b0c PR |
14 | @@ -0,0 +1,14 @@ |
15 | +dnl # | |
16 | +dnl # Prevent manual building in DKMS source tree. | |
17 | +dnl # | |
18 | +AC_DEFUN([ZFS_AC_DKMS_INHIBIT], [ | |
19 | + AC_MSG_CHECKING([for dkms.conf file]) | |
20 | + AS_IF([test -e dkms.conf], [ | |
21 | + AC_MSG_ERROR([ | |
22 | + *** ZFS should not be manually built in the DKMS source tree. | |
23 | + *** Remove all ZFS packages before compiling the ZoL sources. | |
24 | + *** Running "make install" breaks ZFS packages.]) | |
25 | + ], [ | |
26 | + AC_MSG_RESULT([not found]) | |
27 | + ]) | |
28 | +]) | |
1c416e32 | 29 | Index: zfs/config/user.m4 |
312f9b0c | 30 | =================================================================== |
1c416e32 AX |
31 | --- zfs.orig/config/user.m4 |
32 | +++ zfs/config/user.m4 | |
312f9b0c PR |
33 | @@ -2,6 +2,7 @@ dnl # |
34 | dnl # Default ZFS user configuration | |
35 | dnl # | |
36 | AC_DEFUN([ZFS_AC_CONFIG_USER], [ | |
37 | + ZFS_AC_DKMS_INHIBIT | |
38 | ZFS_AC_CONFIG_USER_MOUNT_HELPER | |
39 | ZFS_AC_CONFIG_USER_UDEV | |
40 | ZFS_AC_CONFIG_USER_SYSTEMD |