diff options
| -rw-r--r-- | classes/insane.bbclass | 10 | ||||
| -rw-r--r-- | packages/uclibc/uclibc.inc | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 8ef4858aa4..15e2061239 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -210,11 +210,11 @@ def package_qa_check_rpath(file,name,d): output = os.popen("%s -Byr %s" % (scanelf,file)) txt = output.readline().split() - if bad_dir in txt: - package_qa_write_error( 1, name, file, d) - bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, txt, file)) - return False - + for line in txt: + if bad_dir in line: + package_qa_write_error( 1, name, file, d) + bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, line, file)) + return False return True def package_qa_check_devdbg(path, name,d): diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index d81cfc636a..15004c4b9a 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -72,8 +72,10 @@ EXTRA_OEMAKE_task_do_populate_staging = "${OEMAKE_NO_CC}" EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}" KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}/include" +KERNEL_HEADERS = "${CROSS_DIR}/${TARGET_SYS}/include" configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${KERNEL_SOURCE}",g; \ + s,^KERNEL_HEADERS=.*,KERNEL_HEADERS="${KERNEL_HEADERS}",g; \ s,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX="/",g; \ s,^DEVEL_PREFIX=.*,DEVEL_PREFIX="/${prefix}",g; \ s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \ |