|
Line
Link Here
|
| 0 |
-- src/udev/udev-builtin.c |
0 |
++ src/udev/udev-builtin.c |
|
Lines 34-40
static const struct udev_builtin *builtins[] = {
Link Here
|
| 34 |
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid, |
34 |
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid, |
| 35 |
#endif |
35 |
#endif |
| 36 |
[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs, |
36 |
[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs, |
| 37 |
#ifdef ENABLE_FIRMWARE |
37 |
#ifdef HAVE_FIRMWARE |
| 38 |
[UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware, |
38 |
[UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware, |
| 39 |
#endif |
39 |
#endif |
| 40 |
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb, |
40 |
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb, |
| 41 |
-- src/udev/udev.h |
41 |
++ src/udev/udev.h |
|
Lines 140-146
enum udev_builtin_cmd {
Link Here
|
| 140 |
UDEV_BUILTIN_BLKID, |
140 |
UDEV_BUILTIN_BLKID, |
| 141 |
#endif |
141 |
#endif |
| 142 |
UDEV_BUILTIN_BTRFS, |
142 |
UDEV_BUILTIN_BTRFS, |
| 143 |
#ifdef ENABLE_FIRMWARE |
143 |
#ifdef HAVE_FIRMWARE |
| 144 |
UDEV_BUILTIN_FIRMWARE, |
144 |
UDEV_BUILTIN_FIRMWARE, |
| 145 |
#endif |
145 |
#endif |
| 146 |
UDEV_BUILTIN_HWDB, |
146 |
UDEV_BUILTIN_HWDB, |
|
Lines 169-175
struct udev_builtin {
Link Here
|
| 169 |
extern const struct udev_builtin udev_builtin_blkid; |
169 |
extern const struct udev_builtin udev_builtin_blkid; |
| 170 |
#endif |
170 |
#endif |
| 171 |
extern const struct udev_builtin udev_builtin_btrfs; |
171 |
extern const struct udev_builtin udev_builtin_btrfs; |
| 172 |
#ifdef ENABLE_FIRMWARE |
172 |
#ifdef HAVE_FIRMWARE |
| 173 |
extern const struct udev_builtin udev_builtin_firmware; |
173 |
extern const struct udev_builtin udev_builtin_firmware; |
| 174 |
#endif |
174 |
#endif |
| 175 |
extern const struct udev_builtin udev_builtin_hwdb; |
175 |
extern const struct udev_builtin udev_builtin_hwdb; |
| 176 |
-- src/udev/udevd.c |
176 |
++ src/udev/udevd.c |
|
Lines 98-104
struct event {
Link Here
|
| 98 |
dev_t devnum; |
98 |
dev_t devnum; |
| 99 |
int ifindex; |
99 |
int ifindex; |
| 100 |
bool is_block; |
100 |
bool is_block; |
| 101 |
#ifdef ENABLE_FIRMWARE |
101 |
#ifdef HAVE_FIRMWARE |
| 102 |
bool nodelay; |
102 |
bool nodelay; |
| 103 |
#endif |
103 |
#endif |
| 104 |
}; |
104 |
}; |
|
Lines 444-450
static int event_queue_insert(struct udev_device *dev)
Link Here
|
| 444 |
event->devnum = udev_device_get_devnum(dev); |
444 |
event->devnum = udev_device_get_devnum(dev); |
| 445 |
event->is_block = streq("block", udev_device_get_subsystem(dev)); |
445 |
event->is_block = streq("block", udev_device_get_subsystem(dev)); |
| 446 |
event->ifindex = udev_device_get_ifindex(dev); |
446 |
event->ifindex = udev_device_get_ifindex(dev); |
| 447 |
#ifdef ENABLE_FIRMWARE |
447 |
#ifdef HAVE_FIRMWARE |
| 448 |
if (streq(udev_device_get_subsystem(dev), "firmware")) |
448 |
if (streq(udev_device_get_subsystem(dev), "firmware")) |
| 449 |
event->nodelay = true; |
449 |
event->nodelay = true; |
| 450 |
#endif |
450 |
#endif |
|
Lines 527-533
static bool is_devpath_busy(struct event *event)
Link Here
|
| 527 |
return true; |
527 |
return true; |
| 528 |
} |
528 |
} |
| 529 |
|
529 |
|
| 530 |
#ifdef ENABLE_FIRMWARE |
530 |
#ifdef HAVE_FIRMWARE |
| 531 |
/* allow to bypass the dependency tracking */ |
531 |
/* allow to bypass the dependency tracking */ |
| 532 |
if (event->nodelay) |
532 |
if (event->nodelay) |
| 533 |
continue; |
533 |
continue; |
| 534 |
-- configure |
534 |
++ configure |
|
Lines 18066-18071
Link Here
|
| 18066 |
done |
18099 |
done |
| 18067 |
IFS=$OLD_IFS |
18100 |
IFS=$OLD_IFS |
| 18068 |
|
18101 |
|
|
|
18102 |
if test "x${FIRMWARE_PATH}" != "x"; then : |
| 18103 |
|
| 18104 |
$as_echo "#define HAVE_FIRMWARE 1" >>confdefs.h |
| 18105 |
|
| 18106 |
fi |
| 18069 |
if test "x${FIRMWARE_PATH}" != "x"; then |
18107 |
if test "x${FIRMWARE_PATH}" != "x"; then |
| 18070 |
ENABLE_FIRMWARE_TRUE= |
18108 |
ENABLE_FIRMWARE_TRUE= |
| 18071 |
ENABLE_FIRMWARE_FALSE='#' |
18109 |
ENABLE_FIRMWARE_FALSE='#' |
| 18072 |
-- config.h.in |
18110 |
++ config.h.in |
|
Lines 57-62
Link Here
|
| 57 |
/* Define to 1 if you have the <fcntl.h> header file. */ |
57 |
/* Define to 1 if you have the <fcntl.h> header file. */ |
| 58 |
#undef HAVE_FCNTL_H |
58 |
#undef HAVE_FCNTL_H |
| 59 |
|
59 |
|
|
|
60 |
/* Define if FIRMWARE is available */ |
| 61 |
#undef HAVE_FIRMWARE |
| 62 |
|
| 60 |
/* GCRYPT available */ |
63 |
/* GCRYPT available */ |
| 61 |
#undef HAVE_GCRYPT |
64 |
#undef HAVE_GCRYPT |
| 62 |
|
65 |
|
