klibc - Jan 2019 - [klibc:master] Kbuild.install: Copy UAPI headers instead of reinstalling them

Commit-ID:  2931607d8156b4a725d485d2d0bb0cc5aa90e556
Gitweb:    
http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=2931607d8156b4a725d485d2d0bb0cc5aa90e556
Author:     Ben Hutchings <ben at decadent.org.uk>
AuthorDate: Mon, 7 Jan 2019 04:13:18 +0000
Committer:  Ben Hutchings <ben at decadent.org.uk>
CommitDate: Fri, 18 Jan 2019 03:10:14 +0000

[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 at m3y3r.de>
Reported-by: Luis R. Rodriguez <mcgrof at kernel.org>
Link: https://www.zytor.com/pipermail/klibc/2019-January/004033.html
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>

---
 scripts/Kbuild.install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install
index bafd423..32aec84 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