Skip to content

Commit 704003c

Browse files
committed
lkl: follow up fixes after v5.3 merge (headers_install.sh)
Fixes: 555187a ("kbuild: simplify scripts/headers_install.sh") Signed-off-by: Hajime Tazaki <thehajime@gmail.com>
1 parent e17c2cf commit 704003c

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

arch/lkl/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ arch/lkl/include/generated/uapi/asm/syscall_defs.h: vmlinux
4545
$(Q) export tmpfile=$(shell mktemp); \
4646
sed 's/\x0//g' $@ > $$tmpfile; mv $$tmpfile $@ ; rm -f $$tmpfile
4747

48-
install: lkl.o __headers arch/lkl/include/generated/uapi/asm/syscall_defs.h
48+
install: lkl.o headers arch/lkl/include/generated/uapi/asm/syscall_defs.h
4949
@echo " INSTALL $(INSTALL_PATH)/lib/lkl.o"
5050
@mkdir -p $(INSTALL_PATH)/lib/
5151
@cp lkl.o $(INSTALL_PATH)/lib/

arch/lkl/scripts/headers_install.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,14 @@ def replace(h):
140140

141141
for h in headers:
142142
dir = os.path.dirname(h)
143-
copyfromdir = os.path.dirname(relpath2abspath(h))
144143
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)
145144
try:
146145
os.makedirs(out_dir)
147146
except:
148147
pass
149148
print(" INSTALL\t%s" % (out_dir + "/" + os.path.basename(h)))
150-
os.system(srctree+"/scripts/headers_install.sh %s %s %s" % (out_dir, copyfromdir,
151-
os.path.basename(h)))
149+
os.system(srctree+"/scripts/headers_install.sh %s %s" % (os.path.abspath(h),
150+
out_dir + "/" + os.path.basename(h)))
152151
new_headers.add(out_dir + "/" + os.path.basename(h))
153152

154153
headers = new_headers

0 commit comments

Comments
 (0)