mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-28 21:56:31 +00:00
emlog: new package
[Thomas: - update to the latest github version, which has a number of fixes/improvements compared to the latest tag. - add a patch to fix the build of the kernel module with recent kernel versions (>= 3.19). - use $(INSTALL) -D with a full destination path. - rewrap Config.in help text, lines were too long.] Signed-off-by: Joris Lijssens <joris.lijssens@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
97f7d7061d
commit
6c95124b96
@ -1534,6 +1534,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
|||||||
source "package/debianutils/Config.in"
|
source "package/debianutils/Config.in"
|
||||||
endif
|
endif
|
||||||
source "package/dsp-tools/Config.in"
|
source "package/dsp-tools/Config.in"
|
||||||
|
source "package/emlog/Config.in"
|
||||||
source "package/ftop/Config.in"
|
source "package/ftop/Config.in"
|
||||||
source "package/getent/Config.in"
|
source "package/getent/Config.in"
|
||||||
source "package/htop/Config.in"
|
source "package/htop/Config.in"
|
||||||
|
57
package/emlog/0001-Fix-access-to-the-dentry.patch
Normal file
57
package/emlog/0001-Fix-access-to-the-dentry.patch
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
From 33d34a10fdc01c5716aebdb93c34fdfd7557adc0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||||
|
Date: Tue, 22 Dec 2015 17:39:35 +0100
|
||||||
|
Subject: [PATCH] Fix access to the dentry
|
||||||
|
|
||||||
|
Since Linux 2.6.20, the dentry pointer is no longer stored in
|
||||||
|
file->f_dentry, but in file->f_path.dentry. Until Linux 3.19, there
|
||||||
|
was a compatibility macro which made the change transparent, but this
|
||||||
|
macro has now been removed.
|
||||||
|
|
||||||
|
Since we probably don't care about compatibility with kernels older
|
||||||
|
than 2.6.20, this commit takes the simple approach of using
|
||||||
|
file->f_path.dentry. This will work with any kernel >= 2.6.20.
|
||||||
|
|
||||||
|
Submitted upstream at https://github.com/nicupavel/emlog/pull/3.
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||||
|
---
|
||||||
|
emlog.c | 8 ++++----
|
||||||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/emlog.c b/emlog.c
|
||||||
|
index 41a67e2..1ef3d80 100644
|
||||||
|
--- a/emlog.c
|
||||||
|
+++ b/emlog.c
|
||||||
|
@@ -292,8 +292,8 @@ static ssize_t emlog_read(struct file *file, char __user *buffer, /* The bu
|
||||||
|
struct emlog_info *einfo;
|
||||||
|
|
||||||
|
/* get the metadata about this emlog */
|
||||||
|
- if ((einfo = get_einfo(file->f_dentry->d_inode)) == NULL) {
|
||||||
|
- pr_err("can not fetch einfo for inode %ld.\n", (long)(file->f_dentry->d_inode->i_ino));
|
||||||
|
+ if ((einfo = get_einfo(file->f_path.dentry->d_inode)) == NULL) {
|
||||||
|
+ pr_err("can not fetch einfo for inode %ld.\n", (long)(file->f_path.dentry->d_inode->i_ino));
|
||||||
|
return -EIO;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -368,7 +368,7 @@ static ssize_t emlog_write(struct file *file,
|
||||||
|
struct emlog_info *einfo;
|
||||||
|
|
||||||
|
/* get the metadata about this emlog */
|
||||||
|
- if ((einfo = get_einfo(file->f_dentry->d_inode)) == NULL)
|
||||||
|
+ if ((einfo = get_einfo(file->f_path.dentry->d_inode)) == NULL)
|
||||||
|
return -EIO;
|
||||||
|
|
||||||
|
/* if the message is longer than the buffer, just take the beginning
|
||||||
|
@@ -403,7 +403,7 @@ static unsigned int emlog_poll(struct file *file, struct poll_table_struct * wai
|
||||||
|
struct emlog_info *einfo;
|
||||||
|
|
||||||
|
/* get the metadata about this emlog */
|
||||||
|
- if ((einfo = get_einfo(file->f_dentry->d_inode)) == NULL)
|
||||||
|
+ if ((einfo = get_einfo(file->f_path.dentry->d_inode)) == NULL)
|
||||||
|
return -EIO;
|
||||||
|
|
||||||
|
poll_wait(file, EMLOG_READQ(einfo), wait);
|
||||||
|
--
|
||||||
|
2.6.4
|
||||||
|
|
17
package/emlog/Config.in
Normal file
17
package/emlog/Config.in
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
config BR2_PACKAGE_EMLOG
|
||||||
|
bool "emlog"
|
||||||
|
depends on BR2_LINUX_KERNEL
|
||||||
|
help
|
||||||
|
emlog is a Linux kernel module that makes it easy to access
|
||||||
|
the most recent (and only the most recent) output from a
|
||||||
|
process. It works just like "tail -f" on a log file, except
|
||||||
|
that the storage required never grows. This can be useful in
|
||||||
|
embedded systems where there isn't enough memory or disk
|
||||||
|
space for keeping complete log files, but the most recent
|
||||||
|
debugging messages are sometimes needed (e.g., after an
|
||||||
|
error is observed).
|
||||||
|
|
||||||
|
https://github.com/nicupavel/emlog
|
||||||
|
|
||||||
|
comment "emlog needs a Linux kernel to be built"
|
||||||
|
depends on !BR2_LINUX_KERNEL
|
2
package/emlog/emlog.hash
Normal file
2
package/emlog/emlog.hash
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
# Locally calculated
|
||||||
|
sha256 9bab81e75ef2a1b1b7024a397308356a52463d8ac4b42682ed5a134d46387d1f emlog-bd32494ad757c3d37469877aaf99ced3ee6ca3f8.tar.gz
|
23
package/emlog/emlog.mk
Normal file
23
package/emlog/emlog.mk
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
################################################################################
|
||||||
|
#
|
||||||
|
# emlog
|
||||||
|
#
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
EMLOG_VERSION = bd32494ad757c3d37469877aaf99ced3ee6ca3f8
|
||||||
|
EMLOG_SITE = $(call github,nicupavel,emlog,$(EMLOG_VERSION))
|
||||||
|
EMLOG_DEPENDENCIES = linux
|
||||||
|
EMLOG_LICENSE = GPLv2
|
||||||
|
EMLOG_LICENSE_FILES = COPYING
|
||||||
|
|
||||||
|
define EMLOG_BUILD_CMDS
|
||||||
|
$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) nbcat
|
||||||
|
endef
|
||||||
|
|
||||||
|
# make install tries to strip, so install manually.
|
||||||
|
define EMLOG_INSTALL_TARGET_CMDS
|
||||||
|
$(INSTALL) -D -m 0755 $(@D)/nbcat $(TARGET_DIR)/usr/bin/nbcat
|
||||||
|
endef
|
||||||
|
|
||||||
|
$(eval $(kernel-module))
|
||||||
|
$(eval $(generic-package))
|
Loading…
x
Reference in New Issue
Block a user