diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2019-04-03 17:37:24 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-04-06 08:22:22 -0700 |
commit | 9fce979252417e96f719ee1b3f66d21350a46680 (patch) | |
tree | 873d45d1a8cdfdc74fac855bfcad70dbf892773d | |
parent | f80e286e0b93bb9f2a2b1a5a75a7efeab5e1b932 (diff) | |
download | meta-openembedded-9fce979252417e96f719ee1b3f66d21350a46680.tar.gz |
dracut: fix udevdir not found
In commit [9d1b81c dracut.sh: improve udevdir and systemdutildir
fallback logic], it checked a common binary `collect' to localte
udevdir.
While upgrading systemd to 241, it dropped binary `collect'.
[https://github.com/systemd/systemd/commit/a168792c2d95695fd30c0371d4b3890a9df1eafb]
So check binary `ata_id' to instead.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-initramfs/recipes-devtools/dracut/dracut/0001-dracut.sh-improve-udevdir.patch | 39 | ||||
-rw-r--r-- | meta-initramfs/recipes-devtools/dracut/dracut_git.bb | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0001-dracut.sh-improve-udevdir.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0001-dracut.sh-improve-udevdir.patch new file mode 100644 index 000000000..06e0a094f --- /dev/null +++ b/meta-initramfs/recipes-devtools/dracut/dracut/0001-dracut.sh-improve-udevdir.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 974f728410052bc8fa18d93dc0c1a991bcdb96e6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Wed, 3 Apr 2019 15:24:47 +0800 | ||
4 | Subject: [PATCH] dracut.sh: improve udevdir | ||
5 | |||
6 | In commit [9d1b81c dracut.sh: improve udevdir and systemdutildir | ||
7 | fallback logic], it checked a common binary `collect' to localte | ||
8 | udevdir. | ||
9 | |||
10 | But upstream systemd drop binary `collect'. | ||
11 | [https://github.com/systemd/systemd/commit/a168792c2d95695fd30c0371d4b3890a9df1eafb] | ||
12 | |||
13 | So check binary `ata_id' to instead. | ||
14 | |||
15 | Upstream-Status: Submitted [https://github.com/dracutdevs/dracut/pull/558] | ||
16 | |||
17 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
18 | --- | ||
19 | dracut.sh | 4 ++-- | ||
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/dracut.sh b/dracut.sh | ||
23 | index 3dc2adc..cc8b01a 100755 | ||
24 | --- a/dracut.sh | ||
25 | +++ b/dracut.sh | ||
26 | @@ -1311,8 +1311,8 @@ done | ||
27 | [[ -d $udevdir ]] \ | ||
28 | || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)" | ||
29 | if ! [[ -d "$udevdir" ]]; then | ||
30 | - [[ -e /lib/udev/collect ]] && udevdir=/lib/udev | ||
31 | - [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev | ||
32 | + [[ -e /lib/udev/ata_id ]] && udevdir=/lib/udev | ||
33 | + [[ -e /usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev | ||
34 | fi | ||
35 | |||
36 | [[ -d $systemdutildir ]] \ | ||
37 | -- | ||
38 | 2.7.4 | ||
39 | |||
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb index dd2e8bbb3..344dfecbb 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb | |||
@@ -12,6 +12,7 @@ PV = "049" | |||
12 | SRCREV = "225e4b94cbdb702cf512490dcd2ad9ca5f5b22c1" | 12 | SRCREV = "225e4b94cbdb702cf512490dcd2ad9ca5f5b22c1" |
13 | SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http \ | 13 | SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http \ |
14 | file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \ | 14 | file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \ |
15 | file://0001-dracut.sh-improve-udevdir.patch \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | DEPENDS += "kmod" | 18 | DEPENDS += "kmod" |