From af9b5762c2fe8c2f582feb7d8307371c7f43964e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= Date: Fri, 15 Feb 2019 07:15:24 -0600 Subject: [PATCH] mainly bugfix release: c26c62e remove some code when binary logs are disabled 4c8e0df src/el-pmemory.c: fix usage of uninitialized variable 9b641a4 src/el-pmemory.c: fix wrong options object used eb1fcb4 options: fix g_options altered after el_ocleanup f64ec5e add: printing memory without ascii table c16e5cd make code more c89 compatible d0f1a54 fix: remove comma at the end of enum list 9defd3f fix bad comment with very minor features added: f3c138b add: option to print to stdout d7857c4 make embedlog print to stderr by default --- system/embedlog/Kconfig | 3 ++- system/embedlog/Makefile | 23 +++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/system/embedlog/Kconfig b/system/embedlog/Kconfig index aede08263..e720b5d0c 100644 --- a/system/embedlog/Kconfig +++ b/system/embedlog/Kconfig @@ -50,7 +50,8 @@ config EMBEDLOG_ENABLE_OUT_STDERR bool "Enable logging to standard error" default y ---help--- - If enabled, you will be able to log messages to standard error. + If enabled, you will be able to log messages to standard error (stderr) + and/or standard output (stdout). config EMBEDLOG_ENABLE_OUT_TTY bool "Enable printing to tty device" diff --git a/system/embedlog/Makefile b/system/embedlog/Makefile index 74c841200..89b112c2a 100644 --- a/system/embedlog/Makefile +++ b/system/embedlog/Makefile @@ -39,9 +39,11 @@ WGET = wget CP = cp -R UNPACK = tar -xzf PACKEXT = .tar.gz +NXTOOLSDIR = $(APPDIR)/tools EMBEDLOG_URL = https://distfiles.kurwinet.pl/embedlog -EMBEDLOG_VERSION = 0.3.0 +EMBEDLOG_VERSION = 0.4.0 +EMBEDLOG_SRC_SHA256 = 832c50e0f99d730bed25caed1c4745eca02882a9204c6ad41f715a269293c5a8 EMBEDLOG_EXT = tar.gz EMBEDLOG_SOURCES = embedlog-$(EMBEDLOG_VERSION) EMBEDLOG_TARBALL = $(EMBEDLOG_SOURCES).$(EMBEDLOG_EXT) @@ -138,32 +140,36 @@ else CFLAGS += -DHAVE_TERMIOS_H=0 endif -# config.h is available only when building with autotools +CFLAGS += -DEL_LOG_MAX=$(CONFIG_EMBEDLOG_LOG_MAX) +CFLAGS += -DEL_MEM_LINE_SIZE=$(CONFIG_EMBEDLOG_MEM_LINE_SIZE) +# config.h is available only when building with autotools CFLAGS += -DHAVE_CONFIG_H=0 # embedlog uses access(path, F_OK) to determin if file exists or not and since # nuttx always returns OK here, we mark access as not working and make embedlog # to use stat() for that purpose - CFLAGS += -DHAVE_ACCESS=0 -CFLAGS += -DEL_LOG_MAX=$(CONFIG_EMBEDLOG_LOG_MAX) -CFLAGS += -DEL_MEM_LINE_SIZE=$(CONFIG_EMBEDLOG_MEM_LINE_SIZE) + +# tell embedlog which features are available in nuttx os CFLAGS += -DENABLE_REENTRANT CFLAGS += -DENABLE_OUT_SYSLOG CFLAGS += -DHAVE_STAT -CFLAGS += -DHAVE_SNPRINTF CFLAGS += -DHAVE_UNISTD_H CFLAGS += -DHAVE_FSYNC CFLAGS += -DHAVE_FILENO CFLAGS += -DENABLE_COLORS_EXTENDED=0 -# not yet implemented features - silent compiler warnings +# nuttx has its own snprintf implementation, disable internal snprintf +# implementation +CFLAGS += -DPREFER_PORTABLE_SNPRINTF=0 +CFLAGS += -DNEED_SNPRINTF_ONLY=0 +CFLAGS += -DHAVE_SNPRINTF +# not yet implemented features - silent compiler warnings CFLAGS += -DENABLE_OUT_NET=0 # nuttx does not implement clock() function - CFLAGS += -DENABLE_CLOCK=0 # building of embedlog @@ -171,6 +177,7 @@ CFLAGS += -DENABLE_CLOCK=0 $(EMBEDLOG_TARBALL): @echo "Downloading: $@" $(Q) $(WGET) -O $@ $(EMBEDLOG_URL)/$@ + ${Q} $(NXTOOLSDIR)/check-hash.sh sha256 $(EMBEDLOG_SRC_SHA256) $@ $(Q) touch $@ $(EMBEDLOG_SOURCES): $(EMBEDLOG_TARBALL)