diff options
| author | Turbo Fredriksson <[email protected]> | 2014-06-06 16:07:58 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-06-11 16:32:57 -0700 |
| commit | 2ee4e7da9081207e847088be682c0eee48a2284a (patch) | |
| tree | 4ae547d0eae7eef08d5f23927db80160ce6988b7 /config | |
| parent | 7f6884f419f822f89609f6ed7595f78d12c31834 (diff) | |
Accept udev and dracut paths specified by ./configure
There are two common locations where udev and dracut components are
commonly installed. When building packages using the 'make rpm|deb'
targets check those common locations and pass them to rpmbuild. For
non-standard configurations these values can be provided by the
the following configure options:
--with-udevdir=DIR install udev helpers [default=check]
--with-udevruledir=DIR install udev rules [[UDEVDIR/rules.d]]
--with-dracutdir=DIR install dracut helpers [default=check]
When rebuilding using the source packages the per-distribution
default values specified in the spec file will be used. This is
the preferred way to build packages for a distribution but the
ability to override the defaults is provided as a convenience.
Signed-off-by: Turbo Fredriksson <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #2310
Closes #1680
Diffstat (limited to 'config')
| -rw-r--r-- | config/user-dracut.m4 | 20 | ||||
| -rw-r--r-- | config/user-udev.m4 | 21 | ||||
| -rw-r--r-- | config/zfs-build.m4 | 2 |
3 files changed, 36 insertions, 7 deletions
diff --git a/config/user-dracut.m4 b/config/user-dracut.m4 index 6d96edc27..95f800bda 100644 --- a/config/user-dracut.m4 +++ b/config/user-dracut.m4 @@ -1,8 +1,22 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_DRACUT], [ - AC_ARG_WITH(dracutdir, + AC_MSG_CHECKING(for dracut directory) + AC_ARG_WITH([dracutdir], AC_HELP_STRING([--with-dracutdir=DIR], - [install dracut helpers [[EPREFIX/lib/dracut]]]), - dracutdir=$withval, dracutdir='${exec_prefix}/lib/dracut') + [install dracut helpers @<:@default=check@:>@]), + [dracutdir=$withval], + [dracutdir=check]) + + AS_IF([test "x$dracutdir" = xcheck], [ + path1=/usr/share/dracut + path2=/usr/lib/dracut + default=$path2 + + AS_IF([test -d "$path1"], [dracutdir="$path1"], [ + AS_IF([test -d "$path2"], [dracutdir="$path2"], + [dracutdir="$default"]) + ]) + ]) AC_SUBST(dracutdir) + AC_MSG_RESULT([$dracutdir]) ]) diff --git a/config/user-udev.m4 b/config/user-udev.m4 index 47da60478..65dc79fb4 100644 --- a/config/user-udev.m4 +++ b/config/user-udev.m4 @@ -1,14 +1,29 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_UDEV], [ + AC_MSG_CHECKING(for udev directories) AC_ARG_WITH(udevdir, AC_HELP_STRING([--with-udevdir=DIR], - [install udev helpers [[EPREFIX/lib/udev]]]), - udevdir=$withval, udevdir='${exec_prefix}/lib/udev') + [install udev helpers @<:@default=check@:>@]), + [udevdir=$withval], + [udevdir=check]) + + AS_IF([test "x$udevdir" = xcheck], [ + path1=/lib/udev + path2=/usr/lib/udev + default=$path2 + + AS_IF([test -d "$path1"], [udevdir="$path1"], [ + AS_IF([test -d "$path2"], [udevdir="$path2"], + [udevdir="$default"]) + ]) + ]) AC_ARG_WITH(udevruledir, AC_HELP_STRING([--with-udevruledir=DIR], [install udev rules [[UDEVDIR/rules.d]]]), - udevruledir=$withval, udevruledir='${udevdir}/rules.d') + [udevruledir=$withval], + [udevruledir="${udevdir}/rules.d"]) AC_SUBST(udevdir) AC_SUBST(udevruledir) + AC_MSG_RESULT([$udevdir;$udevruledir]) ]) diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 96a8ec53c..5ec94a059 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -140,7 +140,7 @@ AC_DEFUN([ZFS_AC_RPM], [ ]) RPM_DEFINE_COMMON='--define "$(DEBUG_ZFS) 1" --define "$(DEBUG_DMU_TX) 1"' - RPM_DEFINE_UTIL= + RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)" --define "_udevdir $(udevdir)" --define "_udevruledir $(udevruledir)"' RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)" --define "require_spldir $(SPL)" --define "require_splobj $(SPL_OBJ)" --define "ksrc $(LINUX)" --define "kobj $(LINUX_OBJ)"' RPM_DEFINE_DKMS= |