This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".

The branch, master has been updated via 5d6ad599eb9f6b05d3890f2b0aae3746b8a2b73e (commit) from 4f309eceba9fbf1254eb39120d184ca3f6543168 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 5d6ad599eb9f6b05d3890f2b0aae3746b8a2b73e Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Sun Oct 28 10:14:20 2018 +0300

linuxgen: add dumpconfig utility

it might be useful to package small binary which prints platform default builtin config file.

Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org

diff --git a/Makefile.am b/Makefile.am index e4dab7e3..f651e9ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,12 +5,14 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-user-guides \

if PLATFORM_IS_LINUX_GENERIC PLATFORM_DIR = platform/linux-generic +PLATFORM_DUMPCONF_DIR = platform/linux-generic/dumpconfig PLATFORM_TEST_DIR = platform/linux-generic/test endif

SUBDIRS = \ include \ $(PLATFORM_DIR) \ + $(PLATFORM_DUMPCONF_DIR) \ helper \ doc

diff --git a/platform/linux-generic/dumpconfig/.gitignore b/platform/linux-generic/dumpconfig/.gitignore new file mode 100644 index 00000000..44752b56 --- /dev/null +++ b/platform/linux-generic/dumpconfig/.gitignore @@ -0,0 +1 @@ +odp_linuxgen_dumpconfig diff --git a/platform/linux-generic/dumpconfig/Makefile.am b/platform/linux-generic/dumpconfig/Makefile.am new file mode 100644 index 00000000..933424f0 --- /dev/null +++ b/platform/linux-generic/dumpconfig/Makefile.am @@ -0,0 +1,10 @@ +include $(top_srcdir)/Makefile.inc + +AM_CPPFLAGS = -I$(top_builddir)/platform/$(with_platform)/include +AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/include + +bin_PROGRAMS = odp_linuxgen_dumpconfig + +odp_linuxgen_dumpconfig_SOURCES = dumpconfig.c + +TESTS = odp_linuxgen_dumpconfig diff --git a/platform/linux-generic/dumpconfig/dumpconfig.c b/platform/linux-generic/dumpconfig/dumpconfig.c new file mode 100644 index 00000000..a04f5c2d --- /dev/null +++ b/platform/linux-generic/dumpconfig/dumpconfig.c @@ -0,0 +1,43 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <stdio.h> +#include <stdlib.h> +#include <odp_libconfig_config.h> + +int main(void) +{ + unsigned int i; + const char *filename; + FILE *f; + char c; + + printf("# Builtin platform config\n\n"); + for (i = 0; i < sizeof(config_builtin); i++) + printf("%c", config_builtin[i]); + + filename = getenv("ODP_CONFIG_FILE"); + if (filename == NULL) + return 0; + + printf("# Overridden section with ODP_CONFIG_FILE=%s\n\n", filename); + + f = fopen(filename, "r"); + if (f == NULL) { + fprintf(stderr, "Error: open file %s\n", filename); + return -1; + } + + while (1) { + c = fgetc(f); + if (feof(f)) + break; + printf("%c", c); + } + + fclose(f); + return 0; +} diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index e0fd099b..f9e9c494 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -27,6 +27,7 @@ AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC], [test "${with_platform}" = "linux-generic"]) AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/libodp-linux.pc + platform/linux-generic/dumpconfig/Makefile platform/linux-generic/test/Makefile platform/linux-generic/test/validation/api/shmem/Makefile platform/linux-generic/test/validation/api/pktio/Makefile

-----------------------------------------------------------------------

Summary of changes: Makefile.am | 2 ++ platform/linux-generic/dumpconfig/.gitignore | 1 + platform/linux-generic/dumpconfig/Makefile.am | 10 ++++++ platform/linux-generic/dumpconfig/dumpconfig.c | 43 ++++++++++++++++++++++++++ platform/linux-generic/m4/configure.m4 | 1 + 5 files changed, 57 insertions(+) create mode 100644 platform/linux-generic/dumpconfig/.gitignore create mode 100644 platform/linux-generic/dumpconfig/Makefile.am create mode 100644 platform/linux-generic/dumpconfig/dumpconfig.c

hooks/post-receive