]> code.ossystems Code Review - openembedded-core.git/commitdiff
systemd: fix ptest support
authorMuhammad Shakeel <muhammad_shakeel@mentor.com>
Tue, 24 Sep 2013 08:42:00 +0000 (13:42 +0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 24 Sep 2013 16:47:04 +0000 (17:47 +0100)
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

Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/systemd/systemd_206.bb

index 8d0a0657bbc46a1010db34b2e360ae2f1698c9e9..02be7935cdafefd2c7c284a9e60617d693746379 100644 (file)
@@ -117,14 +117,13 @@ do_install() {
 
 do_install_ptest () {
        install -d ${D}${PTEST_PATH}/test
-       install -d ${D}${libdir}/udev/rules.d
-       install ${B}/test/* ${D}${PTEST_PATH}/test
+       install ${S}/test/* ${D}${PTEST_PATH}/test
        install -m 0755  ${B}/test-udev ${D}${PTEST_PATH}/
        install -d ${D}${PTEST_PATH}/build-aux
        cp -rf ${B}/rules ${D}${PTEST_PATH}/
        cp ${B}/Makefile ${D}${PTEST_PATH}/
-       cp ${B}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/
-       tar -C ${D}${PTEST_PATH}/test -xJf ${B}/test/sys.tar.xz
+       cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/
+       tar -C ${D}${PTEST_PATH}/test -xJf ${S}/test/sys.tar.xz
        sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/test/udev-test.pl
 }