From patchwork Tue Feb 18 11:56:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vyacheslav Yurkov X-Patchwork-Id: 57530 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4B33C02198 for ; Tue, 18 Feb 2025 11:58:00 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web11.17878.1739879879691751132 for ; Tue, 18 Feb 2025 03:58:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nbTftHRt; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: uvv.mail@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-38dcac27bcbso3878781f8f.0 for ; Tue, 18 Feb 2025 03:57:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739879878; x=1740484678; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=UTSpQFZWsZV2EwqFLTpATtxw0D52NYtbxTewy5rLBAw=; b=nbTftHRtZrGE2m7EDTbv6UVQM0698hp4UmjcO/zlt3T0l6POxR9SIrJqu4AdgKJZiM sEYnyaQgJXNngRJoaRWPz8YdONf9NFYzjQ5KHLshti3XkPGYY0O80vf01YQUFsvT1VAg ePvrrnTJlIvv/2jRsFtawgkDGsas3KsQkE03uIHs9sGJP9HwWdkcFaYg0llCZ0OuvWIa ZGoDDHKNZ8jhNWmVvl/SAyE6+IeaWtI3jUciDxWNyFuzxxDY4obaAuXxdTmfhQbx/mnE KiJ5gSrkisvG4GgvdUPQYcaGkfQfbp25wUKb6cR5Z+hGFLp7z4h8nbA5FwhBeaHraegU UdIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739879878; x=1740484678; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UTSpQFZWsZV2EwqFLTpATtxw0D52NYtbxTewy5rLBAw=; b=A9VuYWTEiZ5SDyAZBGndNx/c0Mc65CgcBSGj7pqIzmmE+bscFnbeipmhR9v/wCWgin WSPBpspQ6Bp4oh5+mDSy8Dz5b0h8jaOvQBuRlmcmOj6xBzqS/HiPlIO0jIhkL6+OFZfb I0CstnrHzSCLddRjrBk7ymbplJkE0EL4uIG1SW24WHLUKoZNoQ1e1C7hgtBywoojaeZd mCJaunJsa1JuEBRpbzAtY9zssckljJ8MM8KFitf6wRxmTf/YJGSCuh5TPPhuQSG7pp3P hcuwjmpIUUu7GxUfOCm+mIyew051US3Y5yzvqR7Hq9a80779/XVyJWRssEFuVy1IWp/+ cNlg== X-Gm-Message-State: AOJu0YwEyDrv02gC2n1biwuIJS5BGdcvf7KOneQsXsWlB9D0ZrDNztav YLtAahPiVvU4otn8S5KzwA9e2lUICbep156o9YW/WJ5VFqOQ4KWQ9MawehFh X-Gm-Gg: ASbGncurLfEHACE00MzwwKP7CNetfJ9tuF0ch+uHuz77QHEjqNDyiEo8vXyyTC0+8Kb 5Qwh5vSSfM3qlH4iGIn+aXEAQEqZL/zT4D8AMTXfSKdvUJn1rT4kptjfrdKDIouDWPx+UIVBUod gEm6FoalHpuTel9A2smfNIOC9NUNuZ9ikHzwQMU13Ra5VwB+R9hSrEWAHc423Xnv9Nu73pCxAor 7GR065f5yUx0/i0GPTKc0qV2bD0AxtU0BCvVhkgC2PJmEebNw7B+vsG94RvoUZnzhP4kRom4Q+B z70UqpUR3VuhLiQNkjjlEhY4k9IvULAsZJugiRkp4VJkprnEGw== X-Google-Smtp-Source: AGHT+IFoUCrYAvqeAHk2UEmUoHvFuxeTCfqNm9vinoYYFR1hnq5YxkSMRmHjz/gQ51ubah+XfoPknA== X-Received: by 2002:a05:6000:1fae:b0:38f:3aae:830b with SMTP id ffacd0b85a97d-38f3aafb43bmr10608106f8f.26.1739879877309; Tue, 18 Feb 2025 03:57:57 -0800 (PST) Received: from slackware.local.localdomain ([154.47.27.149]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f259f8115sm15029453f8f.92.2025.02.18.03.57.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 03:57:56 -0800 (PST) From: uvv.mail@gmail.com To: Openembedded-core@lists.openembedded.org Cc: Mikko Rapeli , Vyacheslav Yurkov Subject: [PATCH v5 1/2] systemd: Build the systemctl executable Date: Tue, 18 Feb 2025 12:56:46 +0100 Message-ID: <20250218115647.40502-1-uvv.mail@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 18 Feb 2025 11:58:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211607 From: Vyacheslav Yurkov Instead of the python re-implementation build the actual systemctl from the systemd source tree. The python script was used when systemd didn't provide an option to build individual executables. It is possible in the meantime, so instead of always adapting the script when there's a new functionality, we simply use upstream implementation. License-Update: Base recipe is used Signed-off-by: Vyacheslav Yurkov --- .../systemd/systemd-systemctl-native.bb | 26 +- ...-meson-add-install-tag-for-systemctl.patch | 25 ++ ...2-meson-Bypass-certain-config-checks.patch | 64 +++ .../systemd/systemd-systemctl/systemctl | 376 ------------------ 4 files changed, 104 insertions(+), 387 deletions(-) create mode 100644 meta/recipes-core/systemd/systemd-systemctl/0001-meson-add-install-tag-for-systemctl.patch create mode 100644 meta/recipes-core/systemd/systemd-systemctl/0002-meson-Bypass-certain-config-checks.patch delete mode 100755 meta/recipes-core/systemd/systemd-systemctl/systemctl diff --git a/meta/recipes-core/systemd/systemd-systemctl-native.bb b/meta/recipes-core/systemd/systemd-systemctl-native.bb index ffa024caef..7416d806ef 100644 --- a/meta/recipes-core/systemd/systemd-systemctl-native.bb +++ b/meta/recipes-core/systemd/systemd-systemctl-native.bb @@ -1,17 +1,21 @@ -SUMMARY = "Wrapper for enabling systemd services" +SUMMARY = "Systemctl executable from systemd" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +require systemd.inc +DEPENDS = "gperf-native libcap-native util-linux-native python3-jinja2-native" -inherit native +inherit pkgconfig meson native -SRC_URI = "file://systemctl" +SRC_URI:append = " \ + file://0001-meson-add-install-tag-for-systemctl.patch \ + file://0002-meson-Bypass-certain-config-checks.patch \ +" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +MESON_TARGET = "systemctl:executable" +MESON_INSTALL_TAGS = "systemctl" +EXTRA_OEMESON:append = " -Dlink-systemctl-shared=false" -do_install() { - install -d ${D}${bindir} - install -m 0755 ${S}/systemctl ${D}${bindir} -} +# Systemctl is supposed to operate on target, but the target sysroot is not +# determined at run-time, but rather set during configure +# More details are here https://github.com/systemd/systemd/issues/35897#issuecomment-2665405887 +EXTRA_OEMESON:append = " --sysconfdir ${sysconfdir_native}" diff --git a/meta/recipes-core/systemd/systemd-systemctl/0001-meson-add-install-tag-for-systemctl.patch b/meta/recipes-core/systemd/systemd-systemctl/0001-meson-add-install-tag-for-systemctl.patch new file mode 100644 index 0000000000..a9b3e62708 --- /dev/null +++ b/meta/recipes-core/systemd/systemd-systemctl/0001-meson-add-install-tag-for-systemctl.patch @@ -0,0 +1,25 @@ +From fbf1ae3b7bd074a8d3bfb741f54b8539123399f1 Mon Sep 17 00:00:00 2001 +From: Vyacheslav Yurkov +Date: Sun, 2 Feb 2025 10:13:38 +0100 +Subject: [PATCH] meson: add install tag for systemctl + +Upstream-Status: Backport +[https://github.com/systemd/systemd/commit/b1e5a7aa3f1e552c56d5adbeed6ff67d88d1e103] + +Signed-off-by: Vyacheslav Yurkov +--- + src/systemctl/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/systemctl/meson.build b/src/systemctl/meson.build +index 88f73bf502..46218dc8ef 100644 +--- a/src/systemctl/meson.build ++++ b/src/systemctl/meson.build +@@ -61,6 +61,7 @@ executables += [ + libzstd_cflags, + threads, + ], ++ 'install_tag' : 'systemctl', + }, + fuzz_template + { + 'sources' : [ diff --git a/meta/recipes-core/systemd/systemd-systemctl/0002-meson-Bypass-certain-config-checks.patch b/meta/recipes-core/systemd/systemd-systemctl/0002-meson-Bypass-certain-config-checks.patch new file mode 100644 index 0000000000..a1db61fb8d --- /dev/null +++ b/meta/recipes-core/systemd/systemd-systemctl/0002-meson-Bypass-certain-config-checks.patch @@ -0,0 +1,64 @@ +From fbc797ed6bd35bd26e5b64a9026d519768b1799e Mon Sep 17 00:00:00 2001 +From: Vyacheslav Yurkov +Date: Wed, 5 Feb 2025 07:14:20 +0000 +Subject: [PATCH 2/2] meson: Bypass certain config checks + +Upstream-Status: Backport +[https://github.com/systemd/systemd/commit/8b413ae4060b21ed4712fdad7eba195890740756] + +Signed-off-by: Vyacheslav Yurkov +--- + meson.build | 33 +++++++++++++++++++-------------- + 1 file changed, 19 insertions(+), 14 deletions(-) + +diff --git a/meson.build b/meson.build +index bffda86845..bfc35b88e6 100644 +--- a/meson.build ++++ b/meson.build +@@ -890,13 +890,16 @@ nobody_user = get_option('nobody-user') + nobody_group = get_option('nobody-group') + + if not meson.is_cross_build() +- getent_result = run_command('getent', 'passwd', '65534', check : false) +- if getent_result.returncode() == 0 +- name = getent_result.stdout().split(':')[0] +- if name != nobody_user +- warning('\n' + +- 'The local user with the UID 65534 does not match the configured user name "@0@" of the nobody user (its name is @1@).\n'.format(nobody_user, name) + +- 'Your build will result in an user table setup that is incompatible with the local system.') ++ find_getent_result = find_program('getent', required : false) ++ if find_getent_result.found() ++ getent_result = run_command('getent', 'passwd', '65534', check : false) ++ if getent_result.returncode() == 0 ++ name = getent_result.stdout().split(':')[0] ++ if name != nobody_user ++ warning('\n' + ++ 'The local user with the UID 65534 does not match the configured user name "@0@" of the nobody user (its name is @1@).\n'.format(nobody_user, name) + ++ 'Your build will result in an user table setup that is incompatible with the local system.') ++ endif + endif + endif + id_result = run_command('id', '-u', nobody_user, check : false) +@@ -909,13 +912,15 @@ if not meson.is_cross_build() + endif + endif + +- getent_result = run_command('getent', 'group', '65534', check : false) +- if getent_result.returncode() == 0 +- name = getent_result.stdout().split(':')[0] +- if name != nobody_group +- warning('\n' + +- 'The local group with the GID 65534 does not match the configured group name "@0@" of the nobody group (its name is @1@).\n'.format(nobody_group, name) + +- 'Your build will result in an group table setup that is incompatible with the local system.') ++ if find_getent_result.found() ++ getent_result = run_command('getent', 'group', '65534', check : false) ++ if getent_result.returncode() == 0 ++ name = getent_result.stdout().split(':')[0] ++ if name != nobody_group ++ warning('\n' + ++ 'The local group with the GID 65534 does not match the configured group name "@0@" of the nobody group (its name is @1@).\n'.format(nobody_group, name) + ++ 'Your build will result in an group table setup that is incompatible with the local system.') ++ endif + endif + endif + id_result = run_command('id', '-g', nobody_group, check : false) diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl deleted file mode 100755 index 65e3157859..0000000000 --- a/meta/recipes-core/systemd/systemd-systemctl/systemctl +++ /dev/null @@ -1,376 +0,0 @@ -#!/usr/bin/env python3 -"""systemctl: subset of systemctl used for image construction - -Mask/preset systemd units -""" - -import argparse -import fnmatch -import os -import re -import sys - -from collections import namedtuple -from itertools import chain -from pathlib import Path - -version = 1.0 - -ROOT = Path("/") -SYSCONFDIR = Path("etc") -BASE_LIBDIR = Path("lib") -LIBDIR = Path("usr", "lib") - -locations = list() - - -class SystemdFile(): - """Class representing a single systemd configuration file""" - - _clearable_keys = ['WantedBy'] - - def __init__(self, root, path, instance_unit_name, unit_type): - self.sections = dict() - self._parse(root, path) - dirname = os.path.basename(path.name) + ".d" - for location in locations: - files = (root / location / unit_type / dirname).glob("*.conf") - if instance_unit_name: - inst_dirname = instance_unit_name + ".d" - files = chain(files, (root / location / unit_type / inst_dirname).glob("*.conf")) - for path2 in sorted(files): - self._parse(root, path2) - - def _parse(self, root, path): - """Parse a systemd syntax configuration file - - Args: - path: A pathlib.Path object pointing to the file - - """ - skip_re = re.compile(r"^\s*([#;]|$)") - section_re = re.compile(r"^\s*\[(?P
.*)\]") - kv_re = re.compile(r"^\s*(?P[^\s]+)\s*=\s*(?P.*)") - section = None - - if path.is_symlink(): - try: - path.resolve() - except FileNotFoundError: - # broken symlink, try relative to root - path = root / Path(os.readlink(str(path))).relative_to(ROOT) - - with path.open() as f: - for line in f: - if skip_re.match(line): - continue - - line = line.strip() - m = section_re.match(line) - if m: - if m.group('section') not in self.sections: - section = dict() - self.sections[m.group('section')] = section - else: - section = self.sections[m.group('section')] - continue - - while line.endswith("\\"): - line += f.readline().rstrip("\n") - - m = kv_re.match(line) - k = m.group('key') - v = m.group('value') - if k not in section: - section[k] = list() - - # If we come across a "key=" line for a "clearable key", then - # forget all preceding assignments. This works because we are - # processing files in correct parse order. - if k in self._clearable_keys and not v: - del section[k] - continue - - section[k].extend(v.split()) - - def get(self, section, prop): - """Get a property from section - - Args: - section: Section to retrieve property from - prop: Property to retrieve - - Returns: - List representing all properties of type prop in section. - - Raises: - KeyError: if ``section`` or ``prop`` not found - """ - return self.sections[section][prop] - - -class Presets(): - """Class representing all systemd presets""" - def __init__(self, scope, root): - self.directives = list() - self._collect_presets(scope, root) - - def _parse_presets(self, presets): - """Parse presets out of a set of preset files""" - skip_re = re.compile(r"^\s*([#;]|$)") - directive_re = re.compile(r"^\s*(?Penable|disable)\s+(?P(.+))") - - Directive = namedtuple("Directive", "action unit_name") - for preset in presets: - with preset.open() as f: - for line in f: - m = directive_re.match(line) - if m: - directive = Directive(action=m.group('action'), - unit_name=m.group('unit_name')) - self.directives.append(directive) - elif skip_re.match(line): - pass - else: - sys.exit("Unparsed preset line in {}".format(preset)) - - def _collect_presets(self, scope, root): - """Collect list of preset files""" - presets = dict() - for location in locations: - paths = (root / location / scope).glob("*.preset") - for path in paths: - # earlier names override later ones - if path.name not in presets: - presets[path.name] = path - - self._parse_presets([v for k, v in sorted(presets.items())]) - - def state(self, unit_name): - """Return state of preset for unit_name - - Args: - presets: set of presets - unit_name: name of the unit - - Returns: - None: no matching preset - `enable`: unit_name is enabled - `disable`: unit_name is disabled - """ - for directive in self.directives: - if fnmatch.fnmatch(unit_name, directive.unit_name): - return directive.action - - return None - - -def add_link(path, target): - try: - path.parent.mkdir(parents=True) - except FileExistsError: - pass - if not path.is_symlink(): - print("ln -s {} {}".format(target, path)) - path.symlink_to(target) - - -class SystemdUnitNotFoundError(Exception): - def __init__(self, path, unit): - self.path = path - self.unit = unit - - -class SystemdUnit(): - def __init__(self, root, unit, unit_type): - self.root = root - self.unit = unit - self.unit_type = unit_type - self.config = None - - def _path_for_unit(self, unit): - for location in locations: - path = self.root / location / self.unit_type / unit - if path.exists() or path.is_symlink(): - return path - - raise SystemdUnitNotFoundError(self.root, unit) - - def _process_deps(self, config, service, location, prop, dirstem, instance): - systemdir = self.root / SYSCONFDIR / "systemd" / self.unit_type - - target = ROOT / location.relative_to(self.root) - try: - for dependent in config.get('Install', prop): - # expand any %i to instance (ignoring escape sequence %%) - dependent = re.sub("([^%](%%)*)%i", "\\g<1>{}".format(instance), dependent) - wants = systemdir / "{}.{}".format(dependent, dirstem) / service - add_link(wants, target) - - except KeyError: - pass - - def enable(self, units_enabled=[]): - # if we're enabling an instance, first extract the actual instance - # then figure out what the template unit is - template = re.match(r"[^@]+@(?P[^\.]*)\.", self.unit) - instance_unit_name = None - if template: - instance = template.group('instance') - if instance != "": - instance_unit_name = self.unit - unit = re.sub(r"@[^\.]*\.", "@.", self.unit, 1) - else: - instance = None - unit = self.unit - - if instance_unit_name is not None: - try: - # Try first with instance unit name. Systemd allows to create instance unit files - # e.g. `gnome-shell@wayland.service` which cause template unit file to be ignored - # for the instance for which instance unit file is present. In that case, there may - # not be any template file at all. - path = self._path_for_unit(instance_unit_name) - except SystemdUnitNotFoundError: - path = self._path_for_unit(unit) - else: - path = self._path_for_unit(unit) - - if path.is_symlink(): - # ignore aliases - return - - config = SystemdFile(self.root, path, instance_unit_name, self.unit_type) - if instance == "": - try: - default_instance = config.get('Install', 'DefaultInstance')[0] - except KeyError: - # no default instance, so nothing to enable - return - - service = self.unit.replace("@.", - "@{}.".format(default_instance)) - else: - service = self.unit - - self._process_deps(config, service, path, 'WantedBy', 'wants', instance) - self._process_deps(config, service, path, 'RequiredBy', 'requires', instance) - - try: - for also in config.get('Install', 'Also'): - try: - units_enabled.append(unit) - if also not in units_enabled: - SystemdUnit(self.root, also, self.unit_type).enable(units_enabled) - except SystemdUnitNotFoundError as e: - sys.exit("Error: Systemctl also enable issue with %s (%s)" % (service, e.unit)) - - except KeyError: - pass - - systemdir = self.root / SYSCONFDIR / "systemd" / self.unit_type - target = ROOT / path.relative_to(self.root) - try: - for dest in config.get('Install', 'Alias'): - alias = systemdir / dest - add_link(alias, target) - - except KeyError: - pass - - def mask(self): - systemdir = self.root / SYSCONFDIR / "systemd" / self.unit_type - add_link(systemdir / self.unit, "/dev/null") - - -def collect_services(root, unit_type): - """Collect list of service files""" - services = set() - for location in locations: - paths = (root / location / unit_type).glob("*") - for path in paths: - if path.is_dir(): - continue - services.add(path.name) - - return services - - -def preset_all(root, unit_type): - presets = Presets('{}-preset'.format(unit_type), root) - services = collect_services(root, unit_type) - - for service in services: - state = presets.state(service) - - if state == "enable" or state is None: - try: - SystemdUnit(root, service, unit_type).enable() - except SystemdUnitNotFoundError: - sys.exit("Error: Systemctl preset_all issue in %s" % service) - - # If we populate the systemd links we also create /etc/machine-id, which - # allows systemd to boot with the filesystem read-only before generating - # a real value and then committing it back. - # - # For the stateless configuration, where /etc is generated at runtime - # (for example on a tmpfs), this script shouldn't run at all and we - # allow systemd to completely populate /etc. - (root / SYSCONFDIR / "machine-id").touch() - - -def main(): - if sys.version_info < (3, 4, 0): - sys.exit("Python 3.4 or greater is required") - - parser = argparse.ArgumentParser() - parser.add_argument('command', nargs='?', choices=['enable', 'mask', - 'preset-all']) - parser.add_argument('service', nargs=argparse.REMAINDER) - parser.add_argument('--root') - parser.add_argument('--preset-mode', - choices=['full', 'enable-only', 'disable-only'], - default='full') - parser.add_argument('--global', dest="opt_global", action="store_true", default=False) - - args = parser.parse_args() - - root = Path(args.root) if args.root else ROOT - - locations.append(SYSCONFDIR / "systemd") - # Handle the usrmerge case by ignoring /lib when it's a symlink - if not (root / BASE_LIBDIR).is_symlink(): - locations.append(BASE_LIBDIR / "systemd") - locations.append(LIBDIR / "systemd") - - command = args.command - if not command: - parser.print_help() - return 0 - - unit_type = "user" if args.opt_global else "system" - - if command == "mask": - for service in args.service: - try: - SystemdUnit(root, service, unit_type).mask() - except SystemdUnitNotFoundError as e: - sys.exit("Error: Systemctl main mask issue in %s (%s)" % (service, e.unit)) - elif command == "enable": - for service in args.service: - try: - SystemdUnit(root, service, unit_type).enable() - except SystemdUnitNotFoundError as e: - sys.exit("Error: Systemctl main enable issue in %s (%s)" % (service, e.unit)) - elif command == "preset-all": - if len(args.service) != 0: - sys.exit("Too many arguments.") - if args.preset_mode != "enable-only": - sys.exit("Only enable-only is supported as preset-mode.") - preset_all(root, unit_type) - else: - raise RuntimeError() - - -if __name__ == '__main__': - main() From patchwork Tue Feb 18 11:56:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vyacheslav Yurkov X-Patchwork-Id: 57529 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4B5FC021AA for ; Tue, 18 Feb 2025 11:58:00 +0000 (UTC) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.groups.io with SMTP id smtpd.web10.17872.1739879880340140327 for ; Tue, 18 Feb 2025 03:58:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=a9U7ubYn; spf=pass (domain: gmail.com, ip: 209.85.221.54, mailfrom: uvv.mail@gmail.com) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-38f488f3161so881497f8f.3 for ; Tue, 18 Feb 2025 03:58:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739879878; x=1740484678; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kfYkb7vZrbzeLJunIf8g7QbAR+xZFlF08VFcLj0bi5U=; b=a9U7ubYnnWUYDrdn78qDyW/0O3xkrARcqqZBUTVRf5FT/6kJDIvM7Cp56SGRf5jzmg 3TZILh+64Ympotp31pxC5ipJ9PRDy0HlFNQr55ICCmH3fwhbCFba9fTYTxogGAVCEKU/ E83ZCuzEmBaczwTi1USMDa4a6Ovepadok8al9u14EbPv7WqP9+q8WdR1SLIfCu9lQt8R DdhQEIiS2OqQvmoKDnOy6wR31jk6lNTMeQtVOCPtjYyFCKGEuZBOtSooJnZYTyzi9ofz Gud6ndx+RhJxcUbsRo09i1qAgr/TJu4PweErN8LSOho5w+rAF8nJSG5s8/sYKexyrYgE vpgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739879878; x=1740484678; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kfYkb7vZrbzeLJunIf8g7QbAR+xZFlF08VFcLj0bi5U=; b=Ug0gaXijgHptOtibcChpGoTxOxJz6BHwyvHQrLtFKzLNi7cjZBc25dP0pzMsC3oVqd mnyeDushioyTd4WFd34LTyYo90tj07658X2ILUUBvYJ9HH7LTaMb0qH6rPEdgIkOa+R7 JBfJ48HRCc2aP8UaHj2Iotbv1UB+MdGY/rJfuXzQqAPcbm345GiFvSHyUXRIF04jqyWN E2ZAF4/A7P4IgMbY7dOB9fSe8cGwRuzQ3hjAarKcmL549f6vGEJjbnueXC7bOYdqWhbi KqJ6IRZch4PaPxQo5ZVjQoCPph2bAocfMdkLzr99YOjfDLUseJdtZ4b4RkDitMH19Muw 0gZQ== X-Gm-Message-State: AOJu0Yyxp/BX521EZc4EOD5jZqpouOYBFKfCMtCzw2rWamycVzJHVP7x kmbv5hbZgMJr9ubZewJvPf5ChF1LLBoq9GuQHEtacwkVC4WhDgr508kkXdrS X-Gm-Gg: ASbGncsOuhhgI9jjG5il9xhEVBm5Umbcbuc36L/qXNzLZzvQ4yiDzKAtyhPWwg4azl/ HvRFzbsfCoPf77ug7fcbsmDaOPETAC+p/SBHOXaBmj2ygXSLcG24o8rzNlqwgudKgwTWRyPxQME hG8ezxwNU31go0oFKuIvfRngIkO1sqmP8mp8nrli1s2DGcxc2atOC5QW+sUD0uVyLWOApjapbh9 uerI70GWZb+98cptxQkkzfC7Jh4UVEQlNdI2K4s4DlJJt9NJl9LO5IRKROGv7d+1GZ7MRP5qzDl /TW84f/cMsi6EpLAHzdXPrL4i29FDZhrsZTibLyyaOcFFsfYhw== X-Google-Smtp-Source: AGHT+IHrAnQiV5fVdonB1GF8xdgGia9NgnR/OT654I9iYKguYFxltLwIfl5gn8ZgYa8NmAoJnFxsGA== X-Received: by 2002:adf:ee86:0:b0:38d:b113:eb8 with SMTP id ffacd0b85a97d-38f33f28774mr9050524f8f.20.1739879878249; Tue, 18 Feb 2025 03:57:58 -0800 (PST) Received: from slackware.local.localdomain ([154.47.27.149]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f259f8115sm15029453f8f.92.2025.02.18.03.57.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 03:57:57 -0800 (PST) From: uvv.mail@gmail.com To: Openembedded-core@lists.openembedded.org Cc: Mikko Rapeli , Vyacheslav Yurkov Subject: [PATCH v5 2/2] oeqa/selftest: Drop dependency on systemd-native Date: Tue, 18 Feb 2025 12:56:47 +0100 Message-ID: <20250218115647.40502-2-uvv.mail@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20250218115647.40502-1-uvv.mail@gmail.com> References: <20250218115647.40502-1-uvv.mail@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 18 Feb 2025 11:58:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/211608 From: Vyacheslav Yurkov 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 Reviewed-by: Mikko Rapeli --- 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