From patchwork Thu Mar 30 13:42:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?= X-Patchwork-Id: 21933 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 1126FC761AF for ; Thu, 30 Mar 2023 13:42:22 +0000 (UTC) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by mx.groups.io with SMTP id smtpd.web11.25608.1680183739669288497 for ; Thu, 30 Mar 2023 06:42:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eSCzEnJ9; spf=pass (domain: gmail.com, ip: 209.85.208.43, mailfrom: zboszor@gmail.com) Received: by mail-ed1-f43.google.com with SMTP id r11so76668185edd.5 for ; Thu, 30 Mar 2023 06:42:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680183738; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=OCzVLHLWCbzyI5TVPHPbaIKMwMIZi6TPhQAlJq6v/FU=; b=eSCzEnJ9Xg87DZ03zNradaVuncz0sKqDWbHwSYcdJw69znpbk7PLa/s9/BXzz7E9LR LWi4R8r1rS7J3u+wdLJ8s+gyzgCoJQr6Ce+GLdJ/d/y35n/BM3NpcD+lAf2bF4PonTIN ZZFnIY0Y/kUYnFcfO7x6veitDU03EtTEMFTxjD1ywv7iUh8WOQoA7O2LeFFYdYsBMwr3 ses6QXTTP+P28C1GYsRMUxEHz4k9aTeYBmUfrUWQeEMArIvLC7JLu7KVB65xokdND3Ey JZATktG77utceTBdQuQqb0pDomK99aDt/tvk7IXR8jQbNILSz6KU823mM36g/gfAkD0w Yw3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680183738; 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=OCzVLHLWCbzyI5TVPHPbaIKMwMIZi6TPhQAlJq6v/FU=; b=H4zi3sNg1T+A0fInmPWrkCwvRd7sfPYAjfKUiJlrz2ZOhmZS+JcYG03tDXNewUH+i9 gNo0b0KTNDwHpWuzxDSJNRyI7bdT7p92/QvSAOULEXn6F8V5rlJHOykDsFZp7N7u1U0V jSHUFp1D/vvvE5gus2Xn0BDBQ7zKyQpFRoI41WiG2mlfhvUury1z4Q9vL5/JN3vlinBe 1/KzwQtd4jzrd/uCK3IeSoyE74jkfHf48UGeYGqbYciMgFfX6ffq+zl718CzPGgIkUdw y5bGx3WYWNu5uIVIc8wNvAFb4XMJ5G2UUy9g/bM8CVxs+Bl2KbSj2t90VzqYHpXnuc+n OIRg== X-Gm-Message-State: AAQBX9eZ1+5CJTh3mPl2cM4P3NibFN2HJdm5TQNVSBKz50GPBizmAT7w 04pTpE+6YIeFNckujvi+DsIFlSLEJXc= X-Google-Smtp-Source: AKy350ZqUCa6i88YFxa+M2H6JVZWJNbVdECMqOhI36rxwYvH1LkXUtJrA6/mD8dLqZHsyI1SU9pQ8w== X-Received: by 2002:a17:906:81d5:b0:93d:ae74:fa9e with SMTP id e21-20020a17090681d500b0093dae74fa9emr22989798ejx.7.1680183737593; Thu, 30 Mar 2023 06:42:17 -0700 (PDT) Received: from localhost.lan (dsl51B7D2F9.fixip.t-online.hu. [81.183.210.249]) by smtp.gmail.com with ESMTPSA id w17-20020a170906b19100b0093fa8c2e877sm6547256ejy.80.2023.03.30.06.42.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 06:42:17 -0700 (PDT) From: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= To: openembedded-core@lists.openembedded.org Cc: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= Subject: [PATCH 1/2] systemd: Allow native build Date: Thu, 30 Mar 2023 15:42:13 +0200 Message-Id: <20230330134214.2772913-1-zboszor@gmail.com> X-Mailer: git-send-email 2.39.2 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 ; Thu, 30 Mar 2023 13:42:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179321 systemd-native is a dependency for libgudev-native, which in turn is a dependency for libfprint-native, which is needed to build libfprint. The native systemctl binary is removed so it doesn't conflict with the script from systemd-systemctl-native. TODO? The new natively built systemctl binary may replace the script in systemd-systemctl-native, as it supports more options and works better than the script. For example, the current script does not create the symlinks in /etc/systemd/system for WantedBy= and RequiredBy= settings and does not support systemctl set-default some.target. Signed-off-by: Zoltán Böszörményi --- meta/recipes-core/systemd/systemd_253.1.bb | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_253.1.bb b/meta/recipes-core/systemd/systemd_253.1.bb index 9c2b96d3c1..c73b5e05b3 100644 --- a/meta/recipes-core/systemd/systemd_253.1.bb +++ b/meta/recipes-core/systemd/systemd_253.1.bb @@ -6,6 +6,8 @@ PE = "1" DEPENDS = "intltool-native gperf-native libcap util-linux python3-jinja2-native" +BBCLASSEXTEND = "native" + SECTION = "base/shell" inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check @@ -60,7 +62,7 @@ PAM_PLUGINS = " \ pam-plugin-namespace \ " -PACKAGECONFIG ??= " \ +PACKAGECONFIG:class-target ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam selinux smack usrmerge polkit seccomp', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ @@ -197,7 +199,7 @@ PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,initscripts- PACKAGECONFIG[smack] = "-Dsmack=true,-Dsmack=false" PACKAGECONFIG[sysext] = "-Dsysext=true, -Dsysext=false" PACKAGECONFIG[sysusers] = "-Dsysusers=true,-Dsysusers=false" -PACKAGECONFIG[sysvinit] = "-Dsysvinit-path=${sysconfdir}/init.d -Dsysvrcnd-path=${sysconfdir},-Dsysvinit-path= -Dsysvrcnd-path=,,systemd-compat-units update-rc.d" +PACKAGECONFIG[sysvinit] = "-Dsysvinit-path=${sysconfdir}/init.d -Dsysvrcnd-path=${sysconfdir},-Dsysvinit-path= -Dsysvrcnd-path=,,${@'systemd-compat-units update-rc.d' if d.getVar('PN') == d.getVar('BPN') else ''}" # When enabled use reproducble build timestamp if set as time epoch, # or build time if not. When disabled, time epoch is unset. def build_epoch(d): @@ -211,7 +213,7 @@ PACKAGECONFIG[sbinmerge] = "-Dsplit-bin=false,-Dsplit-bin=true" PACKAGECONFIG[userdb] = "-Duserdb=true,-Duserdb=false" PACKAGECONFIG[utmp] = "-Dutmp=true,-Dutmp=false" PACKAGECONFIG[valgrind] = "-DVALGRIND=1,,valgrind" -PACKAGECONFIG[vconsole] = "-Dvconsole=true,-Dvconsole=false,,${PN}-vconsole-setup" +PACKAGECONFIG[vconsole] = "-Dvconsole=true,-Dvconsole=false,,${BPN}-vconsole-setup" PACKAGECONFIG[wheel-group] = "-Dwheel-group=true, -Dwheel-group=false" PACKAGECONFIG[xdg-autostart] = "-Dxdg-autostart=true,-Dxdg-autostart=false" # Verify keymaps on locale change @@ -364,6 +366,12 @@ do_install() { fi } +do_install:append:class-native () { + rm -f ${D}${bindir}/systemctl + ln -sf ..${base_bindir_native}/udevadm ${D}${base_sbindir}/udevadm + ln -sf ..${systemd_unitdir#${rootprefix}}/systemd-udevd ${D}${base_sbindir}/udevd +} + python populate_packages:prepend (){ systemdlibdir = d.getVar("rootlibdir") do_split_packages(d, systemdlibdir, r'^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) @@ -670,10 +678,10 @@ FILES:${PN} = " ${base_bindir}/* \ FILES:${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" RDEPENDS:${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck" -RDEPENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" -RDEPENDS:${PN} += "volatile-binds" +RDEPENDS:${PN}:class-target += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" +RDEPENDS:${PN}:class-target += "volatile-binds" -RRECOMMENDS:${PN} += "systemd-extra-utils \ +RRECOMMENDS:${PN}:class-target += "systemd-extra-utils \ udev-hwdb \ e2fsprogs-e2fsck \ kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 kernel-module-sch-fq-codel \ From patchwork Thu Mar 30 13:42:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?= X-Patchwork-Id: 21932 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 104AFC761A6 for ; Thu, 30 Mar 2023 13:42:22 +0000 (UTC) Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by mx.groups.io with SMTP id smtpd.web10.25370.1680183740463483034 for ; Thu, 30 Mar 2023 06:42:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=n8nIJdfG; spf=pass (domain: gmail.com, ip: 209.85.208.54, mailfrom: zboszor@gmail.com) Received: by mail-ed1-f54.google.com with SMTP id t10so76499464edd.12 for ; Thu, 30 Mar 2023 06:42:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680183738; 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=37qD3HpRuT76ygaYOrVgaAhvhoR6GxtyNRAWwVXHtN8=; b=n8nIJdfGt7XNn0vuSXwA6o8u0FUAEl+qNTQldSEvaDFDu3PvLHIm6cttFX+/19stVd xw/AZlZb6ruKC3CLb0ZVxFkQsPbTaVtaPwS89n6jx0fil+Z/BjAALFxg9UxWxh3wIAeE dvIR6810lzbvABvxZH+TUNPUJ5yeV6tCRqfsXCU1v5Y0dmuD2vkEf43NxAD8wY6NY/B9 Qs0i0xcxa1rJ143aPDQbQvgbKI1f7dqnG0qi2BFHtsHIfIVyokumebN3KLdrFQL5ApHy 3o/g5vFYhUqqcPGvKzOgRNkFYWQDH0AL8qjoI/3VUEA7ORH48YTKBLCmBtD/2daJgGNI AHlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680183738; 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=37qD3HpRuT76ygaYOrVgaAhvhoR6GxtyNRAWwVXHtN8=; b=7S3lq4F9e0yqmMyZ+Jdrg/ymNcHM09Tj4IO7zlArwo7bX6O84K735HpVEK5+ccRAji CjinSxzyEip7dFW7w+2KFTPtglcwcW1UuEAKcsp3HWS1BTtifqu74KBJfdPwPNZEa0ce XxDvhhL3fdmd6NOaZrOWyA1XXy0UfJbXkc7Oc2gX1ZsAwCMKQKpLZrEB+Mhyy/q/oeRS 2r4b8Bvn6jUFKxPIZBCSU8HjpoIIN3xz6ikRHZPDQydnO6wvLxU6EKt/AN4O2FYCGmr8 UhYlMhVgUsj4komzn84h+6hryyxuWYVMBpxI4AITuNwRQcVks3AJX22+uYa70jXxDeO/ wd1Q== X-Gm-Message-State: AAQBX9fX3e33UkLaNfmopkvKOoasE3JY/pXSwl1XkqoSwlZ9jwIRjgph kyhi/gJFxSsZZXi3IewD0mrJ2QKPFZM= X-Google-Smtp-Source: AKy350YiqhrDmuIM2njhv/GFiWbLemiOXTsVrP+vmRMWjJBcX6Ct6WTfNq25LzIX8EBBk8wkXCaadg== X-Received: by 2002:a17:906:9453:b0:932:b7ce:2aaa with SMTP id z19-20020a170906945300b00932b7ce2aaamr26291082ejx.28.1680183738101; Thu, 30 Mar 2023 06:42:18 -0700 (PDT) Received: from localhost.lan (dsl51B7D2F9.fixip.t-online.hu. [81.183.210.249]) by smtp.gmail.com with ESMTPSA id w17-20020a170906b19100b0093fa8c2e877sm6547256ejy.80.2023.03.30.06.42.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 06:42:17 -0700 (PDT) From: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= To: openembedded-core@lists.openembedded.org Cc: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= Subject: [PATCH 2/2] libgudev: Allow native build Date: Thu, 30 Mar 2023 15:42:14 +0200 Message-Id: <20230330134214.2772913-2-zboszor@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330134214.2772913-1-zboszor@gmail.com> References: <20230330134214.2772913-1-zboszor@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 ; Thu, 30 Mar 2023 13:42:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/179322 libgudev-native is a dependency of libfprint-native, which is needed to build libfprint. Signed-off-by: Zoltán Böszörményi --- meta/recipes-gnome/libgudev/libgudev_237.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-gnome/libgudev/libgudev_237.bb b/meta/recipes-gnome/libgudev/libgudev_237.bb index 9ce43ce34b..ad3a16ab99 100644 --- a/meta/recipes-gnome/libgudev/libgudev_237.bb +++ b/meta/recipes-gnome/libgudev/libgudev_237.bb @@ -9,6 +9,8 @@ SRC_URI[archive.sha256sum] = "0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aa DEPENDS = "glib-2.0 udev" +BBCLASSEXTEND = "native" + RCONFLICTS:${PN} = "systemd (<= 220)" LICENSE = "LGPL-2.1-only"