summaryrefslogtreecommitdiffstats
path: root/meta/classes-recipe/testimage.bbclass
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2022-09-26 12:16:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-09-26 22:04:35 +0100
commit868eb84303cec5c4865da373ab7e47d9c637da96 (patch)
treec45c24493c36196e370d7335a8e24ef69851388c /meta/classes-recipe/testimage.bbclass
parent8f4ebf24538e8a5469e5da93ac2b43deb10118fe (diff)
downloadpoky-868eb84303cec5c4865da373ab7e47d9c637da96.tar.gz
oeqa/runtime/dnf: use dnf-test packages
Instead of installing run-postinsts with it's postinst scripts causing systemd restarts, use the new dnf-test-* packages instead. Remove from the installroot tests entirely as they're exercised enough using just busybox. Rewrite the exclude test to be simplier now these packages are not going to be part of an existing dependency chain. [ YOCTO #14787 ] (From OE-Core rev: fb1de2abc53bd742bc55cfecd384b78852c10d80) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe/testimage.bbclass')
-rw-r--r--meta/classes-recipe/testimage.bbclass5
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass
index 819c7d2bf4..5cc408b0c4 100644
--- a/meta/classes-recipe/testimage.bbclass
+++ b/meta/classes-recipe/testimage.bbclass
@@ -468,10 +468,7 @@ def create_rpm_index(d):
468 package_list = glob.glob(idx_path + "*/*.rpm") 468 package_list = glob.glob(idx_path + "*/*.rpm")
469 469
470 for pkg in package_list: 470 for pkg in package_list:
471 if os.path.basename(pkg).startswith(("curl-ptest")): 471 if not os.path.basename(pkg).startswith(("dnf-test-", "busybox", "update-alternatives", "libc6", "musl")):
472 bb.utils.remove(pkg)
473
474 if not os.path.basename(pkg).startswith(("rpm", "run-postinsts", "busybox", "bash", "update-alternatives", "libc6", "curl", "musl")):
475 bb.utils.remove(pkg) 472 bb.utils.remove(pkg)
476 473
477 bb.utils.unlockfile(lf) 474 bb.utils.unlockfile(lf)