From: Michael Smith <msmith@cbnco.com>
Date: Thu, 9 Jul 2009 04:16:56 +0000 (+0000)
Subject: glibc-stage.inc: don't overwrite gnu/stubs.h
X-Git-Tag: Release-2010-05/1~2947
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13a89f86f4b48f10743b7346dfd0120e0125877a;p=openembedded.git

glibc-stage.inc: don't overwrite gnu/stubs.h

"make install" installs the full version. do_stage() was overwriting
it with an empty file that tricked openssh into calling setlogin()
and logging benign errors.

Also removing a couple of lines not required anymore, I think because
"make install-headers install-lib" was switched to "make install"
in e96e82cd.

Tested with 2.6.1 on x86.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---

diff --git a/recipes/glibc/glibc-stage.inc b/recipes/glibc/glibc-stage.inc
index 2b7b303c14..cb9ab04e1f 100644
--- a/recipes/glibc/glibc-stage.inc
+++ b/recipes/glibc/glibc-stage.inc
@@ -5,12 +5,10 @@ do_stage() {
 		   '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
 		   install
 
-	install -d ${STAGING_INCDIR}/gnu \
-		   ${STAGING_INCDIR}/bits \
-		   ${STAGING_INCDIR}/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-	install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
+	# "make install" omits some (not all) RPC headers that other distros
+	# ship.
+	install -d ${STAGING_INCDIR}/rpcsvc
+
 	for r in ${rpcsvc}; do
 		h=`echo $r|sed -e's,\.x$,.h,'`
 		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/