systemd: restore userspace firmware loading support

This changes the minimum required Linux version from 3.7 back to 3.0. [YOCTO #7409] (From OE-Core rev: 31163abc7bedd477c1aad10e6d1f47dbee194513) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
author: Jonathan Liu <net147@gmail.com> 2015-03-19 15:38:32 +1100
committer: Richard Purdie <richard.purdie@linuxfoundation.org> 2015-03-23 10:33:06 +0000
commit: 814252efd028ec99a15303d9a551e950e49a6726 (patch)
tree: 02e2e7966f60d10b0834fceada27a543f3092c66 /meta
parent: bbc139617637392a9b0fb2e9332a42ad64a4a556 (diff)
download: poky-814252efd028ec99a15303d9a551e950e49a6726.tar.gz
3 files changed, 398 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch b/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
new file mode 100644
index 0000000000..fe2ba5328d
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
@@ -0,0 +1,28 @@
+From 4f0a722489154da99e7f6b3051afde984eed2f74 Mon Sep 17 00:00:00 2001
+From: Jonathan Liu <net147@gmail.com>
+Date: Thu, 19 Mar 2015 15:01:29 +1100
+Subject: [PATCH] Revert "rules: remove firmware loading rules"
+This reverts commit 70e7d754ddb356fb1a2942b262f8cee9650e2a19.
+Userspace firmware loading support is needed for Linux < 3.7.
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Jonathan Liu <net147@gmail.com>
+---
+ rules/50-firmware.rules | 3 +++
+ 1 file changed, 3 insertions(+)
+ create mode 100644 rules/50-firmware.rules
+diff --git a/rules/50-firmware.rules b/rules/50-firmware.rules
+new file mode 100644
+index 0000000..f0ae684
+--- /dev/null
+++ b/rules/50-firmware.rules
+@@ -0,0 +1,3 @@
+# do not edit this file, it will be overwritten on update
+
+SUBSYSTEM=="firmware", ACTION=="add", RUN{builtin}="firmware"
+-- 
+2.3.3
diff --git a/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch b/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
new file mode 100644
index 0000000000..3e3aa278bd
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
@@ -0,0 +1,367 @@
+From 7f074def4e32045353ba4336d703e17b8de7ec4e Mon Sep 17 00:00:00 2001
+From: Jonathan Liu <net147@gmail.com>
+Date: Thu, 19 Mar 2015 15:01:33 +1100
+Subject: [PATCH] Revert "udev: remove userspace firmware loading support"
+This reverts commit be2ea723b1d023b3d385d3b791ee4607cbfb20ca.
+Userspace firmware loading support is needed for Linux < 3.7.
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Jonathan Liu <net147@gmail.com>
+---
+ Makefile.am                      |  12 +++
+ README                           |   9 ++-
+ TODO                             |   1 +
+ configure.ac                     |  20 +++++
+ src/udev/udev-builtin-firmware.c | 154 +++++++++++++++++++++++++++++++++++++++
+ src/udev/udev-builtin.c          |   3 +
+ src/udev/udev.h                  |   6 ++
+ src/udev/udevd.c                 |  13 ++++
+ 8 files changed, 214 insertions(+), 4 deletions(-)
+ create mode 100644 src/udev/udev-builtin-firmware.c
+diff --git a/Makefile.am b/Makefile.am
+index bf04d31..9394700 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -3678,6 +3678,18 @@ libudev_core_la_LIBADD = \
+        $(BLKID_LIBS) \
+        $(KMOD_LIBS)
+ 
+libudev_core_la_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
+
+if ENABLE_FIRMWARE
+libudev_core_la_SOURCES += \
+       src/udev/udev-builtin-firmware.c
+
+dist_udevrules_DATA += \
+       rules/50-firmware.rules
+endif
+
+ if HAVE_KMOD
+ libudev_core_la_SOURCES += \
+        src/udev/udev-builtin-kmod.c
+diff --git a/README b/README
+index c722092..db382d2 100644
+--- a/README
+++ b/README
+@@ -36,7 +36,8 @@ LICENSE:
+         - except src/udev/* which is (currently still) GPLv2, GPLv2+
+ 
+ REQUIREMENTS:
+-        Linux kernel >= 3.7
+        Linux kernel >= 3.0
+        Linux kernel >= 3.3 for loop device partition support features with nspawn
+         Linux kernel >= 3.8 for Smack support
+ 
+         Kernel Config Options:
+@@ -51,14 +52,14 @@ REQUIREMENTS:
+           CONFIG_PROC_FS
+           CONFIG_FHANDLE (libudev, mount and bind mount handling)
+ 
+-        udev will fail to work with the legacy sysfs layout:
+        Udev will fail to work with the legacy layout:
+           CONFIG_SYSFS_DEPRECATED=n
+ 
+         Legacy hotplug slows down the system and confuses udev:
+           CONFIG_UEVENT_HELPER_PATH=""
+ 
+-        Userspace firmware loading is not supported and should
+-        be disabled in the kernel:
+        Userspace firmware loading is deprecated, will go away, and
+        sometimes causes problems:
+           CONFIG_FW_LOADER_USER_HELPER=n
+ 
+         Some udev rules and virtualization detection relies on it:
+diff --git a/TODO b/TODO
+index 255a4f2..407bdd0 100644
+--- a/TODO
+++ b/TODO
+@@ -727,6 +727,7 @@ Features:
+ * ExecOnFailure=/usr/bin/foo
+ 
+ * udev:
+  - remove src/udev/udev-builtin-firmware.c (CONFIG_FW_LOADER_USER_HELPER=n)
+   - move to LGPL
+   - kill scsi_id
+   - add trigger --subsystem-match=usb/usb_device device
+diff --git a/configure.ac b/configure.ac
+index 97a29d6..13b80ce 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -1245,6 +1245,25 @@ fi
+ AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"])
+ 
+ # ------------------------------------------------------------------------------
+AC_ARG_WITH(firmware-path,
+       AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
+          [Firmware search path (default="")]),
+       [], [with_firmware_path=""])
+OLD_IFS=$IFS
+IFS=:
+for i in $with_firmware_path; do
+       if test "x${FIRMWARE_PATH}" = "x"; then
+              FIRMWARE_PATH="\\\"${i}/\\\""
+       else
+              FIRMWARE_PATH="${FIRMWARE_PATH}, \\\"${i}/\\\""
+       fi
+done
+IFS=$OLD_IFS
+AC_SUBST(FIRMWARE_PATH)
+AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ])
+AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
+
+# ------------------------------------------------------------------------------
+ AC_ARG_ENABLE([gudev],
+        AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]),
+        [], [enable_gudev=yes])
+@@ -1533,6 +1552,7 @@ AC_MSG_RESULT([
+         Build Python:            ${PYTHON}
+         Installation Python:     ${PYTHON_BINARY}
+         sphinx binary:           ${SPHINX_BUILD}
+        firmware path:           ${FIRMWARE_PATH}
+         PAM modules dir:         ${with_pamlibdir}
+         PAM configuration dir:   ${with_pamconfdir}
+         D-Bus policy dir:        ${with_dbuspolicydir}
+diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c
+new file mode 100644
+index 0000000..bd8c2fb
+--- /dev/null
+++ b/src/udev/udev-builtin-firmware.c
+@@ -0,0 +1,154 @@
+/*
+ * firmware - Kernel firmware loader
+ *
+ * Copyright (C) 2009 Piter Punk <piterpunk@slackware.com>
+ * Copyright (C) 2009-2011 Kay Sievers <kay@vrfy.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details:*
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <getopt.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <sys/utsname.h>
+#include <sys/stat.h>
+
+#include "udev.h"
+
+static bool set_loading(struct udev *udev, char *loadpath, const char *state) {
+        FILE *ldfile;
+
+        ldfile = fopen(loadpath, "we");
+        if (ldfile == NULL) {
+                log_error("error: can not open '%s'", loadpath);
+                return false;
+        };
+        fprintf(ldfile, "%s\n", state);
+        fclose(ldfile);
+        return true;
+}
+
+static bool copy_firmware(struct udev *udev, const char *source, const char *target, size_t size) {
+        char *buf;
+        FILE *fsource = NULL, *ftarget = NULL;
+        bool ret = false;
+
+        buf = malloc(size);
+        if (buf == NULL) {
+                log_error("No memory available to load firmware file");
+                return false;
+        }
+
+        log_debug("writing '%s' (%zi) to '%s'", source, size, target);
+
+        fsource = fopen(source, "re");
+        if (fsource == NULL)
+                goto exit;
+        ftarget = fopen(target, "we");
+        if (ftarget == NULL)
+                goto exit;
+        if (fread(buf, size, 1, fsource) != 1)
+                goto exit;
+        if (fwrite(buf, size, 1, ftarget) == 1)
+                ret = true;
+exit:
+        if (ftarget != NULL)
+                fclose(ftarget);
+        if (fsource != NULL)
+                fclose(fsource);
+        free(buf);
+        return ret;
+}
+
+static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], bool test) {
+        struct udev *udev = udev_device_get_udev(dev);
+        static const char *searchpath[] = { FIRMWARE_PATH };
+        char loadpath[UTIL_PATH_SIZE];
+        char datapath[UTIL_PATH_SIZE];
+        char fwpath[UTIL_PATH_SIZE];
+        const char *firmware;
+        FILE *fwfile = NULL;
+        struct utsname kernel;
+        struct stat statbuf;
+        unsigned int i;
+        int rc = EXIT_SUCCESS;
+
+        firmware = udev_device_get_property_value(dev, "FIRMWARE");
+        if (firmware == NULL) {
+                log_error("firmware parameter missing");
+                rc = EXIT_FAILURE;
+                goto exit;
+        }
+
+        /* lookup firmware file */
+        uname(&kernel);
+        for (i = 0; i < ELEMENTSOF(searchpath); i++) {
+                strscpyl(fwpath, sizeof(fwpath), searchpath[i], kernel.release, "/", firmware, NULL);
+                fwfile = fopen(fwpath, "re");
+                if (fwfile != NULL)
+                        break;
+
+                strscpyl(fwpath, sizeof(fwpath), searchpath[i], firmware, NULL);
+                fwfile = fopen(fwpath, "re");
+                if (fwfile != NULL)
+                        break;
+        }
+
+        strscpyl(loadpath, sizeof(loadpath), udev_device_get_syspath(dev), "/loading", NULL);
+
+        if (fwfile == NULL) {
+                log_debug("did not find firmware file '%s'", firmware);
+                rc = EXIT_FAILURE;
+                /*
+                 * Do not cancel the request in the initrd, the real root might have
+                 * the firmware file and the 'coldplug' run in the real root will find
+                 * this pending request and fulfill or cancel it.
+                 * */
+                if (!in_initrd())
+                        set_loading(udev, loadpath, "-1");
+                goto exit;
+        }
+
+        if (stat(fwpath, &statbuf) < 0 || statbuf.st_size == 0) {
+                if (!in_initrd())
+                        set_loading(udev, loadpath, "-1");
+                rc = EXIT_FAILURE;
+                goto exit;
+        }
+
+        if (!set_loading(udev, loadpath, "1"))
+                goto exit;
+
+        strscpyl(datapath, sizeof(datapath), udev_device_get_syspath(dev), "/data", NULL);
+        if (!copy_firmware(udev, fwpath, datapath, statbuf.st_size)) {
+                log_error("error sending firmware '%s' to device", firmware);
+                set_loading(udev, loadpath, "-1");
+                rc = EXIT_FAILURE;
+                goto exit;
+        };
+
+        set_loading(udev, loadpath, "0");
+exit:
+        if (fwfile)
+                fclose(fwfile);
+        return rc;
+}
+
+const struct udev_builtin udev_builtin_firmware = {
+        .name = "firmware",
+        .cmd = builtin_firmware,
+        .help = "kernel firmware loader",
+        .run_once = true,
+};
+diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
+index 1950ec2..f21c0b6 100644
+--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
+@@ -34,6 +34,9 @@ static const struct udev_builtin *builtins[] = {
+         [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
+ #endif
+         [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
+#ifdef HAVE_FIRMWARE
+        [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
+#endif
+         [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
+         [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
+         [UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard,
+diff --git a/src/udev/udev.h b/src/udev/udev.h
+index dece6ec..f7ee1e7 100644
+--- a/src/udev/udev.h
+++ b/src/udev/udev.h
+@@ -151,6 +151,9 @@ enum udev_builtin_cmd {
+         UDEV_BUILTIN_BLKID,
+ #endif
+         UDEV_BUILTIN_BTRFS,
+#ifdef HAVE_FIRMWARE
+        UDEV_BUILTIN_FIRMWARE,
+#endif
+         UDEV_BUILTIN_HWDB,
+         UDEV_BUILTIN_INPUT_ID,
+         UDEV_BUILTIN_KEYBOARD,
+@@ -179,6 +182,9 @@ struct udev_builtin {
+ extern const struct udev_builtin udev_builtin_blkid;
+ #endif
+ extern const struct udev_builtin udev_builtin_btrfs;
+#ifdef HAVE_FIRMWARE
+extern const struct udev_builtin udev_builtin_firmware;
+#endif
+ extern const struct udev_builtin udev_builtin_hwdb;
+ extern const struct udev_builtin udev_builtin_input_id;
+ extern const struct udev_builtin udev_builtin_keyboard;
+diff --git a/src/udev/udevd.c b/src/udev/udevd.c
+index 99d4c89..71af1e1 100644
+--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
+@@ -99,6 +99,9 @@ struct event {
+         dev_t devnum;
+         int ifindex;
+         bool is_block;
+#ifdef HAVE_FIRMWARE
+        bool nodelay;
+#endif
+ };
+ 
+ static inline struct event *node_to_event(struct udev_list_node *node) {
+@@ -472,6 +475,10 @@ static int event_queue_insert(struct udev_device *dev) {
+         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
+ 
+         log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev),
+              udev_device_get_action(dev), udev_device_get_subsystem(dev));
+@@ -548,6 +555,12 @@ static bool is_devpath_busy(struct event *event) {
+                         return true;
+                 }
+ 
+#ifdef HAVE_FIRMWARE
+                /* allow to bypass the dependency tracking */
+                if (event->nodelay)
+                        continue;
+#endif
+
+                 /* parent device event found */
+                 if (event->devpath[common] == '/') {
+                         event->delaying_seqnum = loop_event->seqnum;
+-- 
+2.3.3
diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index 31caa30345..5ecdda9e5b 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -44,6 +44,8 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master \
           file://0002-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch \
           file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \
           file://0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch \
+           file://0014-Revert-rules-remove-firmware-loading-rules.patch \
+           file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
           file://tmpfiles-pam.patch \
           file://touchscreen.rules \
           file://00-create-volatile.conf \
@@ -110,6 +112,7 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
                 --enable-split-usr \
                 --without-python \
                 --with-sysvrcnd-path=${sysconfdir} \
+                 --with-firmware-path=${rootlibdir}/firmware \
               "
 # uclibc does not have NSS
 EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname "
author	Jonathan Liu <net147@gmail.com>	2015-03-19 15:38:32 +1100
committer	Richard Purdie <richard.purdie@linuxfoundation.org>	2015-03-23 10:33:06 +0000
commit	814252efd028ec99a15303d9a551e950e49a6726 (patch)
tree	02e2e7966f60d10b0834fceada27a543f3092c66 /meta
parent	bbc139617637392a9b0fb2e9332a42ad64a4a556 (diff)
download	poky-814252efd028ec99a15303d9a551e950e49a6726.tar.gz

diff --git a/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch b/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch new file mode 100644 index 0000000000..fe2ba5328d --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
@@ -0,0 +1,28 @@
		1	From 4f0a722489154da99e7f6b3051afde984eed2f74 Mon Sep 17 00:00:00 2001
		2	From: Jonathan Liu <net147@gmail.com>
		3	Date: Thu, 19 Mar 2015 15:01:29 +1100
		4	Subject: [PATCH] Revert "rules: remove firmware loading rules"
		5
		6	This reverts commit 70e7d754ddb356fb1a2942b262f8cee9650e2a19.
		7	Userspace firmware loading support is needed for Linux < 3.7.
		8
		9	Upstream-Status: Inappropriate [OE specific]
		10
		11	Signed-off-by: Jonathan Liu <net147@gmail.com>
		12	---
		13	rules/50-firmware.rules \| 3 +++
		14	1 file changed, 3 insertions(+)
		15	create mode 100644 rules/50-firmware.rules
		16
		17	diff --git a/rules/50-firmware.rules b/rules/50-firmware.rules
		18	new file mode 100644
		19	index 0000000..f0ae684
		20	--- /dev/null
		21	+++ b/rules/50-firmware.rules
		22	@@ -0,0 +1,3 @@
		23	+# do not edit this file, it will be overwritten on update
		24	+
		25	+SUBSYSTEM=="firmware", ACTION=="add", RUN{builtin}="firmware"
		26	--
		27	2.3.3
		28


diff --git a/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch b/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch new file mode 100644 index 0000000000..3e3aa278bd --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
@@ -0,0 +1,367 @@
		1	From 7f074def4e32045353ba4336d703e17b8de7ec4e Mon Sep 17 00:00:00 2001
		2	From: Jonathan Liu <net147@gmail.com>
		3	Date: Thu, 19 Mar 2015 15:01:33 +1100
		4	Subject: [PATCH] Revert "udev: remove userspace firmware loading support"
		5
		6	This reverts commit be2ea723b1d023b3d385d3b791ee4607cbfb20ca.
		7	Userspace firmware loading support is needed for Linux < 3.7.
		8
		9	Upstream-Status: Inappropriate [OE specific]
		10
		11	Signed-off-by: Jonathan Liu <net147@gmail.com>
		12	---
		13	Makefile.am \| 12 +++
		14	README \| 9 ++-
		15	TODO \| 1 +
		16	configure.ac \| 20 +++++
		17	src/udev/udev-builtin-firmware.c \| 154 +++++++++++++++++++++++++++++++++++++++
		18	src/udev/udev-builtin.c \| 3 +
		19	src/udev/udev.h \| 6 ++
		20	src/udev/udevd.c \| 13 ++++
		21	8 files changed, 214 insertions(+), 4 deletions(-)
		22	create mode 100644 src/udev/udev-builtin-firmware.c
		23
		24	diff --git a/Makefile.am b/Makefile.am
		25	index bf04d31..9394700 100644
		26	--- a/Makefile.am
		27	+++ b/Makefile.am
		28	@@ -3678,6 +3678,18 @@ libudev_core_la_LIBADD = \
		29	$(BLKID_LIBS) \
		30	$(KMOD_LIBS)
		31
		32	+libudev_core_la_CPPFLAGS = \
		33	+ $(AM_CPPFLAGS) \
		34	+ -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
		35	+
		36	+if ENABLE_FIRMWARE
		37	+libudev_core_la_SOURCES += \
		38	+ src/udev/udev-builtin-firmware.c
		39	+
		40	+dist_udevrules_DATA += \
		41	+ rules/50-firmware.rules
		42	+endif
		43	+
		44	if HAVE_KMOD
		45	libudev_core_la_SOURCES += \
		46	src/udev/udev-builtin-kmod.c
		47	diff --git a/README b/README
		48	index c722092..db382d2 100644
		49	--- a/README
		50	+++ b/README
		51	@@ -36,7 +36,8 @@ LICENSE:
		52	- except src/udev/* which is (currently still) GPLv2, GPLv2+
		53
		54	REQUIREMENTS:
		55	- Linux kernel >= 3.7
		56	+ Linux kernel >= 3.0
		57	+ Linux kernel >= 3.3 for loop device partition support features with nspawn
		58	Linux kernel >= 3.8 for Smack support
		59
		60	Kernel Config Options:
		61	@@ -51,14 +52,14 @@ REQUIREMENTS:
		62	CONFIG_PROC_FS
		63	CONFIG_FHANDLE (libudev, mount and bind mount handling)
		64
		65	- udev will fail to work with the legacy sysfs layout:
		66	+ Udev will fail to work with the legacy layout:
		67	CONFIG_SYSFS_DEPRECATED=n
		68
		69	Legacy hotplug slows down the system and confuses udev:
		70	CONFIG_UEVENT_HELPER_PATH=""
		71
		72	- Userspace firmware loading is not supported and should
		73	- be disabled in the kernel:
		74	+ Userspace firmware loading is deprecated, will go away, and
		75	+ sometimes causes problems:
		76	CONFIG_FW_LOADER_USER_HELPER=n
		77
		78	Some udev rules and virtualization detection relies on it:
		79	diff --git a/TODO b/TODO
		80	index 255a4f2..407bdd0 100644
		81	--- a/TODO
		82	+++ b/TODO
		83	@@ -727,6 +727,7 @@ Features:
		84	* ExecOnFailure=/usr/bin/foo
		85
		86	* udev:
		87	+ - remove src/udev/udev-builtin-firmware.c (CONFIG_FW_LOADER_USER_HELPER=n)
		88	- move to LGPL
		89	- kill scsi_id
		90	- add trigger --subsystem-match=usb/usb_device device
		91	diff --git a/configure.ac b/configure.ac
		92	index 97a29d6..13b80ce 100644
		93	--- a/configure.ac
		94	+++ b/configure.ac
		95	@@ -1245,6 +1245,25 @@ fi
		96	AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"])
		97
		98	# ------------------------------------------------------------------------------
		99	+AC_ARG_WITH(firmware-path,
		100	+ AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
		101	+ [Firmware search path (default="")]),
		102	+ [], [with_firmware_path=""])
		103	+OLD_IFS=$IFS
		104	+IFS=:
		105	+for i in $with_firmware_path; do
		106	+ if test "x${FIRMWARE_PATH}" = "x"; then
		107	+ FIRMWARE_PATH="\\\"${i}/\\\""
		108	+ else
		109	+ FIRMWARE_PATH="${FIRMWARE_PATH}, \\\"${i}/\\\""
		110	+ fi
		111	+done
		112	+IFS=$OLD_IFS
		113	+AC_SUBST(FIRMWARE_PATH)
		114	+AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ])
		115	+AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
		116	+
		117	+# ------------------------------------------------------------------------------
		118	AC_ARG_ENABLE([gudev],
		119	AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]),
		120	[], [enable_gudev=yes])
		121	@@ -1533,6 +1552,7 @@ AC_MSG_RESULT([
		122	Build Python: ${PYTHON}
		123	Installation Python: ${PYTHON_BINARY}
		124	sphinx binary: ${SPHINX_BUILD}
		125	+ firmware path: ${FIRMWARE_PATH}
		126	PAM modules dir: ${with_pamlibdir}
		127	PAM configuration dir: ${with_pamconfdir}
		128	D-Bus policy dir: ${with_dbuspolicydir}
		129	diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c
		130	new file mode 100644
		131	index 0000000..bd8c2fb
		132	--- /dev/null
		133	+++ b/src/udev/udev-builtin-firmware.c
		134	@@ -0,0 +1,154 @@
		135	+/*
		136	+ * firmware - Kernel firmware loader
		137	+ *
		138	+ * Copyright (C) 2009 Piter Punk <piterpunk@slackware.com>
		139	+ * Copyright (C) 2009-2011 Kay Sievers <kay@vrfy.org>
		140	+ *
		141	+ * This program is free software; you can redistribute it and/or
		142	+ * modify it under the terms of the GNU General Public License as
		143	+ * published by the Free Software Foundation; either version 2 of the
		144	+ * License, or (at your option) any later version.
		145	+ *
		146	+ * This program is distributed in the hope that it will be useful, but
		147	+ * WITHOUT ANY WARRANTY; without even the implied warranty of
		148	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		149	+ * General Public License for more details:*
		150	+ */
		151	+
		152	+#include <unistd.h>
		153	+#include <stdlib.h>
		154	+#include <string.h>
		155	+#include <stdio.h>
		156	+#include <getopt.h>
		157	+#include <errno.h>
		158	+#include <stdbool.h>
		159	+#include <sys/utsname.h>
		160	+#include <sys/stat.h>
		161	+
		162	+#include "udev.h"
		163	+
		164	+static bool set_loading(struct udev udev, char loadpath, const char *state) {
		165	+ FILE *ldfile;
		166	+
		167	+ ldfile = fopen(loadpath, "we");
		168	+ if (ldfile == NULL) {
		169	+ log_error("error: can not open '%s'", loadpath);
		170	+ return false;
		171	+ };
		172	+ fprintf(ldfile, "%s\n", state);
		173	+ fclose(ldfile);
		174	+ return true;
		175	+}
		176	+
		177	+static bool copy_firmware(struct udev udev, const char source, const char *target, size_t size) {
		178	+ char *buf;
		179	+ FILE fsource = NULL, ftarget = NULL;
		180	+ bool ret = false;
		181	+
		182	+ buf = malloc(size);
		183	+ if (buf == NULL) {
		184	+ log_error("No memory available to load firmware file");
		185	+ return false;
		186	+ }
		187	+
		188	+ log_debug("writing '%s' (%zi) to '%s'", source, size, target);
		189	+
		190	+ fsource = fopen(source, "re");
		191	+ if (fsource == NULL)
		192	+ goto exit;
		193	+ ftarget = fopen(target, "we");
		194	+ if (ftarget == NULL)
		195	+ goto exit;
		196	+ if (fread(buf, size, 1, fsource) != 1)
		197	+ goto exit;
		198	+ if (fwrite(buf, size, 1, ftarget) == 1)
		199	+ ret = true;
		200	+exit:
		201	+ if (ftarget != NULL)
		202	+ fclose(ftarget);
		203	+ if (fsource != NULL)
		204	+ fclose(fsource);
		205	+ free(buf);
		206	+ return ret;
		207	+}
		208	+
		209	+static int builtin_firmware(struct udev_device dev, int argc, char argv[], bool test) {
		210	+ struct udev *udev = udev_device_get_udev(dev);
		211	+ static const char *searchpath[] = { FIRMWARE_PATH };
		212	+ char loadpath[UTIL_PATH_SIZE];
		213	+ char datapath[UTIL_PATH_SIZE];
		214	+ char fwpath[UTIL_PATH_SIZE];
		215	+ const char *firmware;
		216	+ FILE *fwfile = NULL;
		217	+ struct utsname kernel;
		218	+ struct stat statbuf;
		219	+ unsigned int i;
		220	+ int rc = EXIT_SUCCESS;
		221	+
		222	+ firmware = udev_device_get_property_value(dev, "FIRMWARE");
		223	+ if (firmware == NULL) {
		224	+ log_error("firmware parameter missing");
		225	+ rc = EXIT_FAILURE;
		226	+ goto exit;
		227	+ }
		228	+
		229	+ /* lookup firmware file */
		230	+ uname(&kernel);
		231	+ for (i = 0; i < ELEMENTSOF(searchpath); i++) {
		232	+ strscpyl(fwpath, sizeof(fwpath), searchpath[i], kernel.release, "/", firmware, NULL);
		233	+ fwfile = fopen(fwpath, "re");
		234	+ if (fwfile != NULL)
		235	+ break;
		236	+
		237	+ strscpyl(fwpath, sizeof(fwpath), searchpath[i], firmware, NULL);
		238	+ fwfile = fopen(fwpath, "re");
		239	+ if (fwfile != NULL)
		240	+ break;
		241	+ }
		242	+
		243	+ strscpyl(loadpath, sizeof(loadpath), udev_device_get_syspath(dev), "/loading", NULL);
		244	+
		245	+ if (fwfile == NULL) {
		246	+ log_debug("did not find firmware file '%s'", firmware);
		247	+ rc = EXIT_FAILURE;
		248	+ /*
		249	+ * Do not cancel the request in the initrd, the real root might have
		250	+ * the firmware file and the 'coldplug' run in the real root will find
		251	+ * this pending request and fulfill or cancel it.
		252	+ * */
		253	+ if (!in_initrd())
		254	+ set_loading(udev, loadpath, "-1");
		255	+ goto exit;
		256	+ }
		257	+
		258	+ if (stat(fwpath, &statbuf) < 0 \|\| statbuf.st_size == 0) {
		259	+ if (!in_initrd())
		260	+ set_loading(udev, loadpath, "-1");
		261	+ rc = EXIT_FAILURE;
		262	+ goto exit;
		263	+ }
		264	+
		265	+ if (!set_loading(udev, loadpath, "1"))
		266	+ goto exit;
		267	+
		268	+ strscpyl(datapath, sizeof(datapath), udev_device_get_syspath(dev), "/data", NULL);
		269	+ if (!copy_firmware(udev, fwpath, datapath, statbuf.st_size)) {
		270	+ log_error("error sending firmware '%s' to device", firmware);
		271	+ set_loading(udev, loadpath, "-1");
		272	+ rc = EXIT_FAILURE;
		273	+ goto exit;
		274	+ };
		275	+
		276	+ set_loading(udev, loadpath, "0");
		277	+exit:
		278	+ if (fwfile)
		279	+ fclose(fwfile);
		280	+ return rc;
		281	+}
		282	+
		283	+const struct udev_builtin udev_builtin_firmware = {
		284	+ .name = "firmware",
		285	+ .cmd = builtin_firmware,
		286	+ .help = "kernel firmware loader",
		287	+ .run_once = true,
		288	+};
		289	diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
		290	index 1950ec2..f21c0b6 100644
		291	--- a/src/udev/udev-builtin.c
		292	+++ b/src/udev/udev-builtin.c
		293	@@ -34,6 +34,9 @@ static const struct udev_builtin *builtins[] = {
		294	[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
		295	#endif
		296	[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
		297	+#ifdef HAVE_FIRMWARE
		298	+ [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
		299	+#endif
		300	[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
		301	[UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
		302	[UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard,
		303	diff --git a/src/udev/udev.h b/src/udev/udev.h
		304	index dece6ec..f7ee1e7 100644
		305	--- a/src/udev/udev.h
		306	+++ b/src/udev/udev.h
		307	@@ -151,6 +151,9 @@ enum udev_builtin_cmd {
		308	UDEV_BUILTIN_BLKID,
		309	#endif
		310	UDEV_BUILTIN_BTRFS,
		311	+#ifdef HAVE_FIRMWARE
		312	+ UDEV_BUILTIN_FIRMWARE,
		313	+#endif
		314	UDEV_BUILTIN_HWDB,
		315	UDEV_BUILTIN_INPUT_ID,
		316	UDEV_BUILTIN_KEYBOARD,
		317	@@ -179,6 +182,9 @@ struct udev_builtin {
		318	extern const struct udev_builtin udev_builtin_blkid;
		319	#endif
		320	extern const struct udev_builtin udev_builtin_btrfs;
		321	+#ifdef HAVE_FIRMWARE
		322	+extern const struct udev_builtin udev_builtin_firmware;
		323	+#endif
		324	extern const struct udev_builtin udev_builtin_hwdb;
		325	extern const struct udev_builtin udev_builtin_input_id;
		326	extern const struct udev_builtin udev_builtin_keyboard;
		327	diff --git a/src/udev/udevd.c b/src/udev/udevd.c
		328	index 99d4c89..71af1e1 100644
		329	--- a/src/udev/udevd.c
		330	+++ b/src/udev/udevd.c
		331	@@ -99,6 +99,9 @@ struct event {
		332	dev_t devnum;
		333	int ifindex;
		334	bool is_block;
		335	+#ifdef HAVE_FIRMWARE
		336	+ bool nodelay;
		337	+#endif
		338	};
		339
		340	static inline struct event node_to_event(struct udev_list_node node) {
		341	@@ -472,6 +475,10 @@ static int event_queue_insert(struct udev_device *dev) {
		342	event->devnum = udev_device_get_devnum(dev);
		343	event->is_block = streq("block", udev_device_get_subsystem(dev));
		344	event->ifindex = udev_device_get_ifindex(dev);
		345	+#ifdef HAVE_FIRMWARE
		346	+ if (streq(udev_device_get_subsystem(dev), "firmware"))
		347	+ event->nodelay = true;
		348	+#endif
		349
		350	log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev),
		351	udev_device_get_action(dev), udev_device_get_subsystem(dev));
		352	@@ -548,6 +555,12 @@ static bool is_devpath_busy(struct event *event) {
		353	return true;
		354	}
		355
		356	+#ifdef HAVE_FIRMWARE
		357	+ /* allow to bypass the dependency tracking */
		358	+ if (event->nodelay)
		359	+ continue;
		360	+#endif
		361	+
		362	/* parent device event found */
		363	if (event->devpath[common] == '/') {
		364	event->delaying_seqnum = loop_event->seqnum;
		365	--
		366	2.3.3
		367


diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index 31caa30345..5ecdda9e5b 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -44,6 +44,8 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master \
44	file://0002-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch \	44	file://0002-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch \
45	file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \	45	file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \
46	file://0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch \	46	file://0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch \
		47	file://0014-Revert-rules-remove-firmware-loading-rules.patch \
		48	file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
47	file://tmpfiles-pam.patch \	49	file://tmpfiles-pam.patch \
48	file://touchscreen.rules \	50	file://touchscreen.rules \
49	file://00-create-volatile.conf \	51	file://00-create-volatile.conf \
@@ -110,6 +112,7 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
110	--enable-split-usr \	112	--enable-split-usr \
111	--without-python \	113	--without-python \
112	--with-sysvrcnd-path=${sysconfdir} \	114	--with-sysvrcnd-path=${sysconfdir} \
		115	--with-firmware-path=${rootlibdir}/firmware \
113	"	116	"
114	# uclibc does not have NSS	117	# uclibc does not have NSS
115	EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname "	118	EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname "