merge of '132be09ee353f798eadc984f8f09e27e68180850'

     and 'c0e1d74b2a331789caaf72b458b57924d21c7da3'

7 files changed, 8 insertions, 8 deletions

diff --git a/packages/glibc/glibc-initial_2.2.5.bb b/packages/glibc/glibc-initial_2.2.5.bb
index 882684e9b7..752164d968 100644
--- a/packages/glibc/glibc-initial_2.2.5.bb
+++ b/packages/glibc/glibc-initial_2.2.5.bb
@@ -18,7 +18,7 @@ do_configure () {
 		--enable-hacker-mode
 	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
 		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files,
 		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
 		# Another workaround might be to tell configure to not use any cross options to $(CC).
 		# The real fix would be to get install-headers to not generate errlist-compat.c.
diff --git a/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb b/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb
index 78bdaadd9a..389c4616d6 100644
--- a/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb
@@ -17,7 +17,7 @@ do_configure () {
 		--enable-hacker-mode
 	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
 		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files,
 		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
 		# Another workaround might be to tell configure to not use any cross options to $(CC).
 		# The real fix would be to get install-headers to not generate errlist-compat.c.
diff --git a/packages/glibc/glibc-initial_2.3.2.bb b/packages/glibc/glibc-initial_2.3.2.bb
index 4433ced868..261f87b288 100644
--- a/packages/glibc/glibc-initial_2.3.2.bb
+++ b/packages/glibc/glibc-initial_2.3.2.bb
@@ -17,7 +17,7 @@ do_configure () {
 		--enable-hacker-mode
 	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
 		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files,
 		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
 		# Another workaround might be to tell configure to not use any cross options to $(CC).
 		# The real fix would be to get install-headers to not generate errlist-compat.c.
diff --git a/packages/glibc/glibc-initial_2.4.bb b/packages/glibc/glibc-initial_2.4.bb
index f13419a413..b6bf3ece51 100644
--- a/packages/glibc/glibc-initial_2.4.bb
+++ b/packages/glibc/glibc-initial_2.4.bb
@@ -15,7 +15,7 @@ do_configure () {
 		--enable-hacker-mode
 	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
 		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files,
 		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
 		# Another workaround might be to tell configure to not use any cross options to $(CC).
 		# The real fix would be to get install-headers to not generate errlist-compat.c.
diff --git a/packages/glibc/glibc-initial_2.5.bb b/packages/glibc/glibc-initial_2.5.bb
index f13419a413..b6bf3ece51 100644
--- a/packages/glibc/glibc-initial_2.5.bb
+++ b/packages/glibc/glibc-initial_2.5.bb
@@ -15,7 +15,7 @@ do_configure () {
 		--enable-hacker-mode
 	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
 		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files,
 		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
 		# Another workaround might be to tell configure to not use any cross options to $(CC).
 		# The real fix would be to get install-headers to not generate errlist-compat.c.
diff --git a/packages/glibc/glibc-initial_cvs.bb b/packages/glibc/glibc-initial_cvs.bb
index 70c7e161a4..1a3dfe84d1 100644
--- a/packages/glibc/glibc-initial_cvs.bb
+++ b/packages/glibc/glibc-initial_cvs.bb
@@ -16,7 +16,7 @@ do_configure () {
 		--enable-hacker-mode
 	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
 		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files,
 		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
 		# Another workaround might be to tell configure to not use any cross options to $(CC).
 		# The real fix would be to get install-headers to not generate errlist-compat.c.
diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index de6765b77e..6f00011d00 100644
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -131,8 +131,8 @@ glibc_do_unpack () {
 }
 
 python do_unpack () {
-	bb.build.exec_func('base_do_unpack', d)	
-	bb.build.exec_func('glibc_do_unpack', d)	
+	bb.build.exec_func('base_do_unpack', d)
+	bb.build.exec_func('glibc_do_unpack', d)
 }
 
 do_configure () {