From d64d35ad944893c6edc24aaac37add774be02cd7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 2 Dec 2018 17:19:50 +0100 Subject: packagegroup-meta-oe: rename the group that contains ptest packages Otherwise packagegroup.bbclass includes the -ptest package for the second time which leads to this error: ERROR: packagegroup-meta-oe-1.0-r0 do_package: QA Issue: packagegroup-meta-oe-ptest is listed in PACKAGES multiple times, this leads to packaging errors. [packages-list] ERROR: packagegroup-meta-oe-1.0-r0 do_package: Fatal QA errors found, failing task. Signed-off-by: Alexander Kanavin Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 2a23a61700..2a5ff33e57 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -21,7 +21,7 @@ PACKAGES = ' \ packagegroup-meta-oe-test \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-oe-ptest", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-oe-ptest-packages", "", d)} \ ' RDEPENDS_packagegroup-meta-oe = "\ @@ -41,7 +41,7 @@ RDEPENDS_packagegroup-meta-oe = "\ packagegroup-meta-oe-test \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-oe-ptest", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-oe-ptest-packages", "", d)} \ " RDEPENDS_packagegroup-meta-oe-benchmarks = "\ @@ -232,7 +232,7 @@ RDEPENDS_packagegroup-meta-oe-test ="\ fwts gtest pm-qa stress-ng testfloat \ " -RDEPENDS_packagegroup-meta-oe-ptest = "\ +RDEPENDS_packagegroup-meta-oe-ptest-packages = "\ zeromq-ptest \ leveldb-ptest \ psqlodbc-ptest \ -- cgit 1.2.3-korg