summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoy.Li <rongqing.li@windriver.com>2013-09-03 02:50:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-14 08:29:42 +0100
commitf8ccabac554335a79720d29ad83c601444cf2633 (patch)
treea033dd294be0e6f02a6f6aed0601eab80e5f1890 /meta/recipes-core
parent97f1c03d9858a0c0cd8477746e7493fe0a4ae2e7 (diff)
downloadpoky-f8ccabac554335a79720d29ad83c601444cf2633.tar.gz
systemd: add ptest
(From OE-Core rev: dc3ac3d406bd6152eaa195e90b95bcdb0ac31121) Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd/run-ptest2
-rw-r--r--meta/recipes-core/systemd/systemd_206.bb16
2 files changed, 17 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd/run-ptest b/meta/recipes-core/systemd/systemd/run-ptest
new file mode 100644
index 0000000000..0418bc977b
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/run-ptest
@@ -0,0 +1,2 @@
1make test/rules-test.sh.log
2make test/udev-test.pl.log
diff --git a/meta/recipes-core/systemd/systemd_206.bb b/meta/recipes-core/systemd/systemd_206.bb
index 2d0ce9b062..8d0a0657bb 100644
--- a/meta/recipes-core/systemd/systemd_206.bb
+++ b/meta/recipes-core/systemd/systemd_206.bb
@@ -15,7 +15,7 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
15 15
16SECTION = "base/shell" 16SECTION = "base/shell"
17 17
18inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd 18inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest
19 19
20SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ 20SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
21 file://0001-use-CAP_MKNOD-ConditionCapability.patch \ 21 file://0001-use-CAP_MKNOD-ConditionCapability.patch \
@@ -25,6 +25,7 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
25 ${UCLIBCPATCHES} \ 25 ${UCLIBCPATCHES} \
26 file://00-create-volatile.conf \ 26 file://00-create-volatile.conf \
27 file://init \ 27 file://init \
28 file://run-ptest \
28 " 29 "
29SRC_URI[md5sum] = "89e36f2d3ba963020b72738549954cbc" 30SRC_URI[md5sum] = "89e36f2d3ba963020b72738549954cbc"
30SRC_URI[sha256sum] = "4c993de071118ea1df7ffc4be26ef0b0d78354ef15b2743a2783d20edfcde9de" 31SRC_URI[sha256sum] = "4c993de071118ea1df7ffc4be26ef0b0d78354ef15b2743a2783d20edfcde9de"
@@ -114,6 +115,19 @@ do_install() {
114 fi 115 fi
115} 116}
116 117
118do_install_ptest () {
119 install -d ${D}${PTEST_PATH}/test
120 install -d ${D}${libdir}/udev/rules.d
121 install ${B}/test/* ${D}${PTEST_PATH}/test
122 install -m 0755 ${B}/test-udev ${D}${PTEST_PATH}/
123 install -d ${D}${PTEST_PATH}/build-aux
124 cp -rf ${B}/rules ${D}${PTEST_PATH}/
125 cp ${B}/Makefile ${D}${PTEST_PATH}/
126 cp ${B}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/
127 tar -C ${D}${PTEST_PATH}/test -xJf ${B}/test/sys.tar.xz
128 sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/test/udev-test.pl
129}
130
117python populate_packages_prepend (){ 131python populate_packages_prepend (){
118 systemdlibdir = d.getVar("rootlibdir", True) 132 systemdlibdir = d.getVar("rootlibdir", True)
119 do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) 133 do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)