[PATCH 00/27] meta: fix B != S

[PATCH 00/27] meta: fix B != S

[Robert Yang]

The following changes since commit b61a2acc321489c3427f0afa3059486dc144a13b:

  bind: Update libxml2 check to make it deterministic. (2015-01-08 09:21:18 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/b_src
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/b_src

Robert Yang (27):
  libnl: separate B and S
  nspr: fix B != S
  ghostscript: fix B != S
  bc: separate B and S
  cmake: fix B != S
  cracklib: separate B and S
  flac: separate B and S
  libgcrypt: separate B and S
  gnutls: separate B and S
  bash: separate B and S
  pinentry: separate B and S
  oprofile: separate B and S
  expect: separate B and S
  apr-util: fix B != S
  qemu: fix B != S
  gnome-desktop-testing: separate B and S
  libcroco: separate B and S
  alsa-utils: fix B != S
  neard: fix B != S
  python: fix B != S
  connman: fix B != S
  libfm-extra: separate B and S
  libfm: separate B and S
  icon-naming-utils: separate B and S
  rpm: separate B and S
  presentproto: separate B and S
  kexec-tools: separate B and S

 meta/recipes-connectivity/connman/connman.inc      |   14 +++++++-------
 meta/recipes-connectivity/connman/connman_1.26.bb  |    2 ++
 meta/recipes-connectivity/neard/neard.inc          |    4 ++--
 meta/recipes-connectivity/neard/neard_0.14.bb      |    1 +
 meta/recipes-devtools/cmake/cmake.inc              |    6 ++++--
 meta/recipes-devtools/expect/expect_5.45.bb        |    4 +++-
 .../icon-naming-utils/icon-naming-utils_0.8.90.bb  |    4 ++--
 meta/recipes-devtools/python/python.inc            |    4 ++--
 meta/recipes-devtools/python/python3_3.3.3.bb      |    6 +++---
 meta/recipes-devtools/python/python_2.7.3.bb       |    6 +++---
 meta/recipes-devtools/qemu/qemu.inc                |    8 +++++---
 meta/recipes-devtools/rpm/rpm_4.11.2.bb            |    4 +++-
 meta/recipes-extended/bash/bash.inc                |    2 +-
 meta/recipes-extended/bash/bash_4.3.bb             |    2 ++
 meta/recipes-extended/bc/bc_1.06.bb                |    4 ++--
 meta/recipes-extended/cracklib/cracklib_2.9.2.bb   |    4 +++-
 .../ghostscript/ghostscript_9.15.bb                |    8 +++++---
 .../xorg-proto/presentproto_git.bb                 |    4 +++-
 meta/recipes-kernel/kexec/kexec-tools.inc          |    4 +++-
 meta/recipes-kernel/oprofile/oprofile.inc          |    5 ++---
 meta/recipes-kernel/oprofile/oprofile_1.0.0.bb     |    1 +
 .../alsa/alsa-utils-alsaconf_1.0.28.bb             |    2 +-
 meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb  |    4 +++-
 meta/recipes-multimedia/flac/flac_1.3.0.bb         |    4 ++--
 meta/recipes-support/apr/apr-util_1.5.4.bb         |   17 ++++++++++-------
 .../gnome-desktop-testing_2014.1.bb                |    4 +++-
 meta/recipes-support/gnutls/gnutls.inc             |    2 +-
 meta/recipes-support/gnutls/gnutls_3.3.11.bb       |    2 ++
 meta/recipes-support/libcroco/libcroco_0.6.8.bb    |    4 ++--
 meta/recipes-support/libfm/libfm-extra_1.2.3.bb    |    4 +++-
 meta/recipes-support/libfm/libfm_1.2.3.bb          |    4 +++-
 meta/recipes-support/libgcrypt/libgcrypt.inc       |    4 +++-
 meta/recipes-support/libnl/libnl_3.2.25.bb         |    3 ++-
 meta/recipes-support/nspr/nspr_4.10.7.bb           |   12 ++++++++----
 meta/recipes-support/pinentry/pinentry_0.9.0.bb    |    4 +++-
 35 files changed, 105 insertions(+), 62 deletions(-)

-- 
1.7.9.5

[PATCH 01/27] libnl: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/libnl/libnl_3.2.25.bb |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/libnl/libnl_3.2.25.bb b/meta/recipes-support/libnl/libnl_3.2.25.bb
index dcaa85d..97814fb 100644
--- a/meta/recipes-support/libnl/libnl_3.2.25.bb
+++ b/meta/recipes-support/libnl/libnl_3.2.25.bb
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
 SECTION = "libs/network"
 
 PE = "1"
+PR = "r1"
 
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
@@ -17,7 +18,7 @@ SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
 SRC_URI[md5sum] = "03f74d0cd5037cadc8cdfa313bbd195c"
 SRC_URI[sha256sum] = "8beb7590674957b931de6b7f81c530b85dc7c1ad8fbda015398bc1e8d1ce8ec5"
 
-inherit autotools-brokensep pkgconfig
+inherit autotools pkgconfig
 
 FILES_${PN} = "${libdir}/libnl-3.so.* \
                ${libdir}/libnl.so.* \
-- 
1.7.9.5

[PATCH 02/27] nspr: fix B != S

[Robert Yang]

And bump the PR to avoid:
make[3]: ../../../config/./nsinstall: Command not found

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/nspr/nspr_4.10.7.bb |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-support/nspr/nspr_4.10.7.bb b/meta/recipes-support/nspr/nspr_4.10.7.bb
index 69e9dfa..de28197 100644
--- a/meta/recipes-support/nspr/nspr_4.10.7.bb
+++ b/meta/recipes-support/nspr/nspr_4.10.7.bb
@@ -21,8 +21,7 @@ S = "${WORKDIR}/nspr-${PV}/nspr"
 RDEPENDS_${PN}-dev += "perl"
 TARGET_CC_ARCH += "${LDFLAGS}"
 
-TESTS = "runtests.pl \
-    runtests.sh \
+TESTS = " \
     accept \
     acceptread \
     acceptreademu \
@@ -138,7 +137,9 @@ TESTS = "runtests.pl \
     xnotify \
     zerolen"
 
-inherit autotools-brokensep
+PR = "r1"
+
+inherit autotools
 
 do_compile_prepend() {
 	oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export
@@ -154,8 +155,11 @@ do_install_append() {
     sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nspr.pc
     sed -i s:OEINCDIR:${includedir}:g ${D}${libdir}/pkgconfig/nspr.pc
     sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nspr.pc
-    cd ${S}/pr/tests
+
     mkdir -p ${D}${libdir}/nspr/tests
+    install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests
+    install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests
+    cd ${B}/pr/tests
     install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests
 
     # delete compile-et.pl and perr.properties from ${bindir} because these are
-- 
1.7.9.5

[PATCH 03/27] ghostscript: fix B != S

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../ghostscript/ghostscript_9.15.bb                |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.15.bb b/meta/recipes-extended/ghostscript/ghostscript_9.15.bb
index ee5483c..850ed81 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.15.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.15.bb
@@ -34,6 +34,8 @@ SRC_URI_class-native = "${SRC_URI_BASE} \
 SRC_URI[md5sum] = "5a78ab0990ff6ec3a103576bc8777c46"
 SRC_URI[sha256sum] = "27f11e4fe5b89857ae745687281d1e4daf9681edc858a3f7e8e77ef09609777a"
 
+PR = "r1"
+
 EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \
                 --with-fontpath=${datadir}/fonts \
                 --without-libidn --with-cups-serverbin=${exec_prefix}/lib/cups \
@@ -58,7 +60,7 @@ EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \
 CFLAGS += "-DHAVE_SYS_TIME_H=1"
 BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1"
 
-inherit autotools-brokensep
+inherit autotools
 
 do_configure_prepend () {
 	mkdir -p obj
@@ -80,8 +82,8 @@ do_configure_append () {
 
 do_install_append () {
     mkdir -p ${D}${datadir}/ghostscript/${PV}/
-    cp -r Resource ${D}${datadir}/ghostscript/${PV}/
-    cp -r iccprofiles ${D}${datadir}/ghostscript/${PV}/
+    cp -r ${S}/Resource ${D}${datadir}/ghostscript/${PV}/
+    cp -r ${S}/iccprofiles ${D}${datadir}/ghostscript/${PV}/
 }
 
 do_compile_class-native () {
-- 
1.7.9.5

[PATCH 04/27] bc: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/bc/bc_1.06.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/bc/bc_1.06.bb b/meta/recipes-extended/bc/bc_1.06.bb
index b116052..d8c8a86 100644
--- a/meta/recipes-extended/bc/bc_1.06.bb
+++ b/meta/recipes-extended/bc/bc_1.06.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 SECTION = "base"
 DEPENDS = "flex"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz \
            file://fix-segment-fault.patch "
@@ -18,7 +18,7 @@ SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz \
 SRC_URI[md5sum] = "d44b5dddebd8a7a7309aea6c36fda117"
 SRC_URI[sha256sum] = "4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33"
 
-inherit autotools-brokensep texinfo update-alternatives
+inherit autotools texinfo update-alternatives
 
 ALTERNATIVE_${PN} = "dc"
 ALTERNATIVE_PRIORITY = "100"
-- 
1.7.9.5

[PATCH 05/27] cmake: fix B != S

[Robert Yang]

And bump PR to avoid:
| Error when bootstrapping CMake:
| Found directory "/path/to/cmake-2.8.12.2/Bootstrap.cmk".
| Looks like somebody did bootstrap CMake in the source tree, but now you are
| trying to do bootstrap in the binary tree. Please remove Bootstrap.cmk
| directory from the source tree.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/cmake/cmake.inc |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index fb451fd..28b7f2d 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -17,7 +17,9 @@ SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz
            file://cmake-2.8.11.2-FindFreetype.patch \
            "
 
-inherit autotools-brokensep
+PR = "r1"
+
+inherit autotools
 
 # Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable
 # and possibly missing qmake binary (qtbase-native can be removed from sysroot
@@ -45,5 +47,5 @@ do_configure_prepend() {
 CMAKE_EXTRACONF = ""
 
 do_configure () {
-	./configure --prefix=${prefix} -- ${CMAKE_EXTRACONF}
+	${S}/configure --prefix=${prefix} -- ${CMAKE_EXTRACONF}
 }
-- 
1.7.9.5

[PATCH 06/27] cracklib: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/cracklib/cracklib_2.9.2.bb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.2.bb b/meta/recipes-extended/cracklib/cracklib_2.9.2.bb
index b66ca54..177ab27 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.9.2.bb
+++ b/meta/recipes-extended/cracklib/cracklib_2.9.2.bb
@@ -16,7 +16,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz \
 SRC_URI[md5sum] = "559072fdfc095cdb763c4de3471a889e"
 SRC_URI[sha256sum] = "c1c899291d443e99d1aecfbc879e4ac9c0cbc265574f47b487842da11e9759f5"
 
-inherit autotools-brokensep gettext
+PR = "r1"
+
+inherit autotools gettext
 
 do_install_append_class-target() {
 	create-cracklib-dict -o ${D}${datadir}/cracklib/pw_dict ${D}${datadir}/cracklib/cracklib-small
-- 
1.7.9.5

[PATCH 07/27] flac: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Remove the CLEANBROKEN.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-multimedia/flac/flac_1.3.0.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/flac/flac_1.3.0.bb b/meta/recipes-multimedia/flac/flac_1.3.0.bb
index cf786a4..ba9b628 100644
--- a/meta/recipes-multimedia/flac/flac_1.3.0.bb
+++ b/meta/recipes-multimedia/flac/flac_1.3.0.bb
@@ -21,9 +21,9 @@ SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz \
 SRC_URI[md5sum] = "13b5c214cee8373464d3d65dee362cdd"
 SRC_URI[sha256sum] = "fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc"
 
-CLEANBROKEN = "1"
+PR = "r1"
 
-inherit autotools-brokensep gettext
+inherit autotools gettext
 
 EXTRA_OECONF = "--disable-oggtest \
                 --with-ogg-libraries=${STAGING_LIBDIR} \
-- 
1.7.9.5

[PATCH 08/27] libgcrypt: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/libgcrypt/libgcrypt.inc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index 43e0291..eea67aa 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
@@ -18,7 +18,9 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
 
 BINCONFIG = "${bindir}/libgcrypt-config"
 
-inherit autotools-brokensep texinfo binconfig-disabled pkgconfig
+PR = "r1"
+
+inherit autotools texinfo binconfig-disabled pkgconfig
 
 EXTRA_OECONF = "--disable-asm --with-capabilities"
 
-- 
1.7.9.5

[PATCH 09/27] gnutls: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/gnutls/gnutls.inc       |    2 +-
 meta/recipes-support/gnutls/gnutls_3.3.11.bb |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 12b26cc..45fb529 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -17,7 +17,7 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]
 
 SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz"
 
-inherit autotools-brokensep texinfo binconfig pkgconfig gettext lib_package
+inherit autotools texinfo binconfig pkgconfig gettext lib_package
 
 EXTRA_OECONF="--disable-rpath \
               --with-included-libtasn1 \
diff --git a/meta/recipes-support/gnutls/gnutls_3.3.11.bb b/meta/recipes-support/gnutls/gnutls_3.3.11.bb
index 320c510..1cf3a74 100644
--- a/meta/recipes-support/gnutls/gnutls_3.3.11.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.3.11.bb
@@ -1,5 +1,7 @@
 require gnutls.inc
 
+PR = "r1"
+
 SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
            "
 SRC_URI[md5sum] = "b657e3010c10cae2244e7ce79ee3d446"
-- 
1.7.9.5

[PATCH 10/27] bash: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
x86_64-poky-linux-ar: shmatch.o: No such file or directory

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/bash/bash.inc    |    2 +-
 meta/recipes-extended/bash/bash_4.3.bb |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index a00db5c..0fd5af9 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -4,7 +4,7 @@ SECTION = "base/shell"
 
 DEPENDS = "ncurses bison-native"
 
-inherit autotools-brokensep gettext texinfo update-alternatives ptest
+inherit autotools gettext texinfo update-alternatives ptest
 
 PARALLEL_MAKE = ""
 
diff --git a/meta/recipes-extended/bash/bash_4.3.bb b/meta/recipes-extended/bash/bash_4.3.bb
index 54f2101..23d3197 100644
--- a/meta/recipes-extended/bash/bash_4.3.bb
+++ b/meta/recipes-extended/bash/bash_4.3.bb
@@ -1,5 +1,7 @@
 require bash.inc
 
+PR = "r1"
+
 # GPLv2+ (< 4.0), GPLv3+ (>= 4.0)
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-- 
1.7.9.5

[PATCH 11/27] pinentry: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/pinentry/pinentry_0.9.0.bb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/pinentry/pinentry_0.9.0.bb b/meta/recipes-support/pinentry/pinentry_0.9.0.bb
index 68d2478..10b329b 100644
--- a/meta/recipes-support/pinentry/pinentry_0.9.0.bb
+++ b/meta/recipes-support/pinentry/pinentry_0.9.0.bb
@@ -8,7 +8,9 @@ HOMEPAGE = "http://www.gnupg.org/related_software/pinentry/index.en.html"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e"
 
-inherit autotools-brokensep
+PR = "r1"
+
+inherit autotools
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2"
 
-- 
1.7.9.5

[PATCH 12/27] oprofile: separate B and S

[Robert Yang]

And bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-kernel/oprofile/oprofile.inc      |    5 ++---
 meta/recipes-kernel/oprofile/oprofile_1.0.0.bb |    1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc
index 509640c..c4fe36a 100644
--- a/meta/recipes-kernel/oprofile/oprofile.inc
+++ b/meta/recipes-kernel/oprofile/oprofile.inc
@@ -25,7 +25,7 @@ SRC_URI = "file://filemode-fix.patch \
            file://run-ptest \
            file://root-home-dir.patch"
 
-inherit autotools-brokensep pkgconfig ptest
+inherit autotools pkgconfig ptest
 
 EXTRA_OECONF = "--with-kernel=${STAGING_KERNEL_DIR}  --without-x"
 do_configure () {
@@ -40,7 +40,6 @@ do_compile_ptest() {
 
 do_install_ptest() {
 	subdirs="libdb/tests libutil++/tests libregex/tests libutil/tests libop/tests libdb/tests "
-	cd ${S}
 	for tooltest in ${subdirs}
 	do
 		find ${tooltest} -perm /u=x -type f| cpio -pvdu ${D}${PTEST_PATH}
@@ -54,6 +53,6 @@ do_install_ptest() {
 	cp libregex/tests/mangled-name ${D}${PTEST_PATH}/libregex/tests
 
 	# needed by litutil++ file_manip_tests
-	cp libutil++/tests/file_manip_tests.cpp \
+	cp ${S}/libutil++/tests/file_manip_tests.cpp \
 		libutil++/tests/file_manip_tests.o ${D}${PTEST_PATH}/libutil++/tests
 }
diff --git a/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb b/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb
index ad48ab3..f4a34b3 100644
--- a/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb
+++ b/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb
@@ -10,3 +10,4 @@ SRC_URI[sha256sum] = "847110b4ecdcf8c8353cd38f94c1b704aad4bfcd9453e38b88d112cfb7
 
 S = "${WORKDIR}/oprofile-${PV}"
 
+PR = "r1"
-- 
1.7.9.5

[PATCH 13/27] expect: separate B and S

[Robert Yang]

And bump the PR to avoid:
install: cannot stat `/path/to/image/usr/lib64/expect5.45/libexpect*.so': No such file or directory

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/expect/expect_5.45.bb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/expect/expect_5.45.bb b/meta/recipes-devtools/expect/expect_5.45.bb
index 3e839a2..264f007 100644
--- a/meta/recipes-devtools/expect/expect_5.45.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.bb
@@ -16,7 +16,9 @@ LIC_FILES_CHKSUM = "file://license.terms;md5=fbf2de7e9102505b1439db06fc36ce5c"
 DEPENDS += "tcl"
 RDEPENDS_${PN} = "tcl"
 
-inherit autotools-brokensep
+inherit autotools
+
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
            file://0001-configure.in.patch \
-- 
1.7.9.5

[PATCH 14/27] apr-util: fix B != S

[Robert Yang]

And bump PR to avoid:
x86_64-linux-libtool:   error: 'dbm/apr_dbm_gdbm.la' is not a valid libtool archive

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/apr/apr-util_1.5.4.bb |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-support/apr/apr-util_1.5.4.bb b/meta/recipes-support/apr/apr-util_1.5.4.bb
index 1cd47b1..ac01b63 100644
--- a/meta/recipes-support/apr/apr-util_1.5.4.bb
+++ b/meta/recipes-support/apr/apr-util_1.5.4.bb
@@ -28,22 +28,25 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
 		--with-expat=${STAGING_DIR_HOST}${prefix}"
 
 
-inherit autotools-brokensep lib_package binconfig
+inherit autotools lib_package binconfig
+
+PR = "r1"
 
 OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
 
 do_configure_append() {
 	if [ "${CLASSOVERRIDE}" = "class-target" ]; then
-		cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
+		cp ${STAGING_DATADIR}/apr/apr_rules.mk ${B}/build/rules.mk
 	fi
 }
 do_configure_prepend_class-native() {
-	cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk
+	mkdir ${B}/build
+	cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${B}/build/rules.mk
 }
 do_configure_append_class-native() {
-	sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk
+	sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk
 	# sometimes there isn't SHELL
-	sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk
+	sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk
 }
 
 FILES_${PN}     += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so"
@@ -54,7 +57,7 @@ FILES_${PN}-staticdev += "${libdir}/apr-util-1/apr_dbm_gdbm.a"
 inherit ptest
 
 do_compile_ptest() {
-	cd ${S}/test
+	cd ${B}/test
 	oe_runmake
 }
 
@@ -62,6 +65,6 @@ do_install_ptest() {
 	t=${D}${PTEST_PATH}/test
 	mkdir $t
 	for i in testall data; do \
-	  cp -r ${S}/test/$i $t; \
+	  cp -r ${B}/test/$i $t; \
 	done
 }
-- 
1.7.9.5

[PATCH 15/27] qemu: fix B != S

[Robert Yang]

And bump PR to avoid:
Makefile:16: *** This is an out of tree build but your source tree
(/path/to/qemu-2.2.0) seems to have been used for an in-tree build. You
can fix this by running "make distclean && rm -rf *-linux-user
*-softmmu" in your source tree.  Stop.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/qemu/qemu.inc |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index c9a5d32..49415c1 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -5,9 +5,11 @@ DEPENDS = "glib-2.0 zlib pixman"
 RDEPENDS_${PN}_class-target += "bash python"
 
 require qemu-targets.inc
-inherit autotools-brokensep
+inherit autotools
 BBCLASSEXTEND = "native nativesdk"
 
+PR = "r1"
+
 # QEMU_TARGETS is overridable variable
 QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc sh4 x86_64"
 
@@ -37,13 +39,13 @@ do_configure_prepend_class-native() {
 	fi
 
 	# Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed
-	sed -i 's/-lX11//g' Makefile.target
+	sed -i 's/-lX11//g' ${S}/Makefile.target
 }
 
 do_configure_prepend_class-nativesdk() {
 	if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then
 		# Undo the -lX11 added by linker-flags.patch
-		sed -i 's/-lX11//g' Makefile.target
+		sed -i 's/-lX11//g' ${S}/Makefile.target
 	fi
 }
 
-- 
1.7.9.5

[PATCH 16/27] gnome-desktop-testing: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../gnome-desktop-testing_2014.1.bb                |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
index c688e9d..482de99 100644
--- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
+++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
@@ -13,7 +13,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
 
 DEPENDS = "glib-2.0"
 
-inherit autotools-brokensep pkgconfig
+inherit autotools pkgconfig
+
+PR = "r1"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[journald] = "--with-systemd-journal,--without-systemd-journal,systemd,systemd"
-- 
1.7.9.5

[PATCH 17/27] libcroco: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/libcroco/libcroco_0.6.8.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/libcroco/libcroco_0.6.8.bb b/meta/recipes-support/libcroco/libcroco_0.6.8.bb
index 278934e..88696a4 100644
--- a/meta/recipes-support/libcroco/libcroco_0.6.8.bb
+++ b/meta/recipes-support/libcroco/libcroco_0.6.8.bb
@@ -11,11 +11,11 @@ SECTION = "x11/utils"
 DEPENDS = "glib-2.0 libxml2 zlib"
 BBCLASSEXTEND = "native"
 EXTRA_OECONF += "--enable-Bsymbolic=auto"
-PR = "r1"
+PR = "r2"
 
 BINCONFIG = "${bindir}/croco-0.6-config"
 
-inherit autotools-brokensep pkgconfig gnomebase gtk-doc binconfig-disabled
+inherit autotools pkgconfig gnomebase gtk-doc binconfig-disabled
 
 GNOME_COMPRESS_TYPE = "xz"
 
-- 
1.7.9.5

[PATCH 18/27] alsa-utils: fix B != S

[Robert Yang]

And bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../alsa/alsa-utils-alsaconf_1.0.28.bb             |    2 +-
 meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb  |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb
index 968c81e..2d49cc5 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb
@@ -13,5 +13,5 @@ S = "${WORKDIR}/alsa-utils-${PV}"
 
 do_install() {
 	install -d ${D}${sbindir}
-	install -m 0755 ${S}/alsaconf/alsaconf ${D}${sbindir}/
+	install -m 0755 ${B}/alsaconf/alsaconf ${D}${sbindir}/
 }
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
index 5f35d76..ac5512a 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
@@ -25,7 +25,9 @@ SRC_URI[sha256sum] = "f3ff4c89b0125a7797b1b13cd094cc92276e655458274967386e812d03
 #
 EXTRA_OECONF_append_libc-uclibc = " --disable-nls"
 
-inherit autotools-brokensep gettext pkgconfig
+PR = "r1"
+
+inherit autotools gettext pkgconfig
 
 # This are all packages that we need to make. Also, the now empty alsa-utils
 # ipk depends on them.
-- 
1.7.9.5

[PATCH 19/27] neard: fix B != S

[Robert Yang]

And bump PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-connectivity/neard/neard.inc     |    4 ++--
 meta/recipes-connectivity/neard/neard_0.14.bb |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc
index e714cad..76640d8 100644
--- a/meta/recipes-connectivity/neard/neard.inc
+++ b/meta/recipes-connectivity/neard/neard.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
  file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
  "
 
-inherit autotools-brokensep pkgconfig systemd update-rc.d
+inherit autotools pkgconfig systemd update-rc.d
 
 EXTRA_OECONF += "--enable-tools"
 
@@ -35,7 +35,7 @@ do_install_append() {
 	# Install the tests for neard-tests
 	install -d ${D}${libdir}/neard
 	install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/
-	install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/
+	install -m 0755 ${B}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/
 }
 
 PACKAGES =+ "${PN}-tests"
diff --git a/meta/recipes-connectivity/neard/neard_0.14.bb b/meta/recipes-connectivity/neard/neard_0.14.bb
index daf3a4b..43fb589 100644
--- a/meta/recipes-connectivity/neard/neard_0.14.bb
+++ b/meta/recipes-connectivity/neard/neard_0.14.bb
@@ -8,3 +8,4 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BPN}-${PV}.tar.xz \
 SRC_URI[md5sum] = "692ba2653d60155255244c87396c486b"
 SRC_URI[sha256sum] = "6ea724b443d39d679168fc7776a965d1f64727c3735391df2c01469ee7cd8cca"
 
+PR = "r1"
-- 
1.7.9.5

[PATCH 20/27] python: fix B != S

[Robert Yang]

And bump PR to avoid:
gcc: error: Parser/tokenizer_pgen.o: No such file or directory
gcc: error: Parser/printgrammar.o: No such file or directory
gcc: error: Parser/pgenmain.o: No such file or directory

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/python/python.inc       |    4 ++--
 meta/recipes-devtools/python/python3_3.3.3.bb |    6 +++---
 meta/recipes-devtools/python/python_2.7.3.bb  |    6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 19942ba..bc5e5b9 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.python.org"
 LICENSE = "PSFv2"
 SECTION = "devel/python"
 # bump this on every change in contrib/python/generate-manifest-2.7.py
-INC_PR = "r0"
+INC_PR = "r1"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ed3abfd1059e2d3a36a8cff3986f9bb6"
 
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a3
 
 PYTHON_MAJMIN = "2.7"
 
-inherit autotools-brokensep
+inherit autotools
 
 PYTHONLSBOPTS = "--with-wctype-functions"
 PYTHONLSBOPTS_linuxstdbase = "ac_cv_sizeof_off_t=8"
diff --git a/meta/recipes-devtools/python/python3_3.3.3.bb b/meta/recipes-devtools/python/python3_3.3.3.bb
index 2c1f63f..efa98c0 100644
--- a/meta/recipes-devtools/python/python3_3.3.3.bb
+++ b/meta/recipes-devtools/python/python3_3.3.3.bb
@@ -76,7 +76,7 @@ do_configure_prepend() {
 
 do_compile() {
         # regenerate platform specific files, because they depend on system headers
-        cd Lib/plat-linux*
+        cd ${S}/Lib/plat-linux*
         include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python3-native/python3 \
                 ${S}/Tools/scripts/h2py.py -i '(u_long)' \
                 ${STAGING_INCDIR}/dlfcn.h \
@@ -108,7 +108,7 @@ do_compile() {
 	install -m 0644 Makefile Makefile.sysroot
 
 	export CROSS_COMPILE="${TARGET_PREFIX}"
-	export PYTHONBUILDDIR="${S}"
+	export PYTHONBUILDDIR="${B}"
 	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \
 		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python3-native/python3 \
 		STAGING_LIBDIR=${STAGING_LIBDIR} \
@@ -136,7 +136,7 @@ do_install() {
 	install -m 0644 Makefile.orig Makefile
 
 	export CROSS_COMPILE="${TARGET_PREFIX}"
-	export PYTHONBUILDDIR="${S}"
+	export PYTHONBUILDDIR="${B}"
 	install -d ${D}${libdir}/pkgconfig
 	install -d ${D}${libdir}/python${PYTHON_MAJMIN}/config
 
diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb
index 9ded75b..90b397f 100644
--- a/meta/recipes-devtools/python/python_2.7.3.bb
+++ b/meta/recipes-devtools/python/python_2.7.3.bb
@@ -61,7 +61,7 @@ do_configure_prepend() {
 
 do_compile() {
         # regenerate platform specific files, because they depend on system headers
-        cd Lib/plat-linux2
+        cd ${S}/Lib/plat-linux2
         include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python-native/python \
                 ${S}/Tools/scripts/h2py.py -i '(u_long)' \
                 ${STAGING_INCDIR}/dlfcn.h \
@@ -93,7 +93,7 @@ do_compile() {
 	install -m 0644 Makefile Makefile.sysroot
 
 	export CROSS_COMPILE="${TARGET_PREFIX}"
-	export PYTHONBUILDDIR="${S}"
+	export PYTHONBUILDDIR="${B}"
 
 	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
 		HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
@@ -110,7 +110,7 @@ do_install() {
 	install -m 0644 Makefile.orig Makefile
 
 	export CROSS_COMPILE="${TARGET_PREFIX}"
-	export PYTHONBUILDDIR="${S}"
+	export PYTHONBUILDDIR="${B}"
 
 	# After swizzling the makefile, we need to run the build again.
 	# install can race with the build so we have to run this first, then install
-- 
1.7.9.5

[PATCH 21/27] connman: fix B != S

[Robert Yang]

And bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-connectivity/connman/connman.inc     |   14 +++++++-------
 meta/recipes-connectivity/connman/connman_1.26.bb |    2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index ddabdb9..736b324 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -67,18 +67,18 @@ SYSTEMD_SERVICE_${PN} = "connman.service"
 SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
 SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup"
 
-inherit autotools-brokensep pkgconfig systemd update-rc.d
+inherit autotools pkgconfig systemd update-rc.d
 
 do_configure_append () {
-	sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service
+	sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service
 }
 
 # This allows *everyone* to access ConnMan over DBus, without any access
 # control.  Really the at_console flag should work, which would mean that
 # both this and the xuser patch can be dropped.
 do_compile_append() {
-	sed -i -e s:deny:allow:g src/connman-dbus.conf
-	sed -i -e s:deny:allow:g vpn/vpn-dbus.conf
+	sed -i -e s:deny:allow:g ${S}/src/connman-dbus.conf
+	sed -i -e s:deny:allow:g ${S}/vpn/vpn-dbus.conf
 }
 
 do_install_append() {
@@ -89,9 +89,9 @@ do_install_append() {
 	fi
 
 	install -d ${D}${bindir}
-	install -m 0755 ${S}/tools/*-test ${D}${bindir}
-	if [ -e ${S}/tools/wispr ]; then
-		install -m 0755 ${S}/tools/wispr ${D}${bindir}
+	install -m 0755 ${B}/tools/*-test ${D}${bindir}
+	if [ -e ${B}/tools/wispr ]; then
+		install -m 0755 ${B}/tools/wispr ${D}${bindir}
 	fi
 	install -m 0755 ${B}/client/connmanctl ${D}${bindir}
 
diff --git a/meta/recipes-connectivity/connman/connman_1.26.bb b/meta/recipes-connectivity/connman/connman_1.26.bb
index b93f1cd..7c0c4f7 100644
--- a/meta/recipes-connectivity/connman/connman_1.26.bb
+++ b/meta/recipes-connectivity/connman/connman_1.26.bb
@@ -9,3 +9,5 @@ SRC_URI[md5sum] = "ba05b110b7c81e5fa14e8b402ef37a9e"
 SRC_URI[sha256sum] = "7184e4b6d954449ee00a30e188924b3e37a20ad2fd9a0b76a2bdd82c863dcf8a"
 
 RRECOMMENDS_${PN} = "connman-conf"
+
+PR = "r1"
-- 
1.7.9.5

[PATCH 22/27] libfm-extra: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/libfm/libfm-extra_1.2.3.bb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/libfm/libfm-extra_1.2.3.bb b/meta/recipes-support/libfm/libfm-extra_1.2.3.bb
index 8bdb12c..85bcc3c 100644
--- a/meta/recipes-support/libfm/libfm-extra_1.2.3.bb
+++ b/meta/recipes-support/libfm/libfm-extra_1.2.3.bb
@@ -16,6 +16,8 @@ S = "${WORKDIR}/libfm-${PV}"
 
 EXTRA_OECONF = "--with-extra-only --with-gtk=no"
 
-inherit autotools-brokensep pkgconfig gtk-doc
+PR = "r1"
+
+inherit autotools pkgconfig gtk-doc
 
 do_configure[dirs] =+ "${S}/m4"
-- 
1.7.9.5

[PATCH 23/27] libfm: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-support/libfm/libfm_1.2.3.bb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/libfm/libfm_1.2.3.bb b/meta/recipes-support/libfm/libfm_1.2.3.bb
index 856364a..629502f 100644
--- a/meta/recipes-support/libfm/libfm_1.2.3.bb
+++ b/meta/recipes-support/libfm/libfm_1.2.3.bb
@@ -16,7 +16,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz"
 SRC_URI[md5sum] = "3ff38200701658f7e80e25ed395d92dd"
 SRC_URI[sha256sum] = "c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9"
 
-inherit autotools-brokensep pkgconfig gtk-doc
+PR = "r1"
+
+inherit autotools pkgconfig gtk-doc
 
 do_configure[dirs] =+ "${S}/m4"
 
-- 
1.7.9.5

[PATCH 24/27] icon-naming-utils: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../icon-naming-utils/icon-naming-utils_0.8.90.bb  |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb b/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb
index 18e7fc0..6b356b0 100644
--- a/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb
+++ b/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb
@@ -10,7 +10,7 @@ and names that can be used to make icon themes work in a desktop \
 environment or application that implements the naming specification. "
 LICENSE = "GPLv2"
 DEPENDS = "libxml-simple-perl-native"
-PR = "r4"
+PR = "r5"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
@@ -18,7 +18,7 @@ SRC_URI = "http://tango.freedesktop.org/releases/icon-naming-utils-${PV}.tar.gz"
 SRC_URI[md5sum] = "2c5c7a418e5eb3268f65e21993277fba"
 SRC_URI[sha256sum] = "044ab2199ed8c6a55ce36fd4fcd8b8021a5e21f5bab028c0a7cdcf52a5902e1c"
 
-inherit autotools-brokensep allarch perlnative
+inherit autotools allarch perlnative
 
 do_configure_append() {
 	# Make sure we use our nativeperl wrapper.
-- 
1.7.9.5

[PATCH 25/27] rpm: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/rpm/rpm_4.11.2.bb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/rpm/rpm_4.11.2.bb b/meta/recipes-devtools/rpm/rpm_4.11.2.bb
index 86a14fa..4e44bc4 100644
--- a/meta/recipes-devtools/rpm/rpm_4.11.2.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.11.2.bb
@@ -39,7 +39,9 @@ SRC_URI += "http://rpm.org/releases/rpm-4.11.x/${BP}.tar.bz2 \
 SRC_URI[md5sum] = "876ac9948a88367054f8ddb5c0e87173"
 SRC_URI[sha256sum] = "403f8de632b33846ce5746f429c21a60f40dff9dcb56f1b4118f37a0652a48d4"
 
-inherit autotools-brokensep
+PR = "r1"
+
+inherit autotools
 inherit pythonnative
 inherit pkgconfig
 inherit gettext
-- 
1.7.9.5

[PATCH 26/27] presentproto: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../xorg-proto/presentproto_git.bb                 |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/xorg-proto/presentproto_git.bb b/meta/recipes-graphics/xorg-proto/presentproto_git.bb
index 7fca51d..dbb6f32 100644
--- a/meta/recipes-graphics/xorg-proto/presentproto_git.bb
+++ b/meta/recipes-graphics/xorg-proto/presentproto_git.bb
@@ -17,6 +17,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac"
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/presentproto"
 S = "${WORKDIR}/git"
 
-inherit autotools-brokensep
+PR = "r1"
+
+inherit autotools
 
 BBCLASSEXTEND = "native"
-- 
1.7.9.5

[PATCH 27/27] kexec-tools: separate B and S

[Robert Yang]

It works well now, and bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-kernel/kexec/kexec-tools.inc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/kexec/kexec-tools.inc b/meta/recipes-kernel/kexec/kexec-tools.inc
index 312424a..7797a25 100644
--- a/meta/recipes-kernel/kexec/kexec-tools.inc
+++ b/meta/recipes-kernel/kexec/kexec-tools.inc
@@ -10,7 +10,9 @@ DEPENDS = "zlib xz"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz"
 
-inherit autotools-brokensep
+PR = "r1"
+
+inherit autotools
 
 COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)'
 
-- 
1.7.9.5

Re: [PATCH 19/27] neard: fix B != S

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 562 bytes --]

On 14 January 2015 at 08:47, Robert Yang <liezhi.yang@windriver.com> wrote:

> And bump PR to avoid:
> configure: error: source directory already configured; run "make
> distclean" there first
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>

The autobuilder is hitting this:

/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-mips-lsb/build/build/tmp/work/mips32r2-poky-linux/neard/0.14-r1/neard-0.14/src/genbuiltin
nfctype1 nfctype2 nfctype3 nfctype4 p2p > src/builtin.h
/bin/sh: src/builtin.h: No such file or directory

Ross

[-- Attachment #2: Type: text/html, Size: 1219 bytes --]

Re: [PATCH 19/27] neard: fix B != S

[Robert Yang]

On 01/16/2015 01:12 AM, Burton, Ross wrote:
>
> On 14 January 2015 at 08:47, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> wrote:
>
>     And bump PR to avoid:
>     configure: error: source directory already configured; run "make distclean"
>     there first
>
>     Signed-off-by: Robert Yang <liezhi.yang@windriver.com
>     <mailto:liezhi.yang@windriver.com>>
>
>
> The autobuilder is hitting this:
>
> /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-mips-lsb/build/build/tmp/work/mips32r2-poky-linux/neard/0.14-r1/neard-0.14/src/genbuiltin
> nfctype1 nfctype2 nfctype3 nfctype4 p2p > src/builtin.h
> /bin/sh: src/builtin.h: No such file or directory

Hi Ross,

It's a parallel issue so that I can't reproduce it, I added a patch
in the PULL to fix it:

   git://git.openembedded.org/openembedded-core-contrib rbt/b_src
   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/b_src

commit 72dc7eea4b30c5193520361ef9f368cfe6ce0565
Author: Robert Yang <liezhi.yang@windriver.com>
Date:   Thu Jan 15 18:24:07 2015 -0800

     neard:  fix parallel issue

     There might be no src dir if the src/builtin.h runs earlier, create it
     to fix the race issue:
     src/genbuiltin nfctype1 nfctype2 nfctype3 nfctype4 p2p > src/builtin.h
     /bin/sh: src/builtin.h: No such file or directory

     Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

diff --git 
a/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch 
b/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch
new file mode 100644
index 0000000..4660676
--- /dev/null
+++ b/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch
@@ -0,0 +1,33 @@
+From 43acc56d5506c7e318f717fb3634bc16e3438913 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Thu, 15 Jan 2015 18:12:07 -0800
+Subject: [PATCH] Makefile.am: fix parallel issue
+
+There might be no src dir if src/builtin.h runs earlier, create it to
+fix the race issue:
+
+src/genbuiltin nfctype1 nfctype2 nfctype3 nfctype4 p2p > src/builtin.h
+/bin/sh: src/builtin.h: No such file or directory
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ Makefile.am |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3241311..a43eaa2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -164,6 +164,7 @@ MAINTAINERCLEANFILES = Makefile.in \
+ src/plugin.$(OBJEXT): src/builtin.h
+
+ src/builtin.h: src/genbuiltin $(builtin_sources)
++      $(AM_V_at)$(MKDIR_P) src
+       $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
+
+ $(src_neard_OBJECTS) \
+--
+1.7.9.5
+
diff --git a/meta/recipes-connectivity/neard/neard_0.14.bb 
b/meta/recipes-connectivity/neard/neard_0.14.bb
index 43fb589..7a1096b 100644
--- a/meta/recipes-connectivity/neard/neard_0.14.bb
+++ b/meta/recipes-connectivity/neard/neard_0.14.bb
@@ -4,6 +4,7 @@ SRC_URI = 
"${KERNELORG_MIRROR}/linux/network/nfc/${BPN}-${PV}.tar.xz \
             file://parallel-build.patch \
             file://neard.in \
             file://neard.service.in \
+           file://Makefile.am-fix-parallel-issue.patch \
            "
  SRC_URI[md5sum] = "692ba2653d60155255244c87396c486b"
  SRC_URI[sha256sum] = 
"6ea724b443d39d679168fc7776a965d1f64727c3735391df2c01469ee7cd8cca"

// Robert

>
> Ross