Attachment #343560 for bug #463604

Lines 728-733 for i in $with_firmware_path; do Link Here

(-)a/configure.ac (-1 / +1 lines)
728	done	728	done
729	IFS=$OLD_IFS	729	IFS=$OLD_IFS
730	AC_SUBST(FIRMWARE_PATH)	730	AC_SUBST(FIRMWARE_PATH)
		731	AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ])
731	AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])	732	AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
732		733
733	# ------------------------------------------------------------------------------	734	# ------------------------------------------------------------------------------
Lines 736-742 AC_ARG_ENABLE([gudev], Link Here
736	[], [enable_gudev=yes])	737	[], [enable_gudev=yes])
737	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]) ])	738	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]) ])
738	AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])	739	AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])
739
740	AS_IF([test "x$enable_gudev" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ])	740	AS_IF([test "x$enable_gudev" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ])
741		741
742	# ------------------------------------------------------------------------------	742	# ------------------------------------------------------------------------------

Lines 34-40 static const struct udev_builtin *builtins[] = { Link Here

(-)a/src/udev/udev-builtin.c (-1 / +1 lines)
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,

Lines 140-146 enum udev_builtin_cmd { Link Here

(-)a/src/udev/udev.h (-2 / +2 lines)
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;




        dev_t devnum;
        int ifindex;
        bool is_block;
#ifdef HAVE_FIRMWARE
        bool nodelay;
#endif
};

        event->devnum = udev_device_get_devnum(dev);
        event->is_block = streq("block", udev_device_get_subsystem(dev));
        event->ifindex = udev_device_get_ifindex(dev);
#ifdef HAVE_FIRMWARE
        if (streq(udev_device_get_subsystem(dev), "firmware"))
                event->nodelay = true;
#endif

                        return true;
                }

#ifdef HAVE_FIRMWARE
                /* allow to bypass the dependency tracking */
                if (event->nodelay)
                        continue;
-

Return to bug 463604

Lines 98-104 struct event { Link Here

(-)a/src/udev/udevd.c (-4 / +3 lines)
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	-