From 97e1b583fc59e6a5f0abcf3aab2d6f9a0d82a91f Mon Sep 17 00:00:00 2001 From: Daniel Krebs Date: Fri, 13 Jan 2017 20:47:19 +0100 Subject: [PATCH 01/25] try to fix building libhermit deb package with new bootstrap compiler --- .travis.yml | 20 ++++++++------------ debian/rules | 29 +++-------------------------- 2 files changed, 11 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42c23e9ef..ea51e16b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,23 +5,20 @@ git: language: c compiler: gcc before_install: + - echo "deb https://dl.bintray.com/rwth-os/hermitcore vivid main" | sudo tee -a /etc/apt/sources.list - sudo apt-get -qq update - sudo apt-get install -y curl qemu-system-x86 nasm texinfo libmpfr-dev libmpc-dev libgmp-dev libisl-dev flex bison packaging-dev + - sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap - git submodule update --init lwip usr/libomp + script: - - mv .git .. - cd .. - mv HermitCore libhermit-0.1 - - tar -czf libhermit_0.1.orig.tar.gz libhermit-0.1 - - mv .git libhermit-0.1 - - cd $TOPDIR - - wget https://bintray.com/rwth-os/hermitcore/download_file?file_path=binutils-hermit_2.26.1-1_amd64.deb -O binutils-hermit_2.26.1-1_amd64.deb - - sudo dpkg -i ./binutils-hermit_2.26.1-1_amd64.deb - - wget https://www.lankes.org/deploy/bootstrap.tar.gz - - tar xzf bootstrap.tar.gz - - cd /home/travis/build/RWTH-OS/libhermit-0.1 - - debuild -e PATH -us -uc + - tar -czf libhermit_0.1.orig.tar.gz libhermit-0.1 --exclude=.git + - cd libhermit-0.1 + - debuild -e PATH -us -uc -j2 - x86_64-hermit-readelf -a kernel/main.o + deploy: on: production provider: bintray @@ -32,8 +29,7 @@ deploy: secure: JfsqEUO3Z60yGfuK5RSzwMoWZtaYflZtW7QE6R1DVMPEQ+CytzEdV2JaTpY14xz4yz1YpBBuQ0P3Q3e2rf/ORp8N8j7/5m3gfiDi8bRH3gX10r6vCQaUBilj0pz3amWUacxwBUEYR/f1029OnJ1qug30f4ARk7DWyuAePt0OboDXZ3j4JOi8xfXKTzofyKGugU4EuzhmKAbpHaBoX97g8z+gETC+wsBEYio8iD2h0ZOe/qZ0S+JGYkphIKcxpQazKdi3YrmWm0BUZsQRtkgoH7KUZm8vqfOUyVOrK+UGOTz4vXqCWHZ+wG1QRrGPUv8ehLrB26y2o02mmaDWQhM+I3RtllL06JDvDw40xjRImYtzg6xr7Mvl0OTQHprXrkN8gw2IbIivV8v31O46Ov+KIaN3CCx1IncnllBWjEXAIs4zPtvNj2Ad338JTkI/opHmPG0DI0DKE36r8wPZYTs/pHVpc3xEzwKYDklJkICjMLUakUGKppS7eKzKGRMjWvbT0vM/U7hHUcz0lA+BUoXedNmJQ1wBT85Ud8uobuKS4C8QmlgIuF1PI2+6LJr5LsCGZRvg7Pl1SPc3ZQLPHX4ggoLAnZZJiV/0ZPCn7XCLiUS1qws37l0uZT1zJQMFLsw9MGuP58tpT7WDuYYAwma/pL+OKC/JKoDhuJwM1I7wB4s= env: global: - - TOPDIR=/home/travis/build - - PATH=$PATH:/opt/hermit/bin:$TOPDIR/x86/bin + - PATH=$PATH:/opt/hermit/bin/ - PROXY_STR=":hermit:M:7:\\x42::`pwd`/RWTH-OS/libhermit-0.1/tools/proxy" - HERMIT_ISLE=qemu - HERMIT_CPUS=1 diff --git a/debian/rules b/debian/rules index 32933b96f..e5e8b849f 100755 --- a/debian/rules +++ b/debian/rules @@ -3,41 +3,18 @@ # output every command that modifies files on the build system. #export DH_VERBOSE = 1 - # see FEATURE AREAS in dpkg-buildflags(1) #export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_BUILD_OPTS = nocheck -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - - %: - dh $@ #--with autotools_dev + dh $@ --parallel - -# dh_make generated override targets -# This is example for Cmake (See https://bugs.debian.org/641051 ) override_dh_auto_configure: - dh_auto_configure -- --prefix=/opt/hermit + ./configure --prefix=`pwd`/debian/libhermit/opt/hermit override_dh_auto_test: @echo "tests are disabled" override_dh_auto_install: - mkdir -p debian/libhermit/opt/hermit/x86_64-hermit/lib - mkdir -p debian/libhermit/opt/hermit/x86_64-hermit/include - mkdir -p debian/libhermit/opt/hermit/x86_64-hermit/bin - /usr/bin/install -c -m 644 libhermit.a debian/libhermit/opt/hermit/x86_64-hermit/lib - #/usr/bin/install -c -m 644 usr/ircce/libircce.a debian/libhermit/opt/hermit/x86_64-hermit/lib - #/usr/bin/install -c -m 644 usr/ircce/*.h debian/libhermit/opt/hermit/x86_64-hermit/include - #/usr/bin/install -c -m 644 usr/ircce/libxray.a debian/libhermit/opt/hermit/x86_64-hermit/lib - #/usr/bin/install -c -m 644 usr/ircce/libxray.spec debian/libhermit/opt/hermit/x86_64-hermit/lib - #/usr/bin/install -c -m 644 usr/ircce/libxray.h debian/libhermit/opt/hermit/x86_64-hermit/include - #/usr/bin/install -c -m 644 usr/libomp/libiomp.h debian/libhermit/opt/hermit/x86_64-hermit/lib - #/usr/bin/install -c -m 644 usr/libomp/libgomp.spec debian/libhermit/opt/hermit/x86_64-hermit/lib - #/usr/bin/install -c -m 644 usr/libomp/src/omp.h debian/libhermit/opt/hermit/x86_64-hermit/include - /usr/bin/install -c tools/proxy debian/libhermit/opt/hermit/bin + make install_libhermit From c3c4ade56f3ea0c587096c0dcb196323d891f89a Mon Sep 17 00:00:00 2001 From: Daniel Krebs Date: Sat, 14 Jan 2017 03:57:36 +0100 Subject: [PATCH 02/25] debian: remove /opt/hermit/share from deb package --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index e5e8b849f..4358826b5 100755 --- a/debian/rules +++ b/debian/rules @@ -18,3 +18,6 @@ override_dh_auto_test: override_dh_auto_install: make install_libhermit + + # delete unneded files that would cause conflicts + rm -rf `-pwd`/debian/libhermit/opt/hermit/share/info/dir From a135f11e7095cf1c2958c58cdc92e876e122a73d Mon Sep 17 00:00:00 2001 From: Daniel Krebs Date: Sat, 14 Jan 2017 22:50:45 +0100 Subject: [PATCH 03/25] deb: manually execute target for arch/x86/kernel/boot.h when building --- debian/rules | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/rules b/debian/rules index 4358826b5..c389f6952 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,12 @@ export DEB_BUILD_OPTS = nocheck override_dh_auto_configure: ./configure --prefix=`pwd`/debian/libhermit/opt/hermit +override_dh_auto_build: + # this target is somehow not executed by dh_auto_build and thus the build fails + make arch/x86/kernel/boot.h + + dh_auto_build + override_dh_auto_test: @echo "tests are disabled" From 60450d008696812df1d5e4ad757c9cf4585ec3ac Mon Sep 17 00:00:00 2001 From: Daniel Krebs Date: Sat, 14 Jan 2017 22:58:17 +0100 Subject: [PATCH 04/25] travis: don't output all the readelf stuff but only the ABI version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ea51e16b0..eeed3c182 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ script: - tar -czf libhermit_0.1.orig.tar.gz libhermit-0.1 --exclude=.git - cd libhermit-0.1 - debuild -e PATH -us -uc -j2 - - x86_64-hermit-readelf -a kernel/main.o + - x86_64-hermit-readelf -a kernel/main.o | grep ABI deploy: on: production From 66083ab6c7d3539c1f09fa22a511629faaa5adb1 Mon Sep 17 00:00:00 2001 From: Daniel Krebs Date: Tue, 17 Jan 2017 12:23:44 +0100 Subject: [PATCH 05/25] debian: prevent library stripping by debhelper This should produce binaries with the correct format now! --- debian/rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/rules b/debian/rules index c389f6952..28818f26d 100755 --- a/debian/rules +++ b/debian/rules @@ -27,3 +27,8 @@ override_dh_auto_install: # delete unneded files that would cause conflicts rm -rf `-pwd`/debian/libhermit/opt/hermit/share/info/dir + +override_dh_strip: + # stripping will incorrectly use system tools for stripping, generating + # wrong binary format, i.e. not for HermitCore + @echo "No stripping" From dc685c4f6653cff30d4ca8a6970f4059901c3bad Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 18:31:24 +0100 Subject: [PATCH 06/25] build after the libhermit also user-level libraries --- .travis.yml | 3 ++- Makefile.in | 30 +++++++++++++++++++++++++++++- debian/rules | 3 ++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index eeed3c182..0d84a836b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,8 @@ before_install: - echo "deb https://dl.bintray.com/rwth-os/hermitcore vivid main" | sudo tee -a /etc/apt/sources.list - sudo apt-get -qq update - sudo apt-get install -y curl qemu-system-x86 nasm texinfo libmpfr-dev libmpc-dev libgmp-dev libisl-dev flex bison packaging-dev - - sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap + #- sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap + - sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit - git submodule update --init lwip usr/libomp script: diff --git a/Makefile.in b/Makefile.in index e9520da03..b82764c88 100644 --- a/Makefile.in +++ b/Makefile.in @@ -126,6 +126,34 @@ toolchain: $(INSTALL_LIBHERMIT) PROFILING_CFLAGS="$(PROFILING_CFLAGS)" \ PROFILING_LDFLAGS="$(PROFILING_LDFLAGS)" -C usr toolchain +libs: $(INSTALL_LIBHERMIT) + $Q$(MAKE) ARCH=$(ARCH) PREFIX=$(prefix) \ + LDFLAGS_FOR_TARGET="$(LDFLAGS_FOR_NEWLIB)" \ + GOFLAGS_FOR_TARGET="$(GOFLAGS_FOR_NEWLIB)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_NEWLIB)" \ + FFLAGS_FOR_TARGET="$(FFLAGS_FOR_NEWLIB)" \ + FCFLAGS_FOR_TARGET="$(FCFLAGS_FOR_NEWLIB)" \ + FCFLAGS="$(FCFLAGS_FOR_NEWLIB)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_NEWLIB)" \ + NASMFLAGS="$(NASMFLAGS_FOR_NEWLIB)" \ + CC_FOR_TARGET=$(CC_FOR_TARGET) \ + GO_FOR_TARGET=$(GO_FOR_TARGET) \ + FC_FOR_TARGET=$(FC_FOR_TARGET) \ + CXX_FOR_TARGET=$(CXX_FOR_TARGET) \ + GCC_FOR_TARGET=$(GCC_FOR_TARGET) \ + AR_FOR_TARGET=$(AR_FOR_TARGET) \ + AS_FOR_TARGET=$(AS_FOR_TARGET) \ + LD_FOR_TARGET=$(LD_FOR_TARGET) \ + NM_FOR_TARGET=$(NM_FOR_TARGET) \ + OBJDUMP_FOR_TARGET=$(OBJDUMP_FOR_TARGET) \ + OBJCOPY_FOR_TARGET=$(OBJCOPY_FOR_TARGET) \ + RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET) \ + STRIP_FOR_TARGET=$(STRIP_FOR_TARGET) \ + ELFEDIT_FOR_TARGET=$(ELFEDIT_FOR_TARGET) \ + READELF_FOR_TARGET=$(READELF_FOR_TARGET) \ + PROFILING_CFLAGS="$(PROFILING_CFLAGS)" \ + PROFILING_LDFLAGS="$(PROFILING_LDFLAGS)" -C usr libs + bootstrap: $Q$(MAKE) ARCH=$(ARCH) PREFIX=$(prefix) CFLAGS="" LDFLAGS="" -C usr bootstrap @@ -245,6 +273,6 @@ include/hermit/config.inc: include/hermit/config.h @echo [GCC-ASM] $@ $Q$(CC_FOR_TARGET) $(CFLAGS) -c -o $@ $< -.PHONY: default all clean qemu gdb usr test toolchain tools examples +.PHONY: default all clean qemu gdb usr test toolchain tools examples libs include $(addsuffix /Makefile,$(SUBDIRS)) diff --git a/debian/rules b/debian/rules index 28818f26d..73d662403 100755 --- a/debian/rules +++ b/debian/rules @@ -18,12 +18,13 @@ override_dh_auto_build: make arch/x86/kernel/boot.h dh_auto_build + make libs override_dh_auto_test: @echo "tests are disabled" override_dh_auto_install: - make install_libhermit + make install # delete unneded files that would cause conflicts rm -rf `-pwd`/debian/libhermit/opt/hermit/share/info/dir From 1c0002a590f28622890eae9e582b4e41eb06474c Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 18:45:07 +0100 Subject: [PATCH 07/25] switch back to bootstrap compiler --- .travis.yml | 4 ++-- debian/rules | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0d84a836b..90387f122 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ before_install: - echo "deb https://dl.bintray.com/rwth-os/hermitcore vivid main" | sudo tee -a /etc/apt/sources.list - sudo apt-get -qq update - sudo apt-get install -y curl qemu-system-x86 nasm texinfo libmpfr-dev libmpc-dev libgmp-dev libisl-dev flex bison packaging-dev - #- sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap - - sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit + - sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap + #- sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit - git submodule update --init lwip usr/libomp script: diff --git a/debian/rules b/debian/rules index 73d662403..0a11f89af 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ override_dh_auto_build: make arch/x86/kernel/boot.h dh_auto_build - make libs + #make libs override_dh_auto_test: @echo "tests are disabled" From f152caa005e44a2cb2f5e64e7784b4f2f2ab048f Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 18:49:05 +0100 Subject: [PATCH 08/25] remove typo --- debian/rules | 2 +- usr/ircce/{Makefile => Makefile.in} | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) rename usr/ircce/{Makefile => Makefile.in} (72%) diff --git a/debian/rules b/debian/rules index 0a11f89af..42fb99c0f 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ override_dh_auto_test: @echo "tests are disabled" override_dh_auto_install: - make install + make install_libhermit # delete unneded files that would cause conflicts rm -rf `-pwd`/debian/libhermit/opt/hermit/share/info/dir diff --git a/usr/ircce/Makefile b/usr/ircce/Makefile.in similarity index 72% rename from usr/ircce/Makefile rename to usr/ircce/Makefile.in index 94abecf44..970aac0d7 100644 --- a/usr/ircce/Makefile +++ b/usr/ircce/Makefile.in @@ -6,6 +6,12 @@ C_source = $(wildcard *.c) NAME = libircce.a OBJS = $(C_source:.c=.o) +prefix = @prefix@ +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_DATA = @INSTALL_DATA@ + # # Prettify output V = 0 @@ -27,8 +33,8 @@ $(NAME): $(OBJS) $Q$(AR_FOR_TARGET) $(ARFLAGS_FOR_TARGET) $@ $(OBJS) install: - $Q$(CP) $(NAME) $(PREFIX)/$(CROSSPREFIX)/lib - $Q$(CP) *.h $(PREFIX)/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) $(NAME) $(prefix)/$(CROSSPREFIX)/lib + $Q$(INSTALL_DATA) *.h $(prefix/$(CROSSPREFIX)/include clean: @echo Cleaning examples From ab96d6e9afb7b64feb973b67768ef5a91b214f37 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 18:52:03 +0100 Subject: [PATCH 09/25] configure makefile also in usr/irrce --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6b0ae9e16..04d0aa390 100644 --- a/configure.ac +++ b/configure.ac @@ -73,5 +73,5 @@ else AC_DEFINE(DEFAULT_STACK_SIZE, 262144, Define the default stack size) fi -AC_CONFIG_FILES(Makefile) +AC_CONFIG_FILES(Makefile usr/ircce/Makefile) AC_OUTPUT From 808c061dc324f9a175f61a7a3b60fd71512425d3 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 18:55:33 +0100 Subject: [PATCH 10/25] add missing configure script --- configure | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/configure b/configure index f1dc7a989..0d0e3849f 100755 --- a/configure +++ b/configure @@ -619,6 +619,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -694,6 +695,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -946,6 +948,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1083,7 +1094,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1236,6 +1247,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2845,7 +2857,7 @@ $as_echo "#define DEFAULT_STACK_SIZE 262144" >>confdefs.h fi -ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile usr/ircce/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3540,6 +3552,7 @@ do case $ac_config_target in "include/hermit/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/hermit/config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "usr/ircce/Makefile") CONFIG_FILES="$CONFIG_FILES usr/ircce/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac From 33f949aa47f0938b02b52cda4488404458788421 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 19:09:39 +0100 Subject: [PATCH 11/25] create Makefiles by HermitCore configure script --- Makefile.in | 4 ++-- configure.ac | 2 +- tools/{Makefile => Makefile.in} | 10 ++++++++++ usr/libomp | 2 +- usr/xray/{Makefile => Makefile.in} | 11 ++++++++--- 5 files changed, 22 insertions(+), 7 deletions(-) rename tools/{Makefile => Makefile.in} (72%) rename usr/xray/{Makefile => Makefile.in} (60%) diff --git a/Makefile.in b/Makefile.in index b82764c88..8b4cbcf8e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -126,7 +126,7 @@ toolchain: $(INSTALL_LIBHERMIT) PROFILING_CFLAGS="$(PROFILING_CFLAGS)" \ PROFILING_LDFLAGS="$(PROFILING_LDFLAGS)" -C usr toolchain -libs: $(INSTALL_LIBHERMIT) +libs: $Q$(MAKE) ARCH=$(ARCH) PREFIX=$(prefix) \ LDFLAGS_FOR_TARGET="$(LDFLAGS_FOR_NEWLIB)" \ GOFLAGS_FOR_TARGET="$(GOFLAGS_FOR_NEWLIB)" \ @@ -217,7 +217,7 @@ install_libhermit: install: install_libhermit $Q$(MAKE) PREFIX=$(prefix) -C usr install - $Q$(INSTALL_PROGRAM) tools/proxy $(prefix)/bin + $Q$(MAKE) PREFIX=$(prefix) -C tools install clean: $Q$(RM) $(NAME) $(NAME).sym $(NAME).bin *~ diff --git a/configure.ac b/configure.ac index 04d0aa390..176aae17e 100644 --- a/configure.ac +++ b/configure.ac @@ -73,5 +73,5 @@ else AC_DEFINE(DEFAULT_STACK_SIZE, 262144, Define the default stack size) fi -AC_CONFIG_FILES(Makefile usr/ircce/Makefile) +AC_CONFIG_FILES(Makefile usr/ircce/Makefile usr/xray/Makefile usr/libomp/Makefile) AC_OUTPUT diff --git a/tools/Makefile b/tools/Makefile.in similarity index 72% rename from tools/Makefile rename to tools/Makefile.in index a9fa8b31d..577e8850c 100644 --- a/tools/Makefile +++ b/tools/Makefile.in @@ -3,6 +3,12 @@ CC = gcc CFLAGS = -O2 -Wall -std=gnu99 $(ARCH_OPT) PROXYFILES = proxy init.sh $(shell find ../usr/tests ../usr/benchmarks ../usr/openmpbench -type f -executable) +prefix = @prefix@ +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_DATA = @INSTALL_DATA@ + # Prettify output V = 0 ifeq ($V,0) @@ -25,6 +31,10 @@ clean: @echo Cleaning tools $Q$(RM) -rf *.o *~ *.bin *.obj +install: + @echo Install tools + $Q$(INSTALL_PROGRAM) proxy $(prefix)/bin + veryclean: clean depend: diff --git a/usr/libomp b/usr/libomp index b686c65c3..e7ea3a270 160000 --- a/usr/libomp +++ b/usr/libomp @@ -1 +1 @@ -Subproject commit b686c65c3234365fd4c610be74ece5c3a5195658 +Subproject commit e7ea3a270fc09f771596c02869344a362c8c5439 diff --git a/usr/xray/Makefile b/usr/xray/Makefile.in similarity index 60% rename from usr/xray/Makefile rename to usr/xray/Makefile.in index 4e4bc0997..de709f34a 100644 --- a/usr/xray/Makefile +++ b/usr/xray/Makefile.in @@ -11,14 +11,19 @@ CFLAGS += ${CFLAGS_FOR_TARGET} OBJS = xray.o stringpool.o hashtable.o symtable.o demangle.o parsesymbols.o report.o +prefix = @prefix@ +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_DATA = @INSTALL_DATA@ $(NAME): $(OBJS) $(AR_FOR_TARGET) rsv $@ $(OBJS) install: $(NAME) - $(CP) $(NAME) $(PREFIX)/$(CROSSPREFIX)/lib - $(CP) libxray.spec $(PREFIX)/$(CROSSPREFIX)/lib - $(CP) xray.h $(PREFIX)/$(CROSSPREFIX)/include + $(INSTALL_DATA) $(NAME) $(prefix)/$(CROSSPREFIX)/lib + $(INSTALL_DATA) libxray.spec $(prefix)/$(CROSSPREFIX)/lib + $(INSTALL_DATA) xray.h $(prefix)/$(CROSSPREFIX)/include %.o: %.c @echo [CC] $@ From 5533980760b9fe3f383d30ad25afab8bbf1d62fa Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 19:13:56 +0100 Subject: [PATCH 12/25] configure all makefiles --- configure | 5 ++++- configure.ac | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0d0e3849f..ecb4f5a1f 100755 --- a/configure +++ b/configure @@ -2857,7 +2857,7 @@ $as_echo "#define DEFAULT_STACK_SIZE 262144" >>confdefs.h fi -ac_config_files="$ac_config_files Makefile usr/ircce/Makefile" +ac_config_files="$ac_config_files Makefile tools/Makefile usr/ircce/Makefile usr/xray/Makefile usr/libomp/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3552,7 +3552,10 @@ do case $ac_config_target in "include/hermit/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/hermit/config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "usr/ircce/Makefile") CONFIG_FILES="$CONFIG_FILES usr/ircce/Makefile" ;; + "usr/xray/Makefile") CONFIG_FILES="$CONFIG_FILES usr/xray/Makefile" ;; + "usr/libomp/Makefile") CONFIG_FILES="$CONFIG_FILES usr/libomp/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 176aae17e..0034a434e 100644 --- a/configure.ac +++ b/configure.ac @@ -73,5 +73,5 @@ else AC_DEFINE(DEFAULT_STACK_SIZE, 262144, Define the default stack size) fi -AC_CONFIG_FILES(Makefile usr/ircce/Makefile usr/xray/Makefile usr/libomp/Makefile) +AC_CONFIG_FILES(Makefile tools/Makefile usr/ircce/Makefile usr/xray/Makefile usr/libomp/Makefile) AC_OUTPUT From 277cdf488b43848156ca22fb0f910d035f9b18de Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 19:19:31 +0100 Subject: [PATCH 13/25] try to build all libraries --- .travis.yml | 4 ++-- debian/rules | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90387f122..0d84a836b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ before_install: - echo "deb https://dl.bintray.com/rwth-os/hermitcore vivid main" | sudo tee -a /etc/apt/sources.list - sudo apt-get -qq update - sudo apt-get install -y curl qemu-system-x86 nasm texinfo libmpfr-dev libmpc-dev libgmp-dev libisl-dev flex bison packaging-dev - - sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap - #- sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit + #- sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap + - sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit - git submodule update --init lwip usr/libomp script: diff --git a/debian/rules b/debian/rules index 42fb99c0f..d2e890c83 100755 --- a/debian/rules +++ b/debian/rules @@ -18,14 +18,15 @@ override_dh_auto_build: make arch/x86/kernel/boot.h dh_auto_build - #make libs + make libs override_dh_auto_test: @echo "tests are disabled" override_dh_auto_install: - make install_libhermit - + #make install_libhermit + make install + # delete unneded files that would cause conflicts rm -rf `-pwd`/debian/libhermit/opt/hermit/share/info/dir From 5cf3e00096c586bbe7355bab846c38eae237398e Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 19:29:50 +0100 Subject: [PATCH 14/25] on demand creates the install scripts the destination directories --- usr/ircce/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/ircce/Makefile.in b/usr/ircce/Makefile.in index 970aac0d7..b066c9959 100644 --- a/usr/ircce/Makefile.in +++ b/usr/ircce/Makefile.in @@ -34,7 +34,7 @@ $(NAME): $(OBJS) install: $Q$(INSTALL_DATA) $(NAME) $(prefix)/$(CROSSPREFIX)/lib - $Q$(INSTALL_DATA) *.h $(prefix/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) -d *.h $(prefix/$(CROSSPREFIX)/include clean: @echo Cleaning examples From 451f18ea5a07a9b6ec77a978150b4a7433e3bfa6 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 19:57:02 +0100 Subject: [PATCH 15/25] Install only RCCE headers --- usr/ircce/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/ircce/Makefile.in b/usr/ircce/Makefile.in index b066c9959..778e9e64c 100644 --- a/usr/ircce/Makefile.in +++ b/usr/ircce/Makefile.in @@ -34,7 +34,7 @@ $(NAME): $(OBJS) install: $Q$(INSTALL_DATA) $(NAME) $(prefix)/$(CROSSPREFIX)/lib - $Q$(INSTALL_DATA) -d *.h $(prefix/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) RCCE*.h $(prefix/$(CROSSPREFIX)/include clean: @echo Cleaning examples From 4747001f822ce805889e0009d1099bc56ebb79b3 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 20:10:41 +0100 Subject: [PATCH 16/25] exclude RCCE headers --- usr/ircce/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/ircce/Makefile.in b/usr/ircce/Makefile.in index 778e9e64c..b0b954843 100644 --- a/usr/ircce/Makefile.in +++ b/usr/ircce/Makefile.in @@ -34,7 +34,7 @@ $(NAME): $(OBJS) install: $Q$(INSTALL_DATA) $(NAME) $(prefix)/$(CROSSPREFIX)/lib - $Q$(INSTALL_DATA) RCCE*.h $(prefix/$(CROSSPREFIX)/include + #$Q$(INSTALL_DATA) RCCE*.h $(prefix/$(CROSSPREFIX)/include clean: @echo Cleaning examples From f13e655b723633d645081e4c09b9cda978bff6f5 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 20:30:02 +0100 Subject: [PATCH 17/25] build bootstrap version of HermitCore --- .travis.yml | 4 ++-- debian/rules | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0d84a836b..90387f122 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ before_install: - echo "deb https://dl.bintray.com/rwth-os/hermitcore vivid main" | sudo tee -a /etc/apt/sources.list - sudo apt-get -qq update - sudo apt-get install -y curl qemu-system-x86 nasm texinfo libmpfr-dev libmpc-dev libgmp-dev libisl-dev flex bison packaging-dev - #- sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap - - sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit + - sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap + #- sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit - git submodule update --init lwip usr/libomp script: diff --git a/debian/rules b/debian/rules index d2e890c83..05ef373ac 100755 --- a/debian/rules +++ b/debian/rules @@ -18,14 +18,14 @@ override_dh_auto_build: make arch/x86/kernel/boot.h dh_auto_build - make libs + #make libs override_dh_auto_test: @echo "tests are disabled" override_dh_auto_install: - #make install_libhermit - make install + make install_libhermit + #make install # delete unneded files that would cause conflicts rm -rf `-pwd`/debian/libhermit/opt/hermit/share/info/dir From 50df9f13a3bdb354bda9e79f68e1fe09eb534e27 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 20:34:33 +0100 Subject: [PATCH 18/25] install all iRCCE headers --- usr/ircce/Makefile.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usr/ircce/Makefile.in b/usr/ircce/Makefile.in index b0b954843..4c664d651 100644 --- a/usr/ircce/Makefile.in +++ b/usr/ircce/Makefile.in @@ -34,7 +34,12 @@ $(NAME): $(OBJS) install: $Q$(INSTALL_DATA) $(NAME) $(prefix)/$(CROSSPREFIX)/lib - #$Q$(INSTALL_DATA) RCCE*.h $(prefix/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) iRCCE.h $(prefix/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) iRCCE_lib.h $(prefix/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) RCCE_debug.h $(prefix/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) RCCE.h $(prefix/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) RCCE_lib.h $(prefix/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) rte_memcpy.h $(prefix/$(CROSSPREFIX)/include clean: @echo Cleaning examples From f847f7a0e8e6a18d4e1577948e17db08cea87573 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 20:36:36 +0100 Subject: [PATCH 19/25] add check that all binaries are build --- tools/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index 577e8850c..6974e9b63 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -31,7 +31,7 @@ clean: @echo Cleaning tools $Q$(RM) -rf *.o *~ *.bin *.obj -install: +install: proxy @echo Install tools $Q$(INSTALL_PROGRAM) proxy $(prefix)/bin From 4140a168624fe4c1333efbbb7c3ad55db26217e3 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 20:47:25 +0100 Subject: [PATCH 20/25] add building of all user-level libs --- .travis.yml | 4 ++-- debian/rules | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90387f122..0d84a836b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ before_install: - echo "deb https://dl.bintray.com/rwth-os/hermitcore vivid main" | sudo tee -a /etc/apt/sources.list - sudo apt-get -qq update - sudo apt-get install -y curl qemu-system-x86 nasm texinfo libmpfr-dev libmpc-dev libgmp-dev libisl-dev flex bison packaging-dev - - sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap - #- sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit + #- sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap + - sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit - git submodule update --init lwip usr/libomp script: diff --git a/debian/rules b/debian/rules index 05ef373ac..9f0e5f692 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ export DEB_BUILD_OPTS = nocheck %: - dh $@ --parallel + dh $@ #--parallel override_dh_auto_configure: ./configure --prefix=`pwd`/debian/libhermit/opt/hermit @@ -18,14 +18,14 @@ override_dh_auto_build: make arch/x86/kernel/boot.h dh_auto_build - #make libs + make libs override_dh_auto_test: @echo "tests are disabled" override_dh_auto_install: - make install_libhermit - #make install + #make install_libhermit + make install # delete unneded files that would cause conflicts rm -rf `-pwd`/debian/libhermit/opt/hermit/share/info/dir From 7329103a30c677b77bf7942e13f1ec65c87602df Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 20:52:06 +0100 Subject: [PATCH 21/25] remove typos --- usr/ircce/Makefile.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usr/ircce/Makefile.in b/usr/ircce/Makefile.in index 4c664d651..321433e84 100644 --- a/usr/ircce/Makefile.in +++ b/usr/ircce/Makefile.in @@ -34,12 +34,12 @@ $(NAME): $(OBJS) install: $Q$(INSTALL_DATA) $(NAME) $(prefix)/$(CROSSPREFIX)/lib - $Q$(INSTALL_DATA) iRCCE.h $(prefix/$(CROSSPREFIX)/include - $Q$(INSTALL_DATA) iRCCE_lib.h $(prefix/$(CROSSPREFIX)/include - $Q$(INSTALL_DATA) RCCE_debug.h $(prefix/$(CROSSPREFIX)/include - $Q$(INSTALL_DATA) RCCE.h $(prefix/$(CROSSPREFIX)/include - $Q$(INSTALL_DATA) RCCE_lib.h $(prefix/$(CROSSPREFIX)/include - $Q$(INSTALL_DATA) rte_memcpy.h $(prefix/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) iRCCE.h $(prefix)/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) iRCCE_lib.h $(prefix)/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) RCCE_debug.h $(prefix)/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) RCCE.h $(prefix)/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) RCCE_lib.h $(prefix)/$(CROSSPREFIX)/include + $Q$(INSTALL_DATA) rte_memcpy.h $(prefix)/$(CROSSPREFIX)/include clean: @echo Cleaning examples From 2b5de6b5139af5de60118ef5330f97ac071244a4 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 21:07:06 +0100 Subject: [PATCH 22/25] create directory for all bins --- tools/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/Makefile.in b/tools/Makefile.in index 6974e9b63..42f7cd9fc 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -33,6 +33,7 @@ clean: install: proxy @echo Install tools + $Q$(INSTALL_PROGRAM) -d $(prefix)/bin $Q$(INSTALL_PROGRAM) proxy $(prefix)/bin veryclean: clean From 6b5cb2e9888403f6a2ca0f7c216d56e69ac83220 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 21:21:27 +0100 Subject: [PATCH 23/25] build bootstrap lib --- .travis.yml | 4 ++-- debian/rules | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0d84a836b..90387f122 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ before_install: - echo "deb https://dl.bintray.com/rwth-os/hermitcore vivid main" | sudo tee -a /etc/apt/sources.list - sudo apt-get -qq update - sudo apt-get install -y curl qemu-system-x86 nasm texinfo libmpfr-dev libmpc-dev libgmp-dev libisl-dev flex bison packaging-dev - #- sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap - - sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit + - sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap + #- sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit - git submodule update --init lwip usr/libomp script: diff --git a/debian/rules b/debian/rules index 9f0e5f692..ee625f503 100755 --- a/debian/rules +++ b/debian/rules @@ -18,14 +18,14 @@ override_dh_auto_build: make arch/x86/kernel/boot.h dh_auto_build - make libs + #make libs override_dh_auto_test: @echo "tests are disabled" override_dh_auto_install: - #make install_libhermit - make install + make install_libhermit + #make install # delete unneded files that would cause conflicts rm -rf `-pwd`/debian/libhermit/opt/hermit/share/info/dir From 863fbdcbda790b75b682bc042dd57704f8c129c3 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 21:28:43 +0100 Subject: [PATCH 24/25] build all libs --- .travis.yml | 4 ++-- debian/rules | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90387f122..0d84a836b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ before_install: - echo "deb https://dl.bintray.com/rwth-os/hermitcore vivid main" | sudo tee -a /etc/apt/sources.list - sudo apt-get -qq update - sudo apt-get install -y curl qemu-system-x86 nasm texinfo libmpfr-dev libmpc-dev libgmp-dev libisl-dev flex bison packaging-dev - - sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap - #- sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit + #- sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap + - sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit - git submodule update --init lwip usr/libomp script: diff --git a/debian/rules b/debian/rules index ee625f503..9f0e5f692 100755 --- a/debian/rules +++ b/debian/rules @@ -18,14 +18,14 @@ override_dh_auto_build: make arch/x86/kernel/boot.h dh_auto_build - #make libs + make libs override_dh_auto_test: @echo "tests are disabled" override_dh_auto_install: - make install_libhermit - #make install + #make install_libhermit + make install # delete unneded files that would cause conflicts rm -rf `-pwd`/debian/libhermit/opt/hermit/share/info/dir From bca3f6a7311cb86e328d2adebcd3e7c05b5596a2 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 22:55:42 +0100 Subject: [PATCH 25/25] fix path to the loader --- tools/Makefile.in | 1 + tools/proxy.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index 42f7cd9fc..34535c35c 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -35,6 +35,7 @@ install: proxy @echo Install tools $Q$(INSTALL_PROGRAM) -d $(prefix)/bin $Q$(INSTALL_PROGRAM) proxy $(prefix)/bin + $Q$(INSTALL_DATA) ../arch/x86/loader/ldhermit.elf $(prefix)/bin veryclean: clean diff --git a/tools/proxy.c b/tools/proxy.c index c1229c691..b028a708b 100644 --- a/tools/proxy.c +++ b/tools/proxy.c @@ -299,7 +299,7 @@ static int init_qemu(char *path) exit(1); } str = strstr(loader_path, "proxy"); - strncpy(str, "../arch/x86/loader/ldhermit.elf", MAX_PATH-strlen(loader_path)+5); + strncpy(str, "ldhermit.elf", MAX_PATH-strlen(loader_path)+5); str = getenv("HERMIT_APP_PORT"); if (str)