merge of 4ed4d06c5ea603aeb65c4f23220d3a64c7e917c8

     and 8c18de8e683dcd5c02a273e3df84472d13182c02

11 files changed, 18 insertions, 17 deletions

diff --git a/packages/binutils/binutils_2.14.90.0.6.bb b/packages/binutils/binutils_2.14.90.0.6.bb
index 9a95ae0109..b93c5f5fe1 100644
--- a/packages/binutils/binutils_2.14.90.0.6.bb
+++ b/packages/binutils/binutils_2.14.90.0.6.bb
@@ -1,7 +1,7 @@
 SECTION = "devel"
 inherit autotools gettext
 
-PR = "r2"
+PR = "r3"
 
 DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
@@ -53,7 +53,7 @@ SRC_URI = \
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--with-sysroot=${prefix} \
+EXTRA_OECONF = "--with-sysroot=/ \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-shared"
 
diff --git a/packages/binutils/binutils_2.14.90.0.7.bb b/packages/binutils/binutils_2.14.90.0.7.bb
index 8b431732de..1afdcb560f 100644
--- a/packages/binutils/binutils_2.14.90.0.7.bb
+++ b/packages/binutils/binutils_2.14.90.0.7.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-PR = "r3"
+PR = "r4"
 
 PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
 
@@ -53,7 +53,7 @@ SRC_URI = \
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--with-sysroot=${prefix} \
+EXTRA_OECONF = "--with-sysroot=/ \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-shared"
 
diff --git a/packages/binutils/binutils_2.15.90.0.3.bb b/packages/binutils/binutils_2.15.90.0.3.bb
index 38d760d431..b5a885f3e4 100644
--- a/packages/binutils/binutils_2.15.90.0.3.bb
+++ b/packages/binutils/binutils_2.15.90.0.3.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-PR = "r3"
+PR = "r4"
 
 PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
 
@@ -51,7 +51,7 @@ SRC_URI = \
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--with-sysroot=${prefix} \
+EXTRA_OECONF = "--with-sysroot=/ \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-shared"
 
diff --git a/packages/binutils/binutils_2.15.91.0.1.bb b/packages/binutils/binutils_2.15.91.0.1.bb
index 0257b76fb7..146a94d381 100644
--- a/packages/binutils/binutils_2.15.91.0.1.bb
+++ b/packages/binutils/binutils_2.15.91.0.1.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-PR = "r3"
+PR = "r4"
 
 PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
 
@@ -50,7 +50,7 @@ SRC_URI = \
 S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--with-sysroot=${prefix} \
+EXTRA_OECONF = "--with-sysroot=/ \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-shared"
 
diff --git a/packages/binutils/binutils_2.15.91.0.2.bb b/packages/binutils/binutils_2.15.91.0.2.bb
index 588d529866..9ebff8f1df 100644
--- a/packages/binutils/binutils_2.15.91.0.2.bb
+++ b/packages/binutils/binutils_2.15.91.0.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-PR = "r5"
+PR = "r6"
 
 inherit autotools gettext
 
diff --git a/packages/binutils/binutils_2.15.94.0.1.bb b/packages/binutils/binutils_2.15.94.0.1.bb
index 5edf4548a3..6d4a1dee69 100644
--- a/packages/binutils/binutils_2.15.94.0.1.bb
+++ b/packages/binutils/binutils_2.15.94.0.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-PR = "r1"
+PR = "r2"
 
 inherit autotools gettext
 
diff --git a/packages/binutils/binutils_2.16.91.0.6.bb b/packages/binutils/binutils_2.16.91.0.6.bb
index 6e35d30686..268680cb53 100644
--- a/packages/binutils/binutils_2.16.91.0.6.bb
+++ b/packages/binutils/binutils_2.16.91.0.6.bb
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+PR = "r1"
 
 # glibc 2.3 has issues with this version
 # of binutils.
diff --git a/packages/binutils/binutils_2.16.bb b/packages/binutils/binutils_2.16.bb
index 9cca585cae..5b936dcc66 100644
--- a/packages/binutils/binutils_2.16.bb
+++ b/packages/binutils/binutils_2.16.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = \
     "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \
diff --git a/packages/binutils/binutils_csl-arm-20050416.bb b/packages/binutils/binutils_csl-arm-20050416.bb
index e6ce5337ae..687a46285e 100644
--- a/packages/binutils/binutils_csl-arm-20050416.bb
+++ b/packages/binutils/binutils_csl-arm-20050416.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
 PV = "2.15.99+csl-arm+cvs20050416"
-PR = "r0"
+PR = "r1"
 OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_arm-linux = "-1"
@@ -51,7 +51,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;meth
 S = "${WORKDIR}/src"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--with-sysroot=${prefix} \
+EXTRA_OECONF = "--with-sysroot=/ \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-shared"
 
diff --git a/packages/binutils/binutils_csl-arm-20050603.bb b/packages/binutils/binutils_csl-arm-20050603.bb
index 4e1813b90c..575a3b93f5 100644
--- a/packages/binutils/binutils_csl-arm-20050603.bb
+++ b/packages/binutils/binutils_csl-arm-20050603.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
 PV = "2.15.99+csl-arm+cvs20050603"
-PR = "r0"
+PR = "r1"
 OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE_arm-linux = "1"
@@ -51,7 +51,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;meth
 S = "${WORKDIR}/src"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--with-sysroot=${prefix} \
+EXTRA_OECONF = "--with-sysroot=/ \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-shared"
 
diff --git a/packages/binutils/binutils_cvs.bb b/packages/binutils/binutils_cvs.bb
index e870c8f0b5..ecd2d634e1 100644
--- a/packages/binutils/binutils_cvs.bb
+++ b/packages/binutils/binutils_cvs.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
 PV = "0.0+cvs${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
 
@@ -50,7 +50,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;meth
 S = "${WORKDIR}/src"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--with-sysroot=${prefix} \
+EXTRA_OECONF = "--with-sysroot=/ \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-shared"