1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
| | From ca8607912b6da3ce87ecd8a7209f23840fec5a90 Mon Sep 17 00:00:00 2001
Message-ID: <ca8607912b6da3ce87ecd8a7209f23840fec5a90.1696185684.git.vivien@planete-kraus.eu>
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sun, 1 Oct 2023 20:40:40 +0200
Subject: [PATCH] Squashed commit of the following:
commit dacff83d872c1dcb563439f98c9b974e244fcd46
Author: Boian Bonev <bbonev@ipacct.com>
Date: Fri Aug 11 23:14:02 2023 +0000
Export dummies for
- udev_device_has_current_tag
- udev_device_get_current_tags_list_entry
since the current eudev device database does not support the concept of
current tags
commit 7d2123ead5a15d4b2aff70eafc6f7b9b2f6527ac
Author: Boian Bonev <bbonev@ipacct.com>
Date: Fri Aug 11 22:08:27 2023 +0000
Bump udev version to 251
---
configure.ac | 2 +-
src/libudev/libudev-device.c | 11 +++++++++++
src/libudev/libudev.h | 2 ++
src/libudev/libudev.sym | 6 ++++++
4 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 3e31b0ebc..069fdfb87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.68])
AC_INIT([eudev],[3.2.12],[https://github.com/gentoo/eudev/issues])
-AC_SUBST(UDEV_VERSION, 243)
+AC_SUBST(UDEV_VERSION, 251)
AC_CONFIG_SRCDIR([src/udev/udevd.c])
AC_USE_SYSTEM_EXTENSIONS
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index d6bc4032a..312d9ee84 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -1825,6 +1825,12 @@ _public_ struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_dev
return udev_list_get_entry(&udev_device->tags_list);
}
+_public_ struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device)
+{
+ // TODO: eudev database does not support current tags
+ return udev_device_get_tags_list_entry(udev_device);
+}
+
/**
* udev_device_has_tag:
* @udev_device: udev device
@@ -1848,6 +1854,11 @@ _public_ int udev_device_has_tag(struct udev_device *udev_device, const char *ta
return false;
}
+_public_ int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag) {
+ // TODO: eudev database does not support current tags
+ return udev_device_has_tag(udev_device, tag);
+}
+
#define ENVP_SIZE 128
#define MONITOR_BUF_SIZE 4096
static int update_envp_monitor_buf(struct udev_device *udev_device)
diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
index e4bc18970..62fab107f 100644
--- a/src/libudev/libudev.h
+++ b/src/libudev/libudev.h
@@ -100,6 +100,7 @@ int udev_device_get_is_initialized(struct udev_device *udev_device);
struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device);
struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device *udev_device);
struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device *udev_device);
+struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device);
struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device *udev_device);
const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key);
const char *udev_device_get_driver(struct udev_device *udev_device);
@@ -110,6 +111,7 @@ unsigned long long int udev_device_get_usec_since_initialized(struct udev_device
const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr);
int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *sysattr, char *value);
int udev_device_has_tag(struct udev_device *udev_device, const char *tag);
+int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag);
/*
* udev_monitor
diff --git a/src/libudev/libudev.sym b/src/libudev/libudev.sym
index 76726fca7..d56c2aeab 100644
--- a/src/libudev/libudev.sym
+++ b/src/libudev/libudev.sym
@@ -118,3 +118,9 @@ global:
udev_queue_flush;
udev_queue_get_fd;
} LIBUDEV_199;
+
+LIBUDEV_247 {
+global:
+ udev_device_has_current_tag;
+ udev_device_get_current_tags_list_entry;
+} LIBUDEV_215;
base-commit: 2e4dd05900e7b42d96cd7bdd5689c8ee431fb000
--
2.41.0
|