Remove manual RDEPENDS from PN-ptest to PN package
PATCH 1/1 Remove manual RDEPENDS from PN-ptest to PN package
They are now added automatically by the ptest class.
--- 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(-)
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb +1 -1
@@ -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() {
meta/recipes-devtools/elfutils/elfutils_0.176.bb +1 -1
@@ -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"
meta/recipes-extended/sed/sed_4.2.2.bb +1 -1
@@ -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 \
meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb +1 -1
@@ -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
Signature · 1 line
2.17.1
Quoted 28 lines · Adrian Bunk
They are now added automatically by the ptest class.
Signed-off-by Adrian Bunk <[email protected]>--- 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(-)meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb +1
-1@@ -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() {meta/recipes-devtools/elfutils/elfutils_0.176.bb +0
-0
meta/recipes-devtools/elfutils/elfutils_0.176.bb inherit autotools gettext ptest · line 47
Quoted 5 lines
meta/recipes-devtools/elfutils/elfutils_0.176.bb +1
-1@@ -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
Quoted 31 lines
meta/recipes-devtools/elfutils/elfutils_0.176.bb +0
-0EXTRA_OECONF_append_class-target += "--disable-tests-rpath"meta/recipes-extended/sed/sed_4.2.2.bb +1
-1@@ -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 \meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb +1
-1@@ -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-longSignature · 1 line
2.17.1
Quoted 6 lines · Richard Purdie
On Wed, 2019-06-05 at 21:41 +0300, Adrian Bunk wrote:
...Quoted 4 lines
meta/recipes-devtools/elfutils/elfutils_0.176.bb +0
-0@@ -44,7 +44,7 @@ inherit autotools gettext ptest
Quoted 6 lines
meta/recipes-devtools/elfutils/elfutils_0.176.bb inherit autotools gettext ptest · line 47
Quoted 4 lines
meta/recipes-devtools/elfutils/elfutils_0.176.bb +1
-1EXTRA_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.
Quoted 1 line
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.
Quoted 3 lines
Cheers,
Richard
cu
Adrian
Signature · 4 lines
"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 SeedQuoted 16 lines · Adrian Bunk
Quoted 6 lines · Richard Purdie
On Wed, 2019-06-05 at 21:41 +0300, Adrian Bunk wrote:
...Quoted 4 lines
meta/recipes-devtools/elfutils/elfutils_0.176.bb +0
-0@@ -44,7 +44,7 @@ inherit autotools gettext ptestQuoted 8 lines
Quoted 6 lines
meta/recipes-devtools/elfutils/elfutils_0.176.bb +0
-1EXTRA_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?
Quoted 7 lines
Nice catch, v2 sent.
Quoted 1 line
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