Skip to content

Commit

Permalink
getting calc to compile and link in rtems
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Feb 29, 2024
1 parent a4aa6d7 commit baffa86
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dockerfile": "../Dockerfile",
"target": "developer",
"args": {
"TARGET_ARCHITECTURE": "linux"
"TARGET_ARCHITECTURE": "rtems"
}
},
"remoteEnv": {
Expand Down
11 changes: 4 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,14 @@ RUN autosave/install.sh R5-11
COPY ibek-support/busy/ busy/
RUN busy/install.sh R1-7-3

COPY ibek-support/sscan/ sscan/
RUN sscan/install.sh R2-11-6

COPY ibek-support/calc/ calc/
RUN calc/install.sh R3-7-5

COPY ibek-support/motor/ motor/
RUN motor/install.sh R7-3-1
# COPY ibek-support/motor/ motor/
# RUN motor/install.sh R7-3-1

COPY ibek-support/pmac/ pmac/
RUN pmac/install.sh 2-6-2b1
# COPY ibek-support/pmac/ pmac/
# RUN pmac/install.sh 2-6-2b1

# get the ioc source and build it
COPY ioc ${SOURCE_FOLDER}/ioc
Expand Down
2 changes: 1 addition & 1 deletion ibek-support
Submodule ibek-support updated 1 files
+5 −1 calc/install.sh

0 comments on commit baffa86

Please sign in to comment.