diff options
| author | Khem Raj <raj.khem@gmail.com> | 2024-12-14 10:01:34 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-12-14 10:02:43 -0800 |
| commit | da51096bcf257723a929c799bc6934877de81fa5 (patch) | |
| tree | f9ebf3b44884b7a85a56b1978527e9731cb67e84 | |
| parent | f0fab487e1df939be1feeb977d6b1e4fb1ea9158 (diff) | |
| download | meta-openembedded-da51096bcf257723a929c799bc6934877de81fa5.tar.gz | |
kernel-module-emlog: Fix build with kernel 6.12+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-core/emlog/emlog.inc | 1 | ||||
| -rw-r--r-- | meta-oe/recipes-core/emlog/files/0001-Remove-modules_clean-from-clean-target.patch (renamed from meta-oe/recipes-core/emlog/emlog/0001-Remove-modules_clean-from-clean-target.patch) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch | 32 | ||||
| -rw-r--r-- | meta-oe/recipes-core/emlog/files/Drop-use-of-error-h.patch (renamed from meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-core/emlog/files/emlog.initd (renamed from meta-oe/recipes-core/emlog/emlog/emlog.initd) | 0 |
5 files changed, 33 insertions, 0 deletions
diff --git a/meta-oe/recipes-core/emlog/emlog.inc b/meta-oe/recipes-core/emlog/emlog.inc index 631e52f388..5e96b8b3bd 100644 --- a/meta-oe/recipes-core/emlog/emlog.inc +++ b/meta-oe/recipes-core/emlog/emlog.inc | |||
| @@ -4,6 +4,7 @@ LICENSE = "GPL-2.0-only" | |||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
| 5 | 5 | ||
| 6 | SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=https;branch=master" | 6 | SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=https;branch=master" |
| 7 | SRC_URI += "file://0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch" | ||
| 7 | SRCREV = "a9bbf324fde131ff4cf064e32674086c4ced4dca" | 8 | SRCREV = "a9bbf324fde131ff4cf064e32674086c4ced4dca" |
| 8 | PV = "0.70+git" | 9 | PV = "0.70+git" |
| 9 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-core/emlog/emlog/0001-Remove-modules_clean-from-clean-target.patch b/meta-oe/recipes-core/emlog/files/0001-Remove-modules_clean-from-clean-target.patch index beba528b33..beba528b33 100644 --- a/meta-oe/recipes-core/emlog/emlog/0001-Remove-modules_clean-from-clean-target.patch +++ b/meta-oe/recipes-core/emlog/files/0001-Remove-modules_clean-from-clean-target.patch | |||
diff --git a/meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch b/meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch new file mode 100644 index 0000000000..86f719b0bb --- /dev/null +++ b/meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | From dca01ea62833249d78ac3bdf277b73424bf93e89 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 14 Dec 2024 09:55:10 -0800 | ||
| 4 | Subject: [PATCH] emlog: Do not use no_llseek with kernel 6.12.0+ | ||
| 5 | |||
| 6 | no_llseek is finally gone with 6.12-rc1 [1] | ||
| 7 | |||
| 8 | [1] https://github.com/torvalds/linux/commit/cb787f4ac0c2e439ea8d7e6387b925f74576bdf8 | ||
| 9 | |||
| 10 | Upstream-Status: Submitted [https://github.com/nicupavel/emlog/pull/16] | ||
| 11 | --- | ||
| 12 | emlog.c | 7 ++++++- | ||
| 13 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/emlog.c b/emlog.c | ||
| 16 | index 2ead738..b45c72d 100644 | ||
| 17 | --- a/emlog.c | ||
| 18 | +++ b/emlog.c | ||
| 19 | @@ -464,7 +464,12 @@ static const struct file_operations emlog_fops = { | ||
| 20 | .open = emlog_open, | ||
| 21 | .release = emlog_release, | ||
| 22 | .poll = emlog_poll, | ||
| 23 | - .llseek = no_llseek, /* no_llseek by default introduced at v2.6.37-rc1 */ | ||
| 24 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) | ||
| 25 | + /* no_llseek by default introduced at v2.6.37-rc1 and | ||
| 26 | + * removed in 6.12.0 | ||
| 27 | + */ | ||
| 28 | + .llseek = no_llseek, | ||
| 29 | +#endif | ||
| 30 | .owner = THIS_MODULE, | ||
| 31 | }; | ||
| 32 | |||
diff --git a/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch b/meta-oe/recipes-core/emlog/files/Drop-use-of-error-h.patch index 4c5a191ac4..4c5a191ac4 100644 --- a/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch +++ b/meta-oe/recipes-core/emlog/files/Drop-use-of-error-h.patch | |||
diff --git a/meta-oe/recipes-core/emlog/emlog/emlog.initd b/meta-oe/recipes-core/emlog/files/emlog.initd index 361cf8029e..361cf8029e 100644 --- a/meta-oe/recipes-core/emlog/emlog/emlog.initd +++ b/meta-oe/recipes-core/emlog/files/emlog.initd | |||
