blob: 5c7a6625b5c576634dfc99c37825af4cd909a75f [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From 1892079b827cf8f8316305b6d6e0985db82441a2 Mon Sep 17 00:00:00 2001
2From: Thomas Kunze <thommycheck@gmx.de>
3Date: Sat, 6 Aug 2011 05:30:14 +0000
4Subject: [PATCH] klibc: initial commit of version 1.5.24
5
Patrick Williamsb48b7b42016-08-17 15:04:38 -05006Patch was imported from the OpenEmbedded git server
7(git://git.openembedded.org/openembedded)
8as of commit id eefb99a313bbcc8f34c8b32bf0c5aa2dd2580735
9Signed-off-by: Thomas Kunze <thommycheck@gmx.de>
10
11Minor edits following upstream changes
12Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
13
Brad Bishop316dfdd2018-06-25 12:45:53 -040014---
15 scripts/Kbuild.install | 4 ----
16 usr/dash/Kbuild | 2 --
17 usr/gzip/Kbuild | 2 --
18 usr/kinit/Kbuild | 2 --
19 usr/kinit/fstype/Kbuild | 2 --
20 usr/kinit/ipconfig/Kbuild | 2 --
21 usr/kinit/nfsmount/Kbuild | 2 --
22 usr/kinit/resume/Kbuild | 2 --
23 usr/kinit/run-init/Kbuild | 2 --
24 usr/klibc/Kbuild | 2 --
25 usr/utils/Kbuild | 2 --
26 11 files changed, 24 deletions(-)
27
28diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install
29index d32a8a5..fda699d 100644
30--- a/scripts/Kbuild.install
31+++ b/scripts/Kbuild.install
32@@ -88,19 +88,15 @@ else
Patrick Williamsb48b7b42016-08-17 15:04:38 -050033 header:
34 $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
35 $(Q)mkdir -p $(INSTALLROOT)$(bindir)
36- $(Q)mkdir -p $(INSTALLROOT)$(mandir)/man1
37- $(Q)mkdir -p $(INSTALLROOT)$(SHLIBDIR)
38 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)
39 $(Q)-rm -rf $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
40 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
41 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
42- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
43 $(Q)for x in ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../include/mtd; do \
44 ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
45 done
Patrick Williamsb48b7b42016-08-17 15:04:38 -050046 $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
47 $(Q)chmod -R a+rX,go-w $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
48- $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
49 $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
50
51 footer: header
Brad Bishop316dfdd2018-06-25 12:45:53 -040052diff --git a/usr/dash/Kbuild b/usr/dash/Kbuild
53index 3a98c1f..1a6920a 100644
54--- a/usr/dash/Kbuild
55+++ b/usr/dash/Kbuild
56@@ -92,5 +92,3 @@ $(obj)/syntax.c: $(obj)/mksyntax
Patrick Williamsb48b7b42016-08-17 15:04:38 -050057 $(obj)/syntax.h: $(obj)/syntax.c
58 $(Q):
59
60-# Targets to install
61-install-y := sh.shared
Brad Bishop316dfdd2018-06-25 12:45:53 -040062diff --git a/usr/gzip/Kbuild b/usr/gzip/Kbuild
63index 9bbf0a4..c497d02 100644
64--- a/usr/gzip/Kbuild
65+++ b/usr/gzip/Kbuild
66@@ -21,5 +21,3 @@ $(obj)/gunzip $(obj)/zcat: $(obj)/gzip
Patrick Williamsb48b7b42016-08-17 15:04:38 -050067 # Cleaning
68 targets := gzip gzip.g gunzip zcat
69
70-# Targets to install
71-install-y := gzip gunzip zcat
Brad Bishop316dfdd2018-06-25 12:45:53 -040072diff --git a/usr/kinit/Kbuild b/usr/kinit/Kbuild
73index 5320127..f7fdccd 100644
74--- a/usr/kinit/Kbuild
75+++ b/usr/kinit/Kbuild
76@@ -33,5 +33,3 @@ targets += kinit kinit.g kinit.shared kinit.shared.g
Patrick Williamsb48b7b42016-08-17 15:04:38 -050077 subdir- := fstype ipconfig nfsmount resume run-init
78
79
80-# install binary
81-install-y := kinit kinit.shared
Brad Bishop316dfdd2018-06-25 12:45:53 -040082diff --git a/usr/kinit/fstype/Kbuild b/usr/kinit/fstype/Kbuild
83index 9b20db1..367611d 100644
84--- a/usr/kinit/fstype/Kbuild
85+++ b/usr/kinit/fstype/Kbuild
86@@ -21,5 +21,3 @@ shared/fstype-y := $(objs)
87 # Cleaning
88 clean-dirs := static shared
89
90-# install binary
91-install-y := $(shared-y)
92diff --git a/usr/kinit/ipconfig/Kbuild b/usr/kinit/ipconfig/Kbuild
93index 7f8d181..eb1d472 100644
94--- a/usr/kinit/ipconfig/Kbuild
95+++ b/usr/kinit/ipconfig/Kbuild
96@@ -27,5 +27,3 @@ shared/ipconfig-y := $(objs)
97 # Cleaning
98 clean-dirs := static shared
99
100-# install binary
101-install-y := $(shared-y)
102diff --git a/usr/kinit/nfsmount/Kbuild b/usr/kinit/nfsmount/Kbuild
103index 461e6f3..ba31708 100644
104--- a/usr/kinit/nfsmount/Kbuild
105+++ b/usr/kinit/nfsmount/Kbuild
106@@ -23,5 +23,3 @@ dummypmap-y := dummypmap_test.o
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500107
108 clean-dirs := static shared
109
110-# Install binary
111-install-y := $(shared-y)
Brad Bishop316dfdd2018-06-25 12:45:53 -0400112diff --git a/usr/kinit/resume/Kbuild b/usr/kinit/resume/Kbuild
113index 034195d..c1342e1 100644
114--- a/usr/kinit/resume/Kbuild
115+++ b/usr/kinit/resume/Kbuild
116@@ -26,5 +26,3 @@ shared/resume-lib := ../lib.a
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500117 # Cleaning
118 clean-dirs := static shared
119
120-# install binary
121-install-y := $(shared-y)
Brad Bishop316dfdd2018-06-25 12:45:53 -0400122diff --git a/usr/kinit/run-init/Kbuild b/usr/kinit/run-init/Kbuild
123index f7832b7..c153b0a 100644
124--- a/usr/kinit/run-init/Kbuild
125+++ b/usr/kinit/run-init/Kbuild
126@@ -30,5 +30,3 @@ shared/run-init-lib := ../lib.a
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500127 # Cleaning
128 clean-dirs := static shared
129
130-# install binary
131-install-y := $(shared-y)
Brad Bishop316dfdd2018-06-25 12:45:53 -0400132diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild
133index eba6add..98caf2e 100644
134--- a/usr/klibc/Kbuild
135+++ b/usr/klibc/Kbuild
136@@ -185,5 +185,3 @@ install-rule:
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500137 $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib))
138 $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
139 $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib
140- $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
141- $(INSTALLROOT)$(SHLIBDIR)
Brad Bishop316dfdd2018-06-25 12:45:53 -0400142diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild
143index 05aa794..67d9486 100644
144--- a/usr/utils/Kbuild
145+++ b/usr/utils/Kbuild
146@@ -72,5 +72,3 @@ $(obj)/shared/reboot $(obj)/shared/poweroff: $(obj)/shared/halt
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500147 # Clean deletes the static and shared dir
148 clean-dirs := static shared
149
150-# install only install the shared binaries
151-install-y := $(shared-y) shared/reboot shared/poweroff