* [PATCH V2 0/3] systemd: split modules into packages
@ 2015-04-22 17:01 Bruno Bottazzini
2015-04-22 17:01 ` [PATCH 1/3] systemd 219 -> system 219-stable Bruno Bottazzini
` (2 more replies)
0 siblings, 3 replies; 16+ messages in thread
From: Bruno Bottazzini @ 2015-04-22 17:01 UTC (permalink / raw)
To: openembedded-core
Differences from V1:
- Rebasing with master since patchset wasn't fully reviewed last time
Bruno Bottazzini (2):
systemd 219 -> system 219-stable
systemd: split modules into packages
Gustavo Sverzut Barbieri (1):
dbus: split tools package.
meta/recipes-core/dbus/dbus.inc | 9 +-
meta/recipes-core/systemd/systemd_219.bb | 1085 ++++++++++++++++++++++++++----
2 files changed, 954 insertions(+), 140 deletions(-)
--
2.3.5
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH 1/3] systemd 219 -> system 219-stable 2015-04-22 17:01 [PATCH V2 0/3] systemd: split modules into packages Bruno Bottazzini @ 2015-04-22 17:01 ` Bruno Bottazzini 2015-04-22 17:01 ` [PATCH 2/3] dbus: split tools package Bruno Bottazzini 2015-04-22 17:01 ` [PATCH 3/3] systemd: split modules into packages Bruno Bottazzini 2 siblings, 0 replies; 16+ messages in thread From: Bruno Bottazzini @ 2015-04-22 17:01 UTC (permalink / raw) To: openembedded-core The upstream systemd git repo only contains the main systemd branch that progresses at a quick pace, continuously bringing both bugfixes and new features. Distributions usually prefer basing their releases on stabilized versions that receive the bugfixes but not the features. --- meta/recipes-core/systemd/systemd_219.bb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index 43c4f95..d1303f7 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -25,11 +25,11 @@ SECTION = "base/shell" inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext -SRCREV = "a88abde72169ddc2df77df3fa5bed30725022253" +SRCREV = "85a6fabdd3e43cfab0fc6359e9f2a9e368d4a3ed" -PV = "219+git${SRCPV}" +PV = "219-stable+git${SRCPV}" -SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master \ +SRC_URI = "git://anongit.freedesktop.org/systemd/systemd-stable;branch=v219-stable;protocol=git \ file://0002-shared-missing.h-fall-back-to-insecure-getenv.patch \ file://0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0004-configure-Check-for-additional-features-that-uclibc-.patch \ @@ -38,12 +38,8 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master \ file://0007-util-Use-mkostemp-only-if-libc-supports-it.patch \ file://0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch \ file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \ - file://0010-Make-root-s-home-directory-configurable.patch \ file://0011-systemd-user-avoid-using-system-auth.patch \ - file://0001-tmpfiles-avoid-creating-duplicate-acl-entries.patch \ - file://0002-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch \ file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \ - file://0013-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch \ file://0014-Revert-rules-remove-firmware-loading-rules.patch \ file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \ file://tmpfiles-pam.patch \ -- 2.3.5 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/3] dbus: split tools package. 2015-04-22 17:01 [PATCH V2 0/3] systemd: split modules into packages Bruno Bottazzini 2015-04-22 17:01 ` [PATCH 1/3] systemd 219 -> system 219-stable Bruno Bottazzini @ 2015-04-22 17:01 ` Bruno Bottazzini 2015-04-22 17:01 ` [PATCH 3/3] systemd: split modules into packages Bruno Bottazzini 2 siblings, 0 replies; 16+ messages in thread From: Bruno Bottazzini @ 2015-04-22 17:01 UTC (permalink / raw) To: openembedded-core From: Gustavo Sverzut Barbieri <gustavo.barbieri@intel.com> Most tools are not required if one is launching a simple daemon. The user will be able to exclude dbus-tool and save some space in his build Signed-off-by: Bruno Bottazzini <bruno.bottazzini@intel.com> --- meta/recipes-core/dbus/dbus.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index fb5d017..58dd728 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -39,7 +39,7 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session DEBIANNAME_${PN} = "dbus-1" -PACKAGES =+ "${PN}-lib" +PACKAGES =+ "${PN}-lib ${PN}-tools" OLDPKGNAME = "dbus-x11" OLDPKGNAME_class-nativesdk = "" @@ -47,6 +47,7 @@ OLDPKGNAME_class-nativesdk = "" # for compatibility RPROVIDES_${PN} = "${OLDPKGNAME}" RREPLACES_${PN} += "${OLDPKGNAME}" +RRECOMMENDS_${PN}_class-native = "" FILES_${PN} = "${bindir}/dbus-daemon* \ ${bindir}/dbus-uuidgen \ @@ -64,6 +65,12 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ FILES_${PN}-lib = "${libdir}/lib*.so.*" RRECOMMENDS_${PN}-lib = "${PN}" FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" +FILES_${PN}-tools += "${bindir}/dbus-uuidgen \ + ${bindir}/dbus-cleanup-sockets \ + ${bindir}/dbus-monitor \ + ${bindir}/dbus-launch \ + ${bindir}/dbus-run-session" +RRECOMMENDS_${PN} = "${PN}-tools" pkg_postinst_dbus() { # If both systemd and sysvinit are enabled, mask the dbus-1 init script -- 2.3.5 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/3] systemd: split modules into packages 2015-04-22 17:01 [PATCH V2 0/3] systemd: split modules into packages Bruno Bottazzini 2015-04-22 17:01 ` [PATCH 1/3] systemd 219 -> system 219-stable Bruno Bottazzini 2015-04-22 17:01 ` [PATCH 2/3] dbus: split tools package Bruno Bottazzini @ 2015-04-22 17:01 ` Bruno Bottazzini 2015-04-22 17:27 ` Anders Darander 2 siblings, 1 reply; 16+ messages in thread From: Bruno Bottazzini @ 2015-04-22 17:01 UTC (permalink / raw) To: openembedded-core if one wants to launch a simple deamon, most modules are not required. He will be able to save space and exclude unwanted packages from the final image. --- meta/recipes-core/systemd/systemd_219.bb | 1075 ++++++++++++++++++++++++++---- 1 file changed, 943 insertions(+), 132 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index d1303f7..d86068c 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -19,7 +19,7 @@ PROVIDES = "udev" PE = "1" -DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux" +DEPENDS = "util-linux intltool-native gperf-native readline libcap libcgroup qemu-native" SECTION = "base/shell" @@ -58,23 +58,45 @@ LDFLAGS_append_libc-uclibc = " -lrt" GTKDOC_DOCDIR = "${S}/docs/" -PACKAGECONFIG ??= "xz ldconfig \ +PACKAGECONFIG ??= " \ + gcrypt \ + kmod \ + ldconfig \ + ${@bb.utils.contains('DISTRO_FEATURES', 'blkid', 'blkid', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'efi', 'efi', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'lz4', 'lz4', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xz', 'xz', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'libidn', 'libidn', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)}" +PACKAGECONFIG[glib] = "--enable-gudev,--disable-gudev,glib-2.0" +PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" +PACKAGECONFIG[blkid] = "--enable-blkid,--disable-blkid,util-linux" +PACKAGECONFIG[efi] = "--enable-efi,--disable-efi" +PACKAGECONFIG[kmod] = "--enable-kmod,--disable-kmod,kmod" +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,,polkit" +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" +PACKAGECONFIG[smack] = "--enable-smack,--disable-smack" +PACKAGECONFIG[ima] = "--enable-ima,--disable-ima" +PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor" +PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" +PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl" # Sign the journal for anti-tampering PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" # regardless of PACKAGECONFIG, libgcrypt is always required to expand # the AM_PATH_LIBGCRYPT autoconf macro -DEPENDS += "libgcrypt" # Compress the journal +PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4" PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" +PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,libqrencode" +PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" PACKAGECONFIG[cryptsetup] = "--enable-libcryptsetup,--disable-libcryptsetup,cryptsetup" PACKAGECONFIG[microhttpd] = "--enable-microhttpd,--disable-microhttpd,libmicrohttpd" PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils" PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved" -PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd" PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit" PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" @@ -97,17 +119,33 @@ rootprefix ?= "${base_prefix}" rootlibdir ?= "${base_libdir}" rootlibexecdir = "${rootprefix}/lib" -# The gtk+ tools should get built as a separate recipe e.g. systemd-tools EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ --with-rootlibdir=${rootlibdir} \ - --with-roothomedir=${ROOT_HOME} \ - --disable-coredump \ + --enable-coredump \ --disable-introspection \ - --disable-kdbus \ + --enable-kdbus \ + --disable-manpages \ --enable-split-usr \ --without-python \ --with-sysvrcnd-path=${sysconfdir} \ --with-firmware-path=/lib/firmware \ + --enable-libcurl \ + --enable-ldconfig \ + --enable-backlight \ + --enable-binfmt \ + --enable-bootchart \ + --enable-firstboot \ + --enable-hostnamed \ + --enable-localed \ + --enable-logind \ + --enable-machined \ + --enable-networkd \ + --enable-quotacheck \ + --enable-randomseed \ + --enable-resolved \ + --enable-rfkill \ + --enable-sysusers \ + --enable-vconsole \ " # uclibc does not have NSS EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname " @@ -202,158 +240,748 @@ do_install_ptest () { python populate_packages_prepend (){ systemdlibdir = d.getVar("rootlibdir", True) - do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) + do_split_packages(d, systemdlibdir, '^lib(udev|gudev|systemd|nss)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) } -PACKAGES_DYNAMIC += "^lib(udev|systemd).*" +PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd|nss).*" + +######################################################################## +# Base Packages +######################################################################## + +PACKAGES =+ "${PN}-generators-filesystems" +SUMMARY_${PN}-generators-filesystems = "systemd's generator for filesystem services based on fstab and GPT" +RDEPENDS_${PN}-generators-filesystems = "${PN}-services-fsck" +FILES_${PN}-generators-filesystems = "\ + ${rootlibexecdir}/systemd/system-generators/systemd-fstab-generator \ + ${rootlibexecdir}/systemd/system-generators/systemd-gpt-auto-generator \ + ${rootlibexecdir}/systemd/systemd-remount-fs \ + ${systemd_unitdir}/system/local-fs.target.wants/systemd-remount-fs.service \ + ${systemd_unitdir}/system/systemd-remount-fs.service \ +" -PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \ - ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh libgudev" +PACKAGES =+ "${PN}-generators-getty" +SUMMARY_${PN}-generators-getty = "systemd's generator TTY services" +RDEPENDS_${PN}-generators-getty = "${PN}-services-getty" +FILES_${PN}-generators-getty = "\ + ${rootlibexecdir}/systemd/system-generators/systemd-getty-generator \ +" -SYSTEMD_PACKAGES = "${PN}-binfmt" -SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" +PACKAGES =+ "${PN}-tools" +SUMMARY_${PN}-tools = "systemd command line tools (cgls, delta, run, analyze...)" +RRECOMMENDS_${PN}-tools = "${PN}-services-base" +FILES_${PN}-tools = "\ + ${base_bindir}/systemd-machine-id-setup \ + ${bindir}/busctl \ + ${bindir}/coredumpctl \ + ${bindir}/systemd-analyze \ + ${bindir}/systemd-cat \ + ${bindir}/systemd-cgls \ + ${bindir}/systemd-cgtop \ + ${bindir}/systemd-delta \ + ${bindir}/systemd-detect-virt \ + ${bindir}/systemd-path \ + ${bindir}/systemd-run \ + ${rootlibexecdir}/systemd/systemd-ac-power \ + ${rootlibexecdir}/systemd/systemd-activate \ + ${rootlibexecdir}/systemd/systemd-reply-password \ + ${rootprefix}/bin/systemd-escape \ + ${rootprefix}/bin/systemd-notify \ +" -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} += "--system systemd-journal-gateway; --system systemd-timesync" -GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal" +######################################################################## +# Services Packages +######################################################################## + +PACKAGES =+ "${PN}-services-ask-password" +SUMMARY_${PN}-services-ask-password = "systemd's service and tool to query the user for a system password" +RRECOMMENDS_${PN}-services-ask-password = "${PN}-services-base" +FILES_${PN}-services-ask-password = "\ + ${rootprefix}/bin/systemd-ask-password \ + ${rootprefix}/bin/systemd-tty-ask-password-agent \ + ${systemd_unitdir}/system/multi-user.target.wants/systemd-ask-password-wall.path \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-ask-password-console.path \ + ${systemd_unitdir}/system/systemd-ask-password-console.path \ + ${systemd_unitdir}/system/systemd-ask-password-console.service \ + ${systemd_unitdir}/system/systemd-ask-password-wall.path \ + ${systemd_unitdir}/system/systemd-ask-password-wall.service \ +" -FILES_${PN}-analyze = "${bindir}/systemd-analyze" +PACKAGES =+ "${PN}-services-backlight" +SUMMARY_${PN}-services-backlight = "systemd's backlight state save/restore service" +FILES_${PN}-services-backlight = "\ + ${systemd_unitdir}/system/systemd-backlight@.service \ + ${rootlibexecdir}/systemd/systemd-backlight \ +" -FILES_${PN}-initramfs = "/init" -RDEPENDS_${PN}-initramfs = "${PN}" +PACKAGES =+ "${PN}-services-binfmt" +SUMMARY_${PN}-services-binfmt = "systemd's service to configure additional binary formats for executables" +RRECOMMENDS_${PN}-services-binfmt = "kernel-module-binfmt-misc" +FILES_${PN}-services-binfmt = "\ + ${sysconfdir}/binfmt.d/ \ + ${exec_prefix}/lib/binfmt.d/ \ + ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.automount \ + ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.mount \ + ${systemd_unitdir}/system/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount \ + ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.* \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-binfmt.service \ + ${systemd_unitdir}/system/systemd-binfmt.service \ + ${rootlibexecdir}/systemd/systemd-binfmt \ +" -FILES_libgudev = "${libdir}/libgudev*${SOLIBS}" +PACKAGES =+ "${PN}-services-bootchart" +SUMMARY_${PN}-services-bootchart = "systemd's boot performance service and graphing tool" +CONFFILES_${PN}-services-bootchart = "${sysconfdir}/systemd/bootchart.conf" +FILES_${PN}-services-bootchart = "\ + ${sysconfdir}/systemd/bootchart.conf \ + ${rootlibexecdir}/systemd/systemd-bootchart \ +" -RDEPENDS_${PN}-ptest += "perl python bash" -FILES_${PN}-ptest += "${libdir}/udev/rules.d" +PACKAGES =+ "${PN}-services-coredump" +SUMMARY_${PN}-services-coredump = "systemd's coredump log hook and service" +RDEPENDS_${PN}-services-coredump = "${PN}-services-sysctl" +CONFFILES_${PN}-services-coredump = "${sysconfdir}/systemd/coredump.conf" +FILES_${PN}-services-coredump = "\ + ${exec_prefix}/lib/sysctl.d/50-coredump.conf \ + ${sysconfdir}/systemd/coredump.conf \ + ${rootlibexecdir}/systemd/systemd-coredump \ +" + +PACKAGES =+ "${PN}-services-cryptsetup" +SUMMARY_${PN}-services-cryptsetup = "systemd's disk decryption service" +ALLOW_EMPTY_${PN}-services-cryptsetup = "1" +FILES_${PN}-services-cryptsetup = "\ + ${rootlibexecdir}/systemd/system-generators/systemd-cryptsetup-generator \ + ${systemd_unitdir}/system/cryptsetup-pre.target \ + ${systemd_unitdir}/system/cryptsetup.target \ + ${systemd_unitdir}/system/sysinit.target.wants/cryptsetup.target \ + ${rootlibexecdir}/systemd/systemd-cryptsetup \ +" + +PACKAGES =+ "${PN}-services-dbus" +SUMMARY_${PN}-services-dbus = "systemd's DBus daemon system service" +# NOTE: dbus dependency will go away when kdbus is in use +RDEPENDS_${PN}-services-dbus = "dbus" +FILES_${PN}-services-dbus = "\ + ${datadir}/dbus-1/services/org.freedesktop.systemd1.service \ + ${datadir}/dbus-1/system-services/org.freedesktop.systemd1.service \ + ${datadir}/dbus-1/system-services/org.freedesktop.import1.service \ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf \ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ + ${systemd_unitdir}/system/sockets.target.wants/dbus.socket \ + ${systemd_unitdir}/system/dbus.target.wants/dbus.socket \ + ${systemd_unitdir}/system/multi-user.target.wants/dbus.service \ + ${systemd_unitdir}/system/dbus.socket \ + ${systemd_unitdir}/system/dbus.service \ +" + +PACKAGES =+ "${PN}-services-debug" +SUMMARY_${PN}-services-debug = "systemd's debug service" +RRECOMMENDS_${PN}-services-debug = "${PN}-services-base ${PN}-tools" +FILES_${PN}-services-debug = "\ + ${rootlibexecdir}/systemd/system-generators/systemd-debug-generator \ + ${systemd_unitdir}/system/debug-shell.service \ + ${systemd_unitdir}/system/sys-kernel-config.mount \ + ${systemd_unitdir}/system/sys-kernel-debug.mount \ + ${systemd_unitdir}/system/sysinit.target.wants/sys-kernel-config.mount \ + ${systemd_unitdir}/system/sysinit.target.wants/sys-kernel-debug.mount \ +" -FILES_${PN}-dbg += "${libdir}/systemd/ptest/.debug" +PACKAGES =+ "${PN}-services-firstboot" +SUMMARY_${PN}-services-firstboot = "systemd's service to initialize basic system settings" +FILES_${PN}-services-firstboot = "\ + ${base_bindir}/systemd-firstboot \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-firstboot.service \ + ${systemd_unitdir}/system/systemd-firstboot.service \ +" + +PACKAGES =+ "${PN}-services-fsck" +SUMMARY_${PN}-services-fsck = "systemd's filesystem check service" +RRECOMMENDS_${PN}-services-fsck = "util-linux-fsck e2fsprogs-e2fsck" +FILES_${PN}-services-fsck = "\ + ${systemd_unitdir}/system/systemd-fsck-root.service \ + ${systemd_unitdir}/system/systemd-fsck@.service \ + ${rootlibexecdir}/systemd/systemd-fsck \ +" + +PACKAGES =+ "${PN}-services-fuse" +SUMMARY_${PN}-services-fuse = "systemd's FUSE (filesystem in userspace) service" +FILES_${PN}-services-fuse = "\ + ${systemd_unitdir}/system/sysinit.target.wants/sys-fs-fuse-connections.mount \ + ${systemd_unitdir}/system/sys-fs-fuse-connections.mount \ +" + +PACKAGES =+ "${PN}-services-getty" +SUMMARY_${PN}-services-getty = "systemd's getty service" +RRECOMMENDS_${PN}-services-getty = "util-linux-agetty ${PN}-generators-getty" +FILES_${PN}-services-getty = "\ + ${systemd_unitdir}/system/autovt@.service \ + ${systemd_unitdir}/system/console-getty.service \ + ${systemd_unitdir}/system/container-getty@.service \ + ${systemd_unitdir}/system/getty@.service \ + ${systemd_unitdir}/system/serial-getty@.service \ + ${sysconfdir}/systemd/system/getty.target.wants/ \ +" + +PACKAGES =+ "${PN}-services-hostnamed" +SUMMARY_${PN}-services-hostnamed = "systemd's hostname management service" +RDEPENDS_${PN}-services-hostnamed = "${PN}-services-dbus" +CONFFILES_${PN}-services-hostnamed = "${sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf" +FILES_${PN}-services-hostnamed = "\ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf \ + ${bindir}/hostnamectl \ + ${systemd_unitdir}/system/busnames.target.wants/org.freedesktop.hostname1.busname \ + ${systemd_unitdir}/system/dbus-org.freedesktop.hostname1.service \ + ${systemd_unitdir}/system/org.freedesktop.hostname1.busname \ + ${systemd_unitdir}/system/systemd-hostnamed.service \ + ${rootlibexecdir}/systemd/systemd-hostnamed \ + ${datadir}/dbus-1/system-services/org.freedesktop.hostname1.service \ + ${datadir}/polkit-1/actions/org.freedesktop.hostname1.policy \ +" + +PACKAGES =+ "${PN}-services-journal" +SUMMARY_${PN}-services-journal = "systemd's journal (logging) service" +CONFFILES_${PN}-services-journal = "${sysconfdir}/systemd/journald.conf" +FILES_${PN}-services-journal = "\ + ${base_bindir}/journalctl \ + ${rootlibexecdir}/systemd/systemd-journald \ + ${sysconfdir}/systemd/journald.conf \ + ${systemd_unitdir}/system/sockets.target.wants/systemd-journald-dev-log.socket \ + ${systemd_unitdir}/system/sockets.target.wants/systemd-journald.socket \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-journal-catalog-update.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-journal-flush.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-journald.service \ + ${systemd_unitdir}/system/systemd-journal-catalog-update.service \ + ${systemd_unitdir}/system/systemd-journal-flush.service \ + ${systemd_unitdir}/system/systemd-journald-dev-log.socket \ + ${systemd_unitdir}/system/systemd-journald.service \ + ${systemd_unitdir}/system/systemd-journald.socket \ + ${exec_prefix}/lib/systemd/catalog/ \ +" + +PACKAGES =+ "${PN}-services-ldconfig" +SUMMARY_${PN}-services-ldconfig = "systemd's service to run ldconfig after updates" +FILES_${PN}-services-ldconfig = "\ + ${systemd_unitdir}/system/sysinit.target.wants/ldconfig.service \ + ${systemd_unitdir}/system/ldconfig.service \ +" + +PACKAGES =+ "${PN}-services-localed" +SUMMARY_${PN}-services-localed = "systemd's locale management service" +RDEPENDS_${PN}-services-localed = "${PN}-services-dbus" +CONFFILES_${PN}-services-localed = "${sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf" +FILES_${PN}-services-localed = "\ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf \ + ${bindir}/localectl \ + ${systemd_unitdir}/system/busnames.target.wants/org.freedesktop.locale1.busname \ + ${systemd_unitdir}/system/dbus-org.freedesktop.locale1.service \ + ${systemd_unitdir}/system/org.freedesktop.locale1.busname \ + ${systemd_unitdir}/system/systemd-localed.service \ + ${rootlibexecdir}/systemd/systemd-localed \ + ${datadir}/dbus-1/system-services/org.freedesktop.locale1.service \ + ${datadir}/polkit-1/actions/org.freedesktop.locale1.policy \ + ${datadir}/systemd/kbd-model-map \ +" + +PACKAGES =+ "${PN}-services-logind" +SUMMARY_${PN}-services-logind = "systemd's login management service" +RDEPENDS_${PN}-services-logind = "${PN}-services-dbus ${PN}-services-tmpfiles" +RRECOMMENDS_${PN}-services-logind = "udev" +CONFFILES_${PN}-services-logind = "\ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf \ + ${sysconfdir}/systemd/logind.conf \ +" +FILES_${PN}-services-logind = "\ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf \ + ${sysconfdir}/systemd/logind.conf \ + ${base_bindir}/loginctl \ + ${base_bindir}/systemd-inhibit \ + ${systemd_unitdir}/system/busnames.target.wants/org.freedesktop.login1.busname \ + ${systemd_unitdir}/system/dbus-org.freedesktop.login1.service \ + ${systemd_unitdir}/system/multi-user.target.wants/systemd-logind.service \ + ${systemd_unitdir}/system/multi-user.target.wants/systemd-user-sessions.service \ + ${systemd_unitdir}/system/org.freedesktop.login1.busname \ + ${systemd_unitdir}/system/systemd-logind.service \ + ${systemd_unitdir}/system/systemd-user-sessions.service \ + ${systemd_unitdir}/system/user@.service \ + ${rootlibexecdir}/systemd/systemd-logind \ + ${rootlibexecdir}/systemd/systemd-user-sessions \ + ${datadir}/dbus-1/system-services/org.freedesktop.login1.service \ + ${datadir}/polkit-1/actions/org.freedesktop.login1.policy \ + ${rootlibexecdir}/udev/rules.d/70-uaccess.rules \ + ${rootlibexecdir}/udev/rules.d/70-power-switch.rules \ + ${rootlibexecdir}/udev/rules.d/71-seat.rules \ + ${rootlibexecdir}/udev/rules.d/73-seat-late.rules \ +" + +PACKAGES =+ "${PN}-services-machined" +SUMMARY_${PN}-services-machined = "systemd's virtual machine and container management service" +RDEPENDS_${PN}-services-machined = "${PN}-services-dbus" +CONFFILES_${PN}-services-machined = "${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf" +FILES_${PN}-services-machined = "\ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ + ${base_bindir}/machinectl \ + ${systemd_unitdir}/system/busnames.target.wants/org.freedesktop.machine1.busname \ + ${systemd_unitdir}/system/dbus-org.freedesktop.machine1.service \ + ${systemd_unitdir}/system/machine.slice \ + ${systemd_unitdir}/system/org.freedesktop.machine1.busname \ + ${systemd_unitdir}/system/systemd-machined.service \ + ${rootlibexecdir}/systemd/systemd-machined \ + ${datadir}/dbus-1/system-services/org.freedesktop.machine1.service \ +" + +PACKAGES =+ "${PN}-services-modules-load" +SUMMARY_${PN}-services-modules-load = "systemd's kernel module loading service" +FILES_${PN}-services-modules-load = "\ + ${sysconfdir}/modules-load.d/ \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-modules-load.service \ + ${systemd_unitdir}/system/systemd-modules-load.service \ + ${rootlibexecdir}/systemd/systemd-modules-load \ + ${exec_prefix}/lib/modules-load.d \ +" + +PACKAGES =+ "${PN}-services-modules-static-nodes" +SUMMARY_${PN}-services-modules-static-nodes = "systemd's kernel module static nodes creation service" +RDEPENDS_${PN}-services-modules-static-nodes = "kmod ${PN}-services-tmpfiles" +FILES_${PN}-services-modules-static-nodes = "\ + ${systemd_unitdir}/system/sysinit.target.wants/kmod-static-nodes.service \ + ${systemd_unitdir}/system/kmod-static-nodes.service \ +" + + +PACKAGES =+ "${PN}-services-multi-seat-x" +SUMMARY_${PN}-services-multi-seat-x = "systemd's X11 multi-seat support service" +RDEPENDS_${PN}-services-multi-seat-x = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/xserver', '', d)}" +FILES_${PN}-services-multi-seat-x = "\ + ${rootlibexecdir}/systemd/systemd-multi-seat-x \ +" + +PACKAGES =+ "${PN}-services-networkd" +SUMMARY_${PN}-services-networkd = "systemd's network management (static, DHCP, bridge...) service" +# NOTE: if no sysusers, then users/groups must be setup +RRECOMMENDS_${PN}-services-networkd = "${PN}-services-sysusers" +FILES_${PN}-services-networkd = "\ + ${sysconfdir}/systemd/network/ \ + ${sysconfdir}/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service \ + ${sysconfdir}/systemd/system/multi-user.target.wants/systemd-networkd.service \ + ${base_bindir}/networkctl \ + ${rootlibexecdir}/systemd/network/80-container-host0.network \ + ${rootlibexecdir}/systemd/network/80-container-ve.network \ + ${rootlibexecdir}/systemd/network/99-default.link \ + ${systemd_unitdir}/system/systemd-networkd-wait-online.service \ + ${systemd_unitdir}/system/systemd-networkd.service \ + ${rootlibexecdir}/systemd/systemd-networkd \ + ${rootlibexecdir}/systemd/systemd-networkd-wait-online \ + ${exec_prefix}/lib/systemd/network \ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf \ + ${datadir}/dbus-1/system-services/org.freedesktop.network1.service \ +" + +PACKAGES =+ "${PN}-services-nspawn" +SUMMARY_${PN}-services-nspawn = "systemd's namespace spawing service and tool" +FILES_${PN}-services-nspawn = "\ + ${systemd_unitdir}/system/systemd-nspawn@.service \ + ${bindir}/systemd-nspawn \ +" + +PACKAGES =+ "${PN}-services-quota" +SUMMARY_${PN}-services-quota = "systemd's file system quota enable and check service" +RDEPENDS_${PN}-services-quota = "quota" +FILES_${PN}-services-quota = "\ + ${systemd_unitdir}/system/quotaon.service \ + ${systemd_unitdir}/system/systemd-quotacheck.service \ + ${rootlibexecdir}/systemd/systemd-quotacheck \ +" + +PACKAGES =+ "${PN}-services-randomseed" +SUMMARY_${PN}-services-randomseed = "systemd's random seed save/restore service" +FILES_${PN}-services-randomseed = "\ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-random-seed.service \ + ${systemd_unitdir}/system/systemd-random-seed.service \ + ${rootlibexecdir}/systemd/systemd-random-seed \ +" + +PACKAGES =+ "${PN}-services-readahead" +SUMMARY_${PN}-services-readahead = "systemd's disk read ahead service" +FILES_${PN}-services-readahead = "\ + ${systemd_unitdir}/system/systemd-readahead-collect.service \ + ${systemd_unitdir}/system/systemd-readahead-done.service \ + ${systemd_unitdir}/system/systemd-readahead-done.timer \ + ${systemd_unitdir}/system/systemd-readahead-drop.service \ + ${systemd_unitdir}/system/systemd-readahead-replay.service \ + ${rootlibexecdir}/systemd/systemd-readahead \ +" + +PACKAGES =+ "${PN}-services-rfkill" +SUMMARY_${PN}-services-rfkill = "systemd's rfkill state save/restore service" +FILES_${PN}-services-rfkill = "\ + ${systemd_unitdir}/system/systemd-rfkill@.service \ + ${rootlibexecdir}/systemd/systemd-rfkill \ +" + +PACKAGES =+ "${PN}-services-sleep" +SUMMARY_${PN}-services-sleep = "systemd's sleep, suspend and hiberate services" +FILES_${PN}-services-sleep = "\ + ${systemd_unitdir}/system/systemd-hybrid-sleep.service \ + ${systemd_unitdir}/system/systemd-suspend.service \ + ${systemd_unitdir}/system/systemd-hibernate.service \ + ${systemd_unitdir}/system-sleep/ \ + ${rootlibexecdir}/systemd/systemd-sleep \ +" + +PACKAGES =+ "${PN}-services-sysctl" +SUMMARY_${PN}-services-sysctl = "systemd's kernel parameters configuration service" +FILES_${PN}-services-sysctl = "\ + ${sysconfdir}/sysctl.d/ \ + ${exec_prefix}/lib/sysctl.d/ \ + ${exec_prefix}/lib/sysctl.d/50-default.conf \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-sysctl.service \ + ${systemd_unitdir}/system/systemd-sysctl.service \ + ${rootlibexecdir}/systemd/systemd-sysctl \ +" + +PACKAGES =+ "${PN}-services-sysusers" +SUMMARY_${PN}-services-sysusers = "systemd's service and tool to allocate system users and groups" +FILES_${PN}-services-sysusers = "\ + ${base_bindir}/systemd-sysusers \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-sysusers.service \ + ${systemd_unitdir}/system/systemd-sysusers.service \ + ${exec_prefix}/lib/sysusers.d/basic.conf \ + ${exec_prefix}/lib/sysusers.d/systemd.conf \ +" + +PACKAGES =+ "${PN}-services-sysvcompat" +SUMMARY_${PN}-services-sysvcompat = "systemd's SYSV legacy and compatibility service" +# NOTE: if no sysusers or tmpfiles, then users/groups and FS structure must be setup +RRECOMMENDS_${PN}-services-sysvcompat = "${PN}-services-sysusers ${PN}-services-tmpfiles" +FILES_${PN}-services-sysvcompat = "\ + ${rootlibexecdir}/systemd/systemd-bus-proxyd \ + ${rootlibexecdir}/systemd/systemd-socket-proxyd \ + ${bindir}/systemd-stdio-bridge \ + ${rootlibexecdir}/systemd/system-generators/systemd-rc-local-generator \ + ${rootlibexecdir}/systemd/system-generators/systemd-sysv-generator \ + ${rootlibexecdir}/systemd/systemd-initctl \ + ${rootlibexecdir}/systemd/systemd-update-utmp \ + ${systemd_unitdir}/system/halt-local.service \ + ${systemd_unitdir}/system/rc-local.service \ + ${systemd_unitdir}/system/runlevel1.target.wants/systemd-update-utmp-runlevel.service \ + ${systemd_unitdir}/system/runlevel2.target.wants/systemd-update-utmp-runlevel.service \ + ${systemd_unitdir}/system/runlevel3.target.wants/systemd-update-utmp-runlevel.service \ + ${systemd_unitdir}/system/runlevel4.target.wants/systemd-update-utmp-runlevel.service \ + ${systemd_unitdir}/system/runlevel5.target.wants/systemd-update-utmp-runlevel.service \ + ${systemd_unitdir}/system/sockets.target.wants/systemd-initctl.socket \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-update-utmp.service \ + ${systemd_unitdir}/system/systemd-initctl.service \ + ${systemd_unitdir}/system/systemd-initctl.socket \ + ${systemd_unitdir}/system/systemd-update-utmp-runlevel.service \ + ${systemd_unitdir}/system/systemd-update-utmp.service \ + ${exec_prefix}/lib/tmpfiles.d/legacy.conf \ +" + +PACKAGES =+ "${PN}-services-timedated" +SUMMARY_${PN}-services-timedated = "systemd's time and date management service" +RDEPENDS_${PN}-services-timedated = "${PN}-services-dbus" +CONFFILES_${PN}-services-timedated = "${sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf" +FILES_${PN}-services-timedated = "\ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf \ + ${bindir}/timedatectl \ + ${systemd_unitdir}/system/busnames.target.wants/org.freedesktop.timedate1.busname \ + ${systemd_unitdir}/system/dbus-org.freedesktop.timedate1.service \ + ${systemd_unitdir}/system/org.freedesktop.timedate1.busname \ + ${systemd_unitdir}/system/systemd-timedated.service \ + ${rootlibexecdir}/systemd/systemd-timedated \ + ${datadir}/dbus-1/system-services/org.freedesktop.timedate1.service \ + ${datadir}/polkit-1/actions/org.freedesktop.timedate1.policy \ +" + +PACKAGES =+ "${PN}-services-timesyncd" +SUMMARY_${PN}-services-timesyncd = "systemd's NTP sync service" +# NOTE: if no sysusers, then users/groups must be setup +RRECOMMENDS_${PN}-services-timesyncd = "${PN}-services-sysusers" +CONFFILES_${PN}-services-timesyncd = "${sysconfdir}/systemd/timesyncd.conf" +FILES_${PN}-services-timesyncd = "\ + ${sysconfdir}/systemd/system/sysinit.target.wants/systemd-timesyncd.service \ + ${sysconfdir}/systemd/timesyncd.conf \ + ${systemd_unitdir}/system/systemd-timesyncd.service \ + ${rootlibexecdir}/systemd/systemd-timesyncd \ +" + +PACKAGES =+ "${PN}-services-tmpfiles" +SUMMARY_${PN}-services-tmpfiles = "systemd's service to create, delete and clean up volatile/tmp files/dirs" +FILES_${PN}-services-tmpfiles = "\ + ${sysconfdir}/tmpfiles.d/ \ + ${base_bindir}/systemd-tmpfiles \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-tmpfiles-setup.service \ + ${systemd_unitdir}/system/systemd-tmpfiles-clean.service \ + ${systemd_unitdir}/system/systemd-tmpfiles-clean.timer \ + ${systemd_unitdir}/system/systemd-tmpfiles-setup-dev.service \ + ${systemd_unitdir}/system/systemd-tmpfiles-setup.service \ + ${systemd_unitdir}/system/timers.target.wants/systemd-tmpfiles-clean.timer \ + ${exec_prefix}/lib/tmpfiles.d/etc.conf \ + ${exec_prefix}/lib/tmpfiles.d/systemd-nologin.conf \ + ${exec_prefix}/lib/tmpfiles.d/systemd.conf \ + ${exec_prefix}/lib/tmpfiles.d/tmp.conf \ + ${exec_prefix}/lib/tmpfiles.d/var.conf \ + ${exec_prefix}/lib/tmpfiles.d/00-create-volatile.conf \ + ${exec_prefix}/lib/tmpfiles.d/x11.conf \ +" + +PACKAGES =+ "${PN}-services-udev" +SUMMARY_${PN}-services-udev = "systemd's udev services" +RDEPENDS_${PN}-services-udev = "udev" +FILES_${PN}-services-udev = "\ + ${systemd_unitdir}/system/initrd-udevadm-cleanup-db.service \ + ${systemd_unitdir}/system/systemd-udev-hwdb-update.service \ + ${systemd_unitdir}/system/systemd-udev-settle.service \ + ${systemd_unitdir}/system/systemd-udev-trigger.service \ + ${systemd_unitdir}/system/systemd-udevd-control.socket \ + ${systemd_unitdir}/system/systemd-udevd-kernel.socket \ + ${systemd_unitdir}/system/systemd-udevd.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-udevd.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-udev-trigger.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-udev-hwdb-update.service \ + ${systemd_unitdir}/system/sockets.target.wants/systemd-udevd-kernel.socket \ + ${systemd_unitdir}/system/sockets.target.wants/systemd-udevd-control.socket \ +" + +PACKAGES =+ "${PN}-services-update" +SUMMARY_${PN}-services-update = "systemd's post update service" +FILES_${PN}-services-update = "\ + ${rootlibexecdir}/systemd/system-generators/systemd-system-update-generator \ + ${rootlibexecdir}/systemd/systemd-update-done \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-update-done.service \ + ${systemd_unitdir}/system/systemd-update-done.service \ +" + +PACKAGES =+ "${PN}-services-vconsole" +SUMMARY_${PN}-services-vconsole = "systemd's service to configure the virtual console (keyboard/font)" +RECOMMENDS_${PN}-services-vconsole = "kbd kbd-consolefonts kbd-keymaps" +FILES_${PN}-services-vconsole = "\ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service \ + ${systemd_unitdir}/system/systemd-vconsole-setup.service \ + ${rootlibexecdir}/systemd/systemd-vconsole-setup \ +" + +######################################################################## +# Standard BitBake Packages +######################################################################## + +FILES_${PN}-dbg += "\ + ${base_libdir}/security/.debug/ \ + ${libdir}/systemd/ptest/.debug \ + ${rootlibdir}/.debug \ + ${systemd_unitdir}/*/.debug \ + ${systemd_unitdir}/.debug \ +" FILES_${PN}-gui = "${bindir}/systemadm" -FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ - ${systemd_unitdir}/system/systemd-vconsole-setup.service \ - ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service" +FILES_${PN}-dev += "\ + ${base_libdir}/security/*.la \ + ${datadir}/dbus-1/interfaces/ \ + ${sysconfdir}/rpm/macros.systemd \ +" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} += "--system systemd-journal-gateway; --system systemd-timesync" +GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal" + +# The test cases need perl and bash to run correctly. +RDEPENDS_${PN}-ptest += "perl python bash" +FILES_${PN}-ptest += "\ + ${libdir}/udev/rules.d \ +" + +######################################################################## +# Misc Packages +######################################################################## + +PACKAGES =+ "${PN}-bash" +SUMMARY_${PN}-bash = "systemd bash shell commands completion" +FILES_${PN}-bash = "\ + ${datadir}/bash-completion/completions/bootctl \ + ${datadir}/bash-completion/completions/busctl \ + ${datadir}/bash-completion/completions/coredumpctl \ + ${datadir}/bash-completion/completions/hostnamectl \ + ${datadir}/bash-completion/completions/journalctl \ + ${datadir}/bash-completion/completions/kernel-install \ + ${datadir}/bash-completion/completions/localectl \ + ${datadir}/bash-completion/completions/loginctl \ + ${datadir}/bash-completion/completions/machinectl \ + ${datadir}/bash-completion/completions/systemctl \ + ${datadir}/bash-completion/completions/systemd-* \ + ${datadir}/bash-completion/completions/timedatectl \ +" + +PACKAGES =+ "${PN}-initramfs" +SUMMARY_${PN}-initramfs = "systemd's initramfs support" +FILES_${PN}-initramfs = "/init" +RDEPENDS_${PN}-initramfs = "${PN}" +PACKAGES =+ "${PN}-kernel-install" +SUMMARY_${PN}-kernel-install = "systemd tool to add/remove kernel and initramfs images to/from /boot" RDEPENDS_${PN}-kernel-install += "bash" -FILES_${PN}-kernel-install = "${bindir}/kernel-install \ - ${sysconfdir}/kernel/ \ - ${exec_prefix}/lib/kernel \ - " -FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ - " - -FILES_${PN}-zsh = "${datadir}/zsh/site-functions" - -FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ - ${exec_prefix}/lib/binfmt.d \ - ${rootlibexecdir}/systemd/systemd-binfmt \ - ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.* \ - ${systemd_unitdir}/system/systemd-binfmt.service" -RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc" - -RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" - -CONFFILES_${PN} = "${sysconfdir}/systemd/journald.conf \ - ${sysconfdir}/systemd/logind.conf \ - ${sysconfdir}/systemd/system.conf \ - ${sysconfdir}/systemd/user.conf" - -FILES_${PN} = " ${base_bindir}/* \ - ${datadir}/bash-completion \ - ${datadir}/dbus-1/services \ - ${datadir}/dbus-1/system-services \ - ${datadir}/polkit-1 \ - ${datadir}/${BPN} \ - ${datadir}/factory \ - ${sysconfdir}/bash_completion.d/ \ - ${sysconfdir}/dbus-1/ \ - ${sysconfdir}/machine-id \ - ${sysconfdir}/modules-load.d/ \ - ${sysconfdir}/pam.d/ \ - ${sysconfdir}/sysctl.d/ \ - ${sysconfdir}/systemd/ \ - ${sysconfdir}/tmpfiles.d/ \ - ${sysconfdir}/xdg/ \ - ${sysconfdir}/init.d/README \ - ${rootlibexecdir}/systemd/* \ - ${systemd_unitdir}/* \ - ${base_libdir}/security/*.so \ - ${libdir}/libnss_* \ - /cgroup \ - ${bindir}/systemd* \ - ${bindir}/busctl \ - ${bindir}/localectl \ - ${bindir}/hostnamectl \ - ${bindir}/timedatectl \ - ${bindir}/bootctl \ - ${bindir}/kernel-install \ - ${exec_prefix}/lib/tmpfiles.d/*.conf \ - ${exec_prefix}/lib/systemd \ - ${exec_prefix}/lib/modules-load.d \ - ${exec_prefix}/lib/sysctl.d \ - ${exec_prefix}/lib/sysusers.d \ - ${localstatedir} \ - /lib/udev/rules.d/70-uaccess.rules \ - /lib/udev/rules.d/71-seat.rules \ - /lib/udev/rules.d/73-seat-late.rules \ - /lib/udev/rules.d/99-systemd.rules \ - " +FILES_${PN}-kernel-install = "\ + ${bindir}/kernel-install \ + ${sysconfdir}/kernel/ \ + ${exec_prefix}/lib/kernel \ +" -FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" -FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" +PACKAGES =+ "${PN}-pam" +SUMMARY_${PN}-pam = "systemd PAM modules and configuration" +FILES_${PN}-pam = "\ + ${sysconfdir}/pam.d \ + ${base_libdir}/security/pam_systemd.so \ +" -RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})" -RDEPENDS_${PN} += "volatile-binds" +PACKAGES =+ "${PN}-preset" +SUMMARY_${PN}-preset = "systemd's service enablement presets" +FILES_${PN}-preset = "${systemd_unitdir}/system-preset/90-systemd.preset" -RRECOMMENDS_${PN} += "systemd-serialgetty systemd-compat-units udev-hwdb\ - util-linux-agetty \ - util-linux-fsck e2fsprogs-e2fsck \ - kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 os-release \ +PACKAGES =+ "${PN}-rpm-macros" +SUMMARY_${PN}-rpm-macros = "systemd RPM macros" +FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ + " + +PACKAGES =+ "${PN}-zsh" +SUMMARY_${PN}-zsh = "systemd zsh shell commands completion" +FILES_${PN}-zsh = "\ + ${datadir}/zsh/site-functions \ " -PACKAGES =+ "udev-dbg udev udev-hwdb" -FILES_udev-dbg += "/lib/udev/.debug" +######################################################################## +# Aggregation of Split Packages +######################################################################## + +PACKAGES =+ "${PN}-services-essential" +SUMMARY_${PN}-services-essential = "systemd's essential services aggregation" +ALLOW_EMPTY_${PN}-services-essential = "1" +RDEPENDS_${PN}-services-essential = "\ + ${PN}-generators-filesystems \ + ${PN}-preset \ + ${PN}-services-fsck \ + ${PN}-services-journal \ + ${PN}-services-modules-load \ + ${PN}-services-randomseed \ + ${PN}-services-sleep \ + ${PN}-services-sysctl \ + ${PN}-services-sysusers \ + ${PN}-services-tmpfiles \ + ${PN}-services-udev \ + udev-rules-systemd \ +" -RPROVIDES_udev = "hotplug" +PACKAGES =+ "${PN}-services-base" +SUMMARY_${PN}-services-base = "systemd's base services aggregation" +ALLOW_EMPTY_${PN}-services-base = "1" +RDEPENDS_${PN}-services-base = "${PN}-services-essential \ + ${PN}-services-ask-password \ + ${PN}-services-backlight \ + ${PN}-services-binfmt \ + ${PN}-services-coredump \ + ${PN}-services-dbus \ + ${PN}-services-firstboot \ + ${PN}-services-fuse \ + ${PN}-services-hostnamed \ + ${PN}-services-ldconfig \ + ${PN}-services-localed \ + ${PN}-services-logind \ + ${PN}-services-networkd \ + ${PN}-services-quota \ + ${PN}-services-rfkill \ + ${PN}-services-timedated \ + ${PN}-services-timesyncd \ + ${PN}-services-update \ + ${PN}-services-vconsole \ + ${PN}-services-modules-static-nodes \ + ${PN}-bash \ + ${PN}-initramfs \ + ${PN}-kernel-install \ + ${PN}-rpm-macros \ + ${PN}-zsh \ +" -RDEPENDS_udev-hwdb += "udev" +PACKAGES =+ "${PN}-services-all" +SUMMARY_${PN}-services-all = "systemd's all services and tools aggregation" +ALLOW_EMPTY_${PN}-services-all = "1" +RDEPENDS_${PN}-services-all = "${PN}-services-base \ + ${PN}-services-bootchart \ + ${PN}-services-cryptsetup \ + ${PN}-services-debug \ + ${PN}-services-machined \ + ${PN}-services-nspawn \ + ${PN}-services-sysvcompat \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${PN}-services-multi-seat-x', '', d)} \ +" -FILES_udev += "${base_sbindir}/udevd \ - ${rootlibexecdir}/systemd/systemd-udevd \ - ${rootlibexecdir}/udev/accelerometer \ - ${rootlibexecdir}/udev/ata_id \ - ${rootlibexecdir}/udev/cdrom_id \ - ${rootlibexecdir}/udev/collect \ - ${rootlibexecdir}/udev/findkeyboards \ - ${rootlibexecdir}/udev/keyboard-force-release.sh \ - ${rootlibexecdir}/udev/keymap \ - ${rootlibexecdir}/udev/mtd_probe \ - ${rootlibexecdir}/udev/scsi_id \ - ${rootlibexecdir}/udev/v4l_id \ - ${rootlibexecdir}/udev/keymaps \ - ${rootlibexecdir}/udev/rules.d/*.rules \ - ${sysconfdir}/udev \ - ${sysconfdir}/init.d/systemd-udevd \ - ${systemd_unitdir}/system/*udev* \ - ${systemd_unitdir}/system/*.wants/*udev* \ - ${base_bindir}/udevadm \ - ${datadir}/bash-completion/completions/udevadm \ - " - -FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d" -INITSCRIPT_PACKAGES = "udev" -INITSCRIPT_NAME_udev = "systemd-udevd" -INITSCRIPT_PARAMS_udev = "start 03 S ." +######################################################################## +# Core Package +######################################################################## -python __anonymous() { - if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): - d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") -} +CONFFILES_${PN} = "\ + ${sysconfdir}/systemd/system.conf \ + ${sysconfdir}/systemd/user.conf \ +" +FILES_${PN} = "\ + ${base_bindir}/systemctl \ + ${base_bindir}/systemd-hwdb \ + ${bindir}/bootctl \ + ${datadir}/${BPN} \ + ${datadir}/factory \ + ${exec_prefix}/lib/libnss_myhostname* \ + ${exec_prefix}/lib/libnss_mymachines.so.2 \ + ${libdir}/systemd/user-generators/ \ + ${libdir}/systemd/user/ \ + ${localstatedir} \ + ${rootlibexecdir}/systemd/systemd \ + ${rootlibexecdir}/systemd/systemd-cgroups-agent \ + ${rootlibexecdir}/systemd/systemd-shutdown \ + ${rootlibexecdir}/systemd/systemd-shutdownd \ + ${rootlibexecdir}/systemd/systemd-machine-id-commit \ + ${rootlibexecdir}/systemd/systemd-hibernate-resume \ + ${rootlibexecdir}/systemd/systemd-importd \ + ${rootlibexecdir}/systemd/import-pubring.gpg \ + ${rootlibexecdir}/systemd/systemd-pull \ + ${sysconfdir}/init.d/README \ + ${sysconfdir}/machine-id \ + ${sysconfdir}/systemd/system.conf \ + ${sysconfdir}/systemd/system/ \ + ${sysconfdir}/systemd/user.conf \ + ${sysconfdir}/systemd/user/ \ + ${sysconfdir}/xdg/systemd/ \ + ${sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh \ + ${systemd_unitdir}/system-generators/ \ + ${systemd_unitdir}/system-preset/ \ + ${systemd_unitdir}/system-shutdown/ \ + ${systemd_unitdir}/system/ \ +" # TODO: # u-a for runlevel and telinit +RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})" +RDEPENDS_${PN} += "volatile-binds" + +RRECOMMENDS_${PN} += "\ + ${PN}-services-base \ + ${PN}-services-essential \ + ${PN}-services-all \ + ${PN}-tools \ + ${PN}-generators-getty \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PN}-pam', '', d)} \ + ${PN}-services-getty \ + kernel-module-autofs4 \ + kernel-module-ipv6 \ + kernel-module-unix \ + util-linux-agetty \ + util-linux-fsck \ + e2fsprogs-e2fsck \ + os-release \ + udev-hwdb \ + systemd-serialgetty \ + systemd-compat-units \ +" ALTERNATIVE_${PN} = "init halt reboot shutdown poweroff runlevel" @@ -381,6 +1009,41 @@ ALTERNATIVE_TARGET[runlevel] = "${base_bindir}/systemctl" ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" ALTERNATIVE_PRIORITY[runlevel] ?= "300" + +######################################################################## +# UDEV Section +######################################################################## + +PACKAGES =+ "udev-dbg" +SUMMARY_udev-dbg = "Dynamic device management - Debugging files" +RRECOMMENDS_udev-dbg += "${PN}-dbg" +FILES_udev-dbg = "\ + ${rootlibexecdir}/udev/.debug \ + ${base_sbindir}/.debug/udevd \ + ${base_bindir}/.debug/udevadm \ + ${rootlibexecdir}/systemd/.debug/systemd-udevd \ + ${base_libdir}/.debug/libudev* \ + ${base_libdir}/.debug/libgudev* \ + ${exec_prefix}/lib/.debug/libgudev* \ +" + +PACKAGES =+ "udev-dev" +SUMMARY_udev-dev = "Dynamic device management - Development files" +RRECOMMENDS_udev-dev += "${PN}-dev" +FILES_udev-dev = "\ + ${datadir}/pkgconfig/*udev* \ + ${libdir}/pkgconfig/*udev* \ + ${libdir}/lib*udev*.la \ + ${includedir}/*udev* \ +" + +PACKAGES =+ "udev-hwdb" +SUMMARY_udev-hwdb = "Dynamic device management - Hardware database" +RDEPENDS_udev-hwdb += "udev" +FILES_udev-hwdb = "\ + ${rootlibexecdir}/udev/hwdb.d/ \ +" + pkg_postinst_udev-hwdb () { if test -n "$D"; then ${@qemu_run_binary(d, '$D', '${base_bindir}/udevadm')} hwdb --update \ @@ -398,6 +1061,154 @@ pkg_prerm_udev-hwdb () { rm -f ${sysconfdir}/udev/hwdb.bin } +PACKAGES =+ "udev-bash" +SUMMARY_udev-bash = "Dynamic device management - Bash shell commands completion" +FILES_udev-bash = "${datadir}/bash-completion/completions/udevadm" + +PACKAGES =+ "udev-zsh" +SUMMARY_udev-zsh = "Dynamic device management - zsh shell commands completion" +FILES_udev-zsh = "${datadir}/zsh/site-functions/_udevadm" + + +######################################################################## +# UDEV Rules Packages +# split rules that require external programs or dependencies. +# those that use only builtins are not split +######################################################################## + +PACKAGES =+ "udev-rules-accelerometer" +SUMMARY_udev-rules-accelerometer = "Dynamic device management - accelerometer rules" +FILES_udev-rules-accelerometer = "\ + ${rootlibexecdir}/udev/accelerometer \ + ${rootlibexecdir}/udev/rules.d/61-accelerometer.rules \ + ${rootlibexecdir}/udev/rules.d/70-touchpad.rules \ +" + +PACKAGES =+ "udev-rules-cdrom" +SUMMARY_udev-rules-cdrom = "Dynamic device management - cdrom rules" +FILES_udev-rules-cdrom = "\ + ${rootlibexecdir}/udev/cdrom_id \ + ${rootlibexecdir}/udev/rules.d/60-cdrom_id.rules \ +" + +PACKAGES =+ "udev-rules-mtd" +SUMMARY_udev-rules-mtd = "Dynamic device management - mtd rules" +FILES_udev-rules-mtd = "\ + ${rootlibexecdir}/udev/mtd_probe \ + ${rootlibexecdir}/udev/rules.d/75-probe_mtd.rules \ +" + +PACKAGES =+ "udev-rules-persistent-storage" +SUMMARY_udev-rules-persistent-storage = "Dynamic device management - persistent storage rules" +FILES_udev-rules-persistent-storage = "\ + ${rootlibexecdir}/udev/ata_id \ + ${rootlibexecdir}/udev/scsi_id \ + ${rootlibexecdir}/udev/rules.d/60-persistent-storage.rules \ + ${rootlibexecdir}/udev/rules.d/60-persistent-storage-tape.rules \ +" + +PACKAGES =+ "udev-rules-systemd" +SUMMARY_udev-rules-systemd = "Dynamic device management - systemd rules" +RDEPENDS_udev-rules-systemd = "${PN} ${PN}-services-sysctl" +FILES_udev-rules-systemd = "\ + ${rootlibexecdir}/udev/rules.d/99-systemd.rules \ +" + +PACKAGES =+ "udev-rules-v4l" +SUMMARY_udev-rules-v4l = "Dynamic device management - v4l rules" +FILES_udev-rules-v4l = "\ + ${rootlibexecdir}/udev/v4l_id \ + ${rootlibexecdir}/udev/rules.d/*-persistent-v4l.rules \ +" + +PACKAGES =+ "udev-rules-all" +SUMMARY_udev-rules-all = "Dynamic device management - all rules aggregation" +ALLOW_EMPTY_udev-rules-all = "1" +RDEPENDS_udev-rules-all = "\ + udev-rules-accelerometer \ + udev-rules-cdrom \ + udev-rules-mtd \ + udev-rules-persistent-storage \ + udev-rules-systemd \ + udev-rules-v4l \ +" + +PACKAGES =+ "udev" +SUMMARY_udev = "Dynamic device management" +RPROVIDES_udev = "hotplug" +PROVIDES = "udev" +CONFFILES_udev = "${sysconfdir}/udev/udev.conf" +RDEPENDS_udev += "${PN}-services-vconsole" +FILES_udev = "\ + ${base_bindir}/udevadm \ + ${base_sbindir}/udevd \ + ${rootlibexecdir}/systemd/systemd-udevd \ + ${rootlibexecdir}/udev/collect \ + ${rootlibexecdir}/udev/rules.d/42-usb-hid-pm.rules \ + ${rootlibexecdir}/udev/rules.d/50-firmware.rules \ + ${rootlibexecdir}/udev/rules.d/50-udev-default.rules \ + ${rootlibexecdir}/udev/rules.d/60-drm.rules \ + ${rootlibexecdir}/udev/rules.d/60-keyboard.rules \ + ${rootlibexecdir}/udev/rules.d/60-persistent-alsa.rules \ + ${rootlibexecdir}/udev/rules.d/60-persistent-input.rules \ + ${rootlibexecdir}/udev/rules.d/60-persistent-serial.rules \ + ${rootlibexecdir}/udev/rules.d/64-btrfs.rules \ + ${rootlibexecdir}/udev/rules.d/75-net-description.rules \ + ${rootlibexecdir}/udev/rules.d/75-tty-description.rules \ + ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \ + ${rootlibexecdir}/udev/rules.d/80-drivers.rules \ + ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \ + ${rootlibexecdir}/udev/rules.d/95-udev-late.rules \ + ${rootlibexecdir}/udev/rules.d/70-mouse.rules \ + ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \ + ${rootlibexecdir}/udev/rules.d/touchscreen.rules \ + ${sysconfdir}/init.d/systemd-udevd \ + ${sysconfdir}/udev \ +" + +RRECOMMENDS_udev = "\ + udev-hwdb \ + udev-rules-all \ +" + +INITSCRIPT_PACKAGES = "udev" +INITSCRIPT_NAME_udev = "systemd-udevd" +INITSCRIPT_PARAMS_udev = "start 03 S ." + +python __anonymous() { + if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): + d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") +} + +# TODO: +# u-a for runlevel and telinit + +ALTERNATIVE_${PN} = "init halt reboot shutdown poweroff runlevel" + +ALTERNATIVE_TARGET[init] = "${rootlibexecdir}/systemd/systemd" +ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init" +ALTERNATIVE_PRIORITY[init] ?= "300" + +ALTERNATIVE_TARGET[halt] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[halt] = "${base_sbindir}/halt" +ALTERNATIVE_PRIORITY[halt] ?= "300" + +ALTERNATIVE_TARGET[reboot] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[reboot] = "${base_sbindir}/reboot" +ALTERNATIVE_PRIORITY[reboot] ?= "300" + +ALTERNATIVE_TARGET[shutdown] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown" +ALTERNATIVE_PRIORITY[shutdown] ?= "300" + +ALTERNATIVE_TARGET[poweroff] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff" +ALTERNATIVE_PRIORITY[poweroff] ?= "300" + +ALTERNATIVE_TARGET[runlevel] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" +ALTERNATIVE_PRIORITY[runlevel] ?= "300" + # As this recipe builds udev, respect systemd being in DISTRO_FEATURES so # that we don't build both udev and systemd in world builds. python () { -- 2.3.5 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 3/3] systemd: split modules into packages 2015-04-22 17:01 ` [PATCH 3/3] systemd: split modules into packages Bruno Bottazzini @ 2015-04-22 17:27 ` Anders Darander 2015-04-22 17:30 ` Otavio Salvador 0 siblings, 1 reply; 16+ messages in thread From: Anders Darander @ 2015-04-22 17:27 UTC (permalink / raw) To: Bruno Bottazzini; +Cc: openembedded-core I'm repeating the comments from my review of the earlier version. I'm slightly worried as we're changing some of the default configurations here. And we're suddenly starting to build almost everything in systemd... * Bruno Bottazzini <bruno.bottazzini@intel.com> [150422 19:02]: > if one wants to launch a simple deamon, most modules are not > required. > He will be able to save space and exclude unwanted packages > from the final image. Missing S-o-B: line. (The same is true for patch 1/3). > --- > meta/recipes-core/systemd/systemd_219.bb | 1075 ++++++++++++++++++++++++++---- > 1 file changed, 943 insertions(+), 132 deletions(-) > diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb > index d1303f7..d86068c 100644 > --- a/meta/recipes-core/systemd/systemd_219.bb > +++ b/meta/recipes-core/systemd/systemd_219.bb > @@ -19,7 +19,7 @@ PROVIDES = "udev" > PE = "1" > -DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux" > +DEPENDS = "util-linux intltool-native gperf-native readline libcap libcgroup qemu-native" > SECTION = "base/shell" > @@ -58,23 +58,45 @@ LDFLAGS_append_libc-uclibc = " -lrt" > GTKDOC_DOCDIR = "${S}/docs/" > -PACKAGECONFIG ??= "xz ldconfig \ > +PACKAGECONFIG ??= " \ > + gcrypt \ > + kmod \ > + ldconfig \ I guess we could debate whether to remove xz or not from the default set of PACKAGECONFIG. Though, if it's removed, it should be mentioned in the commit log at least, as it's a change of the default configuration. > + ${@bb.utils.contains('DISTRO_FEATURES', 'blkid', 'blkid', '', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'efi', 'efi', '', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'lz4', 'lz4', '', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'xz', 'xz', '', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'libidn', 'libidn', '', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)}" > +PACKAGECONFIG[glib] = "--enable-gudev,--disable-gudev,glib-2.0" > +PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" > +PACKAGECONFIG[blkid] = "--enable-blkid,--disable-blkid,util-linux" > +PACKAGECONFIG[efi] = "--enable-efi,--disable-efi" > +PACKAGECONFIG[kmod] = "--enable-kmod,--disable-kmod,kmod" > +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,,polkit" > +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" > +PACKAGECONFIG[smack] = "--enable-smack,--disable-smack" > +PACKAGECONFIG[ima] = "--enable-ima,--disable-ima" > +PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor" > +PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" > +PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" > PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl" > # Sign the journal for anti-tampering > PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" > # regardless of PACKAGECONFIG, libgcrypt is always required to expand > # the AM_PATH_LIBGCRYPT autoconf macro > -DEPENDS += "libgcrypt" Have you verified that it builds OK if you remove the line above, and also removes gcrypt from PACKAGECONFIG? If so, the comment above should also be removed, otherwise the DEPENDS line above should be kept. > # Compress the journal > +PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4" > PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" > +PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,libqrencode" > +PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" > PACKAGECONFIG[cryptsetup] = "--enable-libcryptsetup,--disable-libcryptsetup,cryptsetup" > PACKAGECONFIG[microhttpd] = "--enable-microhttpd,--disable-microhttpd,libmicrohttpd" > PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils" > PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved" > -PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd" Why are you removing the PACKAGECONFIG definition for networkd? > PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" > PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit" > PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" > @@ -97,17 +119,33 @@ rootprefix ?= "${base_prefix}" > rootlibdir ?= "${base_libdir}" > rootlibexecdir = "${rootprefix}/lib" > -# The gtk+ tools should get built as a separate recipe e.g. systemd-tools > EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ > --with-rootlibdir=${rootlibdir} \ > - --with-roothomedir=${ROOT_HOME} \ > - --disable-coredump \ > + --enable-coredump \ > --disable-introspection \ > - --disable-kdbus \ > + --enable-kdbus \ This should probably be a PACKAGECONFIG. I haven't looked at the code, but is it safe to build kdbus-support into systemd if you're running on kernels without kdbus support? And the same if you're running on a kernel with kdbus support, but where the rest of user-space lacks kdbus support? As I haven't had time to play with kdbus, this makes me nervous. > + --disable-manpages \ > --enable-split-usr \ > --without-python \ > --with-sysvrcnd-path=${sysconfdir} \ > --with-firmware-path=/lib/firmware \ > + --enable-libcurl \ Do you have a DEPEND on curl? Otherwise you shouldn't enable it. (Non-deterministic builds). And instead of enabling it, it should be a PACKAGECONFIG. > + --enable-ldconfig \ > + --enable-backlight \ > + --enable-binfmt \ > + --enable-bootchart \ > + --enable-firstboot \ > + --enable-hostnamed \ > + --enable-localed \ > + --enable-logind \ > + --enable-machined \ > + --enable-networkd \ Why are we suddenly enabling all modules above? E.g. networkd was a PACKAGECONFIG earlier. Most (all?) of these ought to be PACKAGECONFIGs instead. I know that you're splitting these out into separate packages for installation, but they might increas build time both to being built themselves, as well as having to build dependencies of them. > + --enable-quotacheck \ > + --enable-randomseed \ > + --enable-resolved \ > + --enable-rfkill \ > + --enable-sysusers \ > + --enable-vconsole \ > " Maybe some of these also should be PACKAGECONFIGS? I haven't looked at all of your alternatives configuration yet, to see if they make sense or not. Cheers, Anders -- Anders Darander ChargeStorm AB / eStorm AB ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/3] systemd: split modules into packages 2015-04-22 17:27 ` Anders Darander @ 2015-04-22 17:30 ` Otavio Salvador 2015-04-23 19:58 ` Leandro Dorileo 0 siblings, 1 reply; 16+ messages in thread From: Otavio Salvador @ 2015-04-22 17:30 UTC (permalink / raw) To: Bruno Bottazzini, Patches and discussions about the oe-core layer On Wed, Apr 22, 2015 at 2:27 PM, Anders Darander <anders@chargestorm.se> wrote: > > I'm repeating the comments from my review of the earlier version. > > I'm slightly worried as we're changing some of the default > configurations here. And we're suddenly starting to build almost > everything in systemd... I am in favor of the modularization changes but against the default change. If it is done: - needs further discussion - needs to be another patch So NACK. -- Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/3] systemd: split modules into packages 2015-04-22 17:30 ` Otavio Salvador @ 2015-04-23 19:58 ` Leandro Dorileo 0 siblings, 0 replies; 16+ messages in thread From: Leandro Dorileo @ 2015-04-23 19:58 UTC (permalink / raw) To: openembedded-core Hi Otavio, On 04/22/2015 02:30 PM, Otavio Salvador wrote: > On Wed, Apr 22, 2015 at 2:27 PM, Anders Darander <anders@chargestorm.se> wrote: >> >> I'm repeating the comments from my review of the earlier version. >> >> I'm slightly worried as we're changing some of the default >> configurations here. And we're suddenly starting to build almost >> everything in systemd... > > I am in favor of the modularization changes but against the default > change. If it is done: > > - needs further discussion > - needs to be another patch No *intended* default configuration changes AFAIK. We must work a bit on that, as pointed out by Anders, default configurations should remain the same and use PACKAGECONFIGS troughout the build options. Regards... -- Dorileo ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 0/3] systemd and dbus split into packages @ 2015-03-04 21:27 Bruno Bottazzini 2015-03-04 21:27 ` [PATCH 3/3] systemd: split modules " Bruno Bottazzini 0 siblings, 1 reply; 16+ messages in thread From: Bruno Bottazzini @ 2015-03-04 21:27 UTC (permalink / raw) To: openembedded-core In this patchset we include the following: 1- dbus: split tools package Most tools are not required if one is launching a simple daemon. So, we split it into two packages dbus and dbus-tools which the user will be to exclude it from the image if he wants to. 2- systemd: verify if files test-udev and systemd-journal-flush exists If the user put --disable-tests on EXTRA_OECONF for systemd, some files will not be created and systemd do_install phase will fail. This patch will give this flexibility for the user 3- systemd: split modules into packages Since systemd repo grows with more and more tools, the recipe will provide a customizable layer and he will be able to choose what he wants to ship to the final image. He will be able to save space and exclude unwanted packages from the final image. Bruno Bottazzini (2): systemd: verify if files test-udev and systemd-journal-flush exists systemd: split modules into packages Gustavo Sverzut Barbieri (1): dbus: split tools package. meta/recipes-core/dbus/dbus.inc | 10 +- meta/recipes-core/systemd/systemd_219.bb | 1079 ++++++++++++++++++++++++++---- 2 files changed, 956 insertions(+), 133 deletions(-) -- 1.9.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 3/3] systemd: split modules into packages 2015-03-04 21:27 [PATCH 0/3] systemd and dbus split " Bruno Bottazzini @ 2015-03-04 21:27 ` Bruno Bottazzini 2015-03-05 14:28 ` Anders Darander 0 siblings, 1 reply; 16+ messages in thread From: Bruno Bottazzini @ 2015-03-04 21:27 UTC (permalink / raw) To: openembedded-core if one wants to launch a simple deamon, most modules are not required. He will be able to save space and exclude unwanted packages from the final image. --- meta/recipes-core/systemd/systemd_219.bb | 1071 ++++++++++++++++++++++++++---- 1 file changed, 942 insertions(+), 129 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index 6a8b5b8..fd6cf57 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -56,10 +56,31 @@ LDFLAGS_append_libc-uclibc = " -lrt" GTKDOC_DOCDIR = "${S}/docs/" -PACKAGECONFIG ??= "xz \ +DEPENDS += "curl" + +PACKAGECONFIG ??= "acl \ + blkid \ + efi \ + kmod \ + gcrypt \ + lz4 \ + xz \ + libidn \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)}" +PACKAGECONFIG[glib] = "--enable-gudev,--disable-gudev,glib-2.0" +PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" +PACKAGECONFIG[blkid] = "--enable-blkid,--disable-blkid,util-linux" +PACKAGECONFIG[efi] = "--enable-efi,--disable-efi" +PACKAGECONFIG[kmod] = "--enable-kmod,--disable-kmod,kmod" +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,,polkit" +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" +PACKAGECONFIG[smack] = "--enable-smack,--disable-smack" +PACKAGECONFIG[ima] = "--enable-ima,--disable-ima" +PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor" +PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" +PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl" # Sign the journal for anti-tampering PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" @@ -67,7 +88,10 @@ PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" # the AM_PATH_LIBGCRYPT autoconf macro DEPENDS += "libgcrypt" # Compress the journal +PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4" PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" +PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,libqrencode" +PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" PACKAGECONFIG[cryptsetup] = "--enable-libcryptsetup,--disable-libcryptsetup,cryptsetup" PACKAGECONFIG[microhttpd] = "--enable-microhttpd,--disable-microhttpd,libmicrohttpd" PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils" @@ -90,16 +114,35 @@ rootprefix ?= "${base_prefix}" rootlibdir ?= "${base_libdir}" rootlibexecdir = "${rootprefix}/lib" -# The gtk+ tools should get built as a separate recipe e.g. systemd-tools EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ --with-rootlibdir=${rootlibdir} \ --with-roothomedir=${ROOT_HOME} \ - --disable-coredump \ + --with-sysvrcnd-path=${sysconfdir} \ + --without-python \ + --disable-introspection \ + --disable-kdbus \ + --disable-manpages \ --disable-introspection \ --disable-kdbus \ --enable-split-usr \ - --without-python \ - --with-sysvrcnd-path=${sysconfdir} \ + --enable-libcurl \ + --enable-coredump \ + --enable-ldconfig \ + --enable-backlight \ + --enable-binfmt \ + --enable-bootchart \ + --enable-firstboot \ + --enable-hostnamed \ + --enable-localed \ + --enable-logind \ + --enable-machined \ + --enable-networkd \ + --enable-quotacheck \ + --enable-randomseed \ + --enable-resolved \ + --enable-rfkill \ + --enable-sysusers \ + --enable-vconsole \ " # uclibc does not have NSS EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname " @@ -196,158 +239,745 @@ do_install_ptest () { python populate_packages_prepend (){ systemdlibdir = d.getVar("rootlibdir", True) - do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) + do_split_packages(d, systemdlibdir, '^lib(udev|gudev|systemd|nss)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) } -PACKAGES_DYNAMIC += "^lib(udev|systemd).*" +PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd|nss).*" + +######################################################################## +# Base Packages +######################################################################## + +PACKAGES =+ "${PN}-generators-filesystems" +SUMMARY_${PN}-generators-filesystems = "systemd's generator for filesystem services based on fstab and GPT" +RDEPENDS_${PN}-generators-filesystems = "${PN}-services-fsck" +FILES_${PN}-generators-filesystems = "\ + ${rootlibexecdir}/systemd/system-generators/systemd-fstab-generator \ + ${rootlibexecdir}/systemd/system-generators/systemd-gpt-auto-generator \ + ${rootlibexecdir}/systemd/systemd-remount-fs \ + ${systemd_unitdir}/system/local-fs.target.wants/systemd-remount-fs.service \ + ${systemd_unitdir}/system/systemd-remount-fs.service \ +" -PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \ - ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh libgudev" +PACKAGES =+ "${PN}-generators-getty" +SUMMARY_${PN}-generators-getty = "systemd's generator TTY services" +RDEPENDS_${PN}-generators-getty = "${PN}-services-getty" +FILES_${PN}-generators-getty = "\ + ${rootlibexecdir}/systemd/system-generators/systemd-getty-generator \ +" -SYSTEMD_PACKAGES = "${PN}-binfmt" -SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" +PACKAGES =+ "${PN}-tools" +SUMMARY_${PN}-tools = "systemd command line tools (cgls, delta, run, analyze...)" +RRECOMMENDS_${PN}-tools = "${PN}-services-base" +FILES_${PN}-tools = "\ + ${base_bindir}/systemd-machine-id-setup \ + ${bindir}/busctl \ + ${bindir}/coredumpctl \ + ${bindir}/systemd-analyze \ + ${bindir}/systemd-cat \ + ${bindir}/systemd-cgls \ + ${bindir}/systemd-cgtop \ + ${bindir}/systemd-delta \ + ${bindir}/systemd-detect-virt \ + ${bindir}/systemd-path \ + ${bindir}/systemd-run \ + ${rootlibexecdir}/systemd/systemd-ac-power \ + ${rootlibexecdir}/systemd/systemd-activate \ + ${rootlibexecdir}/systemd/systemd-reply-password \ + ${rootprefix}/bin/systemd-escape \ + ${rootprefix}/bin/systemd-notify \ +" -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} += "--system systemd-journal-gateway; --system systemd-timesync" -GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal" +######################################################################## +# Services Packages +######################################################################## + +PACKAGES =+ "${PN}-services-ask-password" +SUMMARY_${PN}-services-ask-password = "systemd's service and tool to query the user for a system password" +RRECOMMENDS_${PN}-services-ask-password = "${PN}-services-base" +FILES_${PN}-services-ask-password = "\ + ${rootprefix}/bin/systemd-ask-password \ + ${rootprefix}/bin/systemd-tty-ask-password-agent \ + ${systemd_unitdir}/system/multi-user.target.wants/systemd-ask-password-wall.path \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-ask-password-console.path \ + ${systemd_unitdir}/system/systemd-ask-password-console.path \ + ${systemd_unitdir}/system/systemd-ask-password-console.service \ + ${systemd_unitdir}/system/systemd-ask-password-wall.path \ + ${systemd_unitdir}/system/systemd-ask-password-wall.service \ +" -FILES_${PN}-analyze = "${bindir}/systemd-analyze" +PACKAGES =+ "${PN}-services-backlight" +SUMMARY_${PN}-services-backlight = "systemd's backlight state save/restore service" +FILES_${PN}-services-backlight = "\ + ${systemd_unitdir}/system/systemd-backlight@.service \ + ${rootlibexecdir}/systemd/systemd-backlight \ +" -FILES_${PN}-initramfs = "/init" -RDEPENDS_${PN}-initramfs = "${PN}" +PACKAGES =+ "${PN}-services-binfmt" +SUMMARY_${PN}-services-binfmt = "systemd's service to configure additional binary formats for executables" +RRECOMMENDS_${PN}-services-binfmt = "kernel-module-binfmt-misc" +FILES_${PN}-services-binfmt = "\ + ${sysconfdir}/binfmt.d/ \ + ${exec_prefix}/lib/binfmt.d/ \ + ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.automount \ + ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.mount \ + ${systemd_unitdir}/system/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount \ + ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.* \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-binfmt.service \ + ${systemd_unitdir}/system/systemd-binfmt.service \ + ${rootlibexecdir}/systemd/systemd-binfmt \ +" -FILES_libgudev = "${libdir}/libgudev*${SOLIBS}" +PACKAGES =+ "${PN}-services-bootchart" +SUMMARY_${PN}-services-bootchart = "systemd's boot performance service and graphing tool" +CONFFILES_${PN}-services-bootchart = "${sysconfdir}/systemd/bootchart.conf" +FILES_${PN}-services-bootchart = "\ + ${sysconfdir}/systemd/bootchart.conf \ + ${rootlibexecdir}/systemd/systemd-bootchart \ +" -RDEPENDS_${PN}-ptest += "perl python bash" -FILES_${PN}-ptest += "${libdir}/udev/rules.d" +PACKAGES =+ "${PN}-services-coredump" +SUMMARY_${PN}-services-coredump = "systemd's coredump log hook and service" +RDEPENDS_${PN}-services-coredump = "${PN}-services-sysctl" +CONFFILES_${PN}-services-coredump = "${sysconfdir}/systemd/coredump.conf" +FILES_${PN}-services-coredump = "\ + ${exec_prefix}/lib/sysctl.d/50-coredump.conf \ + ${sysconfdir}/systemd/coredump.conf \ + ${rootlibexecdir}/systemd/systemd-coredump \ +" + +PACKAGES =+ "${PN}-services-cryptsetup" +SUMMARY_${PN}-services-cryptsetup = "systemd's disk decryption service" +ALLOW_EMPTY_${PN}-services-cryptsetup = "1" +FILES_${PN}-services-cryptsetup = "\ + ${rootlibexecdir}/systemd/system-generators/systemd-cryptsetup-generator \ + ${systemd_unitdir}/system/cryptsetup-pre.target \ + ${systemd_unitdir}/system/cryptsetup.target \ + ${systemd_unitdir}/system/sysinit.target.wants/cryptsetup.target \ + ${rootlibexecdir}/systemd/systemd-cryptsetup \ +" + +PACKAGES =+ "${PN}-services-dbus" +SUMMARY_${PN}-services-dbus = "systemd's DBus daemon system service" +# NOTE: dbus dependency will go away when kdbus is in use +RDEPENDS_${PN}-services-dbus = "dbus" +FILES_${PN}-services-dbus = "\ + ${datadir}/dbus-1/services/org.freedesktop.systemd1.service \ + ${datadir}/dbus-1/system-services/org.freedesktop.systemd1.service \ + ${datadir}/dbus-1/system-services/org.freedesktop.import1.service \ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf \ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ + ${systemd_unitdir}/system/sockets.target.wants/dbus.socket \ + ${systemd_unitdir}/system/dbus.target.wants/dbus.socket \ + ${systemd_unitdir}/system/multi-user.target.wants/dbus.service \ + ${systemd_unitdir}/system/dbus.socket \ + ${systemd_unitdir}/system/dbus.service \ +" + +PACKAGES =+ "${PN}-services-debug" +SUMMARY_${PN}-services-debug = "systemd's debug service" +RRECOMMENDS_${PN}-services-debug = "${PN}-services-base ${PN}-tools" +FILES_${PN}-services-debug = "\ + ${rootlibexecdir}/systemd/system-generators/systemd-debug-generator \ + ${systemd_unitdir}/system/debug-shell.service \ + ${systemd_unitdir}/system/sys-kernel-config.mount \ + ${systemd_unitdir}/system/sys-kernel-debug.mount \ + ${systemd_unitdir}/system/sysinit.target.wants/sys-kernel-config.mount \ + ${systemd_unitdir}/system/sysinit.target.wants/sys-kernel-debug.mount \ +" + +PACKAGES =+ "${PN}-services-firstboot" +SUMMARY_${PN}-services-firstboot = "systemd's service to initialize basic system settings" +FILES_${PN}-services-firstboot = "\ + ${base_bindir}/systemd-firstboot \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-firstboot.service \ + ${systemd_unitdir}/system/systemd-firstboot.service \ +" + +PACKAGES =+ "${PN}-services-fsck" +SUMMARY_${PN}-services-fsck = "systemd's filesystem check service" +RRECOMMENDS_${PN}-services-fsck = "util-linux-fsck e2fsprogs-e2fsck" +FILES_${PN}-services-fsck = "\ + ${systemd_unitdir}/system/systemd-fsck-root.service \ + ${systemd_unitdir}/system/systemd-fsck@.service \ + ${rootlibexecdir}/systemd/systemd-fsck \ +" + +PACKAGES =+ "${PN}-services-fuse" +SUMMARY_${PN}-services-fuse = "systemd's FUSE (filesystem in userspace) service" +FILES_${PN}-services-fuse = "\ + ${systemd_unitdir}/system/sysinit.target.wants/sys-fs-fuse-connections.mount \ + ${systemd_unitdir}/system/sys-fs-fuse-connections.mount \ +" + +PACKAGES =+ "${PN}-services-getty" +SUMMARY_${PN}-services-getty = "systemd's getty service" +RRECOMMENDS_${PN}-services-getty = "util-linux-agetty ${PN}-generators-getty" +FILES_${PN}-services-getty = "\ + ${systemd_unitdir}/system/autovt@.service \ + ${systemd_unitdir}/system/console-getty.service \ + ${systemd_unitdir}/system/container-getty@.service \ + ${systemd_unitdir}/system/getty@.service \ + ${systemd_unitdir}/system/serial-getty@.service \ + ${sysconfdir}/systemd/system/getty.target.wants/ \ +" + +PACKAGES =+ "${PN}-services-hostnamed" +SUMMARY_${PN}-services-hostnamed = "systemd's hostname management service" +RDEPENDS_${PN}-services-hostnamed = "${PN}-services-dbus" +CONFFILES_${PN}-services-hostnamed = "${sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf" +FILES_${PN}-services-hostnamed = "\ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf \ + ${bindir}/hostnamectl \ + ${systemd_unitdir}/system/busnames.target.wants/org.freedesktop.hostname1.busname \ + ${systemd_unitdir}/system/dbus-org.freedesktop.hostname1.service \ + ${systemd_unitdir}/system/org.freedesktop.hostname1.busname \ + ${systemd_unitdir}/system/systemd-hostnamed.service \ + ${rootlibexecdir}/systemd/systemd-hostnamed \ + ${datadir}/dbus-1/system-services/org.freedesktop.hostname1.service \ + ${datadir}/polkit-1/actions/org.freedesktop.hostname1.policy \ +" + +PACKAGES =+ "${PN}-services-journal" +SUMMARY_${PN}-services-journal = "systemd's journal (logging) service" +CONFFILES_${PN}-services-journal = "${sysconfdir}/systemd/journald.conf" +FILES_${PN}-services-journal = "\ + ${base_bindir}/journalctl \ + ${rootlibexecdir}/systemd/systemd-journald \ + ${sysconfdir}/systemd/journald.conf \ + ${systemd_unitdir}/system/sockets.target.wants/systemd-journald-dev-log.socket \ + ${systemd_unitdir}/system/sockets.target.wants/systemd-journald.socket \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-journal-catalog-update.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-journal-flush.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-journald.service \ + ${systemd_unitdir}/system/systemd-journal-catalog-update.service \ + ${systemd_unitdir}/system/systemd-journal-flush.service \ + ${systemd_unitdir}/system/systemd-journald-dev-log.socket \ + ${systemd_unitdir}/system/systemd-journald.service \ + ${systemd_unitdir}/system/systemd-journald.socket \ + ${exec_prefix}/lib/systemd/catalog/ \ +" + +PACKAGES =+ "${PN}-services-ldconfig" +SUMMARY_${PN}-services-ldconfig = "systemd's service to run ldconfig after updates" +FILES_${PN}-services-ldconfig = "\ + ${systemd_unitdir}/system/sysinit.target.wants/ldconfig.service \ + ${systemd_unitdir}/system/ldconfig.service \ +" + +PACKAGES =+ "${PN}-services-localed" +SUMMARY_${PN}-services-localed = "systemd's locale management service" +RDEPENDS_${PN}-services-localed = "${PN}-services-dbus" +CONFFILES_${PN}-services-localed = "${sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf" +FILES_${PN}-services-localed = "\ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf \ + ${bindir}/localectl \ + ${systemd_unitdir}/system/busnames.target.wants/org.freedesktop.locale1.busname \ + ${systemd_unitdir}/system/dbus-org.freedesktop.locale1.service \ + ${systemd_unitdir}/system/org.freedesktop.locale1.busname \ + ${systemd_unitdir}/system/systemd-localed.service \ + ${rootlibexecdir}/systemd/systemd-localed \ + ${datadir}/dbus-1/system-services/org.freedesktop.locale1.service \ + ${datadir}/polkit-1/actions/org.freedesktop.locale1.policy \ + ${datadir}/systemd/kbd-model-map \ +" + +PACKAGES =+ "${PN}-services-logind" +SUMMARY_${PN}-services-logind = "systemd's login management service" +RDEPENDS_${PN}-services-logind = "${PN}-services-dbus ${PN}-services-tmpfiles" +RRECOMMENDS_${PN}-services-logind = "udev" +CONFFILES_${PN}-services-logind = "\ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf \ + ${sysconfdir}/systemd/logind.conf \ +" +FILES_${PN}-services-logind = "\ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf \ + ${sysconfdir}/systemd/logind.conf \ + ${base_bindir}/loginctl \ + ${base_bindir}/systemd-inhibit \ + ${systemd_unitdir}/system/busnames.target.wants/org.freedesktop.login1.busname \ + ${systemd_unitdir}/system/dbus-org.freedesktop.login1.service \ + ${systemd_unitdir}/system/multi-user.target.wants/systemd-logind.service \ + ${systemd_unitdir}/system/multi-user.target.wants/systemd-user-sessions.service \ + ${systemd_unitdir}/system/org.freedesktop.login1.busname \ + ${systemd_unitdir}/system/systemd-logind.service \ + ${systemd_unitdir}/system/systemd-user-sessions.service \ + ${systemd_unitdir}/system/user@.service \ + ${rootlibexecdir}/systemd/systemd-logind \ + ${rootlibexecdir}/systemd/systemd-user-sessions \ + ${datadir}/dbus-1/system-services/org.freedesktop.login1.service \ + ${datadir}/polkit-1/actions/org.freedesktop.login1.policy \ + ${rootlibexecdir}/udev/rules.d/70-uaccess.rules \ + ${rootlibexecdir}/udev/rules.d/70-power-switch.rules \ + ${rootlibexecdir}/udev/rules.d/71-seat.rules \ + ${rootlibexecdir}/udev/rules.d/73-seat-late.rules \ +" + +PACKAGES =+ "${PN}-services-machined" +SUMMARY_${PN}-services-machined = "systemd's virtual machine and container management service" +RDEPENDS_${PN}-services-machined = "${PN}-services-dbus" +CONFFILES_${PN}-services-machined = "${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf" +FILES_${PN}-services-machined = "\ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ + ${base_bindir}/machinectl \ + ${systemd_unitdir}/system/busnames.target.wants/org.freedesktop.machine1.busname \ + ${systemd_unitdir}/system/dbus-org.freedesktop.machine1.service \ + ${systemd_unitdir}/system/machine.slice \ + ${systemd_unitdir}/system/org.freedesktop.machine1.busname \ + ${systemd_unitdir}/system/systemd-machined.service \ + ${rootlibexecdir}/systemd/systemd-machined \ + ${datadir}/dbus-1/system-services/org.freedesktop.machine1.service \ +" + +PACKAGES =+ "${PN}-services-modules-load" +SUMMARY_${PN}-services-modules-load = "systemd's kernel module loading service" +FILES_${PN}-services-modules-load = "\ + ${sysconfdir}/modules-load.d/ \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-modules-load.service \ + ${systemd_unitdir}/system/systemd-modules-load.service \ + ${rootlibexecdir}/systemd/systemd-modules-load \ + ${exec_prefix}/lib/modules-load.d \ +" + +PACKAGES =+ "${PN}-services-modules-static-nodes" +SUMMARY_${PN}-services-modules-static-nodes = "systemd's kernel module static nodes creation service" +RDEPENDS_${PN}-services-modules-static-nodes = "kmod ${PN}-services-tmpfiles" +FILES_${PN}-services-modules-static-nodes = "\ + ${systemd_unitdir}/system/sysinit.target.wants/kmod-static-nodes.service \ + ${systemd_unitdir}/system/kmod-static-nodes.service \ +" + + +PACKAGES =+ "${PN}-services-multi-seat-x" +SUMMARY_${PN}-services-multi-seat-x = "systemd's X11 multi-seat support service" +RDEPENDS_${PN}-services-multi-seat-x = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/xserver', '', d)}" +FILES_${PN}-services-multi-seat-x = "\ + ${rootlibexecdir}/systemd/systemd-multi-seat-x \ +" + +PACKAGES =+ "${PN}-services-networkd" +SUMMARY_${PN}-services-networkd = "systemd's network management (static, DHCP, bridge...) service" +# NOTE: if no sysusers, then users/groups must be setup +RRECOMMENDS_${PN}-services-networkd = "${PN}-services-sysusers" +FILES_${PN}-services-networkd = "\ + ${sysconfdir}/systemd/network/ \ + ${sysconfdir}/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service \ + ${sysconfdir}/systemd/system/multi-user.target.wants/systemd-networkd.service \ + ${base_bindir}/networkctl \ + ${rootlibexecdir}/systemd/network/80-container-host0.network \ + ${rootlibexecdir}/systemd/network/80-container-ve.network \ + ${rootlibexecdir}/systemd/network/99-default.link \ + ${systemd_unitdir}/system/systemd-networkd-wait-online.service \ + ${systemd_unitdir}/system/systemd-networkd.service \ + ${rootlibexecdir}/systemd/systemd-networkd \ + ${rootlibexecdir}/systemd/systemd-networkd-wait-online \ + ${exec_prefix}/lib/systemd/network \ +" + +PACKAGES =+ "${PN}-services-nspawn" +SUMMARY_${PN}-services-nspawn = "systemd's namespace spawing service and tool" +FILES_${PN}-services-nspawn = "\ + ${systemd_unitdir}/system/systemd-nspawn@.service \ + ${bindir}/systemd-nspawn \ +" + +PACKAGES =+ "${PN}-services-quota" +SUMMARY_${PN}-services-quota = "systemd's file system quota enable and check service" +RDEPENDS_${PN}-services-quota = "quota" +FILES_${PN}-services-quota = "\ + ${systemd_unitdir}/system/quotaon.service \ + ${systemd_unitdir}/system/systemd-quotacheck.service \ + ${rootlibexecdir}/systemd/systemd-quotacheck \ +" + +PACKAGES =+ "${PN}-services-randomseed" +SUMMARY_${PN}-services-randomseed = "systemd's random seed save/restore service" +FILES_${PN}-services-randomseed = "\ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-random-seed.service \ + ${systemd_unitdir}/system/systemd-random-seed.service \ + ${rootlibexecdir}/systemd/systemd-random-seed \ +" + +PACKAGES =+ "${PN}-services-readahead" +SUMMARY_${PN}-services-readahead = "systemd's disk read ahead service" +FILES_${PN}-services-readahead = "\ + ${systemd_unitdir}/system/systemd-readahead-collect.service \ + ${systemd_unitdir}/system/systemd-readahead-done.service \ + ${systemd_unitdir}/system/systemd-readahead-done.timer \ + ${systemd_unitdir}/system/systemd-readahead-drop.service \ + ${systemd_unitdir}/system/systemd-readahead-replay.service \ + ${rootlibexecdir}/systemd/systemd-readahead \ +" + +PACKAGES =+ "${PN}-services-rfkill" +SUMMARY_${PN}-services-rfkill = "systemd's rfkill state save/restore service" +FILES_${PN}-services-rfkill = "\ + ${systemd_unitdir}/system/systemd-rfkill@.service \ + ${rootlibexecdir}/systemd/systemd-rfkill \ +" + +PACKAGES =+ "${PN}-services-sleep" +SUMMARY_${PN}-services-sleep = "systemd's sleep, suspend and hiberate services" +FILES_${PN}-services-sleep = "\ + ${systemd_unitdir}/system/systemd-hybrid-sleep.service \ + ${systemd_unitdir}/system/systemd-suspend.service \ + ${systemd_unitdir}/system/systemd-hibernate.service \ + ${systemd_unitdir}/system-sleep/ \ + ${rootlibexecdir}/systemd/systemd-sleep \ +" + +PACKAGES =+ "${PN}-services-sysctl" +SUMMARY_${PN}-services-sysctl = "systemd's kernel parameters configuration service" +FILES_${PN}-services-sysctl = "\ + ${sysconfdir}/sysctl.d/ \ + ${exec_prefix}/lib/sysctl.d/ \ + ${exec_prefix}/lib/sysctl.d/50-default.conf \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-sysctl.service \ + ${systemd_unitdir}/system/systemd-sysctl.service \ + ${rootlibexecdir}/systemd/systemd-sysctl \ +" + +PACKAGES =+ "${PN}-services-sysusers" +SUMMARY_${PN}-services-sysusers = "systemd's service and tool to allocate system users and groups" +FILES_${PN}-services-sysusers = "\ + ${base_bindir}/systemd-sysusers \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-sysusers.service \ + ${systemd_unitdir}/system/systemd-sysusers.service \ + ${exec_prefix}/lib/sysusers.d/basic.conf \ + ${exec_prefix}/lib/sysusers.d/systemd.conf \ +" + +PACKAGES =+ "${PN}-services-sysvcompat" +SUMMARY_${PN}-services-sysvcompat = "systemd's SYSV legacy and compatibility service" +# NOTE: if no sysusers or tmpfiles, then users/groups and FS structure must be setup +RRECOMMENDS_${PN}-services-sysvcompat = "${PN}-services-sysusers ${PN}-services-tmpfiles" +FILES_${PN}-services-sysvcompat = "\ + ${rootlibexecdir}/systemd/systemd-bus-proxyd \ + ${rootlibexecdir}/systemd/systemd-socket-proxyd \ + ${bindir}/systemd-stdio-bridge \ + ${rootlibexecdir}/systemd/system-generators/systemd-rc-local-generator \ + ${rootlibexecdir}/systemd/system-generators/systemd-sysv-generator \ + ${rootlibexecdir}/systemd/systemd-initctl \ + ${rootlibexecdir}/systemd/systemd-update-utmp \ + ${systemd_unitdir}/system/halt-local.service \ + ${systemd_unitdir}/system/rc-local.service \ + ${systemd_unitdir}/system/runlevel1.target.wants/systemd-update-utmp-runlevel.service \ + ${systemd_unitdir}/system/runlevel2.target.wants/systemd-update-utmp-runlevel.service \ + ${systemd_unitdir}/system/runlevel3.target.wants/systemd-update-utmp-runlevel.service \ + ${systemd_unitdir}/system/runlevel4.target.wants/systemd-update-utmp-runlevel.service \ + ${systemd_unitdir}/system/runlevel5.target.wants/systemd-update-utmp-runlevel.service \ + ${systemd_unitdir}/system/sockets.target.wants/systemd-initctl.socket \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-update-utmp.service \ + ${systemd_unitdir}/system/systemd-initctl.service \ + ${systemd_unitdir}/system/systemd-initctl.socket \ + ${systemd_unitdir}/system/systemd-update-utmp-runlevel.service \ + ${systemd_unitdir}/system/systemd-update-utmp.service \ + ${exec_prefix}/lib/tmpfiles.d/legacy.conf \ +" + +PACKAGES =+ "${PN}-services-timedated" +SUMMARY_${PN}-services-timedated = "systemd's time and date management service" +RDEPENDS_${PN}-services-timedated = "${PN}-services-dbus" +CONFFILES_${PN}-services-timedated = "${sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf" +FILES_${PN}-services-timedated = "\ + ${sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf \ + ${bindir}/timedatectl \ + ${systemd_unitdir}/system/busnames.target.wants/org.freedesktop.timedate1.busname \ + ${systemd_unitdir}/system/dbus-org.freedesktop.timedate1.service \ + ${systemd_unitdir}/system/org.freedesktop.timedate1.busname \ + ${systemd_unitdir}/system/systemd-timedated.service \ + ${rootlibexecdir}/systemd/systemd-timedated \ + ${datadir}/dbus-1/system-services/org.freedesktop.timedate1.service \ + ${datadir}/polkit-1/actions/org.freedesktop.timedate1.policy \ +" + +PACKAGES =+ "${PN}-services-timesyncd" +SUMMARY_${PN}-services-timesyncd = "systemd's NTP sync service" +# NOTE: if no sysusers, then users/groups must be setup +RRECOMMENDS_${PN}-services-timesyncd = "${PN}-services-sysusers" +CONFFILES_${PN}-services-timesyncd = "${sysconfdir}/systemd/timesyncd.conf" +FILES_${PN}-services-timesyncd = "\ + ${sysconfdir}/systemd/system/sysinit.target.wants/systemd-timesyncd.service \ + ${sysconfdir}/systemd/timesyncd.conf \ + ${systemd_unitdir}/system/systemd-timesyncd.service \ + ${rootlibexecdir}/systemd/systemd-timesyncd \ +" + +PACKAGES =+ "${PN}-services-tmpfiles" +SUMMARY_${PN}-services-tmpfiles = "systemd's service to create, delete and clean up volatile/tmp files/dirs" +FILES_${PN}-services-tmpfiles = "\ + ${sysconfdir}/tmpfiles.d/ \ + ${base_bindir}/systemd-tmpfiles \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-tmpfiles-setup.service \ + ${systemd_unitdir}/system/systemd-tmpfiles-clean.service \ + ${systemd_unitdir}/system/systemd-tmpfiles-clean.timer \ + ${systemd_unitdir}/system/systemd-tmpfiles-setup-dev.service \ + ${systemd_unitdir}/system/systemd-tmpfiles-setup.service \ + ${systemd_unitdir}/system/timers.target.wants/systemd-tmpfiles-clean.timer \ + ${exec_prefix}/lib/tmpfiles.d/etc.conf \ + ${exec_prefix}/lib/tmpfiles.d/systemd-nologin.conf \ + ${exec_prefix}/lib/tmpfiles.d/systemd.conf \ + ${exec_prefix}/lib/tmpfiles.d/tmp.conf \ + ${exec_prefix}/lib/tmpfiles.d/var.conf \ + ${exec_prefix}/lib/tmpfiles.d/00-create-volatile.conf \ + ${exec_prefix}/lib/tmpfiles.d/x11.conf \ +" + +PACKAGES =+ "${PN}-services-udev" +SUMMARY_${PN}-services-udev = "systemd's udev services" +RDEPENDS_${PN}-services-udev = "udev" +FILES_${PN}-services-udev = "\ + ${systemd_unitdir}/system/initrd-udevadm-cleanup-db.service \ + ${systemd_unitdir}/system/systemd-udev-hwdb-update.service \ + ${systemd_unitdir}/system/systemd-udev-settle.service \ + ${systemd_unitdir}/system/systemd-udev-trigger.service \ + ${systemd_unitdir}/system/systemd-udevd-control.socket \ + ${systemd_unitdir}/system/systemd-udevd-kernel.socket \ + ${systemd_unitdir}/system/systemd-udevd.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-udevd.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-udev-trigger.service \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-udev-hwdb-update.service \ + ${systemd_unitdir}/system/sockets.target.wants/systemd-udevd-kernel.socket \ + ${systemd_unitdir}/system/sockets.target.wants/systemd-udevd-control.socket \ +" + +PACKAGES =+ "${PN}-services-update" +SUMMARY_${PN}-services-update = "systemd's post update service" +FILES_${PN}-services-update = "\ + ${rootlibexecdir}/systemd/system-generators/systemd-system-update-generator \ + ${rootlibexecdir}/systemd/systemd-update-done \ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-update-done.service \ + ${systemd_unitdir}/system/systemd-update-done.service \ +" + +PACKAGES =+ "${PN}-services-vconsole" +SUMMARY_${PN}-services-vconsole = "systemd's service to configure the virtual console (keyboard/font)" +RECOMMENDS_${PN}-services-vconsole = "kbd kbd-consolefonts kbd-keymaps" +FILES_${PN}-services-vconsole = "\ + ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service \ + ${systemd_unitdir}/system/systemd-vconsole-setup.service \ + ${rootlibexecdir}/systemd/systemd-vconsole-setup \ +" -FILES_${PN}-dbg += "${libdir}/systemd/ptest/.debug" +######################################################################## +# Standard BitBake Packages +######################################################################## + +FILES_${PN}-dbg += "\ + ${base_libdir}/security/.debug/ \ + ${libdir}/systemd/ptest/.debug \ + ${rootlibdir}/.debug \ + ${systemd_unitdir}/*/.debug \ + ${systemd_unitdir}/.debug \ +" FILES_${PN}-gui = "${bindir}/systemadm" -FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ - ${systemd_unitdir}/system/systemd-vconsole-setup.service \ - ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service" +FILES_${PN}-dev += "\ + ${base_libdir}/security/*.la \ + ${datadir}/dbus-1/interfaces/ \ + ${sysconfdir}/rpm/macros.systemd \ +" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} += "--system systemd-journal-gateway; --system systemd-timesync" +GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal" + +# The test cases need perl and bash to run correctly. +RDEPENDS_${PN}-ptest += "perl python bash" +FILES_${PN}-ptest += "\ + ${libdir}/udev/rules.d \ +" + +######################################################################## +# Misc Packages +######################################################################## + +PACKAGES =+ "${PN}-bash" +SUMMARY_${PN}-bash = "systemd bash shell commands completion" +FILES_${PN}-bash = "\ + ${datadir}/bash-completion/completions/bootctl \ + ${datadir}/bash-completion/completions/busctl \ + ${datadir}/bash-completion/completions/coredumpctl \ + ${datadir}/bash-completion/completions/hostnamectl \ + ${datadir}/bash-completion/completions/journalctl \ + ${datadir}/bash-completion/completions/kernel-install \ + ${datadir}/bash-completion/completions/localectl \ + ${datadir}/bash-completion/completions/loginctl \ + ${datadir}/bash-completion/completions/machinectl \ + ${datadir}/bash-completion/completions/systemctl \ + ${datadir}/bash-completion/completions/systemd-* \ + ${datadir}/bash-completion/completions/timedatectl \ +" +PACKAGES =+ "${PN}-initramfs" +SUMMARY_${PN}-initramfs = "systemd's initramfs support" +FILES_${PN}-initramfs = "/init" +RDEPENDS_${PN}-initramfs = "${PN}" + +PACKAGES =+ "${PN}-kernel-install" +SUMMARY_${PN}-kernel-install = "systemd tool to add/remove kernel and initramfs images to/from /boot" RDEPENDS_${PN}-kernel-install += "bash" -FILES_${PN}-kernel-install = "${bindir}/kernel-install \ - ${sysconfdir}/kernel/ \ - ${exec_prefix}/lib/kernel \ - " -FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ - " - -FILES_${PN}-zsh = "${datadir}/zsh/site-functions" - -FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ - ${exec_prefix}/lib/binfmt.d \ - ${rootlibexecdir}/systemd/systemd-binfmt \ - ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.* \ - ${systemd_unitdir}/system/systemd-binfmt.service" -RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc" - -RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" - -CONFFILES_${PN} = "${sysconfdir}/systemd/journald.conf \ - ${sysconfdir}/systemd/logind.conf \ - ${sysconfdir}/systemd/system.conf \ - ${sysconfdir}/systemd/user.conf" - -FILES_${PN} = " ${base_bindir}/* \ - ${datadir}/bash-completion \ - ${datadir}/dbus-1/services \ - ${datadir}/dbus-1/system-services \ - ${datadir}/polkit-1 \ - ${datadir}/${BPN} \ - ${datadir}/factory \ - ${sysconfdir}/bash_completion.d/ \ - ${sysconfdir}/dbus-1/ \ - ${sysconfdir}/machine-id \ - ${sysconfdir}/modules-load.d/ \ - ${sysconfdir}/pam.d/ \ - ${sysconfdir}/sysctl.d/ \ - ${sysconfdir}/systemd/ \ - ${sysconfdir}/tmpfiles.d/ \ - ${sysconfdir}/xdg/ \ - ${sysconfdir}/init.d/README \ - ${rootlibexecdir}/systemd/* \ - ${systemd_unitdir}/* \ - ${base_libdir}/security/*.so \ - ${libdir}/libnss_* \ - /cgroup \ - ${bindir}/systemd* \ - ${bindir}/busctl \ - ${bindir}/localectl \ - ${bindir}/hostnamectl \ - ${bindir}/timedatectl \ - ${bindir}/bootctl \ - ${bindir}/kernel-install \ - ${exec_prefix}/lib/tmpfiles.d/*.conf \ - ${exec_prefix}/lib/systemd \ - ${exec_prefix}/lib/modules-load.d \ - ${exec_prefix}/lib/sysctl.d \ - ${exec_prefix}/lib/sysusers.d \ - ${localstatedir} \ - /lib/udev/rules.d/70-uaccess.rules \ - /lib/udev/rules.d/71-seat.rules \ - /lib/udev/rules.d/73-seat-late.rules \ - /lib/udev/rules.d/99-systemd.rules \ - " +FILES_${PN}-kernel-install = "\ + ${bindir}/kernel-install \ + ${sysconfdir}/kernel/ \ + ${exec_prefix}/lib/kernel \ +" -FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" -FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" +PACKAGES =+ "${PN}-pam" +SUMMARY_${PN}-pam = "systemd PAM modules and configuration" +FILES_${PN}-pam = "\ + ${sysconfdir}/pam.d \ + ${base_libdir}/security/pam_systemd.so \ +" -RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})" -RDEPENDS_${PN} += "volatile-binds" +PACKAGES =+ "${PN}-preset" +SUMMARY_${PN}-preset = "systemd's service enablement presets" +FILES_${PN}-preset = "${systemd_unitdir}/system-preset/90-systemd.preset" + +PACKAGES =+ "${PN}-rpm-macros" +SUMMARY_${PN}-rpm-macros = "systemd RPM macros" +FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ + " -RRECOMMENDS_${PN} += "systemd-serialgetty systemd-compat-units udev-hwdb\ - util-linux-agetty \ - util-linux-fsck e2fsprogs-e2fsck \ - kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 os-release \ +PACKAGES =+ "${PN}-zsh" +SUMMARY_${PN}-zsh = "systemd zsh shell commands completion" +FILES_${PN}-zsh = "\ + ${datadir}/zsh/site-functions \ " -PACKAGES =+ "udev-dbg udev udev-hwdb" -FILES_udev-dbg += "/lib/udev/.debug" +######################################################################## +# Aggregation of Split Packages +######################################################################## + +PACKAGES =+ "${PN}-services-essential" +SUMMARY_${PN}-services-essential = "systemd's essential services aggregation" +ALLOW_EMPTY_${PN}-services-essential = "1" +RDEPENDS_${PN}-services-essential = "\ + ${PN}-generators-filesystems \ + ${PN}-preset \ + ${PN}-services-fsck \ + ${PN}-services-journal \ + ${PN}-services-modules-load \ + ${PN}-services-randomseed \ + ${PN}-services-sleep \ + ${PN}-services-sysctl \ + ${PN}-services-sysusers \ + ${PN}-services-tmpfiles \ + ${PN}-services-udev \ + udev-rules-systemd \ +" -RPROVIDES_udev = "hotplug" +PACKAGES =+ "${PN}-services-base" +SUMMARY_${PN}-services-base = "systemd's base services aggregation" +ALLOW_EMPTY_${PN}-services-base = "1" +RDEPENDS_${PN}-services-base = "${PN}-services-essential \ + ${PN}-services-ask-password \ + ${PN}-services-backlight \ + ${PN}-services-binfmt \ + ${PN}-services-coredump \ + ${PN}-services-dbus \ + ${PN}-services-firstboot \ + ${PN}-services-fuse \ + ${PN}-services-hostnamed \ + ${PN}-services-ldconfig \ + ${PN}-services-localed \ + ${PN}-services-logind \ + ${PN}-services-networkd \ + ${PN}-services-quota \ + ${PN}-services-rfkill \ + ${PN}-services-timedated \ + ${PN}-services-timesyncd \ + ${PN}-services-update \ + ${PN}-services-vconsole \ + ${PN}-services-modules-static-nodes \ + ${PN}-bash \ + ${PN}-initramfs \ + ${PN}-kernel-install \ + ${PN}-rpm-macros \ + ${PN}-zsh \ +" -RDEPENDS_udev-hwdb += "udev" +PACKAGES =+ "${PN}-services-all" +SUMMARY_${PN}-services-all = "systemd's all services and tools aggregation" +ALLOW_EMPTY_${PN}-services-all = "1" +RDEPENDS_${PN}-services-all = "${PN}-services-base \ + ${PN}-services-bootchart \ + ${PN}-services-cryptsetup \ + ${PN}-services-debug \ + ${PN}-services-machined \ + ${PN}-services-nspawn \ + ${PN}-services-sysvcompat \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${PN}-services-multi-seat-x', '', d)} \ +" -FILES_udev += "${base_sbindir}/udevd \ - ${rootlibexecdir}/systemd/systemd-udevd \ - ${rootlibexecdir}/udev/accelerometer \ - ${rootlibexecdir}/udev/ata_id \ - ${rootlibexecdir}/udev/cdrom_id \ - ${rootlibexecdir}/udev/collect \ - ${rootlibexecdir}/udev/findkeyboards \ - ${rootlibexecdir}/udev/keyboard-force-release.sh \ - ${rootlibexecdir}/udev/keymap \ - ${rootlibexecdir}/udev/mtd_probe \ - ${rootlibexecdir}/udev/scsi_id \ - ${rootlibexecdir}/udev/v4l_id \ - ${rootlibexecdir}/udev/keymaps \ - ${rootlibexecdir}/udev/rules.d/*.rules \ - ${sysconfdir}/udev \ - ${sysconfdir}/init.d/systemd-udevd \ - ${systemd_unitdir}/system/*udev* \ - ${systemd_unitdir}/system/*.wants/*udev* \ - ${base_bindir}/udevadm \ - ${datadir}/bash-completion/completions/udevadm \ - " - -FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d" -INITSCRIPT_PACKAGES = "udev" -INITSCRIPT_NAME_udev = "systemd-udevd" -INITSCRIPT_PARAMS_udev = "start 03 S ." +######################################################################## +# Core Package +######################################################################## -python __anonymous() { - if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): - d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") -} +CONFFILES_${PN} = "\ + ${sysconfdir}/systemd/system.conf \ + ${sysconfdir}/systemd/user.conf \ +" +FILES_${PN} = "\ + ${base_bindir}/systemctl \ + ${base_bindir}/systemd-hwdb \ + ${bindir}/bootctl \ + ${datadir}/${BPN} \ + ${datadir}/factory \ + ${exec_prefix}/lib/libnss_myhostname* \ + ${exec_prefix}/lib/libnss_mymachines.so.2 \ + ${libdir}/systemd/user-generators/ \ + ${libdir}/systemd/user/ \ + ${localstatedir} \ + ${rootlibexecdir}/systemd/systemd \ + ${rootlibexecdir}/systemd/systemd-cgroups-agent \ + ${rootlibexecdir}/systemd/systemd-shutdown \ + ${rootlibexecdir}/systemd/systemd-shutdownd \ + ${rootlibexecdir}/systemd/systemd-machine-id-commit \ + ${rootlibexecdir}/systemd/systemd-hibernate-resume \ + ${rootlibexecdir}/systemd/systemd-importd \ + ${rootlibexecdir}/systemd/import-pubring.gpg \ + ${rootlibexecdir}/systemd/systemd-pull \ + ${sysconfdir}/init.d/README \ + ${sysconfdir}/machine-id \ + ${sysconfdir}/systemd/system.conf \ + ${sysconfdir}/systemd/system/ \ + ${sysconfdir}/systemd/user.conf \ + ${sysconfdir}/systemd/user/ \ + ${sysconfdir}/xdg/systemd/ \ + ${systemd_unitdir}/system-generators/ \ + ${systemd_unitdir}/system-preset/ \ + ${systemd_unitdir}/system-shutdown/ \ + ${systemd_unitdir}/system/ \ +" # TODO: # u-a for runlevel and telinit +RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})" +RDEPENDS_${PN} += "volatile-binds" + +RRECOMMENDS_${PN} += "\ + ${PN}-services-base \ + ${PN}-services-essential \ + ${PN}-services-all \ + ${PN}-tools \ + ${PN}-generators-getty \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PN}-pam', '', d)} \ + ${PN}-services-getty \ + kernel-module-autofs4 \ + kernel-module-ipv6 \ + kernel-module-unix \ + util-linux-agetty \ + util-linux-fsck \ + e2fsprogs-e2fsck \ + os-release \ + udev-hwdb \ + systemd-serialgetty \ + systemd-compat-units \ +" ALTERNATIVE_${PN} = "init halt reboot shutdown poweroff runlevel" @@ -375,6 +1005,41 @@ ALTERNATIVE_TARGET[runlevel] = "${base_bindir}/systemctl" ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" ALTERNATIVE_PRIORITY[runlevel] ?= "300" + +######################################################################## +# UDEV Section +######################################################################## + +PACKAGES =+ "udev-dbg" +SUMMARY_udev-dbg = "Dynamic device management - Debugging files" +RRECOMMENDS_udev-dbg += "${PN}-dbg" +FILES_udev-dbg = "\ + ${rootlibexecdir}/udev/.debug \ + ${base_sbindir}/.debug/udevd \ + ${base_bindir}/.debug/udevadm \ + ${rootlibexecdir}/systemd/.debug/systemd-udevd \ + ${base_libdir}/.debug/libudev* \ + ${base_libdir}/.debug/libgudev* \ + ${exec_prefix}/lib/.debug/libgudev* \ +" + +PACKAGES =+ "udev-dev" +SUMMARY_udev-dev = "Dynamic device management - Development files" +RRECOMMENDS_udev-dev += "${PN}-dev" +FILES_udev-dev = "\ + ${datadir}/pkgconfig/*udev* \ + ${libdir}/pkgconfig/*udev* \ + ${libdir}/lib*udev*.la \ + ${includedir}/*udev* \ +" + +PACKAGES =+ "udev-hwdb" +SUMMARY_udev-hwdb = "Dynamic device management - Hardware database" +RDEPENDS_udev-hwdb += "udev" +FILES_udev-hwdb = "\ + ${rootlibexecdir}/udev/hwdb.d/ \ +" + pkg_postinst_udev-hwdb () { if test -n "$D"; then ${@qemu_run_binary(d, '$D', '${base_bindir}/udevadm')} hwdb --update \ @@ -392,6 +1057,154 @@ pkg_prerm_udev-hwdb () { rm -f ${sysconfdir}/udev/hwdb.bin } +PACKAGES =+ "udev-bash" +SUMMARY_udev-bash = "Dynamic device management - Bash shell commands completion" +FILES_udev-bash = "${datadir}/bash-completion/completions/udevadm" + +PACKAGES =+ "udev-zsh" +SUMMARY_udev-zsh = "Dynamic device management - zsh shell commands completion" +FILES_udev-zsh = "${datadir}/zsh/site-functions/_udevadm" + + +######################################################################## +# UDEV Rules Packages +# split rules that require external programs or dependencies. +# those that use only builtins are not split +######################################################################## + +PACKAGES =+ "udev-rules-accelerometer" +SUMMARY_udev-rules-accelerometer = "Dynamic device management - accelerometer rules" +FILES_udev-rules-accelerometer = "\ + ${rootlibexecdir}/udev/accelerometer \ + ${rootlibexecdir}/udev/rules.d/61-accelerometer.rules \ + ${rootlibexecdir}/udev/rules.d/70-touchpad.rules \ +" + +PACKAGES =+ "udev-rules-cdrom" +SUMMARY_udev-rules-cdrom = "Dynamic device management - cdrom rules" +FILES_udev-rules-cdrom = "\ + ${rootlibexecdir}/udev/cdrom_id \ + ${rootlibexecdir}/udev/rules.d/60-cdrom_id.rules \ +" + +PACKAGES =+ "udev-rules-mtd" +SUMMARY_udev-rules-mtd = "Dynamic device management - mtd rules" +FILES_udev-rules-mtd = "\ + ${rootlibexecdir}/udev/mtd_probe \ + ${rootlibexecdir}/udev/rules.d/75-probe_mtd.rules \ +" + +PACKAGES =+ "udev-rules-persistent-storage" +SUMMARY_udev-rules-persistent-storage = "Dynamic device management - persistent storage rules" +FILES_udev-rules-persistent-storage = "\ + ${rootlibexecdir}/udev/ata_id \ + ${rootlibexecdir}/udev/scsi_id \ + ${rootlibexecdir}/udev/rules.d/60-persistent-storage.rules \ + ${rootlibexecdir}/udev/rules.d/60-persistent-storage-tape.rules \ +" + +PACKAGES =+ "udev-rules-systemd" +SUMMARY_udev-rules-systemd = "Dynamic device management - systemd rules" +RDEPENDS_udev-rules-systemd = "${PN} ${PN}-services-sysctl" +FILES_udev-rules-systemd = "\ + ${rootlibexecdir}/udev/rules.d/99-systemd.rules \ +" + +PACKAGES =+ "udev-rules-v4l" +SUMMARY_udev-rules-v4l = "Dynamic device management - v4l rules" +FILES_udev-rules-v4l = "\ + ${rootlibexecdir}/udev/v4l_id \ + ${rootlibexecdir}/udev/rules.d/*-persistent-v4l.rules \ +" + +PACKAGES =+ "udev-rules-all" +SUMMARY_udev-rules-all = "Dynamic device management - all rules aggregation" +ALLOW_EMPTY_udev-rules-all = "1" +RDEPENDS_udev-rules-all = "\ + udev-rules-accelerometer \ + udev-rules-cdrom \ + udev-rules-mtd \ + udev-rules-persistent-storage \ + udev-rules-systemd \ + udev-rules-v4l \ +" + +PACKAGES =+ "udev" +SUMMARY_udev = "Dynamic device management" +RPROVIDES_udev = "hotplug" +PROVIDES = "udev" +CONFFILES_udev = "${sysconfdir}/udev/udev.conf" +RDEPENDS_udev += "${PN}-services-vconsole" +FILES_udev = "\ + ${base_bindir}/udevadm \ + ${base_sbindir}/udevd \ + ${rootlibexecdir}/systemd/systemd-udevd \ + ${rootlibexecdir}/udev/collect \ + ${rootlibexecdir}/udev/rules.d/42-usb-hid-pm.rules \ + ${rootlibexecdir}/udev/rules.d/50-firmware.rules \ + ${rootlibexecdir}/udev/rules.d/50-udev-default.rules \ + ${rootlibexecdir}/udev/rules.d/60-drm.rules \ + ${rootlibexecdir}/udev/rules.d/60-keyboard.rules \ + ${rootlibexecdir}/udev/rules.d/60-persistent-alsa.rules \ + ${rootlibexecdir}/udev/rules.d/60-persistent-input.rules \ + ${rootlibexecdir}/udev/rules.d/60-persistent-serial.rules \ + ${rootlibexecdir}/udev/rules.d/64-btrfs.rules \ + ${rootlibexecdir}/udev/rules.d/75-net-description.rules \ + ${rootlibexecdir}/udev/rules.d/75-tty-description.rules \ + ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \ + ${rootlibexecdir}/udev/rules.d/80-drivers.rules \ + ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \ + ${rootlibexecdir}/udev/rules.d/95-udev-late.rules \ + ${rootlibexecdir}/udev/rules.d/70-mouse.rules \ + ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \ + ${rootlibexecdir}/udev/rules.d/touchscreen.rules \ + ${sysconfdir}/init.d/systemd-udevd \ + ${sysconfdir}/udev \ +" + +RRECOMMENDS_udev = "\ + udev-hwdb \ + udev-rules-all \ +" + +INITSCRIPT_PACKAGES = "udev" +INITSCRIPT_NAME_udev = "systemd-udevd" +INITSCRIPT_PARAMS_udev = "start 03 S ." + +python __anonymous() { + if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): + d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") +} + +# TODO: +# u-a for runlevel and telinit + +ALTERNATIVE_${PN} = "init halt reboot shutdown poweroff runlevel" + +ALTERNATIVE_TARGET[init] = "${rootlibexecdir}/systemd/systemd" +ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init" +ALTERNATIVE_PRIORITY[init] ?= "300" + +ALTERNATIVE_TARGET[halt] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[halt] = "${base_sbindir}/halt" +ALTERNATIVE_PRIORITY[halt] ?= "300" + +ALTERNATIVE_TARGET[reboot] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[reboot] = "${base_sbindir}/reboot" +ALTERNATIVE_PRIORITY[reboot] ?= "300" + +ALTERNATIVE_TARGET[shutdown] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown" +ALTERNATIVE_PRIORITY[shutdown] ?= "300" + +ALTERNATIVE_TARGET[poweroff] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff" +ALTERNATIVE_PRIORITY[poweroff] ?= "300" + +ALTERNATIVE_TARGET[runlevel] = "${base_bindir}/systemctl" +ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" +ALTERNATIVE_PRIORITY[runlevel] ?= "300" + # As this recipe builds udev, respect systemd being in DISTRO_FEATURES so # that we don't build both udev and systemd in world builds. python () { -- 1.9.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 3/3] systemd: split modules into packages 2015-03-04 21:27 ` [PATCH 3/3] systemd: split modules " Bruno Bottazzini @ 2015-03-05 14:28 ` Anders Darander 2015-03-05 16:14 ` Bottazzini, Bruno 0 siblings, 1 reply; 16+ messages in thread From: Anders Darander @ 2015-03-05 14:28 UTC (permalink / raw) To: Bruno Bottazzini; +Cc: openembedded-core * Bruno Bottazzini <bruno.bottazzini@intel.com> [150304 22:28]: > if one wants to launch a simple deamon, most modules are not > required. > He will be able to save space and exclude unwanted packages > from the final image. > --- > meta/recipes-core/systemd/systemd_219.bb | 1071 ++++++++++++++++++++++++++---- > 1 file changed, 942 insertions(+), 129 deletions(-) > diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb > index 6a8b5b8..fd6cf57 100644 > --- a/meta/recipes-core/systemd/systemd_219.bb > +++ b/meta/recipes-core/systemd/systemd_219.bb > @@ -56,10 +56,31 @@ LDFLAGS_append_libc-uclibc = " -lrt" > GTKDOC_DOCDIR = "${S}/docs/" > -PACKAGECONFIG ??= "xz \ > +DEPENDS += "curl" > + > +PACKAGECONFIG ??= "acl \ > + blkid \ > + efi \ > + kmod \ > + gcrypt \ > + lz4 \ > + xz \ > + libidn \ > ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)}" Just a quick question before I look into the patch in more detail. Is the new setting of PACKAGECONFIG consistent with how systemd was built previously? I guess it is. Another comment, you should remove the dependcies that gets added using PACKAGECONFIG from DEPENDS, e.g. acl etc. (Or are they required nevertheless?) Cheers, Anders -- Anders Darander ChargeStorm AB / eStorm AB ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/3] systemd: split modules into packages 2015-03-05 14:28 ` Anders Darander @ 2015-03-05 16:14 ` Bottazzini, Bruno 2015-03-06 8:23 ` Anders Darander 0 siblings, 1 reply; 16+ messages in thread From: Bottazzini, Bruno @ 2015-03-05 16:14 UTC (permalink / raw) To: Anders Darander; +Cc: openembedded-core On Qui, 2015-03-05 at 15:28 +0100, Anders Darander wrote: > * Bruno Bottazzini <bruno.bottazzini@intel.com> [150304 22:28]: > > if one wants to launch a simple deamon, most modules are not > > required. > > He will be able to save space and exclude unwanted packages > > from the final image. > > --- > > meta/recipes-core/systemd/systemd_219.bb | 1071 ++++++++++++++++++++++++++---- > > 1 file changed, 942 insertions(+), 129 deletions(-) > > > diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb > > index 6a8b5b8..fd6cf57 100644 > > --- a/meta/recipes-core/systemd/systemd_219.bb > > +++ b/meta/recipes-core/systemd/systemd_219.bb > > @@ -56,10 +56,31 @@ LDFLAGS_append_libc-uclibc = " -lrt" > > > GTKDOC_DOCDIR = "${S}/docs/" > > > -PACKAGECONFIG ??= "xz \ > > +DEPENDS += "curl" > > + > > +PACKAGECONFIG ??= "acl \ > > + blkid \ > > + efi \ > > + kmod \ > > + gcrypt \ > > + lz4 \ > > + xz \ > > + libidn \ > > ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ > > ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)}" > > Just a quick question before I look into the patch in more detail. > > Is the new setting of PACKAGECONFIG consistent with how systemd was > built previously? I guess it is. Hi Anders, it is consistent with how systemd was built previously. If you apply the patch and bitbake it. Systemd will be built and shipped normally. But now it will give some options on how to customize it by excluding packages you don't want to be with systemd. > > Another comment, you should remove the dependcies that gets added using > PACKAGECONFIG from DEPENDS, e.g. acl etc. (Or are they required > nevertheless?) You mean I should do the following ? - PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" + PACKAGECONFIG[acl] = "--enable-acl,--disable-acl" If I get what you said correctly, yes they are required. Best Regards, > > Cheers, > Anders > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/3] systemd: split modules into packages 2015-03-05 16:14 ` Bottazzini, Bruno @ 2015-03-06 8:23 ` Anders Darander 2015-03-06 14:03 ` Bottazzini, Bruno 0 siblings, 1 reply; 16+ messages in thread From: Anders Darander @ 2015-03-06 8:23 UTC (permalink / raw) To: Bottazzini, Bruno; +Cc: openembedded-core * Bottazzini, Bruno <bruno.bottazzini@intel.com> [150305 17:15]: > On Qui, 2015-03-05 at 15:28 +0100, Anders Darander wrote: > > Just a quick question before I look into the patch in more detail. > > Is the new setting of PACKAGECONFIG consistent with how systemd was > > built previously? I guess it is. > Hi Anders, > it is consistent with how systemd was built previously. If you apply the > patch and bitbake it. Systemd will be built and shipped normally. > But now it will give some options on how to customize it by excluding > packages you don't want to be with systemd. Nice, I'm really liking this! That's something I've planned on doing myself for a while. > > Another comment, you should remove the dependcies that gets added using > > PACKAGECONFIG from DEPENDS, e.g. acl etc. (Or are they required > > nevertheless?) > You mean I should do the following ? > - PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" > + PACKAGECONFIG[acl] = "--enable-acl,--disable-acl" No, I meant to remove them from the long DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux" line. (Unless I overlooked that part in your patch?) > If I get what you said correctly, yes they are required. What I meant, was thas unless e.g. acl is required even when building with --disable-acl, it's better to add the acl dependency in the PACKAGECONFIG like you to. Though, at the same time, remove acl from the long DEPENDS-line. (As otherwise we'll build acl anyway). Cheers, Anders -- Anders Darander ChargeStorm AB / eStorm AB ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/3] systemd: split modules into packages 2015-03-06 8:23 ` Anders Darander @ 2015-03-06 14:03 ` Bottazzini, Bruno 2015-03-06 22:51 ` Khem Raj 0 siblings, 1 reply; 16+ messages in thread From: Bottazzini, Bruno @ 2015-03-06 14:03 UTC (permalink / raw) To: Anders Darander; +Cc: openembedded-core On Sex, 2015-03-06 at 09:23 +0100, Anders Darander wrote: > * Bottazzini, Bruno <bruno.bottazzini@intel.com> [150305 17:15]: > > > On Qui, 2015-03-05 at 15:28 +0100, Anders Darander wrote: > > > > Just a quick question before I look into the patch in more detail. > > > > Is the new setting of PACKAGECONFIG consistent with how systemd was > > > built previously? I guess it is. > > > Hi Anders, > > > it is consistent with how systemd was built previously. If you apply the > > patch and bitbake it. Systemd will be built and shipped normally. > > > But now it will give some options on how to customize it by excluding > > packages you don't want to be with systemd. > > Nice, I'm really liking this! That's something I've planned on doing > myself for a while. > > > > Another comment, you should remove the dependcies that gets added using > > > PACKAGECONFIG from DEPENDS, e.g. acl etc. (Or are they required > > > nevertheless?) > > > You mean I should do the following ? > > - PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" > > + PACKAGECONFIG[acl] = "--enable-acl,--disable-acl" > > No, I meant to remove them from the long > DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux" > line. (Unless I overlooked that part in your patch?) > > > If I get what you said correctly, yes they are required. > > What I meant, was thas unless e.g. acl is required even when building > with --disable-acl, it's better to add the acl dependency in the > PACKAGECONFIG like you to. Though, at the same time, remove acl from the > long DEPENDS-line. (As otherwise we'll build acl anyway). Anders, You are right. It is not needed to specify the libs on depends. I have removed it and as soon as we review the whole patch I will send a new version with this corrected Best Regards, Bruno Bottazzini > > Cheers, > Anders > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/3] systemd: split modules into packages 2015-03-06 14:03 ` Bottazzini, Bruno @ 2015-03-06 22:51 ` Khem Raj 2015-03-09 13:37 ` Bottazzini, Bruno 0 siblings, 1 reply; 16+ messages in thread From: Khem Raj @ 2015-03-06 22:51 UTC (permalink / raw) To: Bottazzini, Bruno Cc: Anders Darander, Patches and discussions about the oe-core layer On Fri, Mar 6, 2015 at 6:03 AM, Bottazzini, Bruno <bruno.bottazzini@intel.com> wrote: > On Sex, 2015-03-06 at 09:23 +0100, Anders Darander wrote: >> * Bottazzini, Bruno <bruno.bottazzini@intel.com> [150305 17:15]: >> >> > On Qui, 2015-03-05 at 15:28 +0100, Anders Darander wrote: >> >> > > Just a quick question before I look into the patch in more detail. >> >> > > Is the new setting of PACKAGECONFIG consistent with how systemd was >> > > built previously? I guess it is. >> >> > Hi Anders, >> >> > it is consistent with how systemd was built previously. If you apply the >> > patch and bitbake it. Systemd will be built and shipped normally. >> >> > But now it will give some options on how to customize it by excluding >> > packages you don't want to be with systemd. >> >> Nice, I'm really liking this! That's something I've planned on doing >> myself for a while. >> >> > > Another comment, you should remove the dependcies that gets added using >> > > PACKAGECONFIG from DEPENDS, e.g. acl etc. (Or are they required >> > > nevertheless?) >> >> > You mean I should do the following ? >> > - PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" >> > + PACKAGECONFIG[acl] = "--enable-acl,--disable-acl" >> >> No, I meant to remove them from the long >> DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux" >> line. (Unless I overlooked that part in your patch?) >> >> > If I get what you said correctly, yes they are required. >> >> What I meant, was thas unless e.g. acl is required even when building >> with --disable-acl, it's better to add the acl dependency in the >> PACKAGECONFIG like you to. Though, at the same time, remove acl from the >> long DEPENDS-line. (As otherwise we'll build acl anyway). > > Anders, > > You are right. > > It is not needed to specify the libs on depends. > > I have removed it and as soon as we review the whole patch I will send a > new version with this corrected > On top of all this 'acl' is a distro feature so that should be accounted for too. ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/3] systemd: split modules into packages 2015-03-06 22:51 ` Khem Raj @ 2015-03-09 13:37 ` Bottazzini, Bruno 2015-03-09 15:32 ` Khem Raj 0 siblings, 1 reply; 16+ messages in thread From: Bottazzini, Bruno @ 2015-03-09 13:37 UTC (permalink / raw) To: Khem Raj; +Cc: Anders Darander, Patches and discussions about the oe-core layer On Sex, 2015-03-06 at 14:51 -0800, Khem Raj wrote: > On Fri, Mar 6, 2015 at 6:03 AM, Bottazzini, Bruno > <bruno.bottazzini@intel.com> wrote: > > On Sex, 2015-03-06 at 09:23 +0100, Anders Darander wrote: > >> * Bottazzini, Bruno <bruno.bottazzini@intel.com> [150305 17:15]: > >> > >> > On Qui, 2015-03-05 at 15:28 +0100, Anders Darander wrote: > >> > >> > > Just a quick question before I look into the patch in more detail. > >> > >> > > Is the new setting of PACKAGECONFIG consistent with how systemd was > >> > > built previously? I guess it is. > >> > >> > Hi Anders, > >> > >> > it is consistent with how systemd was built previously. If you apply the > >> > patch and bitbake it. Systemd will be built and shipped normally. > >> > >> > But now it will give some options on how to customize it by excluding > >> > packages you don't want to be with systemd. > >> > >> Nice, I'm really liking this! That's something I've planned on doing > >> myself for a while. > >> > >> > > Another comment, you should remove the dependcies that gets added using > >> > > PACKAGECONFIG from DEPENDS, e.g. acl etc. (Or are they required > >> > > nevertheless?) > >> > >> > You mean I should do the following ? > >> > - PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" > >> > + PACKAGECONFIG[acl] = "--enable-acl,--disable-acl" > >> > >> No, I meant to remove them from the long > >> DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux" > >> line. (Unless I overlooked that part in your patch?) > >> > >> > If I get what you said correctly, yes they are required. > >> > >> What I meant, was thas unless e.g. acl is required even when building > >> with --disable-acl, it's better to add the acl dependency in the > >> PACKAGECONFIG like you to. Though, at the same time, remove acl from the > >> long DEPENDS-line. (As otherwise we'll build acl anyway). > > > > Anders, > > > > You are right. > > > > It is not needed to specify the libs on depends. > > > > I have removed it and as soon as we review the whole patch I will send a > > new version with this corrected > > > > On top of all this 'acl' is a distro feature so that should be > accounted for too. Hello Khem, It will be accounted when acl flag is enabled on systemd. Best Regards, ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/3] systemd: split modules into packages 2015-03-09 13:37 ` Bottazzini, Bruno @ 2015-03-09 15:32 ` Khem Raj 2015-03-09 16:08 ` Bottazzini, Bruno 0 siblings, 1 reply; 16+ messages in thread From: Khem Raj @ 2015-03-09 15:32 UTC (permalink / raw) To: Bottazzini, Bruno Cc: Anders Darander, Patches and discussions about the oe-core layer > On Mar 9, 2015, at 6:37 AM, Bottazzini, Bruno <bruno.bottazzini@intel.com> wrote: > > On Sex, 2015-03-06 at 14:51 -0800, Khem Raj wrote: >> On Fri, Mar 6, 2015 at 6:03 AM, Bottazzini, Bruno >> <bruno.bottazzini@intel.com> wrote: >>> On Sex, 2015-03-06 at 09:23 +0100, Anders Darander wrote: >>>> * Bottazzini, Bruno <bruno.bottazzini@intel.com> [150305 17:15]: >>>> >>>>> On Qui, 2015-03-05 at 15:28 +0100, Anders Darander wrote: >>>> >>>>>> Just a quick question before I look into the patch in more detail. >>>> >>>>>> Is the new setting of PACKAGECONFIG consistent with how systemd was >>>>>> built previously? I guess it is. >>>> >>>>> Hi Anders, >>>> >>>>> it is consistent with how systemd was built previously. If you apply the >>>>> patch and bitbake it. Systemd will be built and shipped normally. >>>> >>>>> But now it will give some options on how to customize it by excluding >>>>> packages you don't want to be with systemd. >>>> >>>> Nice, I'm really liking this! That's something I've planned on doing >>>> myself for a while. >>>> >>>>>> Another comment, you should remove the dependcies that gets added using >>>>>> PACKAGECONFIG from DEPENDS, e.g. acl etc. (Or are they required >>>>>> nevertheless?) >>>> >>>>> You mean I should do the following ? >>>>> - PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" >>>>> + PACKAGECONFIG[acl] = "--enable-acl,--disable-acl" >>>> >>>> No, I meant to remove them from the long >>>> DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux" >>>> line. (Unless I overlooked that part in your patch?) >>>> >>>>> If I get what you said correctly, yes they are required. >>>> >>>> What I meant, was thas unless e.g. acl is required even when building >>>> with --disable-acl, it's better to add the acl dependency in the >>>> PACKAGECONFIG like you to. Though, at the same time, remove acl from the >>>> long DEPENDS-line. (As otherwise we'll build acl anyway). >>> >>> Anders, >>> >>> You are right. >>> >>> It is not needed to specify the libs on depends. >>> >>> I have removed it and as soon as we review the whole patch I will send a >>> new version with this corrected >>> >> >> On top of all this 'acl' is a distro feature so that should be >> accounted for too. > > Hello Khem, > > It will be accounted when acl flag is enabled on systemd. > I am saying enabling this packagconfig should depend upon distro features something like PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', ‘acl', ‘acl', '', d)} > Best Regards, > > > > > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/3] systemd: split modules into packages 2015-03-09 15:32 ` Khem Raj @ 2015-03-09 16:08 ` Bottazzini, Bruno 0 siblings, 0 replies; 16+ messages in thread From: Bottazzini, Bruno @ 2015-03-09 16:08 UTC (permalink / raw) To: Khem Raj; +Cc: Anders Darander, Patches and discussions about the oe-core layer On Seg, 2015-03-09 at 08:32 -0700, Khem Raj wrote: > > On Mar 9, 2015, at 6:37 AM, Bottazzini, Bruno <bruno.bottazzini@intel.com> wrote: > > > > On Sex, 2015-03-06 at 14:51 -0800, Khem Raj wrote: > >> On Fri, Mar 6, 2015 at 6:03 AM, Bottazzini, Bruno > >> <bruno.bottazzini@intel.com> wrote: > >>> On Sex, 2015-03-06 at 09:23 +0100, Anders Darander wrote: > >>>> * Bottazzini, Bruno <bruno.bottazzini@intel.com> [150305 17:15]: > >>>> > >>>>> On Qui, 2015-03-05 at 15:28 +0100, Anders Darander wrote: > >>>> > >>>>>> Just a quick question before I look into the patch in more detail. > >>>> > >>>>>> Is the new setting of PACKAGECONFIG consistent with how systemd was > >>>>>> built previously? I guess it is. > >>>> > >>>>> Hi Anders, > >>>> > >>>>> it is consistent with how systemd was built previously. If you apply the > >>>>> patch and bitbake it. Systemd will be built and shipped normally. > >>>> > >>>>> But now it will give some options on how to customize it by excluding > >>>>> packages you don't want to be with systemd. > >>>> > >>>> Nice, I'm really liking this! That's something I've planned on doing > >>>> myself for a while. > >>>> > >>>>>> Another comment, you should remove the dependcies that gets added using > >>>>>> PACKAGECONFIG from DEPENDS, e.g. acl etc. (Or are they required > >>>>>> nevertheless?) > >>>> > >>>>> You mean I should do the following ? > >>>>> - PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" > >>>>> + PACKAGECONFIG[acl] = "--enable-acl,--disable-acl" > >>>> > >>>> No, I meant to remove them from the long > >>>> DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux" > >>>> line. (Unless I overlooked that part in your patch?) > >>>> > >>>>> If I get what you said correctly, yes they are required. > >>>> > >>>> What I meant, was thas unless e.g. acl is required even when building > >>>> with --disable-acl, it's better to add the acl dependency in the > >>>> PACKAGECONFIG like you to. Though, at the same time, remove acl from the > >>>> long DEPENDS-line. (As otherwise we'll build acl anyway). > >>> > >>> Anders, > >>> > >>> You are right. > >>> > >>> It is not needed to specify the libs on depends. > >>> > >>> I have removed it and as soon as we review the whole patch I will send a > >>> new version with this corrected > >>> > >> > >> On top of all this 'acl' is a distro feature so that should be > >> accounted for too. > > > > Hello Khem, > > > > It will be accounted when acl flag is enabled on systemd. > > > > > I am saying enabling this packagconfig should depend upon distro features something like > PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', ‘acl', ‘acl', '', d)} Alright, I got what you said and it looks good to me. Next version will have it. > > > Best Regards, > > > > > > > > > > > ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2015-04-23 19:59 UTC | newest] Thread overview: 16+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-04-22 17:01 [PATCH V2 0/3] systemd: split modules into packages Bruno Bottazzini 2015-04-22 17:01 ` [PATCH 1/3] systemd 219 -> system 219-stable Bruno Bottazzini 2015-04-22 17:01 ` [PATCH 2/3] dbus: split tools package Bruno Bottazzini 2015-04-22 17:01 ` [PATCH 3/3] systemd: split modules into packages Bruno Bottazzini 2015-04-22 17:27 ` Anders Darander 2015-04-22 17:30 ` Otavio Salvador 2015-04-23 19:58 ` Leandro Dorileo -- strict thread matches above, loose matches on Subject: below -- 2015-03-04 21:27 [PATCH 0/3] systemd and dbus split " Bruno Bottazzini 2015-03-04 21:27 ` [PATCH 3/3] systemd: split modules " Bruno Bottazzini 2015-03-05 14:28 ` Anders Darander 2015-03-05 16:14 ` Bottazzini, Bruno 2015-03-06 8:23 ` Anders Darander 2015-03-06 14:03 ` Bottazzini, Bruno 2015-03-06 22:51 ` Khem Raj 2015-03-09 13:37 ` Bottazzini, Bruno 2015-03-09 15:32 ` Khem Raj 2015-03-09 16:08 ` Bottazzini, Bruno
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox