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

Conflicts:
	recipes/tgt/tgt_1.0.5.bb

9 files changed, 19 insertions, 19 deletions

diff --git a/recipes/mamona/bash-noemu_3.2.bb b/recipes/mamona/bash-noemu_3.2.bb
index 4b517ec95d..4269818bc1 100644
--- a/recipes/mamona/bash-noemu_3.2.bb
+++ b/recipes/mamona/bash-noemu_3.2.bb
@@ -1,8 +1,8 @@
 require ../bash/bash.inc
-PR = "r1"
+PR = "r2"
 
-RCONFLICTS = "bash"
-RREPLACES = "bash"
+RCONFLICTS_${PN} = "bash"
+RREPLACES_${PN} = "bash"
 
 SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
            file://001-005.patch \
diff --git a/recipes/mamona/binutils-noemu_2.17.50.0.5.bb b/recipes/mamona/binutils-noemu_2.17.50.0.5.bb
index 2ba6b44304..f2362ff943 100644
--- a/recipes/mamona/binutils-noemu_2.17.50.0.5.bb
+++ b/recipes/mamona/binutils-noemu_2.17.50.0.5.bb
@@ -1,9 +1,9 @@
 require ../binutils/binutils.inc
 
-PR = "r1"
+PR = "r2"
 
-RCONFLICTS = "binutils"
-RREPLACES = "binutils"
+RCONFLICTS_${PN} = "binutils"
+RREPLACES_${PN} = "binutils"
 
 SRC_URI = \
     "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
diff --git a/recipes/mamona/binutils-noemu_2.18.bb b/recipes/mamona/binutils-noemu_2.18.bb
index 71ee3842b3..42233bcf99 100644
--- a/recipes/mamona/binutils-noemu_2.18.bb
+++ b/recipes/mamona/binutils-noemu_2.18.bb
@@ -1,9 +1,9 @@
-PR = "r0"
+PR = "r1"
 
 require ../binutils/binutils.inc
 
-RCONFLICTS = "binutils"
-RREPLACES = "binutils"
+RCONFLICTS_${PN} = "binutils"
+RREPLACES_${PN} = "binutils"
 RCONFLICTS_binutils-noemu-symlinks = "binutils-symlinks"
 RREPLACES_binutils-noemu-symlinks = "binutils-symlinks"
 
diff --git a/recipes/mamona/gcc-noemu_4.1.1.bb b/recipes/mamona/gcc-noemu_4.1.1.bb
index bd00ee1fa7..cc366d6aae 100644
--- a/recipes/mamona/gcc-noemu_4.1.1.bb
+++ b/recipes/mamona/gcc-noemu_4.1.1.bb
@@ -1,11 +1,11 @@
-PR = "r14"
+PR = "r15"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 
-RCONFLICTS = "gcc"
-RREPLACES = "gcc"
+RCONFLICTS_${PN} = "gcc"
+RREPLACES_${PN} = "gcc"
 
 inherit autotools gettext
 
diff --git a/recipes/mamona/gcc-noemu_4.1.2.bb b/recipes/mamona/gcc-noemu_4.1.2.bb
index 05cdeb003b..78c7d799a3 100644
--- a/recipes/mamona/gcc-noemu_4.1.2.bb
+++ b/recipes/mamona/gcc-noemu_4.1.2.bb
@@ -4,10 +4,10 @@ SECTION = "devel"
 LICENSE = "GPL"
 # NOTE: split PR.  If the main .bb changes something that affects its *build*
 # remember to increment the -cross .bb PR too.
-PR = "r0"
+PR = "r1"
 
-RCONFLICTS = "gcc"
-RREPLACES = "gcc"
+RCONFLICTS_${PN} = "gcc"
+RREPLACES_${PN} = "gcc"
 RCONFLICTS_g++-noemu = "g++"
 RREPLACES_g++-noemu = "g++"
 RCONFLICTS_cpp-noemu = "cpp"
diff --git a/recipes/mamona/mamona-sound-n770_0.1.0.bb b/recipes/mamona/mamona-sound-n770_0.1.0.bb
index 5cafb80aa3..c5fcbf87b9 100644
--- a/recipes/mamona/mamona-sound-n770_0.1.0.bb
+++ b/recipes/mamona/mamona-sound-n770_0.1.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://dev.openbossa.org/trac/mamona/"
 #SECTION = "console/utils"
 LICENSE = "GPL"
 RDEPENDS_${PN} = "dspgw-utils udev alsa-lib alsa-utils-alsactl"
-PR = "r1"
+PR = "r2"
 
 PACKAGES = "${PN}"
 
diff --git a/recipes/mamona/mamona-sound-n800_0.1.0.bb b/recipes/mamona/mamona-sound-n800_0.1.0.bb
index 6d7e2e1ef0..d726c36b48 100644
--- a/recipes/mamona/mamona-sound-n800_0.1.0.bb
+++ b/recipes/mamona/mamona-sound-n800_0.1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Mamona's sound configuration for Nokia N800"
 HOMEPAGE = "http://dev.openbossa.org/trac/mamona/"
 LICENSE = "GPL"
 RDEPENDS_${PN} = "dspgw-utils udev alsa-lib alsa-utils-alsactl"
-PR = "r1"
+PR = "r2"
 
 PACKAGES = "${PN}"
 
diff --git a/recipes/mamona/udev-usbserial_0.1.bb b/recipes/mamona/udev-usbserial_0.1.bb
index 2a6e9d504e..c452cf95b2 100644
--- a/recipes/mamona/udev-usbserial_0.1.bb
+++ b/recipes/mamona/udev-usbserial_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Udev rules file to spawn getty in ttyUSB"
 SECTION = "utils"
 LICENSE = "GPL"
 RDEPENDS_${PN} = "udev"
-PR = "r1"
+PR = "r2"
 
 PACKAGES = "${PN}"
 
diff --git a/recipes/mamona/usbnet_0.1.0.bb b/recipes/mamona/usbnet_0.1.0.bb
index 8ac122c3ea..65156a3e3b 100644
--- a/recipes/mamona/usbnet_0.1.0.bb
+++ b/recipes/mamona/usbnet_0.1.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://dev.openbossa.org/trac/mamona/"
 SECTION = "utils"
 LICENSE = "GPL"
 RDEPENDS_${PN} = "module-init-tools busybox"
-PR = "r1"
+PR = "r2"
 
 PACKAGES = "${PN}"