* [PATCH] systemd: add ptest
@ 2013-08-28 8:39 rongqing.li
2013-08-28 9:15 ` ChenQi
2013-08-28 9:16 ` Björn Stenberg
0 siblings, 2 replies; 6+ messages in thread
From: rongqing.li @ 2013-08-28 8:39 UTC (permalink / raw)
To: openembedded-core
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"
+
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)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] systemd: add ptest
2013-08-28 8:39 rongqing.li
@ 2013-08-28 9:15 ` ChenQi
2013-08-28 9:19 ` Rongqing Li
2013-08-28 9:16 ` Björn Stenberg
1 sibling, 1 reply; 6+ messages in thread
From: ChenQi @ 2013-08-28 9:15 UTC (permalink / raw)
To: openembedded-core
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)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] systemd: add ptest
2013-08-28 8:39 rongqing.li
2013-08-28 9:15 ` ChenQi
@ 2013-08-28 9:16 ` Björn Stenberg
1 sibling, 0 replies; 6+ messages in thread
From: Björn Stenberg @ 2013-08-28 9:16 UTC (permalink / raw)
To: rongqing.li; +Cc: openembedded-core
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.
--
Björn
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] systemd: add ptest
2013-08-28 9:15 ` ChenQi
@ 2013-08-28 9:19 ` Rongqing Li
0 siblings, 0 replies; 6+ messages in thread
From: Rongqing Li @ 2013-08-28 9:19 UTC (permalink / raw)
To: ChenQi; +Cc: openembedded-core
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
>
>
--
Best Reagrds,
Roy | RongQing Li
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] systemd: add ptest
@ 2013-09-03 2:50 rongqing.li
2013-09-23 9:24 ` Muhammad Shakeel
0 siblings, 1 reply; 6+ messages in thread
From: rongqing.li @ 2013-09-03 2:50 UTC (permalink / raw)
To: openembedded-core
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_206.bb | 16 +++++++++++++++-
2 files changed, 17 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_206.bb b/meta/recipes-core/systemd/systemd_206.bb
index 75bdc61..9944459 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)}"
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://0001-use-CAP_MKNOD-ConditionCapability.patch \
@@ -24,6 +24,7 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
${UCLIBCPATCHES} \
file://00-create-volatile.conf \
file://init \
+ file://run-ptest \
"
SRC_URI[md5sum] = "89e36f2d3ba963020b72738549954cbc"
SRC_URI[sha256sum] = "4c993de071118ea1df7ffc4be26ef0b0d78354ef15b2743a2783d20edfcde9de"
@@ -113,6 +114,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)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] systemd: add ptest
2013-09-03 2:50 [PATCH] systemd: add ptest rongqing.li
@ 2013-09-23 9:24 ` Muhammad Shakeel
0 siblings, 0 replies; 6+ messages in thread
From: Muhammad Shakeel @ 2013-09-23 9:24 UTC (permalink / raw)
To: openembedded-core
On 09/03/2013 07:50 AM, rongqing.li@windriver.com wrote:
> +do_install_ptest () {
> + install -d ${D}${PTEST_PATH}/test
> + install -d ${D}${libdir}/udev/rules.d
> + install ${B}/test/* ${D}${PTEST_PATH}/test
This patch is merged into master and I am trying to build systemd with
ptest but I see error that ${B}/test/* doesn't exist (true). It works
fine if I replace 'B' with 'S' where this directory is actually present.
Is someone else seeing this error or it is something wrong with my
environment?
> + 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/
Same error here and same solution works here.
> + tar -C ${D}${PTEST_PATH}/test -xJf ${B}/test/sys.tar.xz
'S' for 'B' here as well.
> + sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/test/udev-test.pl
> +}
> +
Thanks,
Shakeel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-09-23 9:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-03 2:50 [PATCH] systemd: add ptest rongqing.li
2013-09-23 9:24 ` Muhammad Shakeel
-- strict thread matches above, loose matches on Subject: below --
2013-08-28 8:39 rongqing.li
2013-08-28 9:15 ` ChenQi
2013-08-28 9:19 ` Rongqing Li
2013-08-28 9:16 ` Björn Stenberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox