diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-09-06 18:56:27 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-07 14:36:30 +0100 |
| commit | 8e3523daade9cd397261a021784ba4bba0b134d1 (patch) | |
| tree | 899a553545aceaa4b1492a0e8babbb6a21b7cb8b | |
| parent | bb0d11cd06c9d4198428fa02375a0b7b1087bb1e (diff) | |
| download | poky-8e3523daade9cd397261a021784ba4bba0b134d1.tar.gz | |
libgudev: upgrade 237 -> 238
Add patches to eudev to ensure compatibility with this version.
(From OE-Core rev: 476ed3f57efb0f7a24651fecc7ddf6489e9ac78a)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/udev/eudev/0001-Export-dummies-for.patch | 82 | ||||
| -rw-r--r-- | meta/recipes-core/udev/eudev/0002-Bump-udev-version-to-251.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-core/udev/eudev_3.2.12.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-gnome/libgudev/libgudev_238.bb (renamed from meta/recipes-gnome/libgudev/libgudev_237.bb) | 2 |
4 files changed, 109 insertions, 2 deletions
diff --git a/meta/recipes-core/udev/eudev/0001-Export-dummies-for.patch b/meta/recipes-core/udev/eudev/0001-Export-dummies-for.patch new file mode 100644 index 0000000000..21fbf0f824 --- /dev/null +++ b/meta/recipes-core/udev/eudev/0001-Export-dummies-for.patch | |||
| @@ -0,0 +1,82 @@ | |||
| 1 | From 45634cc0f09ea354be7efce2ae3d3fa8ffc181ec Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Boian Bonev <bbonev@ipacct.com> | ||
| 3 | Date: Fri, 11 Aug 2023 23:14:02 +0000 | ||
| 4 | Subject: [PATCH] Export dummies for | ||
| 5 | |||
| 6 | - udev_device_has_current_tag | ||
| 7 | - udev_device_get_current_tags_list_entry | ||
| 8 | |||
| 9 | since the current eudev device database does not support the concept of | ||
| 10 | current tags | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://github.com/eudev-project/eudev/pull/253] | ||
| 13 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 14 | --- | ||
| 15 | src/libudev/libudev-device.c | 11 +++++++++++ | ||
| 16 | src/libudev/libudev.h | 2 ++ | ||
| 17 | src/libudev/libudev.sym | 6 ++++++ | ||
| 18 | 3 files changed, 19 insertions(+) | ||
| 19 | |||
| 20 | diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c | ||
| 21 | index ac67ce8..7d7a662 100644 | ||
| 22 | --- a/src/libudev/libudev-device.c | ||
| 23 | +++ b/src/libudev/libudev-device.c | ||
| 24 | @@ -1819,6 +1819,12 @@ _public_ struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_dev | ||
| 25 | return udev_list_get_entry(&udev_device->tags_list); | ||
| 26 | } | ||
| 27 | |||
| 28 | +_public_ struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device) | ||
| 29 | +{ | ||
| 30 | + // TODO: eudev database does not support current tags | ||
| 31 | + return udev_device_get_tags_list_entry(udev_device); | ||
| 32 | +} | ||
| 33 | + | ||
| 34 | /** | ||
| 35 | * udev_device_has_tag: | ||
| 36 | * @udev_device: udev device | ||
| 37 | @@ -1842,6 +1848,11 @@ _public_ int udev_device_has_tag(struct udev_device *udev_device, const char *ta | ||
| 38 | return false; | ||
| 39 | } | ||
| 40 | |||
| 41 | +_public_ int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag) { | ||
| 42 | + // TODO: eudev database does not support current tags | ||
| 43 | + return udev_device_has_tag(udev_device, tag); | ||
| 44 | +} | ||
| 45 | + | ||
| 46 | #define ENVP_SIZE 128 | ||
| 47 | #define MONITOR_BUF_SIZE 4096 | ||
| 48 | static int update_envp_monitor_buf(struct udev_device *udev_device) | ||
| 49 | diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h | ||
| 50 | index 8491d2b..0202964 100644 | ||
| 51 | --- a/src/libudev/libudev.h | ||
| 52 | +++ b/src/libudev/libudev.h | ||
| 53 | @@ -100,6 +100,7 @@ int udev_device_get_is_initialized(struct udev_device *udev_device); | ||
| 54 | struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device); | ||
| 55 | struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device *udev_device); | ||
| 56 | struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device *udev_device); | ||
| 57 | +struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device); | ||
| 58 | struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device *udev_device); | ||
| 59 | const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key); | ||
| 60 | const char *udev_device_get_driver(struct udev_device *udev_device); | ||
| 61 | @@ -110,6 +111,7 @@ unsigned long long int udev_device_get_usec_since_initialized(struct udev_device | ||
| 62 | const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr); | ||
| 63 | int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *sysattr, char *value); | ||
| 64 | int udev_device_has_tag(struct udev_device *udev_device, const char *tag); | ||
| 65 | +int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag); | ||
| 66 | |||
| 67 | /* | ||
| 68 | * udev_monitor | ||
| 69 | diff --git a/src/libudev/libudev.sym b/src/libudev/libudev.sym | ||
| 70 | index 76726fc..d56c2ae 100644 | ||
| 71 | --- a/src/libudev/libudev.sym | ||
| 72 | +++ b/src/libudev/libudev.sym | ||
| 73 | @@ -118,3 +118,9 @@ global: | ||
| 74 | udev_queue_flush; | ||
| 75 | udev_queue_get_fd; | ||
| 76 | } LIBUDEV_199; | ||
| 77 | + | ||
| 78 | +LIBUDEV_247 { | ||
| 79 | +global: | ||
| 80 | + udev_device_has_current_tag; | ||
| 81 | + udev_device_get_current_tags_list_entry; | ||
| 82 | +} LIBUDEV_215; | ||
diff --git a/meta/recipes-core/udev/eudev/0002-Bump-udev-version-to-251.patch b/meta/recipes-core/udev/eudev/0002-Bump-udev-version-to-251.patch new file mode 100644 index 0000000000..520cc38cda --- /dev/null +++ b/meta/recipes-core/udev/eudev/0002-Bump-udev-version-to-251.patch | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | From 7a66d4fe8aac8c8697c3cecb0c189e22524fbc98 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Boian Bonev <bbonev@ipacct.com> | ||
| 3 | Date: Fri, 11 Aug 2023 22:08:27 +0000 | ||
| 4 | Subject: [PATCH] Bump udev version to 251 | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [https://github.com/eudev-project/eudev/pull/253] | ||
| 7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 8 | --- | ||
| 9 | configure.ac | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/configure.ac b/configure.ac | ||
| 13 | index 3e31b0e..069fdfb 100644 | ||
| 14 | --- a/configure.ac | ||
| 15 | +++ b/configure.ac | ||
| 16 | @@ -1,6 +1,6 @@ | ||
| 17 | AC_PREREQ([2.68]) | ||
| 18 | AC_INIT([eudev],[3.2.12],[https://github.com/gentoo/eudev/issues]) | ||
| 19 | -AC_SUBST(UDEV_VERSION, 243) | ||
| 20 | +AC_SUBST(UDEV_VERSION, 251) | ||
| 21 | AC_CONFIG_SRCDIR([src/udev/udevd.c]) | ||
| 22 | |||
| 23 | AC_USE_SYSTEM_EXTENSIONS | ||
diff --git a/meta/recipes-core/udev/eudev_3.2.12.bb b/meta/recipes-core/udev/eudev_3.2.12.bb index 572ccecafd..e19c6c0faa 100644 --- a/meta/recipes-core/udev/eudev_3.2.12.bb +++ b/meta/recipes-core/udev/eudev_3.2.12.bb | |||
| @@ -12,7 +12,9 @@ PROVIDES = "udev" | |||
| 12 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ | 12 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ |
| 13 | file://init \ | 13 | file://init \ |
| 14 | file://local.rules \ | 14 | file://local.rules \ |
| 15 | " | 15 | file://0001-Export-dummies-for.patch \ |
| 16 | file://0002-Bump-udev-version-to-251.patch \ | ||
| 17 | " | ||
| 16 | 18 | ||
| 17 | SRC_URI[sha256sum] = "ccdd64ec3c381d3c3ed0e99d2e70d1f62988c7763de89ca7bdffafa5eacb9ad8" | 19 | SRC_URI[sha256sum] = "ccdd64ec3c381d3c3ed0e99d2e70d1f62988c7763de89ca7bdffafa5eacb9ad8" |
| 18 | 20 | ||
diff --git a/meta/recipes-gnome/libgudev/libgudev_237.bb b/meta/recipes-gnome/libgudev/libgudev_238.bb index 5aa94e58f5..6d7bafd591 100644 --- a/meta/recipes-gnome/libgudev/libgudev_237.bb +++ b/meta/recipes-gnome/libgudev/libgudev_238.bb | |||
| @@ -5,7 +5,7 @@ other programming languages, such as Javascript, because of GObject \ | |||
| 5 | introspection support." | 5 | introspection support." |
| 6 | HOMEPAGE = "https://wiki.gnome.org/Projects/libgudev" | 6 | HOMEPAGE = "https://wiki.gnome.org/Projects/libgudev" |
| 7 | BUGTRACKER = "https://gitlab.gnome.org/GNOME/libgudev/issues" | 7 | BUGTRACKER = "https://gitlab.gnome.org/GNOME/libgudev/issues" |
| 8 | SRC_URI[archive.sha256sum] = "0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa" | 8 | SRC_URI[archive.sha256sum] = "61266ab1afc9d73dbc60a8b2af73e99d2fdff47d99544d085760e4fa667b5dd1" |
| 9 | 9 | ||
| 10 | DEPENDS = "glib-2.0 glib-2.0-native udev" | 10 | DEPENDS = "glib-2.0 glib-2.0-native udev" |
| 11 | 11 | ||
