rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-07-25 17:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove ability to synchronize with Linux

Browse Source
This commit is contained in:
Sebastian Huber 2017-10-24 08:15:06 +02:00
parent 1dd58e4fb8
commit 445d59e39c
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
builder.py
View File

@ -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):

4
freebsd-to-rtems.py
View File

@ -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: