summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2020-09-07 10:29:33 +1000
committerChris Johns <chrisj@rtems.org>2020-09-07 10:29:33 +1000
commitb1c6a98da4a23dfbcf77bd51fee23a0baba93db2 (patch)
treebeb66cbf32ff916773d82480a5addb68bf781b55
parent7a29b47a0ff50c49cabfe1808d3d6383e55833a5 (diff)
downloadrtems-tools-b1c6a98da4a23dfbcf77bd51fee23a0baba93db2.tar.bz2
tester: Fix the install with the new TFTP server
-rwxr-xr-xtester/rtems-tftp-server6
-rw-r--r--tester/wscript17
2 files changed, 8 insertions, 15 deletions
diff --git a/tester/rtems-tftp-server b/tester/rtems-tftp-server
index 361809a..a3764ff 100755
--- a/tester/rtems-tftp-server
+++ b/tester/rtems-tftp-server
@@ -34,8 +34,10 @@ import os
import sys
base = os.path.dirname(os.path.abspath(sys.argv[0]))
-rtems = os.path.dirname(base)
-sys.path = [rtems] + sys.path
+prefix = os.path.dirname(base)
+rtems = os.path.join(prefix, 'share', 'rtems')
+tester = os.path.join(rtems, 'tester')
+sys.path = [prefix, rtems, tester] + sys.path
try:
import rt.tftpserver
diff --git a/tester/wscript b/tester/wscript
index e923347..e0e4693 100644
--- a/tester/wscript
+++ b/tester/wscript
@@ -67,7 +67,8 @@ def build(bld):
'rt/stty.py',
'rt/telnet.py',
'rt/test.py',
- 'rt/tftp.py'],
+ 'rt/tftp.py',
+ 'rt/tftpserver.py'],
install_from = '.',
install_path = '${PREFIX}/share/rtems/tester')
bld(features = 'py',
@@ -76,21 +77,11 @@ def build(bld):
'rt/pygdb/spark.py'],
install_from = '.',
install_path = '${PREFIX}/share/rtems/tester')
- bld(features = 'py',
- source = ['rt/tftpy/__init__.py',
- 'rt/tftpy/TftpClient.py',
- 'rt/tftpy/TftpContexts.py',
- 'rt/tftpy/TftpPacketFactory.py',
- 'rt/tftpy/TftpPacketTypes.py',
- 'rt/tftpy/TftpServer.py',
- 'rt/tftpy/TftpShared.py',
- 'rt/tftpy/TftpStates.py'],
- install_from = '.',
- install_path = '${PREFIX}/share/rtems/tester')
bld.install_files('${PREFIX}/bin',
['rtems-run',
'rtems-test',
- 'rtems-bsp-builder'],
+ 'rtems-bsp-builder',
+ 'rtems-tftp-server'],
chmod = 0o755)
#