Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev

30 files changed, 37 insertions, 30 deletions

diff --git a/recipes/binutils/binutils-cross-sdk.inc b/recipes/binutils/binutils-cross-sdk.inc
index 6e9cda09b8..0ebe5147e6 100644
--- a/recipes/binutils/binutils-cross-sdk.inc
+++ b/recipes/binutils/binutils-cross-sdk.inc
@@ -17,7 +17,7 @@ do_install () {
 	rm ${D}${prefix}/${TARGET_SYS}/bin/.debug -Rf
 	rm ${D}${prefix}/${TARGET_SYS}/bin/*
 	for l in ${D}${bindir}/*; do
-		ln -sf "../../${layout_base_bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`"
+		ln -sf "../../`basename ${bindir}`/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`"
 	done
 
         # Install the libiberty header
diff --git a/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb b/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb
index f84a61d1f5..2f13b264a1 100644
--- a/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb
+++ b/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r1"
+PR = "${INC_PR}.1"
diff --git a/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb b/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb
index f84a61d1f5..2f13b264a1 100644
--- a/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb
+++ b/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r1"
+PR = "${INC_PR}.1"
diff --git a/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb b/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb
index 40e9889691..2f13b264a1 100644
--- a/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb
+++ b/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r2"
+PR = "${INC_PR}.1"
diff --git a/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb b/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb
index f84a61d1f5..2f13b264a1 100644
--- a/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb
+++ b/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r1"
+PR = "${INC_PR}.1"
diff --git a/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb b/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb
index cde4e42942..2f13b264a1 100644
--- a/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb
+++ b/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r5"
+PR = "${INC_PR}.1"
diff --git a/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb b/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb
index cde4e42942..2f13b264a1 100644
--- a/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb
+++ b/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r5"
+PR = "${INC_PR}.1"
diff --git a/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb b/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb
index cde4e42942..2f13b264a1 100644
--- a/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb
+++ b/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r5"
+PR = "${INC_PR}.1"
diff --git a/recipes/binutils/binutils-cross-sdk_2.18.bb b/recipes/binutils/binutils-cross-sdk_2.18.bb
index cde4e42942..2f13b264a1 100644
--- a/recipes/binutils/binutils-cross-sdk_2.18.bb
+++ b/recipes/binutils/binutils-cross-sdk_2.18.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r5"
+PR = "${INC_PR}.1"
diff --git a/recipes/binutils/binutils-cross-sdk_2.19.1.bb b/recipes/binutils/binutils-cross-sdk_2.19.1.bb
index f84a61d1f5..2f13b264a1 100644
--- a/recipes/binutils/binutils-cross-sdk_2.19.1.bb
+++ b/recipes/binutils/binutils-cross-sdk_2.19.1.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r1"
+PR = "${INC_PR}.1"
diff --git a/recipes/binutils/binutils-cross-sdk_2.19.51.0.3.bb b/recipes/binutils/binutils-cross-sdk_2.19.51.0.3.bb
index 76dff5449f..2f13b264a1 100644
--- a/recipes/binutils/binutils-cross-sdk_2.19.51.0.3.bb
+++ b/recipes/binutils/binutils-cross-sdk_2.19.51.0.3.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r0"
+PR = "${INC_PR}.1"
diff --git a/recipes/binutils/binutils-cross-sdk_2.19.bb b/recipes/binutils/binutils-cross-sdk_2.19.bb
index f84a61d1f5..2f13b264a1 100644
--- a/recipes/binutils/binutils-cross-sdk_2.19.bb
+++ b/recipes/binutils/binutils-cross-sdk_2.19.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-sdk.inc
-PR = "r1"
+PR = "${INC_PR}.1"
diff --git a/recipes/binutils/binutils-cross-sdk_cvs.bb b/recipes/binutils/binutils-cross-sdk_cvs.bb
index 94d2704a6f..b01afc4070 100644
--- a/recipes/binutils/binutils-cross-sdk_cvs.bb
+++ b/recipes/binutils/binutils-cross-sdk_cvs.bb
@@ -1,4 +1,4 @@
 require binutils_cvs.bb
 require binutils-cross-sdk.inc
-PR = "r5"
+PR = "${INC_PR}.1"
 FILESPATHPKG .= ":binutils-cvs"
diff --git a/recipes/binutils/binutils-cross_2.18.50.0.7.bb b/recipes/binutils/binutils-cross_2.18.50.0.7.bb
index b78a30ac47..d245f7d11a 100644
--- a/recipes/binutils/binutils-cross_2.18.50.0.7.bb
+++ b/recipes/binutils/binutils-cross_2.18.50.0.7.bb
@@ -1,4 +1,3 @@
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 require binutils_${PV}.bb
 require binutils-cross.inc
-
diff --git a/recipes/binutils/binutils-cross_2.18.bb b/recipes/binutils/binutils-cross_2.18.bb
index b78a30ac47..d245f7d11a 100644
--- a/recipes/binutils/binutils-cross_2.18.bb
+++ b/recipes/binutils/binutils-cross_2.18.bb
@@ -1,4 +1,3 @@
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 require binutils_${PV}.bb
 require binutils-cross.inc
-
diff --git a/recipes/binutils/binutils-cross_2.19.1.bb b/recipes/binutils/binutils-cross_2.19.1.bb
index b78a30ac47..d245f7d11a 100644
--- a/recipes/binutils/binutils-cross_2.19.1.bb
+++ b/recipes/binutils/binutils-cross_2.19.1.bb
@@ -1,4 +1,3 @@
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 require binutils_${PV}.bb
 require binutils-cross.inc
-
diff --git a/recipes/binutils/binutils-cross_2.19.51.0.3.bb b/recipes/binutils/binutils-cross_2.19.51.0.3.bb
index b78a30ac47..d245f7d11a 100644
--- a/recipes/binutils/binutils-cross_2.19.51.0.3.bb
+++ b/recipes/binutils/binutils-cross_2.19.51.0.3.bb
@@ -1,4 +1,3 @@
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 require binutils_${PV}.bb
 require binutils-cross.inc
-
diff --git a/recipes/binutils/binutils-cross_2.19.bb b/recipes/binutils/binutils-cross_2.19.bb
index b78a30ac47..d245f7d11a 100644
--- a/recipes/binutils/binutils-cross_2.19.bb
+++ b/recipes/binutils/binutils-cross_2.19.bb
@@ -1,4 +1,3 @@
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 require binutils_${PV}.bb
 require binutils-cross.inc
-
diff --git a/recipes/binutils/binutils_2.14.90.0.6.bb b/recipes/binutils/binutils_2.14.90.0.6.bb
index e3ab895446..ed12244bf9 100644
--- a/recipes/binutils/binutils_2.14.90.0.6.bb
+++ b/recipes/binutils/binutils_2.14.90.0.6.bb
@@ -2,7 +2,8 @@ SECTION = "devel"
 LICENSE = "GPL"
 inherit autotools gettext
 
-PR = "r5"
+INC_PR = "r5"
+PR = "${INC_PR}.1"
 
 DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
diff --git a/recipes/binutils/binutils_2.14.90.0.7.bb b/recipes/binutils/binutils_2.14.90.0.7.bb
index 3447c4fea8..0d74328649 100644
--- a/recipes/binutils/binutils_2.14.90.0.7.bb
+++ b/recipes/binutils/binutils_2.14.90.0.7.bb
@@ -5,7 +5,8 @@ inherit autotools gettext
 DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 LICENSE = "GPL"
-PR = "r6"
+INC_PR = "r6"
+PR = "${INC_PR}.1"
 
 PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
 
diff --git a/recipes/binutils/binutils_2.15.94.0.1.bb b/recipes/binutils/binutils_2.15.94.0.1.bb
index 74a902b5e6..cdcf14534e 100644
--- a/recipes/binutils/binutils_2.15.94.0.1.bb
+++ b/recipes/binutils/binutils_2.15.94.0.1.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r5"
+INC_PR = "r5"
+PR = "${INC_PR}.1"
 
 inherit autotools gettext
 
diff --git a/recipes/binutils/binutils_2.16.91.0.6.bb b/recipes/binutils/binutils_2.16.91.0.6.bb
index b2511492b3..3461c891ba 100644
--- a/recipes/binutils/binutils_2.16.91.0.6.bb
+++ b/recipes/binutils/binutils_2.16.91.0.6.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "A GNU collection of binary utilities"
 HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r3"
+INC_PR = "r3"
+PR = "${INC_PR}.1"
 
 # glibc 2.3 has issues with this version
 # of binutils.
diff --git a/recipes/binutils/binutils_2.16.91.0.7.bb b/recipes/binutils/binutils_2.16.91.0.7.bb
index 76c128583d..0fb1996ced 100644
--- a/recipes/binutils/binutils_2.16.91.0.7.bb
+++ b/recipes/binutils/binutils_2.16.91.0.7.bb
@@ -3,7 +3,8 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
 DEFAULT_PREFERENCE = "-1"
-PR = "r2"
+INC_PR = "r5"
+PR = "${INC_PR}.1"
 
 inherit autotools gettext
 
diff --git a/recipes/binutils/binutils_2.17.50.0.12.bb b/recipes/binutils/binutils_2.17.50.0.12.bb
index d24d24e1bc..d39ebc79b0 100644
--- a/recipes/binutils/binutils_2.17.50.0.12.bb
+++ b/recipes/binutils/binutils_2.17.50.0.12.bb
@@ -1,5 +1,6 @@
 require binutils.inc
-PR = "r2"
+INC_PR = "r5"
+PR = "${INC_PR}.1"
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
diff --git a/recipes/binutils/binutils_2.18.50.0.7.bb b/recipes/binutils/binutils_2.18.50.0.7.bb
index d2e3e3bcd8..2e2bb54d00 100644
--- a/recipes/binutils/binutils_2.18.50.0.7.bb
+++ b/recipes/binutils/binutils_2.18.50.0.7.bb
@@ -1,4 +1,5 @@
-PR = "r7"
+INC_PR = "r7"
+PR = "${INC_PR}.1"
 
 require binutils.inc
 LICENSE = "GPLv3"
diff --git a/recipes/binutils/binutils_2.18.bb b/recipes/binutils/binutils_2.18.bb
index 3b650c679b..87214644db 100644
--- a/recipes/binutils/binutils_2.18.bb
+++ b/recipes/binutils/binutils_2.18.bb
@@ -1,4 +1,5 @@
-PR = "r6"
+INC_PR = "r6"
+PR = "${INC_PR}.1"
 
 require binutils.inc
 LICENSE = "GPLv3"
diff --git a/recipes/binutils/binutils_2.19.1.bb b/recipes/binutils/binutils_2.19.1.bb
index 7ff6159c30..ea2de737ea 100644
--- a/recipes/binutils/binutils_2.19.1.bb
+++ b/recipes/binutils/binutils_2.19.1.bb
@@ -1,4 +1,5 @@
-PR = "r1"
+INC_PR = "r1"
+PR = "${INC_PR}.1"
 
 require binutils.inc
 LICENSE = "GPLv3"
diff --git a/recipes/binutils/binutils_2.19.51.0.3.bb b/recipes/binutils/binutils_2.19.51.0.3.bb
index 698ba2bc22..cf208b2ea9 100644
--- a/recipes/binutils/binutils_2.19.51.0.3.bb
+++ b/recipes/binutils/binutils_2.19.51.0.3.bb
@@ -1,4 +1,5 @@
-PR = "r1"
+INC_PR = "r1"
+PR = "${INC_PR}.1"
 
 require binutils.inc
 LICENSE = "GPLv3"
diff --git a/recipes/binutils/binutils_2.19.bb b/recipes/binutils/binutils_2.19.bb
index 652e705313..c1d821e11c 100644
--- a/recipes/binutils/binutils_2.19.bb
+++ b/recipes/binutils/binutils_2.19.bb
@@ -1,4 +1,5 @@
-PR = "r2"
+INC_PR = "r2"
+PR = "${INC_PR}.1"
 
 require binutils.inc
 LICENSE = "GPLv3"
diff --git a/recipes/binutils/binutils_cvs.bb b/recipes/binutils/binutils_cvs.bb
index 75c88867f1..f47de6f2ee 100644
--- a/recipes/binutils/binutils_cvs.bb
+++ b/recipes/binutils/binutils_cvs.bb
@@ -1,6 +1,7 @@
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
 PV = "0.0+cvs${SRCDATE}"
-PR = "r0"
+INC_PR = "r5"
+PR = "${INC_PR}.1"
 
 require binutils.inc