Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / b48b7b4109868a8c0ddda090992e936e821c7ea6 / . / import-layers / meta-openembedded / meta-initramfs / recipes-devtools / klibc / klibc-2.0.4 / staging.patch
blob: c01c712a126f8d3762097fceba5b4ff16d8f04ad [file] [log] [blame]
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame^]1Patch was imported from the OpenEmbedded git server
2(git://git.openembedded.org/openembedded)
3as of commit id eefb99a313bbcc8f34c8b32bf0c5aa2dd2580735
4Signed-off-by: Thomas Kunze <thommycheck@gmx.de>
5
6Minor edits following upstream changes
7Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
8
9Index: klibc-1.5.24/scripts/Kbuild.install
10===================================================================
11--- a/scripts/Kbuild.install 2011-07-27 15:50:53.000000000 +0200
12+++ b/scripts/Kbuild.install 2011-08-01 00:03:03.000000000 +0200
13@@ -88,13 +88,10 @@
14 header:
15 $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
16 $(Q)mkdir -p $(INSTALLROOT)$(bindir)
17- $(Q)mkdir -p $(INSTALLROOT)$(mandir)/man1
18- $(Q)mkdir -p $(INSTALLROOT)$(SHLIBDIR)
19 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)
20 $(Q)-rm -rf $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
21 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
22 $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
23- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
24 $(Q)for x in ../../../include/asm ../../../include/asm-generic ../../../include/linux ../../../include/mtd; do \
25 ln -sf $${x} $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/ || exit; \
26 done
27@@ -103,7 +100,6 @@
28 done
29 $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
30 $(Q)chmod -R a+rX,go-w $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
31- $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
32 $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
33
34 footer: header
35
36Index: klibc-1.5.24/usr/dash/Kbuild
37===================================================================
38--- a/usr/dash/Kbuild 2011-07-27 15:50:53.000000000 +0200
39+++ b/usr/dash/Kbuild 2011-08-01 00:07:56.000000000 +0200
40@@ -92,5 +92,3 @@
41 $(obj)/syntax.h: $(obj)/syntax.c
42 $(Q):
43
44-# Targets to install
45-install-y := sh.shared
46
47Index: klibc-1.5.24/usr/gzip/Kbuild
48===================================================================
49--- a/usr/gzip/Kbuild 2011-07-27 15:50:53.000000000 +0200
50+++ b/usr/gzip/Kbuild 2011-08-01 00:06:39.000000000 +0200
51@@ -21,5 +21,3 @@
52 # Cleaning
53 targets := gzip gzip.g gunzip zcat
54
55-# Targets to install
56-install-y := gzip gunzip zcat
57
58Index: klibc-1.5.24/usr/kinit/fstype/Kbuild
59===================================================================
60--- a/usr/kinit/fstype/Kbuild 2011-07-27 15:50:53.000000000 +0200
61+++ b/usr/kinit/fstype/Kbuild 2011-08-01 00:09:12.000000000 +0200
62@@ -21,5 +21,3 @@
63 # Cleaning
64 clean-dirs := static shared
65
66-# install binary
67-install-y := $(shared-y)
68
69Index: klibc-1.5.24/usr/kinit/ipconfig/Kbuild
70===================================================================
71--- a/usr/kinit/ipconfig/Kbuild 2011-07-27 15:50:53.000000000 +0200
72+++ b/usr/kinit/ipconfig/Kbuild 2011-08-01 00:10:52.000000000 +0200
73@@ -27,5 +27,3 @@
74 # Cleaning
75 clean-dirs := static shared
76
77-# install binary
78-install-y := $(shared-y)
79
80Index: klibc-1.5.24/usr/kinit/Kbuild
81===================================================================
82--- a/usr/kinit/Kbuild 2011-07-27 15:50:53.000000000 +0200
83+++ b/usr/kinit/Kbuild 2011-08-01 00:20:18.000000000 +0200
84@@ -33,5 +33,3 @@
85 subdir- := fstype ipconfig nfsmount resume run-init
86
87
88-# install binary
89-install-y := kinit kinit.shared
90
91Index: klibc-1.5.24/usr/kinit/nfsmount/Kbuild
92===================================================================
93--- a/usr/kinit/nfsmount/Kbuild 2011-07-27 15:50:53.000000000 +0200
94+++ b/usr/kinit/nfsmount/Kbuild 2011-08-01 00:12:52.000000000 +0200
95@@ -23,5 +23,3 @@
96
97 clean-dirs := static shared
98
99-# Install binary
100-install-y := $(shared-y)
101
102Index: klibc-1.5.24/usr/kinit/resume/Kbuild
103===================================================================
104--- a/usr/kinit/resume/Kbuild 2011-07-27 15:50:53.000000000 +0200
105+++ b/usr/kinit/resume/Kbuild 2011-08-01 00:13:51.000000000 +0200
106@@ -26,5 +26,3 @@
107 # Cleaning
108 clean-dirs := static shared
109
110-# install binary
111-install-y := $(shared-y)
112
113Index: klibc-1.5.24/usr/kinit/run-init/Kbuild
114===================================================================
115--- a/usr/kinit/run-init/Kbuild 2011-07-27 15:50:53.000000000 +0200
116+++ b/usr/kinit/run-init/Kbuild 2011-08-01 00:14:41.000000000 +0200
117@@ -25,5 +25,3 @@
118 # Cleaning
119 clean-dirs := static shared
120
121-# install binary
122-install-y := $(shared-y)
123
124Index: klibc-1.5.24/usr/klibc/Kbuild
125===================================================================
126--- a/usr/klibc/Kbuild 2011-07-27 15:50:53.000000000 +0200
127+++ b/usr/klibc/Kbuild 2011-08-01 00:18:11.000000000 +0200
128@@ -177,5 +177,3 @@
129 $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib))
130 $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
131 $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib
132- $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \
133- $(INSTALLROOT)$(SHLIBDIR)
134
135Index: klibc-1.5.24/usr/utils/Kbuild
136===================================================================
137--- a/usr/utils/Kbuild 2011-07-27 15:50:53.000000000 +0200
138+++ b/usr/utils/Kbuild 2011-08-01 00:19:13.000000000 +0200
139@@ -72,5 +72,3 @@
140 # Clean deletes the static and shared dir
141 clean-dirs := static shared
142
143-# install only install the shared binaries
144-install-y := $(shared-y) shared/reboot shared/poweroff