Patchwork systemd: add ptest

login
register
mail settings
Submitter rongqing.li@windriver.com
Date Aug. 28, 2013, 8:39 a.m.
Message ID <1377679158-29124-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/56801/
State New
Headers show

Comments

rongqing.li@windriver.com - Aug. 28, 2013, 8:39 a.m.
From: "Roy.Li" <rongqing.li@windriver.com>

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
---
 meta/recipes-core/systemd/systemd/run-ptest |    2 ++
 meta/recipes-core/systemd/systemd_204.bb    |   18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-core/systemd/systemd/run-ptest
Qi.Chen@windriver.com - Aug. 28, 2013, 9:15 a.m.
On 08/28/2013 04:39 PM, rongqing.li@windriver.com wrote:
> From: "Roy.Li" <rongqing.li@windriver.com>
>
> Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> ---
>   meta/recipes-core/systemd/systemd/run-ptest |    2 ++
>   meta/recipes-core/systemd/systemd_204.bb    |   18 +++++++++++++++++-
>   2 files changed, 19 insertions(+), 1 deletion(-)
>   create mode 100644 meta/recipes-core/systemd/systemd/run-ptest
>
> diff --git a/meta/recipes-core/systemd/systemd/run-ptest b/meta/recipes-core/systemd/systemd/run-ptest
> new file mode 100644
> index 0000000..0418bc9
> --- /dev/null
> +++ b/meta/recipes-core/systemd/systemd/run-ptest
> @@ -0,0 +1,2 @@
> +make test/rules-test.sh.log
> +make test/udev-test.pl.log
> diff --git a/meta/recipes-core/systemd/systemd_204.bb b/meta/recipes-core/systemd/systemd_204.bb
> index 6261367..0242a0d 100644
> --- a/meta/recipes-core/systemd/systemd_204.bb
> +++ b/meta/recipes-core/systemd/systemd_204.bb
> @@ -13,9 +13,11 @@ PE = "1"
>   DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux"
>   DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
>   
> +DISTRO_FEATURES += " ptest"
> +
I think the above two lines are not needed.

Cheers,
Chen Qi

>   SECTION = "base/shell"
>   
> -inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu
> +inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu ptest
>   
>   SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
>              file://touchscreen.rules \
> @@ -24,6 +26,7 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
>              file://install-quotaon-once.patch \
>              file://00-create-volatile.conf \
>              file://init \
> +           file://run-ptest \
>             "
>   SRC_URI[md5sum] = "a07619bb19f48164fbf0761d12fd39a8"
>   SRC_URI[sha256sum] = "072c393503c7c1e55ca7acf3db659cbd28c7fe5fa94fab3db95360bafd96731b"
> @@ -114,6 +117,19 @@ do_install() {
>   	fi
>   }
>   
> +do_install_ptest () {
> +	install -d ${D}${PTEST_PATH}/test
> +	install -d ${D}${libdir}/udev/rules.d
> +	install ${B}/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
> +	sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/test/udev-test.pl
> +}
> +
>   python populate_packages_prepend (){
>       systemdlibdir = d.getVar("rootlibdir", True)
>       do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
Björn Stenberg - Aug. 28, 2013, 9:16 a.m.
rongqing.li@windriver.com wrote:
> +DISTRO_FEATURES += " ptest"

This looks a bit odd to have in the recipe. Ptest should rather be enabled/disabled by the distro.conf or local.conf.
rongqing.li@windriver.com - Aug. 28, 2013, 9:19 a.m.
On 08/28/2013 05:15 PM, ChenQi wrote:
> On 08/28/2013 04:39 PM, rongqing.li@windriver.com wrote:
>> From: "Roy.Li" <rongqing.li@windriver.com>
>>
>> Signed-off-by: Roy.Li <rongqing.li@windriver.com>
>> ---
>>   meta/recipes-core/systemd/systemd/run-ptest |    2 ++
>>   meta/recipes-core/systemd/systemd_204.bb    |   18 +++++++++++++++++-
>>   2 files changed, 19 insertions(+), 1 deletion(-)
>>   create mode 100644 meta/recipes-core/systemd/systemd/run-ptest
>>
>> diff --git a/meta/recipes-core/systemd/systemd/run-ptest
>> b/meta/recipes-core/systemd/systemd/run-ptest
>> new file mode 100644
>> index 0000000..0418bc9
>> --- /dev/null
>> +++ b/meta/recipes-core/systemd/systemd/run-ptest
>> @@ -0,0 +1,2 @@
>> +make test/rules-test.sh.log
>> +make test/udev-test.pl.log
>> diff --git a/meta/recipes-core/systemd/systemd_204.bb
>> b/meta/recipes-core/systemd/systemd_204.bb
>> index 6261367..0242a0d 100644
>> --- a/meta/recipes-core/systemd/systemd_204.bb
>> +++ b/meta/recipes-core/systemd/systemd_204.bb
>> @@ -13,9 +13,11 @@ PE = "1"
>>   DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native
>> gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native
>> util-linux"
>>   DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '',
>> d)}"
>> +DISTRO_FEATURES += " ptest"
>> +
> I think the above two lines are not needed.
>
> Cheers,
> Chen Qi

Sorry, I use it to test my code, it should be removed

-Roy

>
>>   SECTION = "base/shell"
>> -inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d
>> update-alternatives qemu
>> +inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d
>> update-alternatives qemu ptest
>>   SRC_URI =
>> "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
>>              file://touchscreen.rules \
>> @@ -24,6 +26,7 @@ SRC_URI =
>> "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
>>              file://install-quotaon-once.patch \
>>              file://00-create-volatile.conf \
>>              file://init \
>> +           file://run-ptest \
>>             "
>>   SRC_URI[md5sum] = "a07619bb19f48164fbf0761d12fd39a8"
>>   SRC_URI[sha256sum] =
>> "072c393503c7c1e55ca7acf3db659cbd28c7fe5fa94fab3db95360bafd96731b"
>> @@ -114,6 +117,19 @@ do_install() {
>>       fi
>>   }
>> +do_install_ptest () {
>> +    install -d ${D}${PTEST_PATH}/test
>> +    install -d ${D}${libdir}/udev/rules.d
>> +    install ${B}/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
>> +    sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/test/udev-test.pl
>> +}
>> +
>>   python populate_packages_prepend (){
>>       systemdlibdir = d.getVar("rootlibdir", True)
>>       do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s',
>> 'Systemd %s library', extra_depends='', allow_links=True)
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>

Patch

diff --git a/meta/recipes-core/systemd/systemd/run-ptest b/meta/recipes-core/systemd/systemd/run-ptest
new file mode 100644
index 0000000..0418bc9
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/run-ptest
@@ -0,0 +1,2 @@ 
+make test/rules-test.sh.log
+make test/udev-test.pl.log
diff --git a/meta/recipes-core/systemd/systemd_204.bb b/meta/recipes-core/systemd/systemd_204.bb
index 6261367..0242a0d 100644
--- a/meta/recipes-core/systemd/systemd_204.bb
+++ b/meta/recipes-core/systemd/systemd_204.bb
@@ -13,9 +13,11 @@  PE = "1"
 DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
+DISTRO_FEATURES += " ptest"
+
 SECTION = "base/shell"
 
-inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu
+inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu ptest
 
 SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
            file://touchscreen.rules \
@@ -24,6 +26,7 @@  SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
            file://install-quotaon-once.patch \
            file://00-create-volatile.conf \
            file://init \
+           file://run-ptest \
           "
 SRC_URI[md5sum] = "a07619bb19f48164fbf0761d12fd39a8"
 SRC_URI[sha256sum] = "072c393503c7c1e55ca7acf3db659cbd28c7fe5fa94fab3db95360bafd96731b"
@@ -114,6 +117,19 @@  do_install() {
 	fi
 }
 
+do_install_ptest () {
+	install -d ${D}${PTEST_PATH}/test
+	install -d ${D}${libdir}/udev/rules.d
+	install ${B}/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
+	sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/test/udev-test.pl
+}
+
 python populate_packages_prepend (){
     systemdlibdir = d.getVar("rootlibdir", True)
     do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)