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 63123149319eb0e379dc52a3f4691993d026f3bf (commit) from 9a5a18af733c07109224e328ca0ac640ff49f845 (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 63123149319eb0e379dc52a3f4691993d026f3bf Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Mar 23 04:36:41 2018 +0300

build: don't use xxd to hexdump config file

Use standard od and sed programs to hexdump config file, removing dependency on xxd.

Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --git a/DEPENDENCIES b/DEPENDENCIES index f328e787..48f5a839 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -21,8 +21,6 @@ Prerequisites for building the OpenDataPlane (ODP) API

Libraries currently required to link: openssl, libatomic, libconfig

- Required tools: xxd - 3.1 OpenSSL native compile

For native compilation, simply load the necessary libraries using the appropriate diff --git a/m4/odp_libconfig.m4 b/m4/odp_libconfig.m4 index 632c271e..c9d770bb 100644 --- a/m4/odp_libconfig.m4 +++ b/m4/odp_libconfig.m4 @@ -8,12 +8,11 @@ AC_DEFUN([ODP_LIBCONFIG], PKG_CHECK_MODULES([LIBCONFIG], [libconfig])

########################################################################## -# Check for xxd availability +# Check for od availability ########################################################################## -AC_CHECK_PROGS([XXD], [xxd]) -if test -z "$XXD"; - then AC_MSG_ERROR([Could not find 'xxd']) -fi +AC_CHECK_PROGS([OD], [od]) +AC_PROG_SED +AS_IF([test -z "$OD"], [AC_MSG_ERROR([Could not find 'od'])])

########################################################################## # Create a header file odp_libconfig_config.h which containins null @@ -21,8 +20,10 @@ fi ########################################################################## AC_CONFIG_COMMANDS([platform/${with_platform}/include/odp_libconfig_config.h], [mkdir -p platform/${with_platform}/include - (cd ${srcdir}/config ; xxd -i odp-${with_platform}.conf) | \ - sed 's/([[0-9a-f]])$/\0, 0x00/' > \ + (echo "static const char config_builtin[[]] = {"; \ + $OD -An -v -tx1 < ${srcdir}/config/odp-${with_platform}.conf | \ + $SED -e 's/[[0-9a-f]]+/0x\0,/g' ; \ + echo "0x00 };") > \ platform/${with_platform}/include/odp_libconfig_config.h], - [with_platform=$with_platform]) + [with_platform=$with_platform OD=$OD SED=$SED]) ]) # ODP_LIBCONFIG diff --git a/platform/linux-generic/odp_libconfig.c b/platform/linux-generic/odp_libconfig.c index 3b3b3170..85acc572 100644 --- a/platform/linux-generic/odp_libconfig.c +++ b/platform/linux-generic/odp_libconfig.c @@ -16,8 +16,6 @@ #include <odp_libconfig_internal.h> #include <odp_libconfig_config.h>

-#define CONF_STR_NAME ((const char *)odp_linux_generic_conf) - extern struct odp_global_data_s odp_global_data;

int _odp_libconfig_init_global(void) @@ -33,7 +31,7 @@ int _odp_libconfig_init_global(void) config_init(config); config_init(config_rt);

- if (!config_read_string(config, CONF_STR_NAME)) { + if (!config_read_string(config, config_builtin)) { ODP_ERR("Failed to read default config: %s(%d): %s\n", config_error_file(config), config_error_line(config), config_error_text(config));

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

Summary of changes: DEPENDENCIES | 2 -- m4/odp_libconfig.m4 | 17 +++++++++-------- platform/linux-generic/odp_libconfig.c | 4 +--- 3 files changed, 10 insertions(+), 13 deletions(-)

hooks/post-receive