* [PATCH] Remove manual RDEPENDS from PN-ptest to PN package
@ 2019-06-05 18:41 Adrian Bunk
2019-06-05 19:10 ` Richard Purdie
0 siblings, 1 reply; 4+ messages in thread
From: Adrian Bunk @ 2019-06-05 18:41 UTC (permalink / raw)
To: openembedded-core
They are now added automatically by the ptest class.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb | 2 +-
meta/recipes-devtools/elfutils/elfutils_0.176.bb | 2 +-
meta/recipes-extended/sed/sed_4.2.2.bb | 2 +-
meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
index 54b135eaef..ed946159bd 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
@@ -113,7 +113,7 @@ ALTERNATIVE_LINK_NAME[mkfs.ext2] = "${base_sbindir}/mkfs.ext2"
ALTERNATIVE_${PN}-tune2fs = "tune2fs"
ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs"
-RDEPENDS_${PN}-ptest += "${PN} coreutils procps bash bzip2 diffutils perl sed"
+RDEPENDS_${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed"
RDEPENDS_${PN}-ptest += "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks e2fsprogs-resize2fs"
do_compile_ptest() {
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.176.bb b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
index 1a5c70b088..6ed329fd55 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
@@ -44,7 +44,7 @@ inherit autotools gettext ptest
EXTRA_OECONF = "--program-prefix=eu- --without-lzma"
EXTRA_OECONF_append_class-native = " --without-bzlib"
-RDEPENDS_${PN}-ptest = "libasm libelf bash make coreutils ${PN}-binutils ${PN}"
+RDEPENDS_${PN}-ptest = "libasm libelf bash make coreutils ${PN}-binutils"
EXTRA_OECONF_append_class-target += "--disable-tests-rpath"
diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb b/meta/recipes-extended/sed/sed_4.2.2.bb
index f10e365ea4..8e436bad80 100644
--- a/meta/recipes-extended/sed/sed_4.2.2.bb
+++ b/meta/recipes-extended/sed/sed_4.2.2.bb
@@ -15,7 +15,7 @@ SRC_URI[md5sum] = "4111de4faa3b9848a0686b2f260c5056"
SRC_URI[sha256sum] = "fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff"
inherit autotools texinfo update-alternatives gettext ptest
-RDEPENDS_${PN}-ptest += "make ${PN}"
+RDEPENDS_${PN}-ptest += "make"
RRECOMMENDS_${PN}-ptest_append_libc-glibc = " locale-base-ru-ru"
EXTRA_OECONF = "--disable-acl \
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
index 7e80bb45d1..9583ee3abb 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
DEPENDS = "liburcu popt libxml2 util-linux"
RDEPENDS_${PN} = "libgcc"
-RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN} babeltrace procps perl-module-overloading coreutils util-linux kmod lttng-modules"
+RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod lttng-modules"
RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils"
# babelstats.pl wants getopt-long
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Remove manual RDEPENDS from PN-ptest to PN package
2019-06-05 18:41 [PATCH] Remove manual RDEPENDS from PN-ptest to PN package Adrian Bunk
@ 2019-06-05 19:10 ` Richard Purdie
2019-06-06 18:44 ` Adrian Bunk
0 siblings, 1 reply; 4+ messages in thread
From: Richard Purdie @ 2019-06-05 19:10 UTC (permalink / raw)
To: Adrian Bunk, openembedded-core
On Wed, 2019-06-05 at 21:41 +0300, Adrian Bunk wrote:
> They are now added automatically by the ptest class.
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> ---
> meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb | 2 +-
> meta/recipes-devtools/elfutils/elfutils_0.176.bb | 2 +-
> meta/recipes-extended/sed/sed_4.2.2.bb | 2 +-
> meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
> index 54b135eaef..ed946159bd 100644
> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
> +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
> @@ -113,7 +113,7 @@ ALTERNATIVE_LINK_NAME[mkfs.ext2] = "${base_sbindir}/mkfs.ext2"
> ALTERNATIVE_${PN}-tune2fs = "tune2fs"
> ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs"
>
> -RDEPENDS_${PN}-ptest += "${PN} coreutils procps bash bzip2 diffutils perl sed"
> +RDEPENDS_${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed"
> RDEPENDS_${PN}-ptest += "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks e2fsprogs-resize2fs"
>
> do_compile_ptest() {
> diff --git a/meta/recipes-devtools/elfutils/elfutils_0.176.bb b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> index 1a5c70b088..6ed329fd55 100644
> --- a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> +++ b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> @@ -44,7 +44,7 @@ inherit autotools gettext ptest
>
> EXTRA_OECONF = "--program-prefix=eu- --without-lzma"
> EXTRA_OECONF_append_class-native = " --without-bzlib"
> -RDEPENDS_${PN}-ptest = "libasm libelf bash make coreutils ${PN}-binutils ${PN}"
> +RDEPENDS_${PN}-ptest = "libasm libelf bash make coreutils ${PN}-binutils"
Won't that need a += there to preserve the class definition? How was
this tested?
Cheers,
Richard
> EXTRA_OECONF_append_class-target += "--disable-tests-rpath"
>
> diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb b/meta/recipes-extended/sed/sed_4.2.2.bb
> index f10e365ea4..8e436bad80 100644
> --- a/meta/recipes-extended/sed/sed_4.2.2.bb
> +++ b/meta/recipes-extended/sed/sed_4.2.2.bb
> @@ -15,7 +15,7 @@ SRC_URI[md5sum] = "4111de4faa3b9848a0686b2f260c5056"
> SRC_URI[sha256sum] = "fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff"
>
> inherit autotools texinfo update-alternatives gettext ptest
> -RDEPENDS_${PN}-ptest += "make ${PN}"
> +RDEPENDS_${PN}-ptest += "make"
> RRECOMMENDS_${PN}-ptest_append_libc-glibc = " locale-base-ru-ru"
>
> EXTRA_OECONF = "--disable-acl \
> diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
> index 7e80bb45d1..9583ee3abb 100644
> --- a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
> +++ b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
> @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
>
> DEPENDS = "liburcu popt libxml2 util-linux"
> RDEPENDS_${PN} = "libgcc"
> -RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN} babeltrace procps perl-module-overloading coreutils util-linux kmod lttng-modules"
> +RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod lttng-modules"
> RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
> RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils"
> # babelstats.pl wants getopt-long
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Remove manual RDEPENDS from PN-ptest to PN package
2019-06-05 19:10 ` Richard Purdie
@ 2019-06-06 18:44 ` Adrian Bunk
2019-06-06 22:47 ` richard.purdie
0 siblings, 1 reply; 4+ messages in thread
From: Adrian Bunk @ 2019-06-06 18:44 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
On Wed, Jun 05, 2019 at 08:10:31PM +0100, Richard Purdie wrote:
> On Wed, 2019-06-05 at 21:41 +0300, Adrian Bunk wrote:
>...
> > --- a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> > +++ b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> > @@ -44,7 +44,7 @@ inherit autotools gettext ptest
> >
> > EXTRA_OECONF = "--program-prefix=eu- --without-lzma"
> > EXTRA_OECONF_append_class-native = " --without-bzlib"
> > -RDEPENDS_${PN}-ptest = "libasm libelf bash make coreutils ${PN}-binutils ${PN}"
> > +RDEPENDS_${PN}-ptest = "libasm libelf bash make coreutils ${PN}-binutils"
>
> Won't that need a += there to preserve the class definition?
Nice catch, v2 sent.
> How was this tested?
It looked obviously correct (famous last words...),
and I trust that this is breakage that would be
caught on the autobuilder.
> Cheers,
>
> Richard
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Remove manual RDEPENDS from PN-ptest to PN package
2019-06-06 18:44 ` Adrian Bunk
@ 2019-06-06 22:47 ` richard.purdie
0 siblings, 0 replies; 4+ messages in thread
From: richard.purdie @ 2019-06-06 22:47 UTC (permalink / raw)
To: Adrian Bunk; +Cc: openembedded-core
On Thu, 2019-06-06 at 21:44 +0300, Adrian Bunk wrote:
> On Wed, Jun 05, 2019 at 08:10:31PM +0100, Richard Purdie wrote:
> > On Wed, 2019-06-05 at 21:41 +0300, Adrian Bunk wrote:
> > ...
> > > --- a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> > > +++ b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> > > @@ -44,7 +44,7 @@ inherit autotools gettext ptest
> > >
> > > EXTRA_OECONF = "--program-prefix=eu- --without-lzma"
> > > EXTRA_OECONF_append_class-native = " --without-bzlib"
> > > -RDEPENDS_${PN}-ptest = "libasm libelf bash make coreutils ${PN}-
> > > binutils ${PN}"
> > > +RDEPENDS_${PN}-ptest = "libasm libelf bash make coreutils ${PN}-
> > > binutils"
> >
> > Won't that need a += there to preserve the class definition?
>
> Nice catch, v2 sent.
>
> > How was this tested?
>
> It looked obviously correct (famous last words...),
> and I trust that this is breakage that would be
> caught on the autobuilder.
It would get caught by some of my local tests I'm using to check the
ptest dependencies but because the autobuilder uses one image with all
the ptests in, I doubt it would catch it unfortunately :(
Cheers,
Richard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-06-06 22:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-05 18:41 [PATCH] Remove manual RDEPENDS from PN-ptest to PN package Adrian Bunk
2019-06-05 19:10 ` Richard Purdie
2019-06-06 18:44 ` Adrian Bunk
2019-06-06 22:47 ` richard.purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.