Fix glibc-stage.inc to copy the .a files to /usr/lib and not into /lib

diff --git a/packages/glibc/glibc-stage.inc b/packages/glibc/glibc-stage.inc
index a86cf7888edc076b63573341f8ce8865e11d8741..46220d78310f03ba3b240120fce354f4e47862e4 100644 (file)
--- a/packages/glibc/glibc-stage.inc
+++ b/packages/glibc/glibc-stage.inc
@@ -16,8 +16,8 @@ do_stage() {
                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
        done
        for i in libc.a libc_pic.a libc_nonshared.a; do
-               install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i"
+               install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_libdir}/ || die "failed to install $i"
        done
-       echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libpthread.so
-       echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
+       echo 'GROUP ( ${layout_base_libdir}/libpthread.so.0 ${layout_libdir}/libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_libdir}/libpthread.so
+       echo 'GROUP ( ${layout_base_libdir}/libc.so.6 ${layout_libdir}/libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_libdir}/libc.so
 }

diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb
index c40968dd7fc53c3a94632d12e7253d1c02da0980..8beed8e8dcc79c4f6445d865743bf460c37b9c86 100644 (file)
--- a/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r25"
+PR = "r26"
 
 GLIBC_ADDONS ?= "linuxthreads"
 

diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb
index 6ea2951eb61d39ff9ddf0a53732ab97459763bd5..fc06794e614b60e9a7cc0d643a04cf5fd73e4dfd 100644 (file)
--- a/packages/glibc/glibc_2.3.2.bb
+++ b/packages/glibc/glibc_2.3.2.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r14"
+PR = "r15"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 

diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index 9c344ccc4651b322963c145172873a9281dd6b60..4c9b3dce9402b27ef62456b376f1c3a59b3c00d1 100644 (file)
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r10"
+PR = "r11"
 
 GLIBC_ADDONS ?= "linuxthreads"
 

diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index 51de036eceee08992abf50594f15d49e0da985f3..4517adedccef34635d59c6af70fe0ee4d9f2f1de 100644 (file)
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r10"
+PR = "r11"
 
 GLIBC_ADDONS ?= "linuxthreads"
 

diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb
index 6fb4b1229387ad9bca54b3b20a5936ba5fa0b6be..b1a5d66b170afac71df93b1071d6aac7d9ef095b 100644 (file)
--- a/packages/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_i586 = "0"
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r8"
+PR = "r9"
 
 GLIBC_ADDONS ?= "linuxthreads"
 

diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb
index b1eeef30f07aa145dc071888482559ddf726dca9..510709aba9103c095b3705d5d58ea2b829887c3e 100644 (file)
--- a/packages/glibc/glibc_2.3.3.bb
+++ b/packages/glibc/glibc_2.3.3.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r11"
+PR = "r12"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 

diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 4e80f90d2c976e4797310ff25a0adb6e51e68217..d0a396d4656482d955d8c7728c07bd0c9634b757 100644 (file)
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -2,7 +2,7 @@ require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 SRCDATE = "20050627"
-PR = "r17"
+PR = "r18"
 
 #Doesnt build for sh3
 DEFAULT_PREFERENCE_sh3="-1"

diff --git a/packages/glibc/glibc_2.3.6.bb b/packages/glibc/glibc_2.3.6.bb
index bebc48dfa5482d24fbea5467d55d226221fd8118..4519be9d03eb608434c4560fcfcce8033f8f5a38 100644 (file)
--- a/packages/glibc/glibc_2.3.6.bb
+++ b/packages/glibc/glibc_2.3.6.bb
@@ -1,5 +1,7 @@
 require glibc.inc
 
+PR = "r0"
+
 #FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}"
 
 GLIBC_ADDONS ?= "linuxthreads"

diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index 0ab3dbb1574d194648755d8ec583aa9746a895d8..1112486c50d2040f952facc3c7457a2166e9008b 100644 (file)
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r15"
+PR = "r16"
 
 #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi
 COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'

diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index c74a74835793d97587ec981d7fb3cd854b5b1409..6df70076b885c6fa4c5dc13afd32cf52d16020f0 100644 (file)
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -1,5 +1,5 @@
 require glibc.inc
-PR = "r12"
+PR = "r13"
 
 ARM_INSTRUCTION_SET = "arm"
 

diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb
index c1c0c3150d4118cacd0a523a340a698f9ab325ee..5069ea19e27064420f72e7584cfdd3e5125987a6 100644 (file)
--- a/packages/glibc/glibc_2.6.1.bb
+++ b/packages/glibc/glibc_2.6.1.bb
@@ -1,5 +1,5 @@
 require glibc.inc
-PR = "r5"
+PR = "r6"
 
 ARM_INSTRUCTION_SET = "arm"
 

diff --git a/packages/glibc/glibc_2.7.bb b/packages/glibc/glibc_2.7.bb
index d355d85360b63473bd0934e6dad165edfa0d1826..760883c4b6dab9fd44cd23c4b46ce0d1fc5ccfca 100644 (file)
--- a/packages/glibc/glibc_2.7.bb
+++ b/packages/glibc/glibc_2.7.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev"
 
-PR = "r2"
+PR = "r3"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"