diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-19 09:12:55 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-19 09:12:55 +0100 |
| commit | 910966c0e7582620e1087549b10828f2ace1738f (patch) | |
| tree | 7d9c972cf4c154ac7251af84b0657b83bb024087 /package | |
| parent | 95813e9c0009a0fff2e5e30a39e1ea45b061cbc0 (diff) | |
add ADK_RUNTIME_CONSOLE_SERIAL_DEVICE, minor cleanups while there
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/Makefile | 24 | ||||
| -rw-r--r-- | package/base-files/files/inittab.serial | 2 |
2 files changed, 3 insertions, 23 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 11fb4f507..25314b5ec 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 72 +PKG_RELEASE:= 73 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host @@ -63,27 +63,7 @@ endif cat ./files/inittab.serial >> $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_CONSOLE_BOTH) || \ cat ./files/inittab.vga >> $(IDIR_BASE_FILES)/etc/inittab -ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB),y) - $(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab -endif -ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y) - $(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab -endif -ifeq ($(ADK_TARGET_SYSTEM_ARANYM_M68K),y) - $(SED) 's#ttyS#nfcon#g' $(IDIR_BASE_FILES)/etc/inittab -endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC64),y) - $(SED) 's#ttyS#hvc#g' $(IDIR_BASE_FILES)/etc/inittab -endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_SH4),y) - $(SED) 's#ttyS0#ttySC1#g' $(IDIR_BASE_FILES)/etc/inittab -endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_SH4EB),y) - $(SED) 's#ttyS0#ttySC1#g' $(IDIR_BASE_FILES)/etc/inittab -endif -ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800),y) - $(SED) 's#ttyS#ttyUL#g' $(IDIR_BASE_FILES)/etc/inittab -endif + $(SED) 's#@DEVICE@#$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE)#' $(IDIR_BASE_FILES)/etc/inittab $(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_HOSTNAME) || \ echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \ diff --git a/package/base-files/files/inittab.serial b/package/base-files/files/inittab.serial index 5de880f2a..dcb09e438 100644 --- a/package/base-files/files/inittab.serial +++ b/package/base-files/files/inittab.serial @@ -1 +1 @@ -ttyS0::respawn:/sbin/getty -i -L ttyS0 @SPEED@ vt100 +@DEVICE@::respawn:/sbin/getty -i -L @DEVICE@ @SPEED@ vt100 |