diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/199-firmware.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/199-firmware.patch | 98 |
1 files changed, 0 insertions, 98 deletions
diff --git a/meta/recipes-core/systemd/systemd/199-firmware.patch b/meta/recipes-core/systemd/systemd/199-firmware.patch deleted file mode 100644 index aaab59b03b..0000000000 --- a/meta/recipes-core/systemd/systemd/199-firmware.patch +++ /dev/null | |||
@@ -1,98 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | http://cgit.freedesktop.org/systemd/systemd/patch/?id=d8d4bee76cf3b40ea923bc57d44aa0815ca9b5ff | ||
3 | |||
4 | From d8d4bee76cf3b40ea923bc57d44aa0815ca9b5ff Mon Sep 17 00:00:00 2001 | ||
5 | From: Kay Sievers <kay@vrfy.org> | ||
6 | Date: Thu, 28 Mar 2013 14:28:10 +0000 | ||
7 | Subject: build-sys: fix HAVE/ENABLE_FIRMWARE | ||
8 | |||
9 | https://bugs.freedesktop.org/show_bug.cgi?id=62864 | ||
10 | --- | ||
11 | diff --git a/configure.ac b/configure.ac | ||
12 | index 5b88bcf..e73cd5c 100644 | ||
13 | --- a/configure.ac | ||
14 | +++ b/configure.ac | ||
15 | @@ -728,6 +728,7 @@ for i in $with_firmware_path; do | ||
16 | done | ||
17 | IFS=$OLD_IFS | ||
18 | AC_SUBST(FIRMWARE_PATH) | ||
19 | +AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ]) | ||
20 | AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"]) | ||
21 | |||
22 | # ------------------------------------------------------------------------------ | ||
23 | @@ -736,7 +737,6 @@ AC_ARG_ENABLE([gudev], | ||
24 | [], [enable_gudev=yes]) | ||
25 | AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0]) ]) | ||
26 | AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"]) | ||
27 | - | ||
28 | AS_IF([test "x$enable_gudev" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ]) | ||
29 | |||
30 | # ------------------------------------------------------------------------------ | ||
31 | diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c | ||
32 | index 13922d3..c7d4319 100644 | ||
33 | --- a/src/udev/udev-builtin.c | ||
34 | +++ b/src/udev/udev-builtin.c | ||
35 | @@ -34,7 +34,7 @@ static const struct udev_builtin *builtins[] = { | ||
36 | [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid, | ||
37 | #endif | ||
38 | [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs, | ||
39 | -#ifdef ENABLE_FIRMWARE | ||
40 | +#ifdef HAVE_FIRMWARE | ||
41 | [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware, | ||
42 | #endif | ||
43 | [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb, | ||
44 | diff --git a/src/udev/udev.h b/src/udev/udev.h | ||
45 | index aa2edbe..906dfba 100644 | ||
46 | --- a/src/udev/udev.h | ||
47 | +++ b/src/udev/udev.h | ||
48 | @@ -140,7 +140,7 @@ enum udev_builtin_cmd { | ||
49 | UDEV_BUILTIN_BLKID, | ||
50 | #endif | ||
51 | UDEV_BUILTIN_BTRFS, | ||
52 | -#ifdef ENABLE_FIRMWARE | ||
53 | +#ifdef HAVE_FIRMWARE | ||
54 | UDEV_BUILTIN_FIRMWARE, | ||
55 | #endif | ||
56 | UDEV_BUILTIN_HWDB, | ||
57 | @@ -169,7 +169,7 @@ struct udev_builtin { | ||
58 | extern const struct udev_builtin udev_builtin_blkid; | ||
59 | #endif | ||
60 | extern const struct udev_builtin udev_builtin_btrfs; | ||
61 | -#ifdef ENABLE_FIRMWARE | ||
62 | +#ifdef HAVE_FIRMWARE | ||
63 | extern const struct udev_builtin udev_builtin_firmware; | ||
64 | #endif | ||
65 | extern const struct udev_builtin udev_builtin_hwdb; | ||
66 | diff --git a/src/udev/udevd.c b/src/udev/udevd.c | ||
67 | index b30bedf..2ad7388 100644 | ||
68 | --- a/src/udev/udevd.c | ||
69 | +++ b/src/udev/udevd.c | ||
70 | @@ -98,7 +98,7 @@ struct event { | ||
71 | dev_t devnum; | ||
72 | int ifindex; | ||
73 | bool is_block; | ||
74 | -#ifdef ENABLE_FIRMWARE | ||
75 | +#ifdef HAVE_FIRMWARE | ||
76 | bool nodelay; | ||
77 | #endif | ||
78 | }; | ||
79 | @@ -444,7 +444,7 @@ static int event_queue_insert(struct udev_device *dev) | ||
80 | event->devnum = udev_device_get_devnum(dev); | ||
81 | event->is_block = streq("block", udev_device_get_subsystem(dev)); | ||
82 | event->ifindex = udev_device_get_ifindex(dev); | ||
83 | -#ifdef ENABLE_FIRMWARE | ||
84 | +#ifdef HAVE_FIRMWARE | ||
85 | if (streq(udev_device_get_subsystem(dev), "firmware")) | ||
86 | event->nodelay = true; | ||
87 | #endif | ||
88 | @@ -527,7 +527,7 @@ static bool is_devpath_busy(struct event *event) | ||
89 | return true; | ||
90 | } | ||
91 | |||
92 | -#ifdef ENABLE_FIRMWARE | ||
93 | +#ifdef HAVE_FIRMWARE | ||
94 | /* allow to bypass the dependency tracking */ | ||
95 | if (event->nodelay) | ||
96 | continue; | ||
97 | -- | ||
98 | cgit v0.9.0.2-2-gbebe | ||