[PATCH 0/2] Fix buildpaths QA check failure

[PATCH 0/2] Fix buildpaths QA check failure

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

The following changes since commit a6f8a3f12ef0a6f7fe4123b8854848a4c6cf94c7:

  toaster.bbclass: fix TypeError when parsing build stats (2015-12-22 16:15:36 +0000)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib kangkai/buildpaths
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/buildpaths

Kai Kang (2):
  bash: fix buildpaths qa check error
  gccmakedep: fix buildpaths qa check

 meta/recipes-extended/bash/bash.inc                 | 6 ++++--
 meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

-- 
2.6.1

[PATCH 1/2] bash: fix buildpaths qa check error

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

Script bashbug and Makefile for ptest contain build related paths
which cause fail to pass buldpaths QA check.

Remove such paths from these 2 files.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 meta/recipes-extended/bash/bash.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 85639d3..93ca00b 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -45,13 +45,15 @@ do_install_append () {
 }
 do_install_append_class-target () {
 	# Clean host path in bashbug
-	sed -i -e "s,${STAGING_DIR_TARGET},,g" ${D}${bindir}/bashbug
+	sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \
+		-e "s,-I${WORKDIR}/\S* ,,g" ${D}${bindir}/bashbug
 }
 
 do_install_ptest () {
 	make INSTALL_TEST_DIR=${D}${PTEST_PATH}/tests install-test
 	cp ${B}/Makefile ${D}${PTEST_PATH}
-        sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile
+        sed -i -e 's/^Makefile/_Makefile/' -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \
+	    -e "s,${S},,g" -e "s,${B},,g" -e "s,${STAGING_DIR_NATIVE},,g" ${D}${PTEST_PATH}/Makefile
 }
 
 pkg_postinst_${PN} () {
-- 
2.6.1

[PATCH 2/2] gccmakedep: fix buildpaths qa check

[kai.kang]

From: Kai Kang <kai.kang@windriver.com>

When enable "buildpaths" QA check, it fails to build gccmakedep:

| ERROR: QA Issue: File
| work/mips64-poky-linux/gccmakedep/1_1.0.3-r3/packages-split/gccmakedep/usr/bin/gccmakedep
| in package contained reference to tmpdir [buildpaths]

Remove build related path to fix this issue.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb b/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
index ccf2f4b..be3a667 100644
--- a/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
+++ b/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
@@ -14,4 +14,8 @@ PR = "r3"
 PE = "1"
 
 SRC_URI[md5sum] = "127ddb6131eb4a56fdf6644a63ade788"
-SRC_URI[sha256sum] = "f9e2e7a590e27f84b6708ab7a81e546399b949bf652fb9b95193e0e543e6a548"
\ No newline at end of file
+SRC_URI[sha256sum] = "f9e2e7a590e27f84b6708ab7a81e546399b949bf652fb9b95193e0e543e6a548"
+
+do_install_append() {
+	sed -i "s,--sysroot=${STAGING_DIR_TARGET},," ${D}${bindir}/gccmakedep
+}
-- 
2.6.1