Changeset aa27a85 in rtems


Ignore:
Timestamp:
08/18/20 11:14:48 (3 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
46477898
Parents:
f3f0370f
git-author:
Sebastian Huber <sebastian.huber@…> (08/18/20 11:14:48)
git-committer:
Sebastian Huber <sebastian.huber@…> (09/14/20 05:11:40)
Message:

build: Use Python tarfile instead of pax

This patch is for the new build system.

Files:
1 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • spec/build/testsuites/libtests/dl01.yml

    rf3f0370f raa27a85  
    1010  objs.append(self.cc(bld, bic, path + "dl01-o1.c"))
    1111  tar = path + "dl01.tar"
    12   self.pax(bld, objs, [path], tar)
     12  self.tar(bld, objs, [path], tar)
    1313  tar_c, tar_h = self.bin2c(bld, tar)
    1414  objs = []

  • spec/build/testsuites/libtests/dl02.yml

    rf3f0370f raa27a85  
    1111  objs.append(self.cc(bld, bic, path + "dl02-o2.c"))
    1212  tar = path + "dl02.tar"
    13   self.pax(bld, objs, [path], tar)
     13  self.tar(bld, objs, [path], tar)
    1414  tar_c, tar_h = self.bin2c(bld, tar)
    1515  objs = []

  • spec/build/testsuites/libtests/dl04.yml

    rf3f0370f raa27a85  
    1111  objs.append(self.cxx(bld, bic, path + "dl04-o4.cc"))
    1212  tar = path + "dl04.tar"
    13   self.pax(bld, objs, [path], tar)
     13  self.tar(bld, objs, [path], tar)
    1414  tar_c, tar_h = self.bin2c(bld, tar)
    1515  objs = []

  • spec/build/testsuites/libtests/dl05.yml

    rf3f0370f raa27a85  
    1111  objs.append(self.cxx(bld, bic, path + "dl05-o5.cc"))
    1212  tar = path + "dl05.tar"
    13   self.pax(bld, objs, [path], tar)
     13  self.tar(bld, objs, [path], tar)
    1414  tar_c, tar_h = self.bin2c(bld, tar)
    1515  objs = []

  • spec/build/testsuites/libtests/dl06.yml

    rf3f0370f raa27a85  
    88  path = "testsuites/libtests/dl06/"
    99  pre_tar = path + "dl06-pre.tar"
    10   self.pax(bld, path + "dl06_pre_file", [path], pre_tar)
     10  self.tar(bld, path + "dl06_pre_file", [path], pre_tar)
    1111  pre_tar_c, pre_tar_h = self.bin2c(bld, pre_tar, name="dl06_tar")
    1212  objs = []
    … …  
    2323  self.rtems_rap(bld, dl06_pre, objs, ["m"], dl06_rap)
    2424  tar = path + "dl06.tar"
    25   self.pax(bld, dl06_rap, [path], tar)
     25  self.tar(bld, dl06_rap, [path], tar)
    2626  tar_c, tar_h = self.bin2c(bld, tar)
    2727  objs.append(self.cc(bld, bic, tar_c))

  • spec/build/testsuites/libtests/dl07.yml

    rf3f0370f raa27a85  
    1414  objs.append(self.cc(bld, bic, path + "dl07-o5.c"))
    1515  tar = path + "dl07.tar"
    16   self.pax(bld, objs, [path], tar)
     16  self.tar(bld, objs, [path], tar)
    1717  tar_c, tar_h = self.bin2c(bld, tar)
    1818  objs = []

  • spec/build/testsuites/libtests/dl08.yml

    rf3f0370f raa27a85  
    1919  objs.append(self.cc(bld, bic, path + "dl08-o1.c"))
    2020  tar = path + "dl08.tar"
    21   self.pax(bld, [path + "etc/libdl.conf"] + objs, [path], tar)
     21  self.tar(bld, [path + "etc/libdl.conf"] + objs, [path], tar)
    2222  tar_c, tar_h = self.bin2c(bld, tar)
    2323  objs = []

  • spec/build/testsuites/libtests/dl09.yml

    rf3f0370f raa27a85  
    1414  objs.append(self.cc(bld, bic, path + "dl09-o5.c"))
    1515  tar = path + "dl09.tar"
    16   self.pax(bld, objs, [path], tar)
     16  self.tar(bld, objs, [path], tar)
    1717  tar_c, tar_h = self.bin2c(bld, tar)
    1818  objs = []

  • spec/build/testsuites/libtests/dl10.yml

    rf3f0370f raa27a85  
    1919  objs.append(self.cc(bld, bic, path + "dl10-o1.c"))
    2020  tar = path + "dl10.tar"
    21   self.pax(bld, [path + "etc/libdl.conf"] + objs, [path], tar)
     21  self.tar(bld, [path + "etc/libdl.conf"] + objs, [path], tar)
    2222  tar_c, tar_h = self.bin2c(bld, tar)
    2323  objs = []

  • spec/build/testsuites/libtests/grp.yml

    rf3f0370f raa27a85  
    1818  uid: optgzip
    1919- role: build-dependency
    20   uid: optpax
    21 - role: build-dependency
    2220  uid: optrtemsld
    2321- role: build-dependency

  • wscript

    rf3f0370f raa27a85  
    406406        return target
    407407
    408     def pax(self, bld, source, remove, target):
     408    def tar(self, bld, source, remove, target):
    409409        def run(task):
     410            import tarfile
     411
     412            tar = tarfile.TarFile(
     413                task.outputs[0].abspath(), "w", format=tarfile.USTAR_FORMAT
     414            )
    410415            srcpath = bld.path.abspath() + "/"
    411416            bldpath = bld.bldnode.abspath() + "/"
    412             cmd = [bld.env.PAX[0], "-w", "-f", task.outputs[0].abspath()]
    413             for r in remove:
    414                 cmd.extend(
    415                     [
    416                         "-s",
    417                         "," + srcpath + r + ",,",
    418                         "-s",
    419                         "," + bldpath + r + ",,",
    420                     ]
    421                 )
    422             cmd.extend([i.abspath() for i in task.inputs])
    423             return task.exec_command(cmd)
     417            for src in task.inputs:
     418                src = src.abspath()
     419                dst = src
     420                for r in remove:
     421                    dst = src.replace(srcpath + r, "").replace(bldpath + r, "")
     422                tar.add(src, dst)
     423            tar.close()
     424            return 0
    424425
    425426        bld(rule=run, source=source, target=target)
Note: See TracChangeset for help on using the changeset viewer.