diff options
| author | Gyorgy Sarvari <skandigraun@gmail.com> | 2026-03-07 19:38:15 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2026-03-17 13:25:14 -0700 |
| commit | 6b443c2b7ce0ab3d53eba8cf69a5c542739921a3 (patch) | |
| tree | 68cd37a6ddc484b21861d9e587aeb225c9c8d1f6 | |
| parent | 40ceaf426d56f223838a4b04d75b96fed9fb0355 (diff) | |
| download | meta-openembedded-6b443c2b7ce0ab3d53eba8cf69a5c542739921a3.tar.gz | |
emlog: bump to latest revision
Drop the patch that is included in this release.
Actually that is also the changelog since the previous version - there
were no other changes beside the accepted patch.
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-core/emlog/emlog.inc | 3 | ||||
| -rw-r--r-- | meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch | 32 |
2 files changed, 1 insertions, 34 deletions
diff --git a/meta-oe/recipes-core/emlog/emlog.inc b/meta-oe/recipes-core/emlog/emlog.inc index ff2a106c6e..d51c9723fd 100644 --- a/meta-oe/recipes-core/emlog/emlog.inc +++ b/meta-oe/recipes-core/emlog/emlog.inc | |||
| @@ -4,8 +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 = "a50aae487f689c1abb46b151abc68d6635b9b2fe" |
| 8 | SRCREV = "a9bbf324fde131ff4cf064e32674086c4ced4dca" | ||
| 9 | PV = "0.70+git" | 8 | PV = "0.70+git" |
| 10 | 9 | ||
| 11 | CVE_PRODUCT = "nicupavel:emlog" | 10 | CVE_PRODUCT = "nicupavel:emlog" |
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 deleted file mode 100644 index 86f719b0bb..0000000000 --- a/meta-oe/recipes-core/emlog/files/0001-emlog-Do-not-use-no_llseek-with-kernel-6.12.0.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 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 | |||
