From e132e75518f512dc5b622b1cf3fd3f706a58c292 Mon Sep 17 00:00:00 2001 From: Thanassis Tsiodras Date: Sun, 22 Oct 2017 13:21:07 +0200 Subject: [PATCH] Don't use hardcoded paths (Docker, native, chroots...) --- .../{InterfaceView.aadl => InterfaceView.aadl.template} | 0 Demo_PeekPoke_Linux/build-script.sh | 2 +- Demo_PeekPoke_Linux/user_init_pre.sh | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename Demo_PeekPoke_Linux/{InterfaceView.aadl => InterfaceView.aadl.template} (100%) diff --git a/Demo_PeekPoke_Linux/InterfaceView.aadl b/Demo_PeekPoke_Linux/InterfaceView.aadl.template similarity index 100% rename from Demo_PeekPoke_Linux/InterfaceView.aadl rename to Demo_PeekPoke_Linux/InterfaceView.aadl.template diff --git a/Demo_PeekPoke_Linux/build-script.sh b/Demo_PeekPoke_Linux/build-script.sh index 2dfdc70..9966c4a 100755 --- a/Demo_PeekPoke_Linux/build-script.sh +++ b/Demo_PeekPoke_Linux/build-script.sh @@ -96,7 +96,7 @@ cd "$CWD" && assert-builder-ocarina.py \ -o "$OUTPUTDIR" \ --subC function1:"$SKELS"/function1.zip \ --subC function2:"$SKELS"/function2.zip \ - --subC taste_probe:/home/taste/tool-inst/share/components_library/peekpoke/taste_probe.zip \ + --subC taste_probe:$(taste-config --prefix)/share/components_library/peekpoke/taste_probe.zip \ $ORCHESTRATOR_OPTIONS if [ -f user_init_last.sh ] diff --git a/Demo_PeekPoke_Linux/user_init_pre.sh b/Demo_PeekPoke_Linux/user_init_pre.sh index e2152a8..5753b39 100644 --- a/Demo_PeekPoke_Linux/user_init_pre.sh +++ b/Demo_PeekPoke_Linux/user_init_pre.sh @@ -1,3 +1,3 @@ -taste-update-data-view DataView.asn $(taste-config --prefix)/share/components_library/peekpoke/peekpoke_dataview.asn -export USER_CFLAGS=-no-pie -export USER_LDFLAGS=-no-pie +cat InterfaceView.aadl.template | \ + sed "s,/home/taste/tool-inst,$(taste-config --prefix),g" > \ + InterfaceView.aadl -- 2.26.2