Two minor fixes.

configs/common/SysPaths.py:
    Undo accidental change.
src/SConscript:
    Fix.

--HG--
extra : convert_revision : 665b186cff7d8ae560601ced7ae407a41a16cfea

diff --git a/configs/common/SysPaths.py b/configs/common/SysPaths.py
index 5098c54cececc734f8773fe12a3e598bf57cba9e..2070d11f80f0e9d9177f0c8b64e7ee20ed79eb98 100644 (file)
--- a/configs/common/SysPaths.py
+++ b/configs/common/SysPaths.py
@@ -58,7 +58,7 @@ def system():
     if not binary.dir:
         binary.dir = joinpath(system.dir, 'binaries')
     if not disk.dir:
-        disk.dir = joinpath('/n/zamp/z/ktlim/local/clean/linux', 'disks')
+        disk.dir = joinpath(system.dir, 'disks')
     if not script.dir:
         script.dir = joinpath(system.dir, 'boot')
 

diff --git a/src/SConscript b/src/SConscript
index e75a36ab51b6062f5e0d82b87ac483f2770e8056..9f88bbeea34d8753d752cfb10403053d1f994c7c 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -285,7 +285,6 @@ turbolaser_sources = Split('''
 
 # Syscall emulation (non-full-system) sources
 syscall_emulation_sources = Split('''
-        cpu/memtest/memtest.cc
         mem/translating_port.cc
         mem/page_table.cc
        sim/process.cc