summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
authorAnders Olofsson <Anders.Olofsson@axis.com>2012-11-16 01:17:18 +0100
committerKay Sievers <kay@vrfy.org>2012-11-16 01:17:18 +0100
commitf553b3b1074151200187df916427a1468186435e (patch)
treedfbbab0e5db3b6008588a65bdae169274602de20 /src/udev
parentd4205751d4643c272059a3728045929dd0e5e800 (diff)
udev: make blkid optional
I'm building systemd for an embedded system and we would prefer not having to include the entire util-linux package just to get a libblkid whose functionality we don't need.
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/udev-builtin.c2
-rw-r--r--src/udev/udev.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index ee81b2d713..26d65edd47 100644
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -30,7 +30,9 @@
static bool initialized;
static const struct udev_builtin *builtins[] = {
+#ifdef HAVE_BLKID
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
+#endif
[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
[UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
diff --git a/src/udev/udev.h b/src/udev/udev.h
index 82cd2ad6d0..63de30c02d 100644
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -134,7 +134,9 @@ int udev_ctrl_get_set_children_max(struct udev_ctrl_msg *ctrl_msg);
/* built-in commands */
enum udev_builtin_cmd {
+#ifdef HAVE_BLKID
UDEV_BUILTIN_BLKID,
+#endif
UDEV_BUILTIN_BTRFS,
UDEV_BUILTIN_FIRMWARE,
UDEV_BUILTIN_HWDB,
@@ -157,7 +159,9 @@ struct udev_builtin {
bool (*validate)(struct udev *udev);
bool run_once;
};
+#ifdef HAVE_BLKID
extern const struct udev_builtin udev_builtin_blkid;
+#endif
extern const struct udev_builtin udev_builtin_btrfs;
extern const struct udev_builtin udev_builtin_firmware;
extern const struct udev_builtin udev_builtin_hwdb;