]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
udev: Update to version 3.2.14
authorAdolf Belka <adolf.belka@ipfire.org>
Sun, 8 Oct 2023 19:57:37 +0000 (21:57 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 9 Oct 2023 08:17:26 +0000 (08:17 +0000)
- Update from version 3.2.12 to 3.2.14
- Update of rootfile not required
- This version update includes the patches previously used to add the dummies for tags
   and to update to udev version 251 which is bugfix #253
- Changelog
    3.2.14
    Clear sysattr cache if a null pointer is passed by @NaofumiHonda in #255
    Add /usr/local/lib/udev/rules.d by @bbonev in #260
    Fix := not preventing further assignments to RUN by @bbonev in #257
    Let libudev find hwdb.bin under UDEV_HWDB_BIN by
     @vivien-consider-dropping-github in #264
    Add a generic --output argument to udevadm hwdb by
     @vivien-consider-dropping-github in #263
    Dynamically get the udevadm hwdb files with a path variable by
     @vivien-consider-dropping-github in #262
    More wording fixes for the manual page for udev by
     @vivien-consider-dropping-github in #265
    Add missing API from 247 by @bbonev in #253
    Ensure that standard file descriptors are open by @bbonev in #266

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/udev
src/patches/eudev-3.2.12_Bump_udev_version_to_251.patch [deleted file]
src/patches/eudev-3.2.12_Export_dummies_for_current_tags.patch [deleted file]

index 9cb31087504e813d0728d49b1bf43cb7d8e02ae2..3a9c416b5d02af510f5515bf31c94d382379d361 100644 (file)
--- a/lfs/udev
+++ b/lfs/udev
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.2.12
+VER        = 3.2.14
 RULES_VER  = 20171102
 
 THISAPP    = eudev-$(VER)
@@ -42,7 +42,7 @@ objects = $(DL_FILE) udev-lfs-$(RULES_VER).tar.bz2
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 udev-lfs-$(RULES_VER).tar.bz2 = $(DL_FROM)/udev-lfs-$(RULES_VER).tar.bz2
 
-$(DL_FILE)_BLAKE2 = 1d2dcc158432f722904f645749420cb44ff98f68b8b8fc11917e83750c95280d0dc2c4d9a322909a4acdb9455c6ec373eade77aacb1039096daa8e642076d3d1
+$(DL_FILE)_BLAKE2 = 7d68e77012288ecfac43be31f724224d371cb1084238fe045df248927eff854dbb391ad501e2a36d9b5ea4eb0a8cba3f9f21ea668908584a24c2a65df93ffdf8
 udev-lfs-$(RULES_VER).tar.bz2_BLAKE2 = b5fb8177a87719e28adc976b83953024dbcfb8739b0c2e61da186cbc4df5e75e62c888da987d15c64db164002bb0a1e66ce0ff206b143dc953d7571b66d5d5c0
 
 install : $(TARGET)
@@ -74,8 +74,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(RULES_VER).tar.bz2
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/eudev-3.2.12_Bump_udev_version_to_251.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/eudev-3.2.12_Export_dummies_for_current_tags.patch
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --bindir=/bin \
diff --git a/src/patches/eudev-3.2.12_Bump_udev_version_to_251.patch b/src/patches/eudev-3.2.12_Bump_udev_version_to_251.patch
deleted file mode 100644 (file)
index 459d1b6..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- eudev-3.2.12/configure.orig        2023-05-16 16:20:07.000000000 +0200
-+++ eudev-3.2.12/configure     2023-09-05 14:50:58.167510924 +0200
-@@ -3408,7 +3408,7 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--UDEV_VERSION=243
-+UDEV_VERSION=251
diff --git a/src/patches/eudev-3.2.12_Export_dummies_for_current_tags.patch b/src/patches/eudev-3.2.12_Export_dummies_for_current_tags.patch
deleted file mode 100644 (file)
index e0563ab..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-From dacff83d872c1dcb563439f98c9b974e244fcd46 Mon Sep 17 00:00:00 2001
-From: Boian Bonev <bbonev@ipacct.com>
-Date: Fri, 11 Aug 2023 23:14:02 +0000
-Subject: [PATCH] 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
----
- src/libudev/libudev-device.c | 11 +++++++++++
- src/libudev/libudev.h        |  2 ++
- src/libudev/libudev.sym      |  6 ++++++
- 3 files changed, 19 insertions(+)
-
-diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
-index ac67ce846..7d7a6622e 100644
---- a/src/libudev/libudev-device.c
-+++ b/src/libudev/libudev-device.c
-@@ -1819,6 +1819,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
-@@ -1842,6 +1848,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 8491d2b81..0202964d6 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;
-
-