| 1 |
floppym 13/03/28 22:57:21 |
| 2 |
|
| 3 |
Added: 199-firmware.patch |
| 4 |
Log: |
| 5 |
Add patch to resolve issue with firmware built-in, bug 463604. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-apps/systemd/files/199-firmware.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/files/199-firmware.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/files/199-firmware.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 199-firmware.patch |
| 16 |
=================================================================== |
| 17 |
This is same as upstream commit: |
| 18 |
|
| 19 |
http://cgit.freedesktop.org/systemd/systemd/commit/?id=d8d4bee76cf3b40ea923bc57d44aa0815ca9b5ff |
| 20 |
|
| 21 |
Except we patch configure and config.h.in to avoid autotools. |
| 22 |
|
| 23 |
--- src/udev/udev-builtin.c |
| 24 |
+++ src/udev/udev-builtin.c |
| 25 |
@@ -34,7 +34,7 @@ static const struct udev_builtin *builtins[] = { |
| 26 |
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid, |
| 27 |
#endif |
| 28 |
[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs, |
| 29 |
-#ifdef ENABLE_FIRMWARE |
| 30 |
+#ifdef HAVE_FIRMWARE |
| 31 |
[UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware, |
| 32 |
#endif |
| 33 |
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb, |
| 34 |
--- src/udev/udev.h |
| 35 |
+++ src/udev/udev.h |
| 36 |
@@ -140,7 +140,7 @@ enum udev_builtin_cmd { |
| 37 |
UDEV_BUILTIN_BLKID, |
| 38 |
#endif |
| 39 |
UDEV_BUILTIN_BTRFS, |
| 40 |
-#ifdef ENABLE_FIRMWARE |
| 41 |
+#ifdef HAVE_FIRMWARE |
| 42 |
UDEV_BUILTIN_FIRMWARE, |
| 43 |
#endif |
| 44 |
UDEV_BUILTIN_HWDB, |
| 45 |
@@ -169,7 +169,7 @@ struct udev_builtin { |
| 46 |
extern const struct udev_builtin udev_builtin_blkid; |
| 47 |
#endif |
| 48 |
extern const struct udev_builtin udev_builtin_btrfs; |
| 49 |
-#ifdef ENABLE_FIRMWARE |
| 50 |
+#ifdef HAVE_FIRMWARE |
| 51 |
extern const struct udev_builtin udev_builtin_firmware; |
| 52 |
#endif |
| 53 |
extern const struct udev_builtin udev_builtin_hwdb; |
| 54 |
--- src/udev/udevd.c |
| 55 |
+++ src/udev/udevd.c |
| 56 |
@@ -98,7 +98,7 @@ struct event { |
| 57 |
dev_t devnum; |
| 58 |
int ifindex; |
| 59 |
bool is_block; |
| 60 |
-#ifdef ENABLE_FIRMWARE |
| 61 |
+#ifdef HAVE_FIRMWARE |
| 62 |
bool nodelay; |
| 63 |
#endif |
| 64 |
}; |
| 65 |
@@ -444,7 +444,7 @@ static int event_queue_insert(struct udev_device *dev) |
| 66 |
event->devnum = udev_device_get_devnum(dev); |
| 67 |
event->is_block = streq("block", udev_device_get_subsystem(dev)); |
| 68 |
event->ifindex = udev_device_get_ifindex(dev); |
| 69 |
-#ifdef ENABLE_FIRMWARE |
| 70 |
+#ifdef HAVE_FIRMWARE |
| 71 |
if (streq(udev_device_get_subsystem(dev), "firmware")) |
| 72 |
event->nodelay = true; |
| 73 |
#endif |
| 74 |
@@ -527,7 +527,7 @@ static bool is_devpath_busy(struct event *event) |
| 75 |
return true; |
| 76 |
} |
| 77 |
|
| 78 |
-#ifdef ENABLE_FIRMWARE |
| 79 |
+#ifdef HAVE_FIRMWARE |
| 80 |
/* allow to bypass the dependency tracking */ |
| 81 |
if (event->nodelay) |
| 82 |
continue; |
| 83 |
--- configure |
| 84 |
+++ configure |
| 85 |
@@ -18066,6 +18099,11 @@ |
| 86 |
done |
| 87 |
IFS=$OLD_IFS |
| 88 |
|
| 89 |
+if test "x${FIRMWARE_PATH}" != "x"; then : |
| 90 |
+ |
| 91 |
+$as_echo "#define HAVE_FIRMWARE 1" >>confdefs.h |
| 92 |
+ |
| 93 |
+fi |
| 94 |
if test "x${FIRMWARE_PATH}" != "x"; then |
| 95 |
ENABLE_FIRMWARE_TRUE= |
| 96 |
ENABLE_FIRMWARE_FALSE='#' |
| 97 |
--- config.h.in |
| 98 |
+++ config.h.in |
| 99 |
@@ -57,6 +57,9 @@ |
| 100 |
/* Define to 1 if you have the <fcntl.h> header file. */ |
| 101 |
#undef HAVE_FCNTL_H |
| 102 |
|
| 103 |
+/* Define if FIRMWARE is available */ |
| 104 |
+#undef HAVE_FIRMWARE |
| 105 |
+ |
| 106 |
/* GCRYPT available */ |
| 107 |
#undef HAVE_GCRYPT |
Archives