summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuhammad Shakeel <muhammad_shakeel@mentor.com>2013-09-24 13:42:00 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-24 17:57:04 +0100
commitbd5c5f012c71e64f37a7a8995baced98165181b1 (patch)
tree55fca9b4fba642957520497ff5a69a7142ad3446
parenta2a544d62c4a4dc20fde5a4a1ca324711bd6f79c (diff)
downloadpoky-bd5c5f012c71e64f37a7a8995baced98165181b1.tar.gz
systemd: fix ptest support
Currently do_install_ptest_base is failing because it cannot find 'test' directory in build dir, ${B}. 'test' directory is present in source dir, ${S}. Same is true for build-aux/test-driver and test/sys.tar.xz. Also this fixes: QA Issue: systemd: Files/directories were installed but not shipped /usr/lib/udev /usr/lib/udev/rules.d (From OE-Core rev: bec8a29fb27ccdada0839d0bdd67ae22179a94e8) Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_206.bb7
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-core/systemd/systemd_206.bb b/meta/recipes-core/systemd/systemd_206.bb
index 8d0a0657bb..02be7935cd 100644
--- a/meta/recipes-core/systemd/systemd_206.bb
+++ b/meta/recipes-core/systemd/systemd_206.bb
@@ -117,14 +117,13 @@ do_install() {
117 117
118do_install_ptest () { 118do_install_ptest () {
119 install -d ${D}${PTEST_PATH}/test 119 install -d ${D}${PTEST_PATH}/test
120 install -d ${D}${libdir}/udev/rules.d 120 install ${S}/test/* ${D}${PTEST_PATH}/test
121 install ${B}/test/* ${D}${PTEST_PATH}/test
122 install -m 0755 ${B}/test-udev ${D}${PTEST_PATH}/ 121 install -m 0755 ${B}/test-udev ${D}${PTEST_PATH}/
123 install -d ${D}${PTEST_PATH}/build-aux 122 install -d ${D}${PTEST_PATH}/build-aux
124 cp -rf ${B}/rules ${D}${PTEST_PATH}/ 123 cp -rf ${B}/rules ${D}${PTEST_PATH}/
125 cp ${B}/Makefile ${D}${PTEST_PATH}/ 124 cp ${B}/Makefile ${D}${PTEST_PATH}/
126 cp ${B}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ 125 cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/
127 tar -C ${D}${PTEST_PATH}/test -xJf ${B}/test/sys.tar.xz 126 tar -C ${D}${PTEST_PATH}/test -xJf ${S}/test/sys.tar.xz
128 sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/test/udev-test.pl 127 sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/test/udev-test.pl
129} 128}
130 129