Skip to content

Commit

Permalink
Fix paths in header_install script
Browse files Browse the repository at this point in the history
Signed-off-by: Akira Moroo <retrage01@gmail.com>
  • Loading branch information
retrage committed Sep 12, 2019
1 parent 61b2e07 commit cba3fd6
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions arch/um/lkl/scripts/headers_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
srctree = os.environ["srctree"]
objtree = os.environ["objtree"]
header_paths = [ "include/uapi/", "arch/um/lkl/include/uapi/",
"arch/um/lkl/include/generated/uapi/",
"include/generated/" ]
"arch/um/lkl/include/generated/uapi/", "include/generated/" ]

headers = set()
includes = set()
Expand Down Expand Up @@ -127,8 +126,8 @@ def replace(h):
parser.add_argument('-j', '--jobs', help='number of parallel jobs', default=1, type=int)
args = parser.parse_args()

find_headers("arch/lkl/include/uapi/asm/syscalls.h")
headers.add("arch/lkl/include/uapi/asm/host_ops.h")
find_headers("arch/um/lkl/include/uapi/asm/syscalls.h")
headers.add("arch/um/lkl/include/uapi/asm/host_ops.h")

if 'LKL_INSTALL_ADDITIONAL_HEADERS' in os.environ:
with open(os.environ['LKL_INSTALL_ADDITIONAL_HEADERS'], 'rU') as f:
Expand All @@ -142,7 +141,7 @@ def replace(h):
for h in headers:
dir = os.path.dirname(h)
copyfromdir = os.path.dirname(relpath2abspath(h))
out_dir = args.path + "/" + re.sub("(arch/lkl/include/uapi/|arch/lkl/include/generated/uapi/|include/uapi/|include/generated/uapi/|include/generated)(.*)", "lkl/\\2", dir)
out_dir = args.path + "/" + re.sub("(arch/um/lkl/include/uapi/|arch/um/lkl/include/generated/uapi/|include/uapi/|include/generated/uapi/|include/generated)(.*)", "lkl/\\2", dir)
try:
os.makedirs(out_dir)
except:
Expand Down

0 comments on commit cba3fd6

Please sign in to comment.