summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordir <dir@ableton.com>2017-11-30 14:48:41 +0100
committerdir <dir@ableton.com>2018-08-13 17:54:03 +0200
commit6ffa4d43382fe8187a0b336b091d1c400a4a7081 (patch)
treeeb99ef0e5e63ceb996214b1703ecabe4a3bd499f
parent009e895adb57d1738b10c5dea3d6af88c5142abc (diff)
Implement mdev logging output on demand
@upstream
-rw-r--r--package/base-files/Makefile8
-rw-r--r--package/base-files/files/rcdev.mdev1
-rw-r--r--target/config/Config.in.runtime4
3 files changed, 13 insertions, 0 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 78da71657..8a8a26e5e 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -21,6 +21,12 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
+ifeq ($(ADK_RUNTIME_DEV_MDEV_LOGGING),y)
+ADK_RUNTIME_DEV_MDEV_LOGGING_LINE:='echo >/dev/mdev.log'
+else
+ADK_RUNTIME_DEV_MDEV_LOGGING_LINE:=''
+endif
+
do-install:
$(CP) ./src/* $(IDIR_BASE_FILES)
mkdir -p $(IDIR_BASE_FILES)/{etc,dev,boot,root,sys,proc,tmp,run,var,mnt,media}
@@ -55,9 +61,11 @@ endif
endif
ifeq ($(ADK_RUNTIME_DEV_MDEV),y)
$(CP) ./files/rcdev.mdev $(IDIR_BASE_FILES)/etc/init.d/rcdev
+ $(SED) "s#@ADK_RUNTIME_DEV_MDEV_LOGGING@#"$(ADK_RUNTIME_DEV_MDEV_LOGGING_LINE)"#g" $(IDIR_BASE_FILES)/etc/init.d/rcdev
$(CP) ./files/mdev.conf $(IDIR_BASE_FILES)/etc
$(CP) ./files/mdev $(IDIR_BASE_FILES)/etc
endif
+
ifeq ($(ADK_RUNTIME_DEV_UDEV),y)
$(CP) ./files/rcdev.udev $(IDIR_BASE_FILES)/etc/init.d/rcdev
endif
diff --git a/package/base-files/files/rcdev.mdev b/package/base-files/files/rcdev.mdev
index 9af4535c1..b8afd453c 100644
--- a/package/base-files/files/rcdev.mdev
+++ b/package/base-files/files/rcdev.mdev
@@ -2,6 +2,7 @@
mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
# start mdev dynamic device node management
echo >/dev/mdev.seq
+@ADK_RUNTIME_DEV_MDEV_LOGGING@
if [ -f /proc/sys/kernel/hotplug ];then
echo "/sbin/mdev" >/proc/sys/kernel/hotplug
fi
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 6d5a460ab..35f65b48d 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -64,6 +64,10 @@ config ADK_RUNTIME_DEV_MDEV
depends on ADK_PACKAGE_BUSYBOX
depends on !ADK_RUNTIME_INIT_SYSTEMD
+config ADK_RUNTIME_DEV_MDEV_LOGGING
+ bool "Log mdev events into /dev/mdev.log"
+ depends on ADK_RUNTIME_DEV_MDEV
+
config ADK_RUNTIME_DEV_UDEV
bool "Use udev"
select ADK_PACKAGE_UDEV