From 5d88054f195c204a5211aaca0c3824f47a7b9a11 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Tue, 11 Nov 2014 23:04:30 +0100 Subject: RootFS: tweak /etc/issue to display more info Signed-off-by: Abdoulaye Walsimou Gaye --- core/mk/arch/arm/arm.mk | 1 + packages/system/openrc/etc/issue.freebsd | 1 + packages/system/openrc/etc/issue.linux | 1 + packages/system/openrc/openrc.mk | 17 ++++++++++++++--- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/core/mk/arch/arm/arm.mk b/core/mk/arch/arm/arm.mk index be4210e..c1affe9 100644 --- a/core/mk/arch/arm/arm.mk +++ b/core/mk/arch/arm/arm.mk @@ -87,3 +87,4 @@ embtk_musl_dlinker := ld-musl-arm$(__embtk_arm_endian)$(if $(CONFIG_EMBTK_HARDFL __xtools_env_float := $(if $(CONFIG_EMBTK_SOFTFLOAT),sf,hf) __xtools_archos := $(GNU_TARGET) __xtools_env := $(EMBTK_MCU_FLAG)-$(__xtools_env_float) +__xtools_env_abi := eabi diff --git a/packages/system/openrc/etc/issue.freebsd b/packages/system/openrc/etc/issue.freebsd index bd6add5..dbc5665 100644 --- a/packages/system/openrc/etc/issue.freebsd +++ b/packages/system/openrc/etc/issue.freebsd @@ -19,6 +19,7 @@ { builder : {EMBTK_BUILDER} + Arch : {EMBTK_ARCH} xcompiler : {EMBTK_XCOMPILE_ENV} C library : {EMBTK_CLIBRARY_ENV} } diff --git a/packages/system/openrc/etc/issue.linux b/packages/system/openrc/etc/issue.linux index f7b2404..184b1f1 100644 --- a/packages/system/openrc/etc/issue.linux +++ b/packages/system/openrc/etc/issue.linux @@ -19,6 +19,7 @@ { builder : {EMBTK_BUILDER} + Arch : {EMBTK_ARCH} xcompiler : {EMBTK_XCOMPILE_ENV} C library : {EMBTK_CLIBRARY_ENV} } diff --git a/packages/system/openrc/openrc.mk b/packages/system/openrc/openrc.mk index 29c83e4..a6b85bc 100644 --- a/packages/system/openrc/openrc.mk +++ b/packages/system/openrc/openrc.mk @@ -113,13 +113,24 @@ define __embtk_install_openrc_inittab >> $(embtk_rootfs)/etc/inittab endef +# +# issue banner +# __embtk_rootfs_builder := $$USER@$$(uname -n) $$(date +%Y%m%d.%H%M%S.%Z) -__embtk_rootfs_clibraryenv := $(call __embtk_pkg_name,$(embtk_clib)) v$(call __embtk_pkg_version,$(embtk_clib)) +__embtk_rootfs_archenv := $(call embtk_ucase,$(LINUX_ARCH)) ($(EMBTK_MCU_FLAG)) + +__embtk_rootfs_clibraryenv := $(call __embtk_pkg_name,$(embtk_clib)): { +__embtk_rootfs_clibraryenv += version: $(call __embtk_pkg_version,$(embtk_clib)), +__embtk_rootfs_clibraryenv += float: $(if $(CONFIG_EMBTK_SOFTFLOAT),Soft,Hard) +__embtk_rootfs_clibraryenv += $(if $(GCC_WITH_FPU-y),$(embtk_comma) fpu: $(GCC_WITH_FPU-y)) +__embtk_rootfs_clibraryenv += $(if $(__xtools_env_abi),$(embtk_comma) abi: $(__xtools_env_abi)) +__embtk_rootfs_clibraryenv := $(strip $(__embtk_rootfs_clibraryenv)) } + __embtk_rootfs_xcompileenv = $(embtk_targetcc_name-v) [$(embtk_host_uname)] define __embtk_install_openrc_issue cat $(embtk_openrc_mk)/etc/issue.linux | \ - sed -e "s;{EMBTK_VERSION};$(EMBTK_VERSION);" \ - -e "s;{EMBTK_BUILDER};$(__embtk_rootfs_builder);" \ + sed -e "s;{EMBTK_BUILDER};$(__embtk_rootfs_builder);" \ + -e "s;{EMBTK_ARCH};$(__embtk_rootfs_archenv);" \ -e "s;{EMBTK_XCOMPILE_ENV};$(__embtk_rootfs_xcompileenv);" \ -e "s;{EMBTK_CLIBRARY_ENV};$(__embtk_rootfs_clibraryenv);" \ >> $(embtk_rootfs)/etc/issue -- cgit v1.2.3