From fb177ff9d5c3e56fdbce5ab3182b476a1cc0e9d4 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 16 Jun 2016 16:48:12 +0800 Subject: systemd: upgrade to 230 Patches are rebased or removed for the latest version. 'python' is added to RDEPENDS of systemd-ptest. systemd-bootchart is now seprated from systemd, thus removing the related configuration items. Signed-off-by: Chen Qi --- ...-remove-userspace-firmware-loading-suppor.patch | 68 +++++++++------------- 1 file changed, 29 insertions(+), 39 deletions(-) (limited to 'meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch') diff --git a/meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch b/meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch index 8e6289d4ac..642625f32f 100644 --- a/meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch +++ b/meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch @@ -1,6 +1,3 @@ -From 9a3a4e16b36e762291cd1574ec71d7954f8b5363 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 14 Dec 2015 05:33:32 +0000 Subject: [PATCH 17/36] Revert "udev: remove userspace firmware loading support" @@ -13,21 +10,21 @@ Signed-off-by: Jonathan Liu Signed-off-by: Khem Raj --- Makefile.am | 12 +++ - README | 6 +- + README | 4 +- TODO | 1 + configure.ac | 22 ++++++ 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(+), 3 deletions(-) + 8 files changed, 213 insertions(+), 2 deletions(-) create mode 100644 src/udev/udev-builtin-firmware.c diff --git a/Makefile.am b/Makefile.am -index a99e8eb..b5c6ba7 100644 +index 305099a..e774976 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -3573,6 +3573,18 @@ libudev_core_la_LIBADD = \ +@@ -3706,6 +3706,18 @@ libudev_core_la_LIBADD = \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -47,17 +44,10 @@ index a99e8eb..b5c6ba7 100644 libudev_core_la_SOURCES += \ src/udev/udev-builtin-kmod.c diff --git a/README b/README -index 41fb07a..10230ac 100644 +index ca8993c..87f3297 100644 --- a/README +++ b/README -@@ -50,14 +50,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 - +@@ -56,8 +56,8 @@ REQUIREMENTS: Legacy hotplug slows down the system and confuses udev: CONFIG_UEVENT_HELPER_PATH="" @@ -69,11 +59,11 @@ index 41fb07a..10230ac 100644 Some udev rules and virtualization detection relies on it: diff --git a/TODO b/TODO -index 92cc8cc..25f6849 100644 +index fac9ccf..2645582 100644 --- a/TODO +++ b/TODO -@@ -628,6 +628,7 @@ Features: - * rename "userspace" to "core-os" +@@ -642,6 +642,7 @@ Features: + * initialize the hostname from the fs label of /, if /etc/hostname does not exist? * udev: + - remove src/udev/udev-builtin-firmware.c (CONFIG_FW_LOADER_USER_HELPER=n) @@ -81,10 +71,10 @@ index 92cc8cc..25f6849 100644 - kill scsi_id - add trigger --subsystem-match=usb/usb_device device diff --git a/configure.ac b/configure.ac -index 16c83bb..36d20b5 100644 +index 329861a..af85405 100644 --- a/configure.ac +++ b/configure.ac -@@ -1353,6 +1353,25 @@ AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database +@@ -1361,6 +1361,25 @@ AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes]) # ------------------------------------------------------------------------------ @@ -103,23 +93,23 @@ index 16c83bb..36d20b5 100644 +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]) ]) ++AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is availabe]) ]) +AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"]) + +# ------------------------------------------------------------------------------ have_manpages=no AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages])) AC_PATH_PROG([XSLTPROC], [xsltproc]) -@@ -1653,6 +1672,9 @@ AC_MSG_RESULT([ - SysV init scripts: ${SYSTEM_SYSVINIT_PATH} - SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} - 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} +@@ -1656,6 +1675,9 @@ AC_MSG_RESULT([ + SysV init scripts: ${SYSTEM_SYSVINIT_PATH} + SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} + 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 @@ -295,10 +285,10 @@ index e6b36f1..cd9947e 100644 [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 1f9c812..fa35a88 100644 +index 8433e8d..d32366d 100644 --- a/src/udev/udev.h +++ b/src/udev/udev.h -@@ -147,6 +147,9 @@ enum udev_builtin_cmd { +@@ -148,6 +148,9 @@ enum udev_builtin_cmd { UDEV_BUILTIN_BLKID, #endif UDEV_BUILTIN_BTRFS, @@ -308,7 +298,7 @@ index 1f9c812..fa35a88 100644 UDEV_BUILTIN_HWDB, UDEV_BUILTIN_INPUT_ID, UDEV_BUILTIN_KEYBOARD, -@@ -175,6 +178,9 @@ struct udev_builtin { +@@ -176,6 +179,9 @@ struct udev_builtin { extern const struct udev_builtin udev_builtin_blkid; #endif extern const struct udev_builtin udev_builtin_btrfs; @@ -319,7 +309,7 @@ index 1f9c812..fa35a88 100644 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 bb92f16..84024ac 100644 +index e9dd2f4..0abc28e 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -125,6 +125,9 @@ struct event { @@ -332,7 +322,7 @@ index bb92f16..84024ac 100644 }; static inline struct event *node_to_event(struct udev_list_node *node) { -@@ -613,6 +616,10 @@ static int event_queue_insert(Manager *manager, struct udev_device *dev) { +@@ -614,6 +617,10 @@ static int event_queue_insert(Manager *manager, 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); @@ -343,7 +333,7 @@ index bb92f16..84024ac 100644 log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev), udev_device_get_action(dev), udev_device_get_subsystem(dev)); -@@ -698,6 +705,12 @@ static bool is_devpath_busy(Manager *manager, struct event *event) { +@@ -699,6 +706,12 @@ static bool is_devpath_busy(Manager *manager, struct event *event) { return true; } @@ -357,5 +347,5 @@ index bb92f16..84024ac 100644 if (event->devpath[common] == '/') { event->delaying_seqnum = loop_event->seqnum; -- -1.8.3.1 +2.8.3 -- cgit 1.2.3-korg