From: Darrick J. Wong <djwong@xxxxxxxxxx>
Refactor the code that finds the udev rules directory to detect the
location of the parent udev directory instead. IOWs, we go from:
UDEV_RULE_DIR=/foo/bar/rules.d
to:
UDEV_DIR=/foo/bar
UDEV_RULE_DIR=/foo/bar/rules.d
This is needed by the next patch, which adds a helper script.
Signed-off-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
---
configure.ac | 2 +-
include/builddefs.in | 3 ++-
m4/package_services.m4 | 30 +++++++++++++++---------------
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1f7fec838e1239..cabbef51068dbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,7 +175,7 @@ if test "$enable_scrub" = "yes"; then
fi
AC_CONFIG_SYSTEMD_SYSTEM_UNIT_DIR
AC_CONFIG_CROND_DIR
-AC_CONFIG_UDEV_RULE_DIR
+AC_CONFIG_UDEV_DIR
AC_HAVE_BLKID_TOPO
if test "$enable_ubsan" = "yes" || test "$enable_ubsan" = "probe"; then
diff --git a/include/builddefs.in b/include/builddefs.in
index bb022c36627a72..4a25de76d5c325 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -112,7 +112,8 @@ SYSTEMD_SYSTEM_UNIT_DIR = @systemd_system_unit_dir@
HAVE_CROND = @have_crond@
CROND_DIR = @crond_dir@
HAVE_UDEV = @have_udev@
-UDEV_RULE_DIR = @udev_rule_dir@
+UDEV_DIR = @udev_dir@
+UDEV_RULE_DIR = @udev_dir@/rules.d
HAVE_LIBURCU_ATOMIC64 = @have_liburcu_atomic64@
USE_RADIX_TREE_FOR_INUMS = @use_radix_tree_for_inums@
diff --git a/m4/package_services.m4 b/m4/package_services.m4
index a683ddb93e0e91..de0504df0c206f 100644
--- a/m4/package_services.m4
+++ b/m4/package_services.m4
@@ -77,33 +77,33 @@ AC_DEFUN([AC_CONFIG_CROND_DIR],
])
#
-# Figure out where to put udev rule files
+# Figure out where to put udev files
#
-AC_DEFUN([AC_CONFIG_UDEV_RULE_DIR],
+AC_DEFUN([AC_CONFIG_UDEV_DIR],
[
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
- AC_ARG_WITH([udev_rule_dir],
- [AS_HELP_STRING([--with-udev-rule-dir@<:@=DIR@:>@],
- [Install udev rules into DIR.])],
+ AC_ARG_WITH([udev_dir],
+ [AS_HELP_STRING([--with-udev-dir@<:@=DIR@:>@],
+ [Install udev files underneath DIR.])],
[],
- [with_udev_rule_dir=yes])
- AS_IF([test "x${with_udev_rule_dir}" != "xno"],
+ [with_udev_dir=yes])
+ AS_IF([test "x${with_udev_dir}" != "xno"],
[
- AS_IF([test "x${with_udev_rule_dir}" = "xyes"],
+ AS_IF([test "x${with_udev_dir}" = "xyes"],
[
PKG_CHECK_MODULES([udev], [udev],
[
- with_udev_rule_dir="$($PKG_CONFIG --variable=udev_dir udev)/rules.d"
+ with_udev_dir="$($PKG_CONFIG --variable=udev_dir udev)"
], [
- with_udev_rule_dir=""
+ with_udev_dir=""
])
m4_pattern_allow([^PKG_(MAJOR|MINOR|BUILD|REVISION)$])
])
- AC_MSG_CHECKING([for udev rule dir])
- udev_rule_dir="${with_udev_rule_dir}"
- AS_IF([test -n "${udev_rule_dir}"],
+ AC_MSG_CHECKING([for udev dir])
+ udev_dir="${with_udev_dir}"
+ AS_IF([test -n "${udev_dir}"],
[
- AC_MSG_RESULT(${udev_rule_dir})
+ AC_MSG_RESULT(${udev_dir})
have_udev="yes"
],
[
@@ -115,5 +115,5 @@ AC_DEFUN([AC_CONFIG_UDEV_RULE_DIR],
have_udev="disabled"
])
AC_SUBST(have_udev)
- AC_SUBST(udev_rule_dir)
+ AC_SUBST(udev_dir)
])
