4 files changed, 6 insertions, 64 deletions
diff --git a/misc/tools/cmd-boot-image.py b/misc/tools/__init__.py
index f17a91e..6ad687a 100755..100644
--- a/misc/tools/cmd-boot-image.py
+++ b/misc/tools/__init__.py
@@ -1,6 +1,5 @@
-#
 # RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2019 Chris Johns (chrisj@rtems.org)
+# Copyright 2013-2014 Chris Johns (chrisj@rtems.org)
 # All rights reserved.
 #
 # This file is part of the RTEMS Tools package in 'rtems-tools'.
@@ -28,17 +27,4 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-from __future__ import print_function
-
-import sys, os
-
-base = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
-rtems = os.path.dirname(base)
-sys.path = [rtems] + sys.path
-
-try:
-    import boot
-    boot.run(sys.argv[1:], command_path = base)
-except ImportError:
-    print("Incorrect RTEMS Tools installation", file = sys.stderr)
-    sys.exit(1)
+all = ['boot']
diff --git a/misc/tools/boot.py b/misc/tools/boot.py
index 265d1b3..6e8065a 100644
--- a/misc/tools/boot.py
+++ b/misc/tools/boot.py
@@ -1,6 +1,6 @@
 #
 # RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2019 Chris Johns (chrisj@rtems.org)
+# Copyright 2019, 2020 Chris Johns (chrisj@rtems.org)
 # All rights reserved.
 #
 # This file is part of the RTEMS Tools package in 'rtems-tools'.
diff --git a/misc/tools/cmd-tftpproxy.py b/misc/tools/cmd-tftpproxy.py
deleted file mode 100755
index 9f66a76..0000000
--- a/misc/tools/cmd-tftpproxy.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2019 Chris Johns (chrisj@rtems.org)
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-from __future__ import print_function
-
-import sys, os
-
-base = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
-rtems = os.path.dirname(base)
-sys.path = [rtems] + sys.path
-
-try:
-    import tftpproxy
-    tftpproxy.run(sys.argv[1:], command_path = base)
-except ImportError:
-    print("Incorrect RTEMS Tools installation", file = sys.stderr)
-    sys.exit(1)
diff --git a/misc/tools/tftpproxy.py b/misc/tools/tftpproxy.py
index a815584..c0aebb0 100644
--- a/misc/tools/tftpproxy.py
+++ b/misc/tools/tftpproxy.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2019 Chris Johns (chris@contemporary.software)
+# Copyright 2019, 2020 Chris Johns (chris@contemporary.software)
 # All rights reserved.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -39,7 +39,7 @@ from rtemstoolkit import error
 from rtemstoolkit import log
 from rtemstoolkit import version
 
-import getmac
+import misc.tools.getmac
 
 def host_port_split(ip_port):
     ips = ip_port.split(':')
@@ -226,7 +226,7 @@ class udp_handler(socketserver.BaseRequestHandler):
                                                                client,
                                                                host))
             else:
-                mac = getmac.get_mac_address(ip = client_ip)
+                mac = misc.tools.getmac.get_mac_address(ip = client_ip)
                 log.trace(' . request: host not found: %s (%s)' % (client, mac))
 
 class udp_server(socketserver.ThreadingMixIn, socketserver.UDPServer):