diff options
author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2018-08-16 21:49:48 +0200 |
---|---|---|
committer | Gogs <gogs@fake.local> | 2018-08-16 21:49:48 +0200 |
commit | 71bd053dc6b5677d8de0fab9d2f7e512a09e7ad6 (patch) | |
tree | 83c060bb6e269ee4267c7e59dac4242faf8bfa69 /package/base-files | |
parent | 56d412cecdfb4c0be541db9ef4153f7616608d28 (diff) | |
parent | dee2a0e2483bfda415c64f8e168763c63e71f7f6 (diff) |
Merge branch 'gogs-master' of ableton-dir/openadk into master
Diffstat (limited to 'package/base-files')
-rw-r--r-- | package/base-files/Makefile | 19 | ||||
-rw-r--r-- | package/base-files/files/inittab.serial | 2 | ||||
-rw-r--r-- | package/base-files/files/rcdev.mdev | 1 |
3 files changed, 21 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 78da71657..95f22f6f0 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -21,6 +21,18 @@ 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 + +ifeq ($(ADK_RUNTIME_GETTY_SERIAL_AUTOLOGIN),y) +ADK_RUNTIME_GETTY_SERIAL_AUTOLOGIN_STANZA:= -n -l autologin +else +ADK_RUNTIME_GETTY_SERIAL_AUTOLOGIN_STANZA:= +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 +67,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 @@ -75,10 +89,15 @@ endif cat ./files/inittab.serial >> $(IDIR_BASE_FILES)/etc/inittab $(SED) 's#@DEVICE@#$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE)#g' $(IDIR_BASE_FILES)/etc/inittab $(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab + $(SED) 's#@AUTOLOGIN@#$(ADK_RUNTIME_GETTY_SERIAL_AUTOLOGIN_STANZA)#' $(IDIR_BASE_FILES)/etc/inittab endif ifeq ($(ADK_RUNTIME_INIT_SYSVINIT),y) cp ./files/inittab.sysvinit $(IDIR_BASE_FILES)/etc/inittab endif +ifeq ($(ADK_RUNTIME_MOUNT_DEBUGFS),y) + echo debugfs /sys/kernel/debug debugfs defaults 0 0 >> $(IDIR_BASE_FILES)/etc/fstab + echo null::sysinit:/bin/mount -a -t debugfs >> $(IDIR_BASE_FILES)/etc/inittab +endif test -z $(ADK_RUNTIME_HOSTNAME) || \ echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \ echo "127.0.0.1 localhost" > $(IDIR_BASE_FILES)/etc/hosts diff --git a/package/base-files/files/inittab.serial b/package/base-files/files/inittab.serial index dcb09e438..ef31f1599 100644 --- a/package/base-files/files/inittab.serial +++ b/package/base-files/files/inittab.serial @@ -1 +1 @@ -@DEVICE@::respawn:/sbin/getty -i -L @DEVICE@ @SPEED@ vt100 +@DEVICE@::respawn:/sbin/getty -i -L @DEVICE@ @SPEED@ vt100 @AUTOLOGIN@ 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 |