Skip to contentSkip to conversation

packagegroup-meta-oe: drop ptest packages that do not exist

PATCH New Alexander Kanavin 1 participant 2 messages Dec 2, 2018

lore
Share & tools
lore

Alexander Kanavin

author
#0 lore raw

PATCH 1/2 packagegroup-meta-oe: drop ptest packages that do not exist

Signed-off-by Alexander Kanavin <[email protected]>
---
 meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 4 ----
 1 file changed, 4 deletions(-)
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +0 -4
index 08b4bbfc4..2a23a6170 100644
@@ -234,19 +234,15 @@ RDEPENDS_packagegroup-meta-oe-test ="\
 
 RDEPENDS_packagegroup-meta-oe-ptest = "\
     zeromq-ptest \
-    libxml-ptest \
-    soci-ptest \
     leveldb-ptest \
     psqlodbc-ptest \
     lua-ptest \
     protobuf-ptest \
-    libdbi-ptest \
     rsyslog-ptest \
     oprofile-ptest \
     libteam-ptest \
     uthash-ptest \
     mcelog-ptest \
-    openldap-ptest \
     libee-ptest \
     numactl-ptest \
     poco-ptest \
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 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 <[email protected]>
---
 meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +3 -3
index 2a23a6170..2a5ff33e5 100644
@@ -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 \
Signature · 1 line
2.17.1