Signed-off-by: Khem Raj <[email protected]>
---
meta-oe/recipes-core/emlog/emlog.inc | 1 +
...move-modules_clean-from-clean-target.patch | 0
...not-use-no_llseek-with-kernel-6.12.0.patch | 32 +++++++++++++++++++
.../Drop-use-of-error-h.patch | 0
.../emlog/{emlog => files}/emlog.initd | 0
5 files changed, 33 insertions(+)
rename meta-oe/recipes-core/emlog/{emlog =>
files}/0001-Remove-modules_clean-from-clean-target.patch (100%)
create mode 100644
meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch
rename meta-oe/recipes-core/emlog/{emlog => files}/Drop-use-of-error-h.patch
(100%)
rename meta-oe/recipes-core/emlog/{emlog => files}/emlog.initd (100%)
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"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=https;branch=master"
+SRC_URI += "file://0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch"
SRCREV = "a9bbf324fde131ff4cf064e32674086c4ced4dca"
PV = "0.70+git"
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
similarity index 100%
rename from
meta-oe/recipes-core/emlog/emlog/0001-Remove-modules_clean-from-clean-target.patch
rename to
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 @@
+From dca01ea62833249d78ac3bdf277b73424bf93e89 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 14 Dec 2024 09:55:10 -0800
+Subject: [PATCH] emlog: Do not use no_llseek with kernel 6.12.0+
+
+no_llseek is finally gone with 6.12-rc1 [1]
+
+[1]
https://github.com/torvalds/linux/commit/cb787f4ac0c2e439ea8d7e6387b925f74576bdf8
+
+Upstream-Status: Submitted [https://github.com/nicupavel/emlog/pull/16]
+---
+ emlog.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/emlog.c b/emlog.c
+index 2ead738..b45c72d 100644
+--- a/emlog.c
++++ b/emlog.c
+@@ -464,7 +464,12 @@ static const struct file_operations emlog_fops = {
+ .open = emlog_open,
+ .release = emlog_release,
+ .poll = emlog_poll,
+- .llseek = no_llseek, /* no_llseek by default introduced at
v2.6.37-rc1 */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
++ /* no_llseek by default introduced at v2.6.37-rc1 and
++ * removed in 6.12.0
++ */
++ .llseek = no_llseek,
++#endif
+ .owner = THIS_MODULE,
+ };
+
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
similarity index 100%
rename from meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch
rename to 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
similarity index 100%
rename from meta-oe/recipes-core/emlog/emlog/emlog.initd
rename to meta-oe/recipes-core/emlog/files/emlog.initd
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#114315):
https://lists.openembedded.org/g/openembedded-devel/message/114315
Mute This Topic: https://lists.openembedded.org/mt/110117467/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
