Remove ability to synchronize with Linux

2 files changed, 10 insertions, 13 deletions

diff --git a/builder.py b/builder.py
index 65439f63..84ae5f3b 100755
--- a/builder.py
+++ b/builder.py
@@ -50,7 +50,6 @@ import codecs
 #
 LIBBSD_DIR = "."
 FreeBSD_DIR = "freebsd-org"
-Linux_DIR = "linux-org"
 verboseLevel = 0
 isDryRun = False
 isDiffMode = False
@@ -551,7 +550,7 @@ class RTEMSPathComposer(PathComposer):
 
 class LinuxPathComposer(PathComposer):
     def composeOriginPath(self, path):
-        return os.path.join(Linux_DIR, path)
+        return path
 
     def composeLibBSDPath(self, path, prefix):
         return os.path.join(prefix, 'linux', path)
@@ -687,8 +686,8 @@ class Module:
 
     def addLinuxHeaderFiles(self, files):
         self.files += self.addFiles(files,
-                                    LinuxPathComposer(), FromFreeBSDToRTEMSHeaderConverter(),
-                                    FromRTEMSToFreeBSDHeaderConverter(), assertHeaderFile)
+                                    PathComposer(), NoConverter(),
+                                    NoConverter(), assertHeaderFile)
 
     def addCPUDependentFreeBSDHeaderFiles(self, files):
         self.files += self.addFiles(files,
@@ -697,8 +696,8 @@ class Module:
 
     def addCPUDependentLinuxHeaderFiles(self, files):
         self.files += self.addFiles(files,
-                                    CPUDependentLinuxPathComposer(), FromFreeBSDToRTEMSHeaderConverter(),
-                                    FromRTEMSToFreeBSDHeaderConverter(), assertHeaderFile)
+                                    CPUDependentLinuxPathComposer(), NoConverter(),
+                                    NoConverter(), assertHeaderFile)
 
     def addTargetSourceCPUDependentHeaderFiles(self, targetCPUs, sourceCPU, files):
         for cpu in targetCPUs:
@@ -732,8 +731,8 @@ class Module:
 
     def addLinuxSourceFiles(self, files, sourceFileFragmentComposer):
         self.files += self.addFiles(files,
-                                    LinuxPathComposer(), FromFreeBSDToRTEMSSourceConverter(),
-                                    FromRTEMSToFreeBSDSourceConverter(), assertSourceFile,
+                                    PathComposer(), NoConverter(),
+                                    NoConverter(), assertSourceFile,
                                     sourceFileFragmentComposer)
 
     def addCPUDependentFreeBSDSourceFiles(self, cpus, files, sourceFileFragmentComposer):
@@ -759,8 +758,8 @@ class Module:
             self.initCPUDependencies(cpu)
             self.cpuDependentSourceFiles[cpu] += \
                 self.addFiles(files,
-                              CPUDependentLinuxPathComposer(), FromFreeBSDToRTEMSSourceConverter(),
-                              FromRTEMSToFreeBSDSourceConverter(), assertSourceFile,
+                              CPUDependentLinuxPathComposer(), NoConverter(),
+                              NoConverter(), assertSourceFile,
                               sourceFileFragmentComposer)
 
     def addTest(self, testFragementComposer):
diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py
index 418c6c76..443fa833 100755
--- a/freebsd-to-rtems.py
+++ b/freebsd-to-rtems.py
@@ -122,7 +122,6 @@ print("Diff Mode Enabled:           %s" % (("no", "yes")[builder.isDiffMode]))
 print("Only Generate Build Scripts: %s" % (("no", "yes")[isOnlyBuildScripts]))
 print("LibBSD Directory:            %s" % (builder.LIBBSD_DIR))
 print("FreeBSD Directory:           %s" % (builder.FreeBSD_DIR))
-print("Linux Directory:             %s" % (builder.Linux_DIR))
 print("Direction:                   %s" % (("reverse", "forward")[isForward]))
 
 # Check directory argument was set and exist
@@ -138,11 +137,10 @@ def wasDirectorySet(desc, path):
 # Were directories specified?
 wasDirectorySet( "LibBSD", builder.LIBBSD_DIR )
 wasDirectorySet( "FreeBSD", builder.FreeBSD_DIR )
-wasDirectorySet( "Linux", builder.Linux_DIR )
 
 # Are we generating or reverting?
 if isForward == True:
-    print("Forward from", builder.FreeBSD_DIR, "and", builder.Linux_DIR, "into", builder.LIBBSD_DIR)
+    print("Forward from", builder.FreeBSD_DIR, "into", builder.LIBBSD_DIR)
 else:
     print("Reverting from", builder.LIBBSD_DIR)
     if isOnlyBuildScripts == True: