Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-30 00:00:15 +01:00
Code Issues Releases Wiki Activity

Merge branch 'devel' of github.com:RWTH-OS/HermitCore into devel

Browse source
This commit is contained in:
Stefan Lankes 2017-09-18 00:25:33 +02:00
commit 4fab5bb188
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -93,9 +93,10 @@ script:
- cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=true .. - cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=true ..
- CC=$COMPILERC CXX=$COMPILERCXX make -j1 package - CC=$COMPILERC CXX=$COMPILERCXX make -j1 package
- cd $TRAVIS_BUILD_DIR - cd $TRAVIS_BUILD_DIR
- if [ -n "$RUNCLANGTIDY" ]; then git ls-files "*.c" |grep tools/ | xargs -P 1 -I{} clang-tidy -p build/tools-prefix/src/tools-build/compile_commands.json -header-filter="^((?\!build).)*$" {}; fi
- if [ -n "$RUNCLANGTIDY" ]; then git ls-files "*.c" |grep arch/x86/loader/ | xargs -P 1 -I{} clang-tidy -p build/arch_x86_loader-prefix/src/arch_x86_loader-build/compile_commands.json -header-filter="^((?\!build).)*$" {}; fi
- ./tests.sh - ./tests.sh
notifications: notifications:
slack: hermitcore:UtcfeEXkbpx3WyIDK2Wm2beS slack: hermitcore:UtcfeEXkbpx3WyIDK2Wm2beS

1
cmake/HermitCore-Utils.cmake
View file

@ -98,6 +98,7 @@ function(build_external NAME PATH DEPENDS)
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DLOCAL_PREFIX_BASE_DIR=${LOCAL_PREFIX_BASE_DIR} -DLOCAL_PREFIX_BASE_DIR=${LOCAL_PREFIX_BASE_DIR}
-DCMAKE_INSTALL_MESSAGE=NEVER -DCMAKE_INSTALL_MESSAGE=NEVER
-DCMAKE_EXPORT_COMPILE_COMMANDS=true
--no-warn-unused-cli --no-warn-unused-cli
${DO_PROFILING} ${DO_PROFILING}
${CMD_VARS} ${CMD_VARS}

22
tools/proxy.c
View file

@ -27,25 +27,24 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <linux/tcp.h> #include <linux/tcp.h>
#include <net/if.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <sched.h> #include <sched.h>
#include <signal.h> #include <signal.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/inotify.h> #include <sys/inotify.h>
#include <sys/ioctl.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/ioctl.h> #include <unistd.h>
#include <net/if.h>
#include "proxy.h" #include "proxy.h"
@ -242,7 +241,7 @@ static int is_hermit_available(void)
} }
if (!file) if (!file)
return 0; goto err;
//PROXY_DEBUG("Open log file\n"); //PROXY_DEBUG("Open log file\n");
@ -255,9 +254,10 @@ static int is_hermit_available(void)
} }
fclose(file); fclose(file);
free(line);
return ret; err:
free(line);
return ret;
} }
// wait until HermitCore is sucessfully booted // wait until HermitCore is sucessfully booted