diff mbox series

[v5,2/2] oeqa/selftest: Drop dependency on systemd-native

Message ID 20250218115647.40502-2-uvv.mail@gmail.com
State Accepted, archived
Commit b5770d8c56036bdfef8d596d27433d8f408ee36f
Headers show
Series [v5,1/2] systemd: Build the systemctl executable | expand

Commit Message

Vyacheslav Yurkov Feb. 18, 2025, 11:56 a.m. UTC 
From: Vyacheslav Yurkov <uvv.mail@gmail.com>

The tests don't need it. On top of that, this extra requirement
creates a dependency loop between systemd-systemctl-native and util-linux.

Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com>
---
 meta/lib/oeqa/selftest/cases/uki.py | 1 -
 meta/lib/oeqa/selftest/cases/wic.py | 1 -
 2 files changed, 2 deletions(-)

Comments

Mikko Rapeli Feb. 18, 2025, 12:09 p.m. UTC | #1 
Hi,

On Tue, Feb 18, 2025 at 12:56:47PM +0100, uvv.mail@gmail.com wrote:
> From: Vyacheslav Yurkov <uvv.mail@gmail.com>
> 
> The tests don't need it. On top of that, this extra requirement
> creates a dependency loop between systemd-systemctl-native and util-linux.

Yes, this is the right thing to do.

Reviewed-by: Mikko Rapeli <mikko.rapeli@linaro.org>

Cheers,

-Mikko

> Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com>
> ---
>  meta/lib/oeqa/selftest/cases/uki.py | 1 -
>  meta/lib/oeqa/selftest/cases/wic.py | 1 -
>  2 files changed, 2 deletions(-)
> 
> diff --git a/meta/lib/oeqa/selftest/cases/uki.py b/meta/lib/oeqa/selftest/cases/uki.py
> index cd20a99aca..9a1aa4e269 100644
> --- a/meta/lib/oeqa/selftest/cases/uki.py
> +++ b/meta/lib/oeqa/selftest/cases/uki.py
> @@ -94,7 +94,6 @@ WKS_FILE = "efi-uki-bootdisk.wks.in"
>  
>  # efi, uki and systemd features must be enabled
>  MACHINE_FEATURES:append = " efi"
> -DISTRO_FEATURES_NATIVE:append = " systemd"
>  IMAGE_CLASSES:append:pn-core-image-base = " uki"
>  
>  # uki embeds also an initrd, no systemd or udev
> diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
> index 207e487002..4f5d43b5ee 100644
> --- a/meta/lib/oeqa/selftest/cases/wic.py
> +++ b/meta/lib/oeqa/selftest/cases/wic.py
> @@ -1363,7 +1363,6 @@ WKS_FILE = "test_efi_plugin.wks"
>  
>  # efi, uki and systemd features must be enabled
>  MACHINE_FEATURES:append = " efi"
> -DISTRO_FEATURES_NATIVE:append = " systemd"
>  IMAGE_CLASSES:append:pn-core-image-base = " uki"
>  
>  # uki embeds also an initrd, no systemd or udev
diff mbox series

Patch

diff --git a/meta/lib/oeqa/selftest/cases/uki.py b/meta/lib/oeqa/selftest/cases/uki.py
index cd20a99aca..9a1aa4e269 100644
--- a/meta/lib/oeqa/selftest/cases/uki.py
+++ b/meta/lib/oeqa/selftest/cases/uki.py
@@ -94,7 +94,6 @@  WKS_FILE = "efi-uki-bootdisk.wks.in"
 
 # efi, uki and systemd features must be enabled
 MACHINE_FEATURES:append = " efi"
-DISTRO_FEATURES_NATIVE:append = " systemd"
 IMAGE_CLASSES:append:pn-core-image-base = " uki"
 
 # uki embeds also an initrd, no systemd or udev
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index 207e487002..4f5d43b5ee 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -1363,7 +1363,6 @@  WKS_FILE = "test_efi_plugin.wks"
 
 # efi, uki and systemd features must be enabled
 MACHINE_FEATURES:append = " efi"
-DISTRO_FEATURES_NATIVE:append = " systemd"
 IMAGE_CLASSES:append:pn-core-image-base = " uki"
 
 # uki embeds also an initrd, no systemd or udev