eudev: create static nodes from modules
PATCH 1/1 eudev: create static nodes from modules
From: Changqing Li <[email protected]>
dev in modules.devname should be populated in /dev on boot. remove create static mode from udevd will make these devices cannot be populated. When use sysVinit, devices like /dev/net/tun will not be created.
more info:
udevd in systemd also remove create static mode in udevd, but using service kmod-static-nodes.service and systemd-tmpfiles-setup-dev.service in systemd to create these node, so systemd works well.
--- ...dev-create-static-nodes-from-modules.patch | 115 ++++++++++++++++++ meta/recipes-core/udev/eudev_3.2.11.bb | 1 + 2 files changed, 116 insertions(+) create mode 100644 meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch
meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +115 -0
@@ -0,0 +1,115 @@ +From 573d6c4106d5b3828da43d2843c1d599ae3cd1cd Mon Sep 17 00:00:00 2001 +From: Changqing Li <[email protected]> +Date: Tue, 10 May 2022 14:04:35 +0800 +Subject: [PATCH] eudev: create static nodes from modules + +Revert commit <src/udev/udevd.c: remove create static nodes from modules> +https://gitweb.gentoo.org/proj/eudev.git/commit/?id=2b7abd5ec9cc47a8b895df6db77fb1537c6f1a39 + +Upstream-Status: Inappropriate [oe-specific] + +Upstream intentionally remove create static nodes from modules, it is +expected handled by tmpfiles services, refer [1]. +[1] https://github.com/eudev-project/eudev/issues/229 + +For yocto, when start with sysVinit, to enable systemd distro feature, +and install systemd-tmpfiles is not proper, so revert this commit. + +Signed-off-by: Li Zhou <[email protected]> +Signed-off-by: Changqing Li <[email protected]> +--- + src/udev/udevd.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 71 insertions(+) + +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 7ffd174..ff53fe4 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -993,6 +993,76 @@ static void handle_signal(struct udev *udev, int signo) { + } + } + ++static void static_dev_create_from_modules(struct udev *udev) { ++ struct utsname kernel; ++ char modules[UTIL_PATH_SIZE]; ++ char buf[4096]; ++ FILE *f; ++ ++ if (uname(&kernel) < 0) { ++ log_error("uname failed: %m"); ++ return; ++ } ++ ++ strscpyl(modules, sizeof(modules), ROOTPREFIX "/lib/modules/", kernel.release, "/modules.devname", NULL); ++ f = fopen(modules, "re"); ++ if (f == NULL) ++ return; ++ ++ while (fgets(buf, sizeof(buf), f) != NULL) { ++ char *s; ++ const char *modname; ++ const char *devname; ++ const char *devno; ++ int maj, min; ++ char type; ++ mode_t mode; ++ char filename[UTIL_PATH_SIZE]; ++ ++ if (buf[0] == '#') ++ continue; ++ ++ modname = buf; ++ s = strchr(modname, ' '); ++ if (s == NULL) ++ continue; ++ s[0] = '\0'; ++ ++ devname = &s[1]; ++ s = strchr(devname, ' '); ++ if (s == NULL) ++ continue; ++ s[0] = '\0'; ++ ++ devno = &s[1]; ++ s = strchr(devno, ' '); ++ if (s == NULL) ++ s = strchr(devno, '\n'); ++ if (s != NULL) ++ s[0] = '\0'; ++ if (sscanf(devno, "%c%u:%u", &type, &maj, &min) != 3) ++ continue; ++ ++ mode = 0600; ++ if (type == 'c') ++ mode |= S_IFCHR; ++ else if (type == 'b') ++ mode |= S_IFBLK; ++ else ++ continue; ++ ++ strscpyl(filename, sizeof(filename), "/dev/", devname, NULL); ++ mkdir_parents_label(filename, 0755); ++ mac_selinux_create_file_prepare(filename, mode); ++ log_debug("mknod '%s' %c%u:%u", filename, type, maj, min); ++ if (mknod(filename, mode, makedev(maj, min)) < 0 && errno == EEXIST) ++ utimensat(AT_FDCWD, filename, NULL, 0); ++ mac_selinux_create_file_clear(); ++ } ++ ++ fclose(f); ++} ++ + /* + * read the kernel command line, in case we need to get into debug mode + * udev.log-priority=<level> syslog priority +@@ -1199,6 +1269,7 @@ int main(int argc, char *argv[]) { + } + + dev_setup(NULL, UID_INVALID, GID_INVALID); ++ static_dev_create_from_modules(udev); + + /* before opening new files, make sure std{in,out,err} fds are in a sane state */ + if (arg_daemonize) { +-- +2.25.1 +
meta/recipes-core/udev/eudev_3.2.11.bb +1 -0
@@ -12,6 +12,7 @@ PROVIDES = "udev" SRC_URI = "https://github.com/eudev-project/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://init \ file://local.rules \ + file://0001-eudev-create-static-nodes-from-modules.patch \ " SRC_URI[sha256sum] = "19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b"
Signature · 1 line
2.25.1
Quoted 34 lines · Changqing Li
From: Changqing Li <[email protected]>
dev in modules.devname should be populated in /dev on boot. remove create static mode from udevd will make these devices cannot be populated. When use sysVinit, devices like
/dev/net/tunwill not be created.more info:
udevd in systemd also remove create static mode in udevd, but using service kmod-static-nodes.service and systemd-tmpfiles-setup-dev.service in systemd to create these node, so systemd works well.Signed-off-by Changqing Li <[email protected]>--- ...dev-create-static-nodes-from-modules.patch | 115 ++++++++++++++++++ meta/recipes-core/udev/eudev_3.2.11.bb | 1 + 2 files changed, 116 insertions(+) create mode 100644 meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patchmeta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +7
-0@@ -0,0 +1,115 @@ +From 573d6c4106d5b3828da43d2843c1d599ae3cd1cd Mon Sep 17 00:00:00 2001 +From: Changqing Li <[email protected]> +Date: Tue, 10 May 2022 14:04:35 +0800 +Subject: [PATCH] eudev: create static nodes from modules + +Revert commit <src/udev/udevd.c: remove create static nodes from modules> +https://gitweb.gentoo.org/proj/eudev.git/commit/?id=2b7abd5ec9cc47a8b895df6db77fb1537c6f1a39
meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch line 17
Quoted 10 lines
meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +10
-0+ +Upstream-Status: Inappropriate [oe-specific] + +Upstream intentionally remove create static nodes from modules, it is +expected handled by tmpfiles services, refer [1]. +[1] https://github.com/eudev-project/eudev/issues/229 + +For yocto, when start with sysVinit, to enable systemd distro feature, +and install systemd-tmpfiles is not proper, so revert this commit. +
Reading the upstream issue, I'm not sure this really is an "Inappropriate" upstream. eudev has dropped this commit, because you can use systemd-tmpfiles ("as it works without systemd and can be compiled individually" - presumably using our unsupported musl patches...) or opentmpfiles (which is dead and points you back to systemd-tmpfiles).
Feels like this is an engage with upstream rather than carry a patch forever which just causes us to be perpetually divergent.
Quoted 122 lines
meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +98
-0+Signed-off-by: Li Zhou <[email protected]> +Signed-off-by: Changqing Li <[email protected]> +--- + src/udev/udevd.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 71 insertions(+) + +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 7ffd174..ff53fe4 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -993,6 +993,76 @@ static void handle_signal(struct udev *udev, int signo) { + } + } + ++static void static_dev_create_from_modules(struct udev *udev) { ++ struct utsname kernel; ++ char modules[UTIL_PATH_SIZE]; ++ char buf[4096]; ++ FILE *f; ++ ++ if (uname(&kernel) < 0) { ++ log_error("uname failed: %m"); ++ return; ++ } ++ ++ strscpyl(modules, sizeof(modules), ROOTPREFIX "/lib/modules/", kernel.release, "/modules.devname", NULL); ++ f = fopen(modules, "re"); ++ if (f == NULL) ++ return; ++ ++ while (fgets(buf, sizeof(buf), f) != NULL) { ++ char *s; ++ const char *modname; ++ const char *devname; ++ const char *devno; ++ int maj, min; ++ char type; ++ mode_t mode; ++ char filename[UTIL_PATH_SIZE]; ++ ++ if (buf[0] == '#') ++ continue; ++ ++ modname = buf; ++ s = strchr(modname, ' '); ++ if (s == NULL) ++ continue; ++ s[0] = '\0'; ++ ++ devname = &s[1]; ++ s = strchr(devname, ' '); ++ if (s == NULL) ++ continue; ++ s[0] = '\0'; ++ ++ devno = &s[1]; ++ s = strchr(devno, ' '); ++ if (s == NULL) ++ s = strchr(devno, '\n'); ++ if (s != NULL) ++ s[0] = '\0'; ++ if (sscanf(devno, "%c%u:%u", &type, &maj, &min) != 3) ++ continue; ++ ++ mode = 0600; ++ if (type == 'c') ++ mode |= S_IFCHR; ++ else if (type == 'b') ++ mode |= S_IFBLK; ++ else ++ continue; ++ ++ strscpyl(filename, sizeof(filename), "/dev/", devname, NULL); ++ mkdir_parents_label(filename, 0755); ++ mac_selinux_create_file_prepare(filename, mode); ++ log_debug("mknod '%s' %c%u:%u", filename, type, maj, min); ++ if (mknod(filename, mode, makedev(maj, min)) < 0 && errno == EEXIST) ++ utimensat(AT_FDCWD, filename, NULL, 0); ++ mac_selinux_create_file_clear(); ++ } ++ ++ fclose(f); ++} ++ + /* + * read the kernel command line, in case we need to get into debug mode + * udev.log-priority=<level> syslog priority +@@ -1199,6 +1269,7 @@ int main(int argc, char *argv[]) { + } + + dev_setup(NULL, UID_INVALID, GID_INVALID); ++ static_dev_create_from_modules(udev); + + /* before opening new files, make sure std{in,out,err} fds are in a sane state */ + if (arg_daemonize) { +-- +2.25.1 +meta/recipes-core/udev/eudev_3.2.11.bb +1
-1@@ -12,6 +12,7 @@ PROVIDES = "udev" SRC_URI = "https://github.com/eudev-project/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://init \ file://local.rules \ + file://0001-eudev-create-static-nodes-from-modules.patch \ " SRC_URI[sha256sum] = "19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b" --2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#165533): https://lists.openembedded.org/g/openembedded-core/message/165533
Mute This Topic: https://lists.openembedded.org/mt/91052396/3618097
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 1 line
Alex Kiernan
Quoted 53 lines · Alex Kiernan
Quoted 34 lines · Changqing Li
From: Changqing Li <[email protected]>
dev in modules.devname should be populated in /dev on boot. remove create static mode from udevd will make these devices cannot be populated. When use sysVinit, devices like
/dev/net/tunwill not be created.more info:
udevd in systemd also remove create static mode in udevd, but using service kmod-static-nodes.service and systemd-tmpfiles-setup-dev.service in systemd to create these node, so systemd works well.Signed-off-by Changqing Li <[email protected]>--- ...dev-create-static-nodes-from-modules.patch | 115 ++++++++++++++++++ meta/recipes-core/udev/eudev_3.2.11.bb | 1 + 2 files changed, 116 insertions(+) create mode 100644 meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patchmeta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +7
-0@@ -0,0 +1,115 @@ +From 573d6c4106d5b3828da43d2843c1d599ae3cd1cd Mon Sep 17 00:00:00 2001 +From: Changqing Li <[email protected]> +Date: Tue, 10 May 2022 14:04:35 +0800 +Subject: [PATCH] eudev: create static nodes from modules + +Revert commit <src/udev/udevd.c: remove create static nodes from modules> +https://gitweb.gentoo.org/proj/eudev.git/commit/?id=2b7abd5ec9cc47a8b895df6db77fb1537c6f1a39meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch line 17
Quoted 10 lines
meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +10
-0+ +Upstream-Status: Inappropriate [oe-specific] + +Upstream intentionally remove create static nodes from modules, it is +expected handled by tmpfiles services, refer [1]. +[1] https://github.com/eudev-project/eudev/issues/229 + +For yocto, when start with sysVinit, to enable systemd distro feature, +and install systemd-tmpfiles is not proper, so revert this commit. +Reading the upstream issue, I'm not sure this really is an "Inappropriate" upstream. eudev has dropped this commit, because you can use systemd-tmpfiles ("as it works without systemd and can be compiled individually" - presumably using our unsupported musl patches...) or opentmpfiles (which is dead and points you back to systemd-tmpfiles).
Quoted 2 lines
Feels like this is an engage with upstream rather than carry a patch forever which just causes us to be perpetually divergent.
I agree, this does sound like something we need to address to keep the project maintainable...
Cheers,
Richard
________________________________
From: [email protected] <[email protected]>
Sent: Thursday, May 12, 2022 6:33 PM
To: Alex Kiernan <[email protected]>; Li, Changqing <[email protected]>
Cc: Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] eudev: create static nodes from modules
[Please note: This e-mail is from an EXTERNAL e-mail address]
Quoted 53 lines · Alex Kiernan
Quoted 34 lines · Changqing Li
From: Changqing Li <[email protected]>
dev in modules.devname should be populated in /dev on boot. remove create static mode from udevd will make these devices cannot be populated. When use sysVinit, devices like
/dev/net/tunwill not be created.more info:
udevd in systemd also remove create static mode in udevd, but using service kmod-static-nodes.service and systemd-tmpfiles-setup-dev.service in systemd to create these node, so systemd works well.Signed-off-by Changqing Li <[email protected]>--- ...dev-create-static-nodes-from-modules.patch | 115 ++++++++++++++++++ meta/recipes-core/udev/eudev_3.2.11.bb | 1 + 2 files changed, 116 insertions(+) create mode 100644 meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patchmeta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +7
-0@@ -0,0 +1,115 @@ +From 573d6c4106d5b3828da43d2843c1d599ae3cd1cd Mon Sep 17 00:00:00 2001 +From: Changqing Li <[email protected]> +Date: Tue, 10 May 2022 14:04:35 +0800 +Subject: [PATCH] eudev: create static nodes from modules + +Revert commit <src/udev/udevd.c: remove create static nodes from modules> +https://gitweb.gentoo.org/proj/eudev.git/commit/?id=2b7abd5ec9cc47a8b895df6db77fb1537c6f1a39meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch line 17
Quoted 10 lines
meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +10
-0+ +Upstream-Status: Inappropriate [oe-specific] + +Upstream intentionally remove create static nodes from modules, it is +expected handled by tmpfiles services, refer [1]. +[1] https://github.com/eudev-project/eudev/issues/229 + +For yocto, when start with sysVinit, to enable systemd distro feature, +and install systemd-tmpfiles is not proper, so revert this commit. +Reading the upstream issue, I'm not sure this really is an "Inappropriate" upstream. eudev has dropped this commit, because you can use systemd-tmpfiles ("as it works without systemd and can be compiled individually" - presumably using our unsupported musl patches...) or opentmpfiles (which is dead and points you back to systemd-tmpfiles).
Quoted 2 lines
Feels like this is an engage with upstream rather than carry a patch forever which just causes us to be perpetually divergent.
I agree, this does sound like something we need to address to keep the project maintainable...
I tried to suggest upstream to add this back, but upstream seems prefer to use tmpfile solution.
Regrads
Sandy
Cheers,
Richard
Quoted 66 lines · Changqing
________________________________
From: [email protected] <[email protected]>
Sent: Thursday, May 12, 2022 6:33 PM
To: Alex Kiernan <[email protected]>; Li, Changqing <[email protected]>
Cc: Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] eudev: create static nodes from modules[Please note: This e-mail is from an EXTERNAL e-mail address]
Quoted 53 lines · Alex Kiernan
Quoted 34 lines · Changqing Li
From: Changqing Li <[email protected]>
dev in modules.devname should be populated in /dev on boot. remove create static mode from udevd will make these devices cannot be populated. When use sysVinit, devices like
/dev/net/tunwill not be created.more info:
udevd in systemd also remove create static mode in udevd, but using service kmod-static-nodes.service and systemd-tmpfiles-setup-dev.service in systemd to create these node, so systemd works well.Signed-off-by Changqing Li <[email protected]>--- ...dev-create-static-nodes-from-modules.patch | 115 ++++++++++++++++++ meta/recipes-core/udev/eudev_3.2.11.bb | 1 + 2 files changed, 116 insertions(+) create mode 100644 meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patchmeta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +7
-0@@ -0,0 +1,115 @@ +From 573d6c4106d5b3828da43d2843c1d599ae3cd1cd Mon Sep 17 00:00:00 2001 +From: Changqing Li <[email protected]> +Date: Tue, 10 May 2022 14:04:35 +0800 +Subject: [PATCH] eudev: create static nodes from modules + +Revert commit <src/udev/udevd.c: remove create static nodes from modules> +https://gitweb.gentoo.org/proj/eudev.git/commit/?id=2b7abd5ec9cc47a8b895df6db77fb1537c6f1a39meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch line 17
Quoted 10 lines
meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +10
-0+ +Upstream-Status: Inappropriate [oe-specific] + +Upstream intentionally remove create static nodes from modules, it is +expected handled by tmpfiles services, refer [1]. +[1] https://github.com/eudev-project/eudev/issues/229 + +For yocto, when start with sysVinit, to enable systemd distro feature, +and install systemd-tmpfiles is not proper, so revert this commit. +Reading the upstream issue, I'm not sure this really is an "Inappropriate" upstream. eudev has dropped this commit, because you can use systemd-tmpfiles ("as it works without systemd and can be compiled individually" - presumably using our unsupported musl patches...) or opentmpfiles (which is dead and points you back to systemd-tmpfiles).
Quoted 8 lines
Quoted 2 lines
Feels like this is an engage with upstream rather than carry a patch forever which just causes us to be perpetually divergent.
I agree, this does sound like something we need to address to keep the project maintainable...
I tried to suggest upstream to add this back, but upstream seems prefer to use tmpfile solution.
Given how limited the output format which static-nodes generates for tmpfiles is (just d and c! entries), parsing that output directly as part the eudev init script wouldn't be horrible. Or make kmod generate files in the format that volatiles expects? Though that would need populate-volatile extending to generate device nodes.
Signature · 1 line
Alex Kiernan
________________________________
From: Alex Kiernan <[email protected]>
Sent: Sunday, May 15, 2022 10:59 PM
To: Li, Changqing <[email protected]>
Cc: [email protected] <[email protected]>; Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] eudev: create static nodes from modules
[Please note: This e-mail is from an EXTERNAL e-mail address]
Quoted 66 lines · Changqing
________________________________
From: [email protected] <[email protected]>
Sent: Thursday, May 12, 2022 6:33 PM
To: Alex Kiernan <[email protected]>; Li, Changqing <[email protected]>
Cc: Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] eudev: create static nodes from modules[Please note: This e-mail is from an EXTERNAL e-mail address]
Quoted 53 lines · Alex Kiernan
Quoted 34 lines · Changqing Li
From: Changqing Li <[email protected]>
dev in modules.devname should be populated in /dev on boot. remove create static mode from udevd will make these devices cannot be populated. When use sysVinit, devices like
/dev/net/tunwill not be created.more info:
udevd in systemd also remove create static mode in udevd, but using service kmod-static-nodes.service and systemd-tmpfiles-setup-dev.service in systemd to create these node, so systemd works well.Signed-off-by Changqing Li <[email protected]>--- ...dev-create-static-nodes-from-modules.patch | 115 ++++++++++++++++++ meta/recipes-core/udev/eudev_3.2.11.bb | 1 + 2 files changed, 116 insertions(+) create mode 100644 meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patchmeta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +7
-0@@ -0,0 +1,115 @@ +From 573d6c4106d5b3828da43d2843c1d599ae3cd1cd Mon Sep 17 00:00:00 2001 +From: Changqing Li <[email protected]> +Date: Tue, 10 May 2022 14:04:35 +0800 +Subject: [PATCH] eudev: create static nodes from modules + +Revert commit <src/udev/udevd.c: remove create static nodes from modules> +https://gitweb.gentoo.org/proj/eudev.git/commit/?id=2b7abd5ec9cc47a8b895df6db77fb1537c6f1a39meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch line 17
Quoted 10 lines
meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +10
-0+ +Upstream-Status: Inappropriate [oe-specific] + +Upstream intentionally remove create static nodes from modules, it is +expected handled by tmpfiles services, refer [1]. +[1] https://github.com/eudev-project/eudev/issues/229 + +For yocto, when start with sysVinit, to enable systemd distro feature, +and install systemd-tmpfiles is not proper, so revert this commit. +Reading the upstream issue, I'm not sure this really is an "Inappropriate" upstream. eudev has dropped this commit, because you can use systemd-tmpfiles ("as it works without systemd and can be compiled individually" - presumably using our unsupported musl patches...) or opentmpfiles (which is dead and points you back to systemd-tmpfiles).
Quoted 8 lines
Quoted 2 lines
Feels like this is an engage with upstream rather than carry a patch forever which just causes us to be perpetually divergent.
I agree, this does sound like something we need to address to keep the project maintainable...
I tried to suggest upstream to add this back, but upstream seems prefer to use tmpfile solution.
Given how limited the output format which static-nodes generates for tmpfiles is (just d and c! entries), parsing that output directly as part the eudev init script wouldn't be horrible. Or make kmod generate files in the format that volatiles expects? Though that would need populate-volatile extending to generate device nodes.
Thanks, I will dig more about the tmpfile solution, and send a V2 patch.
Regards
Changqing
--
Alex Kiernan
Untested, but if its useful (I suspect cut & paste will have broken spaces):
(quoted diff) +0 -0
b/meta/recipes-core/udev/eudev/init
index c60dbbf6d512..64cd0ea3ef39 100644
meta/recipes-core/udev/eudev/init +34 -0
@@ -23,6 +23,38 @@ kill_udevd () { [ -n "$pid" ] && kill $pid } +make_static_nodes () { + kmod static-nodes --format=tmpfiles | + while read TTYPE TPATH TMODE TUSER TGROUP TAGE TARG; do + case "${TTYPE}" in + 'd') + test -d "${TPATH}" || mkdir -p -m "${TMODE}" "${TPATH}" + ;; + + 'c!') + if [ ! -c "${TPATH}" ]; then + old_ifs="${IFS}" + IFS=: + set -- ${TARG} + IFS="${old_ifs}" + mknod -m "${TMODE}" "${TPATH}" c "$@" + fi + ;; + + *) + echo ERROR + exit 1 + ;; + esac + if [ "${TUSER}" != "-" ]; then + chown "${TUSER}" "${TPATH}" + fi + if [ "${TGROUP}" != "-" ]; then + chown "${TGROUP}" "${TPATH}" + fi + done +} + case "$1" in start) export ACTION=add
@@ -51,6 +83,8 @@ case "$1" in # make_extra_nodes kill_udevd > "/dev/null" 2>&1 + make_static_nodes + # trigger the sorted events [ -e /proc/sys/kernel/hotplug ] && printf '\0\n' >/proc/sys/kernel/hotplug @UDEVD@ -d
Quoted 102 lines · Changqing
________________________________
From: Alex Kiernan <[email protected]>
Sent: Sunday, May 15, 2022 10:59 PM
To: Li, Changqing <[email protected]>
Cc: [email protected] <[email protected]>; Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] eudev: create static nodes from modules[Please note: This e-mail is from an EXTERNAL e-mail address]
Quoted 66 lines · Changqing
________________________________
From: [email protected] <[email protected]>
Sent: Thursday, May 12, 2022 6:33 PM
To: Alex Kiernan <[email protected]>; Li, Changqing <[email protected]>
Cc: Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] eudev: create static nodes from modules[Please note: This e-mail is from an EXTERNAL e-mail address]
Quoted 53 lines · Alex Kiernan
Quoted 34 lines · Changqing Li
From: Changqing Li <[email protected]>
dev in modules.devname should be populated in /dev on boot. remove create static mode from udevd will make these devices cannot be populated. When use sysVinit, devices like
/dev/net/tunwill not be created.more info:
udevd in systemd also remove create static mode in udevd, but using service kmod-static-nodes.service and systemd-tmpfiles-setup-dev.service in systemd to create these node, so systemd works well.Signed-off-by Changqing Li <[email protected]>--- ...dev-create-static-nodes-from-modules.patch | 115 ++++++++++++++++++ meta/recipes-core/udev/eudev_3.2.11.bb | 1 + 2 files changed, 116 insertions(+) create mode 100644 meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patchmeta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +7
-0@@ -0,0 +1,115 @@ +From 573d6c4106d5b3828da43d2843c1d599ae3cd1cd Mon Sep 17 00:00:00 2001 +From: Changqing Li <[email protected]> +Date: Tue, 10 May 2022 14:04:35 +0800 +Subject: [PATCH] eudev: create static nodes from modules + +Revert commit <src/udev/udevd.c: remove create static nodes from modules> +https://gitweb.gentoo.org/proj/eudev.git/commit/?id=2b7abd5ec9cc47a8b895df6db77fb1537c6f1a39meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch line 17
Quoted 10 lines
meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +10
-0+ +Upstream-Status: Inappropriate [oe-specific] + +Upstream intentionally remove create static nodes from modules, it is +expected handled by tmpfiles services, refer [1]. +[1] https://github.com/eudev-project/eudev/issues/229 + +For yocto, when start with sysVinit, to enable systemd distro feature, +and install systemd-tmpfiles is not proper, so revert this commit. +Reading the upstream issue, I'm not sure this really is an "Inappropriate" upstream. eudev has dropped this commit, because you can use systemd-tmpfiles ("as it works without systemd and can be compiled individually" - presumably using our unsupported musl patches...) or opentmpfiles (which is dead and points you back to systemd-tmpfiles).
Quoted 8 lines
Quoted 2 lines
Feels like this is an engage with upstream rather than carry a patch forever which just causes us to be perpetually divergent.
I agree, this does sound like something we need to address to keep the project maintainable...
I tried to suggest upstream to add this back, but upstream seems prefer to use tmpfile solution.
Given how limited the output format which static-nodes generates for tmpfiles is (just d and c! entries), parsing that output directly as part the eudev init script wouldn't be horrible. Or make kmod generate files in the format that volatiles expects? Though that would need populate-volatile extending to generate device nodes.
Thanks, I will dig more about the tmpfile solution, and send a V2 patch.
Regards
Changqing--
Alex Kiernan
Signature · 1 line
Alex Kiernan
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 30 lines · Alex Kiernan via lists.openembedded.org
Untested, but if its useful (I suspect cut & paste will have broken spaces):
meta/recipes-core/udev/eudev/init +18
-0@@ -23,6 +23,38 @@ kill_udevd () { [ -n "$pid" ] && kill $pid } +make_static_nodes () { + kmod static-nodes --format=tmpfiles | + while read TTYPE TPATH TMODE TUSER TGROUP TAGE TARG; do + case "${TTYPE}" in + 'd') + test -d "${TPATH}" || mkdir -p -m "${TMODE}" "${TPATH}" + ;; + + 'c!') + if [ ! -c "${TPATH}" ]; then + old_ifs="${IFS}" + IFS=: + set -- ${TARG} + IFS="${old_ifs}" + mknod -m "${TMODE}" "${TPATH}" c "$@" + fi + ;; +
meta/recipes-core/udev/eudev/init kill_udevd () { · line 53
Quoted 10 lines
meta/recipes-core/udev/eudev/init +10
-0+ *) + echo ERROR + exit 1 + ;; + esac + if [ "${TUSER}" != "-" ]; then + chown "${TUSER}" "${TPATH}" + fi + if [ "${TGROUP}" != "-" ]; then + chown "${TGROUP}" "${TPATH}"
chgrp
Quoted 135 lines
meta/recipes-core/udev/eudev/init +6
-0+ fi + done +} + case "$1" in start) export ACTION=add@@ -51,6 +83,8 @@ case "$1" in # make_extra_nodes kill_udevd > "/dev/null" 2>&1 + make_static_nodes + # trigger the sorted events [ -e /proc/sys/kernel/hotplug ] && printf '\0\n' >/proc/sys/kernel/hotplug @UDEVD@ -dQuoted 95 lines · Changqing
________________________________
From: Alex Kiernan <[email protected]>
Sent: Sunday, May 15, 2022 10:59 PM
To: Li, Changqing <[email protected]>
Cc: [email protected] <[email protected]>; Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] eudev: create static nodes from modules[Please note: This e-mail is from an EXTERNAL e-mail address]
Quoted 66 lines · Changqing
________________________________
From: [email protected] <[email protected]>
Sent: Thursday, May 12, 2022 6:33 PM
To: Alex Kiernan <[email protected]>; Li, Changqing <[email protected]>
Cc: Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] eudev: create static nodes from modules[Please note: This e-mail is from an EXTERNAL e-mail address]
Quoted 53 lines · Alex Kiernan
Quoted 34 lines · Changqing Li
From: Changqing Li <[email protected]>
dev in modules.devname should be populated in /dev on boot. remove create static mode from udevd will make these devices cannot be populated. When use sysVinit, devices like
/dev/net/tunwill not be created.more info:
udevd in systemd also remove create static mode in udevd, but using service kmod-static-nodes.service and systemd-tmpfiles-setup-dev.service in systemd to create these node, so systemd works well.Signed-off-by Changqing Li <[email protected]>--- ...dev-create-static-nodes-from-modules.patch | 115 ++++++++++++++++++ meta/recipes-core/udev/eudev_3.2.11.bb | 1 + 2 files changed, 116 insertions(+) create mode 100644 meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patchmeta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +7
-0@@ -0,0 +1,115 @@ +From 573d6c4106d5b3828da43d2843c1d599ae3cd1cd Mon Sep 17 00:00:00 2001 +From: Changqing Li <[email protected]> +Date: Tue, 10 May 2022 14:04:35 +0800 +Subject: [PATCH] eudev: create static nodes from modules + +Revert commit <src/udev/udevd.c: remove create static nodes from modules> +https://gitweb.gentoo.org/proj/eudev.git/commit/?id=2b7abd5ec9cc47a8b895df6db77fb1537c6f1a39meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch line 17
Quoted 10 lines
meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +10
-0+ +Upstream-Status: Inappropriate [oe-specific] + +Upstream intentionally remove create static nodes from modules, it is +expected handled by tmpfiles services, refer [1]. +[1] https://github.com/eudev-project/eudev/issues/229 + +For yocto, when start with sysVinit, to enable systemd distro feature, +and install systemd-tmpfiles is not proper, so revert this commit. +Reading the upstream issue, I'm not sure this really is an "Inappropriate" upstream. eudev has dropped this commit, because you can use systemd-tmpfiles ("as it works without systemd and can be compiled individually" - presumably using our unsupported musl patches...) or opentmpfiles (which is dead and points you back to systemd-tmpfiles).
Quoted 8 lines
Quoted 2 lines
Feels like this is an engage with upstream rather than carry a patch forever which just causes us to be perpetually divergent.
I agree, this does sound like something we need to address to keep the project maintainable...
I tried to suggest upstream to add this back, but upstream seems prefer to use tmpfile solution.
Given how limited the output format which static-nodes generates for tmpfiles is (just d and c! entries), parsing that output directly as part the eudev init script wouldn't be horrible. Or make kmod generate files in the format that volatiles expects? Though that would need populate-volatile extending to generate device nodes.
Quoted 7 lines
Thanks, I will dig more about the tmpfile solution, and send a V2 patch.
Regards
Changqing--
Alex Kiernan--
Alex Kiernan-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#165667): https://lists.openembedded.org/g/openembedded-core/message/165667
Mute This Topic: https://lists.openembedded.org/mt/91052396/3618097
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 1 line
Alex Kiernan
________________________________
From: Alex Kiernan <[email protected]>
Sent: Monday, May 16, 2022 9:25 PM
To: Alex Kiernan <[email protected]>
Cc: Li, Changqing <[email protected]>; [email protected] <[email protected]>; Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] eudev: create static nodes from modules
[Please note: This e-mail is from an EXTERNAL e-mail address]
Quoted 2 lines · Alex Kiernan via lists.openembedded.org
Untested, but if its useful (I suspect cut & paste will have broken spaces):
Thanks. I will test this.
Quoted 28 lines
meta/recipes-core/udev/eudev/init +18
-0@@ -23,6 +23,38 @@ kill_udevd () { [ -n "$pid" ] && kill $pid } +make_static_nodes () { + kmod static-nodes --format=tmpfiles | + while read TTYPE TPATH TMODE TUSER TGROUP TAGE TARG; do + case "${TTYPE}" in + 'd') + test -d "${TPATH}" || mkdir -p -m "${TMODE}" "${TPATH}" + ;; + + 'c!') + if [ ! -c "${TPATH}" ]; then + old_ifs="${IFS}" + IFS=: + set -- ${TARG} + IFS="${old_ifs}" + mknod -m "${TMODE}" "${TPATH}" c "$@" + fi + ;; +
meta/recipes-core/udev/eudev/init kill_udevd () { · line 53
Quoted 10 lines
meta/recipes-core/udev/eudev/init +10
-0+ *) + echo ERROR + exit 1 + ;; + esac + if [ "${TUSER}" != "-" ]; then + chown "${TUSER}" "${TPATH}" + fi + if [ "${TGROUP}" != "-" ]; then + chown "${TGROUP}" "${TPATH}"
chgrp
Quoted 127 lines
meta/recipes-core/udev/eudev/init +6
-0+ fi + done +} + case "$1" in start) export ACTION=add@@ -51,6 +83,8 @@ case "$1" in # make_extra_nodes kill_udevd > "/dev/null" 2>&1 + make_static_nodes + # trigger the sorted events [ -e /proc/sys/kernel/hotplug ] && printf '\0\n' >/proc/sys/kernel/hotplug @UDEVD@ -dQuoted 95 lines · Changqing
________________________________
From: Alex Kiernan <[email protected]>
Sent: Sunday, May 15, 2022 10:59 PM
To: Li, Changqing <[email protected]>
Cc: [email protected] <[email protected]>; Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] eudev: create static nodes from modules[Please note: This e-mail is from an EXTERNAL e-mail address]
Quoted 66 lines · Changqing
________________________________
From: [email protected] <[email protected]>
Sent: Thursday, May 12, 2022 6:33 PM
To: Alex Kiernan <[email protected]>; Li, Changqing <[email protected]>
Cc: Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH] eudev: create static nodes from modules[Please note: This e-mail is from an EXTERNAL e-mail address]
Quoted 53 lines · Alex Kiernan
Quoted 34 lines · Changqing Li
From: Changqing Li <[email protected]>
dev in modules.devname should be populated in /dev on boot. remove create static mode from udevd will make these devices cannot be populated. When use sysVinit, devices like
/dev/net/tunwill not be created.more info:
udevd in systemd also remove create static mode in udevd, but using service kmod-static-nodes.service and systemd-tmpfiles-setup-dev.service in systemd to create these node, so systemd works well.Signed-off-by Changqing Li <[email protected]>--- ...dev-create-static-nodes-from-modules.patch | 115 ++++++++++++++++++ meta/recipes-core/udev/eudev_3.2.11.bb | 1 + 2 files changed, 116 insertions(+) create mode 100644 meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patchmeta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +7
-0@@ -0,0 +1,115 @@ +From 573d6c4106d5b3828da43d2843c1d599ae3cd1cd Mon Sep 17 00:00:00 2001 +From: Changqing Li <[email protected]> +Date: Tue, 10 May 2022 14:04:35 +0800 +Subject: [PATCH] eudev: create static nodes from modules + +Revert commit <src/udev/udevd.c: remove create static nodes from modules> +https://gitweb.gentoo.org/proj/eudev.git/commit/?id=2b7abd5ec9cc47a8b895df6db77fb1537c6f1a39meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch line 17
Quoted 10 lines
meta/recipes-core/udev/eudev/0001-eudev-create-static-nodes-from-modules.patch new file +10
-0+ +Upstream-Status: Inappropriate [oe-specific] + +Upstream intentionally remove create static nodes from modules, it is +expected handled by tmpfiles services, refer [1]. +[1] https://github.com/eudev-project/eudev/issues/229 + +For yocto, when start with sysVinit, to enable systemd distro feature, +and install systemd-tmpfiles is not proper, so revert this commit. +Reading the upstream issue, I'm not sure this really is an "Inappropriate" upstream. eudev has dropped this commit, because you can use systemd-tmpfiles ("as it works without systemd and can be compiled individually" - presumably using our unsupported musl patches...) or opentmpfiles (which is dead and points you back to systemd-tmpfiles).
Quoted 8 lines
Quoted 2 lines
Feels like this is an engage with upstream rather than carry a patch forever which just causes us to be perpetually divergent.
I agree, this does sound like something we need to address to keep the project maintainable...
I tried to suggest upstream to add this back, but upstream seems prefer to use tmpfile solution.
Given how limited the output format which static-nodes generates for tmpfiles is (just d and c! entries), parsing that output directly as part the eudev init script wouldn't be horrible. Or make kmod generate files in the format that volatiles expects? Though that would need populate-volatile extending to generate device nodes.
Quoted 7 lines
Thanks, I will dig more about the tmpfile solution, and send a V2 patch.
Regards
Changqing--
Alex Kiernan--
Alex Kiernan
Quoted 8 lines
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#165667): https://lists.openembedded.org/g/openembedded-core/message/165667
Mute This Topic: https://lists.openembedded.org/mt/91052396/3618097
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
--
Alex Kiernan