diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2019-01-07 04:13:18 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-01-18 03:10:14 +0000 |
| commit | 2931607d8156b4a725d485d2d0bb0cc5aa90e556 (patch) | |
| tree | 9080698b0ec119267b16e8344330e4e3176519a2 | |
| parent | 42be2beaa876e041d6c1a1eb5bb3b81b9e8242ac (diff) | |
| download | klibc-2931607d8156b4a725d485d2d0bb0cc5aa90e556.tar.gz | |
[klibc] Kbuild.install: Copy UAPI headers instead of reinstalling them
Since the UAPI/KAPI header split in Linux 3.7, we have needed
KLIBCKERNELSRC to point to the installed UAPI headers. Invoking
"make headers_install" in this directory doesn't work.
The previously proposed fix was to invoke make in the parent
directory. But since we require the headers to be installed
already, we can copy the install tree instead. Make sure to
dereference any symbolic links while doing this.
Reported-by: Thomas Meyer <thomas@m3y3r.de>
Reported-by: Luis R. Rodriguez <mcgrof@kernel.org>
Link: https://www.zytor.com/pipermail/klibc/2019-January/004033.html
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | scripts/Kbuild.install | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install index bafd42328ddbb..32aec84a1a8c7 100644 --- a/scripts/Kbuild.install +++ b/scripts/Kbuild.install @@ -95,7 +95,7 @@ header: $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin - $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install + $(Q)cp -rfL $(KLIBCKERNELSRC)/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. $(Q)chmod -R a+rX,go-w $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 |