* [PATCH 1/2] systemd: drop deprecated rootlibdir, rootprefix and split-usr options
@ 2024-11-29 3:36 Ricardo Salveti
2024-11-29 3:36 ` [PATCH 2/2] systemd: remove custom rootlibexecdir and replace with nonarch_base_libdir Ricardo Salveti
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Ricardo Salveti @ 2024-11-29 3:36 UTC (permalink / raw)
To: openembedded-core
Support for split-usr and unmerged-usr were both removed as part of the
systemd 255 release, so remove the current deprecated rootlibdir,
rootprefix and split-usr options from the recipe.
Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
---
meta/recipes-core/systemd/systemd_256.8.bb | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_256.8.bb b/meta/recipes-core/systemd/systemd_256.8.bb
index c17100a636a..26d2237ce3a 100644
--- a/meta/recipes-core/systemd/systemd_256.8.bb
+++ b/meta/recipes-core/systemd/systemd_256.8.bb
@@ -69,7 +69,7 @@ PAM_PLUGINS = " \
"
PACKAGECONFIG ??= " \
- ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam pni-names selinux smack usrmerge polkit seccomp', d)} \
+ ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam pni-names selinux smack polkit seccomp', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', 'coredump elfutils', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
@@ -218,7 +218,6 @@ def build_epoch(d):
PACKAGECONFIG[set-time-epoch] = "${@build_epoch(d)},-Dtime-epoch=0"
PACKAGECONFIG[timedated] = "-Dtimedated=true,-Dtimedated=false"
PACKAGECONFIG[timesyncd] = "-Dtimesyncd=true,-Dtimesyncd=false"
-PACKAGECONFIG[usrmerge] = "-Dsplit-usr=false,-Dsplit-usr=true"
PACKAGECONFIG[sbinmerge] = "-Dsplit-bin=false,-Dsplit-bin=true"
PACKAGECONFIG[userdb] = "-Duserdb=true,-Duserdb=false"
PACKAGECONFIG[utmp] = "-Dutmp=true,-Dutmp=false"
@@ -240,14 +239,10 @@ CFLAGS:append = " --sysroot=${STAGING_DIR_TARGET}"
# Helper variables to clarify locations. This mirrors the logic in systemd's
# build system.
-rootprefix ?= "${root_prefix}"
-rootlibdir ?= "${base_libdir}"
-rootlibexecdir = "${rootprefix}/lib"
+rootlibexecdir = "${nonarch_base_libdir}"
EXTRA_OEMESON += "-Dnobody-user=nobody \
-Dnobody-group=nogroup \
- -Drootlibdir=${rootlibdir} \
- -Drootprefix=${rootprefix} \
-Ddefault-locale=C \
-Dmode=release \
-Dsystem-alloc-uid-min=101 \
@@ -403,7 +398,7 @@ do_install() {
}
python populate_packages:prepend (){
- systemdlibdir = d.getVar("rootlibdir")
+ systemdlibdir = d.getVar("nonarch_base_libdir")
do_split_packages(d, systemdlibdir, r'^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
}
PACKAGES_DYNAMIC += "^lib(udev|systemd|nss).*"
@@ -678,7 +673,7 @@ FILES:${PN} = " ${base_bindir}/* \
${sysconfdir}/ssh/ssh_config.d/20-systemd-ssh-proxy.conf \
${sysconfdir}/ssh/sshd_config.d/20-systemd-userdb.conf \
${rootlibexecdir}/systemd/* \
- ${rootlibdir}/systemd/libsystemd-core* \
+ ${nonarch_base_libdir}/systemd/libsystemd-core* \
${libdir}/pam.d \
${nonarch_libdir}/pam.d \
${systemd_unitdir}/* \
@@ -739,7 +734,7 @@ INSANE_SKIP:${PN}-dbg += "libdir"
INSANE_SKIP:${PN}-doc += " libdir"
INSANE_SKIP:libsystemd-shared += "libdir"
-FILES:libsystemd-shared = "${rootlibdir}/systemd/libsystemd-shared*.so"
+FILES:libsystemd-shared = "${nonarch_base_libdir}/systemd/libsystemd-shared*.so"
RPROVIDES:udev = "hotplug"
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] systemd: remove custom rootlibexecdir and replace with nonarch_base_libdir
2024-11-29 3:36 [PATCH 1/2] systemd: drop deprecated rootlibdir, rootprefix and split-usr options Ricardo Salveti
@ 2024-11-29 3:36 ` Ricardo Salveti
2024-11-29 3:46 ` Patchtest results for " patchtest
2024-12-02 8:40 ` [OE-core] [PATCH 1/2] systemd: drop deprecated rootlibdir, rootprefix and split-usr options Mathieu Dubois-Briand
2024-12-02 19:49 ` Peter Kjellerstedt
2 siblings, 1 reply; 9+ messages in thread
From: Ricardo Salveti @ 2024-11-29 3:36 UTC (permalink / raw)
To: openembedded-core
The rootprefix build option was deprecated in systemd 255, making the
custom rootlibexecdir unnecessary, so remove it in favor of the standard
nonarch_base_libdir definition.
Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
---
meta/recipes-core/systemd/systemd_256.8.bb | 186 ++++++++++-----------
1 file changed, 91 insertions(+), 95 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_256.8.bb b/meta/recipes-core/systemd/systemd_256.8.bb
index 26d2237ce3a..c80bda15d87 100644
--- a/meta/recipes-core/systemd/systemd_256.8.bb
+++ b/meta/recipes-core/systemd/systemd_256.8.bb
@@ -237,10 +237,6 @@ RESOLV_CONF ??= ""
# the eBPFs, so that it can find needed system includes in there.
CFLAGS:append = " --sysroot=${STAGING_DIR_TARGET}"
-# Helper variables to clarify locations. This mirrors the logic in systemd's
-# build system.
-rootlibexecdir = "${nonarch_base_libdir}"
-
EXTRA_OEMESON += "-Dnobody-user=nobody \
-Dnobody-group=nogroup \
-Ddefault-locale=C \
@@ -290,8 +286,8 @@ do_install() {
fi
# Provide support for initramfs
- [ ! -e ${D}/init ] && ln -s ${rootlibexecdir}/systemd/systemd ${D}/init
- [ ! -e ${D}/${base_sbindir}/udevd ] && ln -s ${rootlibexecdir}/systemd/systemd-udevd ${D}/${base_sbindir}/udevd
+ [ ! -e ${D}/init ] && ln -s ${nonarch_base_libdir}/systemd/systemd ${D}/init
+ [ ! -e ${D}/${base_sbindir}/udevd ] && ln -s ${nonarch_base_libdir}/systemd/systemd-udevd ${D}/${base_sbindir}/udevd
install -d ${D}${sysconfdir}/udev/rules.d/
install -d ${D}${nonarch_libdir}/tmpfiles.d
@@ -304,7 +300,7 @@ do_install() {
if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd
- sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
+ sed -i s%@UDEVD@%${nonarch_base_libdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install
fi
@@ -323,8 +319,8 @@ do_install() {
# if the user requests /tmp be on persistent storage (i.e. not volatile)
# then don't use a tmpfs for /tmp
if ! ${@bb.utils.contains('FILESYSTEM_PERMS_TABLES', 'files/fs-perms-volatile-tmp.txt', 'true', 'false', d)}; then
- rm -f ${D}${rootlibexecdir}/systemd/system/tmp.mount
- rm -f ${D}${rootlibexecdir}/systemd/system/local-fs.target.wants/tmp.mount
+ rm -f ${D}${nonarch_base_libdir}/systemd/system/tmp.mount
+ rm -f ${D}${nonarch_base_libdir}/systemd/system/local-fs.target.wants/tmp.mount
fi
install -d ${D}${systemd_system_unitdir}/graphical.target.wants
@@ -388,11 +384,11 @@ do_install() {
fi
if ${@bb.utils.contains('PACKAGECONFIG', 'pni-names', 'true', 'false', d)}; then
- if ! grep -q '^NamePolicy=.*mac' ${D}${rootlibexecdir}/systemd/network/99-default.link; then
- sed -i '/^NamePolicy=/s/$/ mac/' ${D}${rootlibexecdir}/systemd/network/99-default.link
+ if ! grep -q '^NamePolicy=.*mac' ${D}${nonarch_base_libdir}/systemd/network/99-default.link; then
+ sed -i '/^NamePolicy=/s/$/ mac/' ${D}${nonarch_base_libdir}/systemd/network/99-default.link
fi
- if ! grep -q 'AlternativeNamesPolicy=.*mac' ${D}${rootlibexecdir}/systemd/network/99-default.link; then
- sed -i '/AlternativeNamesPolicy=/s/$/ mac/' ${D}${rootlibexecdir}/systemd/network/99-default.link
+ if ! grep -q 'AlternativeNamesPolicy=.*mac' ${D}${nonarch_base_libdir}/systemd/network/99-default.link; then
+ sed -i '/AlternativeNamesPolicy=/s/$/ mac/' ${D}${nonarch_base_libdir}/systemd/network/99-default.link
fi
fi
}
@@ -478,7 +474,7 @@ RDEPENDS:${PN}-initramfs = "${PN}"
FILES:${PN}-gui = "${bindir}/systemadm"
-FILES:${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \
+FILES:${PN}-vconsole-setup = "${nonarch_base_libdir}/systemd/systemd-vconsole-setup \
${systemd_system_unitdir}/systemd-vconsole-setup.service \
${systemd_system_unitdir}/sysinit.target.wants/systemd-vconsole-setup.service"
@@ -494,7 +490,7 @@ FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions"
FILES:${PN}-binfmt = "${sysconfdir}/binfmt.d/ \
${exec_prefix}/lib/binfmt.d \
- ${rootlibexecdir}/systemd/systemd-binfmt \
+ ${nonarch_base_libdir}/systemd/systemd-binfmt \
${systemd_system_unitdir}/proc-sys-fs-binfmt_misc.* \
${systemd_system_unitdir}/systemd-binfmt.service"
RRECOMMENDS:${PN}-binfmt = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', 'kernel-module-binfmt-misc', '', d)}"
@@ -502,7 +498,7 @@ RRECOMMENDS:${PN}-binfmt = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', 'ker
RDEPENDS:${PN}-vconsole-setup = "${@bb.utils.contains('PACKAGECONFIG', 'vconsole', 'kbd kbd-consolefonts kbd-keymaps', '', d)}"
-FILES:${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \
+FILES:${PN}-journal-gatewayd = "${nonarch_base_libdir}/systemd/systemd-journal-gatewayd \
${systemd_system_unitdir}/systemd-journal-gatewayd.service \
${systemd_system_unitdir}/systemd-journal-gatewayd.socket \
${systemd_system_unitdir}/sockets.target.wants/systemd-journal-gatewayd.socket \
@@ -510,13 +506,13 @@ FILES:${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewa
"
SYSTEMD_SERVICE:${PN}-journal-gatewayd = "systemd-journal-gatewayd.socket"
-FILES:${PN}-journal-upload = "${rootlibexecdir}/systemd/systemd-journal-upload \
+FILES:${PN}-journal-upload = "${nonarch_base_libdir}/systemd/systemd-journal-upload \
${systemd_system_unitdir}/systemd-journal-upload.service \
${sysconfdir}/systemd/journal-upload.conf \
"
SYSTEMD_SERVICE:${PN}-journal-upload = "systemd-journal-upload.service"
-FILES:${PN}-journal-remote = "${rootlibexecdir}/systemd/systemd-journal-remote \
+FILES:${PN}-journal-remote = "${nonarch_base_libdir}/systemd/systemd-journal-remote \
${sysconfdir}/systemd/journal-remote.conf \
${systemd_system_unitdir}/systemd-journal-remote.service \
${systemd_system_unitdir}/systemd-journal-remote.socket \
@@ -543,10 +539,10 @@ FILES:${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c
${systemd_system_unitdir}/systemd-machined.service \
${systemd_system_unitdir}/dbus-org.freedesktop.machine1.service \
${systemd_system_unitdir}/var-lib-machines.mount \
- ${rootlibexecdir}/systemd/systemd-import \
- ${rootlibexecdir}/systemd/systemd-importd \
- ${rootlibexecdir}/systemd/systemd-machined \
- ${rootlibexecdir}/systemd/systemd-pull \
+ ${nonarch_base_libdir}/systemd/systemd-import \
+ ${nonarch_base_libdir}/systemd/systemd-importd \
+ ${nonarch_base_libdir}/systemd/systemd-machined \
+ ${nonarch_base_libdir}/systemd/systemd-pull \
${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \
${exec_prefix}/lib/tmpfiles.d/README \
${systemd_system_unitdir}/systemd-nspawn@.service \
@@ -597,15 +593,15 @@ FILES:${PN}-extra-utils = "\
${systemd_system_unitdir}/sysinit.target.wants/systemd-pcrphase.path \
${systemd_system_unitdir}/sysinit.target.wants/systemd-pcrphase-sysinit.path \
${systemd_system_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path \
- ${rootlibexecdir}/systemd/systemd-resolve-host \
- ${rootlibexecdir}/systemd/systemd-ac-power \
- ${rootlibexecdir}/systemd/systemd-activate \
- ${rootlibexecdir}/systemd/systemd-measure \
- ${rootlibexecdir}/systemd/systemd-pcrphase \
- ${rootlibexecdir}/systemd/systemd-socket-proxyd \
- ${rootlibexecdir}/systemd/systemd-reply-password \
- ${rootlibexecdir}/systemd/systemd-sleep \
- ${rootlibexecdir}/systemd/system-sleep \
+ ${nonarch_base_libdir}/systemd/systemd-resolve-host \
+ ${nonarch_base_libdir}/systemd/systemd-ac-power \
+ ${nonarch_base_libdir}/systemd/systemd-activate \
+ ${nonarch_base_libdir}/systemd/systemd-measure \
+ ${nonarch_base_libdir}/systemd/systemd-pcrphase \
+ ${nonarch_base_libdir}/systemd/systemd-socket-proxyd \
+ ${nonarch_base_libdir}/systemd/systemd-reply-password \
+ ${nonarch_base_libdir}/systemd/systemd-sleep \
+ ${nonarch_base_libdir}/systemd/system-sleep \
${systemd_system_unitdir}/systemd-hibernate.service \
${systemd_system_unitdir}/systemd-hybrid-sleep.service \
${systemd_system_unitdir}/systemd-pcrphase-initrd.service \
@@ -613,22 +609,22 @@ FILES:${PN}-extra-utils = "\
${systemd_system_unitdir}/systemd-pcrphase-sysinit.service \
${systemd_system_unitdir}/systemd-suspend.service \
${systemd_system_unitdir}/sleep.target \
- ${rootlibexecdir}/systemd/systemd-initctl \
+ ${nonarch_base_libdir}/systemd/systemd-initctl \
${systemd_system_unitdir}/systemd-initctl.service \
${systemd_system_unitdir}/systemd-initctl.socket \
${systemd_system_unitdir}/sockets.target.wants/systemd-initctl.socket \
- ${rootlibexecdir}/systemd/system-generators/systemd-gpt-auto-generator \
- ${rootlibexecdir}/systemd/systemd-cgroups-agent \
+ ${nonarch_base_libdir}/systemd/system-generators/systemd-gpt-auto-generator \
+ ${nonarch_base_libdir}/systemd/systemd-cgroups-agent \
"
FILES:${PN}-mime = "${MIMEDIR}"
RRECOMMENDS:${PN} += "${PN}-mime"
FILES:${PN}-udev-rules = "\
- ${rootlibexecdir}/udev/rules.d/70-uaccess.rules \
- ${rootlibexecdir}/udev/rules.d/71-seat.rules \
- ${rootlibexecdir}/udev/rules.d/73-seat-late.rules \
- ${rootlibexecdir}/udev/rules.d/99-systemd.rules \
+ ${nonarch_base_libdir}/udev/rules.d/70-uaccess.rules \
+ ${nonarch_base_libdir}/udev/rules.d/71-seat.rules \
+ ${nonarch_base_libdir}/udev/rules.d/73-seat-late.rules \
+ ${nonarch_base_libdir}/udev/rules.d/99-systemd.rules \
"
CONFFILES:${PN} = "${sysconfdir}/systemd/coredump.conf \
@@ -672,7 +668,7 @@ FILES:${PN} = " ${base_bindir}/* \
${sysconfdir}/X11/xinit/xinitrc.d/* \
${sysconfdir}/ssh/ssh_config.d/20-systemd-ssh-proxy.conf \
${sysconfdir}/ssh/sshd_config.d/20-systemd-userdb.conf \
- ${rootlibexecdir}/systemd/* \
+ ${nonarch_base_libdir}/systemd/* \
${nonarch_base_libdir}/systemd/libsystemd-core* \
${libdir}/pam.d \
${nonarch_libdir}/pam.d \
@@ -698,8 +694,8 @@ FILES:${PN} = " ${base_bindir}/* \
${exec_prefix}/lib/environment.d \
${exec_prefix}/lib/pcrlock.d \
${localstatedir} \
- ${rootlibexecdir}/modprobe.d/systemd.conf \
- ${rootlibexecdir}/modprobe.d/README \
+ ${nonarch_base_libdir}/modprobe.d/systemd.conf \
+ ${nonarch_base_libdir}/modprobe.d/README \
${datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf \
${datadir}/dbus-1/system.d/org.freedesktop.locale1.conf \
${datadir}/dbus-1/system.d/org.freedesktop.network1.conf \
@@ -742,58 +738,58 @@ RDEPENDS:udev-bash-completion += "bash-completion"
RDEPENDS:udev-hwdb += "udev"
FILES:udev += "${base_sbindir}/udevd \
- ${rootlibexecdir}/systemd/network/99-default.link \
- ${rootlibexecdir}/systemd/systemd-udevd \
- ${rootlibexecdir}/udev/accelerometer \
- ${rootlibexecdir}/udev/ata_id \
- ${rootlibexecdir}/udev/cdrom_id \
- ${rootlibexecdir}/udev/collect \
- ${rootlibexecdir}/udev/dmi_memory_id \
- ${rootlibexecdir}/udev/fido_id \
- ${rootlibexecdir}/udev/findkeyboards \
- ${rootlibexecdir}/udev/iocost \
- ${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/50-udev-default.rules \
- ${rootlibexecdir}/udev/rules.d/60-autosuspend.rules \
- ${rootlibexecdir}/udev/rules.d/60-autosuspend-chromiumos.rules \
- ${rootlibexecdir}/udev/rules.d/60-block.rules \
- ${rootlibexecdir}/udev/rules.d/60-cdrom_id.rules \
- ${rootlibexecdir}/udev/rules.d/60-dmi-id.rules \
- ${rootlibexecdir}/udev/rules.d/60-drm.rules \
- ${rootlibexecdir}/udev/rules.d/60-evdev.rules \
- ${rootlibexecdir}/udev/rules.d/60-fido-id.rules \
- ${rootlibexecdir}/udev/rules.d/60-infiniband.rules \
- ${rootlibexecdir}/udev/rules.d/60-input-id.rules \
- ${rootlibexecdir}/udev/rules.d/60-persistent-alsa.rules \
- ${rootlibexecdir}/udev/rules.d/60-persistent-input.rules \
- ${rootlibexecdir}/udev/rules.d/60-persistent-storage.rules \
- ${rootlibexecdir}/udev/rules.d/60-persistent-storage-mtd.rules \
- ${rootlibexecdir}/udev/rules.d/60-persistent-storage-tape.rules \
- ${rootlibexecdir}/udev/rules.d/60-persistent-v4l.rules \
- ${rootlibexecdir}/udev/rules.d/60-sensor.rules \
- ${rootlibexecdir}/udev/rules.d/60-serial.rules \
- ${rootlibexecdir}/udev/rules.d/61-autosuspend-manual.rules \
- ${rootlibexecdir}/udev/rules.d/64-btrfs.rules \
- ${rootlibexecdir}/udev/rules.d/70-camera.rules \
- ${rootlibexecdir}/udev/rules.d/70-joystick.rules \
- ${rootlibexecdir}/udev/rules.d/70-memory.rules \
- ${rootlibexecdir}/udev/rules.d/70-mouse.rules \
- ${rootlibexecdir}/udev/rules.d/70-power-switch.rules \
- ${rootlibexecdir}/udev/rules.d/70-touchpad.rules \
- ${rootlibexecdir}/udev/rules.d/75-net-description.rules \
- ${rootlibexecdir}/udev/rules.d/75-probe_mtd.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/81-net-dhcp.rules \
- ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \
- ${rootlibexecdir}/udev/rules.d/90-iocost.rules \
- ${rootlibexecdir}/udev/rules.d/README \
+ ${nonarch_base_libdir}/systemd/network/99-default.link \
+ ${nonarch_base_libdir}/systemd/systemd-udevd \
+ ${nonarch_base_libdir}/udev/accelerometer \
+ ${nonarch_base_libdir}/udev/ata_id \
+ ${nonarch_base_libdir}/udev/cdrom_id \
+ ${nonarch_base_libdir}/udev/collect \
+ ${nonarch_base_libdir}/udev/dmi_memory_id \
+ ${nonarch_base_libdir}/udev/fido_id \
+ ${nonarch_base_libdir}/udev/findkeyboards \
+ ${nonarch_base_libdir}/udev/iocost \
+ ${nonarch_base_libdir}/udev/keyboard-force-release.sh \
+ ${nonarch_base_libdir}/udev/keymap \
+ ${nonarch_base_libdir}/udev/mtd_probe \
+ ${nonarch_base_libdir}/udev/scsi_id \
+ ${nonarch_base_libdir}/udev/v4l_id \
+ ${nonarch_base_libdir}/udev/keymaps \
+ ${nonarch_base_libdir}/udev/rules.d/50-udev-default.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-autosuspend.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-autosuspend-chromiumos.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-block.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-cdrom_id.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-dmi-id.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-drm.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-evdev.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-fido-id.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-infiniband.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-input-id.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-persistent-alsa.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-persistent-input.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-persistent-storage.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-persistent-storage-mtd.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-persistent-storage-tape.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-persistent-v4l.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-sensor.rules \
+ ${nonarch_base_libdir}/udev/rules.d/60-serial.rules \
+ ${nonarch_base_libdir}/udev/rules.d/61-autosuspend-manual.rules \
+ ${nonarch_base_libdir}/udev/rules.d/64-btrfs.rules \
+ ${nonarch_base_libdir}/udev/rules.d/70-camera.rules \
+ ${nonarch_base_libdir}/udev/rules.d/70-joystick.rules \
+ ${nonarch_base_libdir}/udev/rules.d/70-memory.rules \
+ ${nonarch_base_libdir}/udev/rules.d/70-mouse.rules \
+ ${nonarch_base_libdir}/udev/rules.d/70-power-switch.rules \
+ ${nonarch_base_libdir}/udev/rules.d/70-touchpad.rules \
+ ${nonarch_base_libdir}/udev/rules.d/75-net-description.rules \
+ ${nonarch_base_libdir}/udev/rules.d/75-probe_mtd.rules \
+ ${nonarch_base_libdir}/udev/rules.d/78-sound-card.rules \
+ ${nonarch_base_libdir}/udev/rules.d/80-drivers.rules \
+ ${nonarch_base_libdir}/udev/rules.d/80-net-setup-link.rules \
+ ${nonarch_base_libdir}/udev/rules.d/81-net-dhcp.rules \
+ ${nonarch_base_libdir}/udev/rules.d/90-vconsole.rules \
+ ${nonarch_base_libdir}/udev/rules.d/90-iocost.rules \
+ ${nonarch_base_libdir}/udev/rules.d/README \
${sysconfdir}/udev \
${sysconfdir}/init.d/systemd-udevd \
${systemd_system_unitdir}/*udev* \
@@ -805,7 +801,7 @@ FILES:udev += "${base_sbindir}/udevd \
"
FILES:udev-bash-completion = "${datadir}/bash-completion/completions/udevadm"
-FILES:udev-hwdb = "${rootlibexecdir}/udev/hwdb.d \
+FILES:udev-hwdb = "${nonarch_base_libdir}/udev/hwdb.d \
"
RCONFLICTS:${PN} = "tiny-init ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolvconf', '', d)}"
@@ -899,7 +895,7 @@ pkg_prerm:${PN}:libc-glibc () {
PACKAGE_WRITE_DEPS += "qemu-native"
pkg_postinst:udev-hwdb () {
if test -n "$D"; then
- $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} rootlibexecdir="${rootlibexecdir}" PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}" base_bindir="${base_bindir}"
+ $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} rootlibexecdir="${nonarch_base_libdir}" PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}" base_bindir="${base_bindir}"
else
systemd-hwdb update
fi
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Patchtest results for [PATCH 2/2] systemd: remove custom rootlibexecdir and replace with nonarch_base_libdir
2024-11-29 3:36 ` [PATCH 2/2] systemd: remove custom rootlibexecdir and replace with nonarch_base_libdir Ricardo Salveti
@ 2024-11-29 3:46 ` patchtest
2024-11-29 18:57 ` Ricardo de Araujo (Salveti)
0 siblings, 1 reply; 9+ messages in thread
From: patchtest @ 2024-11-29 3:46 UTC (permalink / raw)
To: Ricardo Salveti; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3198 bytes --]
Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:
---
Testing patch /home/patchtest/share/mboxes/2-2-systemd-remove-custom-rootlibexecdir-and-replace-with-nonarch_base_libdir.patch
FAIL: test max line length: Patch line too long (current length 224, maximum is 200) (test_metadata.TestMetadata.test_max_line_length)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)
SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: pretest src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.pretest_src_uri_left_files)
SKIP: test CVE check ignore: No modified recipes or older target branch, skipping test (test_metadata.TestMetadata.test_cve_check_ignore)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.test_src_uri_left_files)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)
---
Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Patchtest results for [PATCH 2/2] systemd: remove custom rootlibexecdir and replace with nonarch_base_libdir
2024-11-29 3:46 ` Patchtest results for " patchtest
@ 2024-11-29 18:57 ` Ricardo de Araujo (Salveti)
2024-11-30 2:23 ` [OE-core] " Khem Raj
0 siblings, 1 reply; 9+ messages in thread
From: Ricardo de Araujo (Salveti) @ 2024-11-29 18:57 UTC (permalink / raw)
To: patchtest; +Cc: openembedded-core
On Fri, Nov 29, 2024 at 12:46 AM <patchtest@automation.yoctoproject.org> wrote:
>
> Thank you for your submission. Patchtest identified one
> or more issues with the patch. Please see the log below for
> more information:
>
> ---
> Testing patch /home/patchtest/share/mboxes/2-2-systemd-remove-custom-rootlibexecdir-and-replace-with-nonarch_base_libdir.patch
>
> FAIL: test max line length: Patch line too long (current length 224, maximum is 200) (test_metadata.TestMetadata.test_max_line_length)
Caused by:
- $INTERCEPT_DIR/postinst_intercept update_udev_hwdb
${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX}
rootlibexecdir="${rootlibexecdir}"
PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}"
base_bindir="${base_bindir}"
+ $INTERCEPT_DIR/postinst_intercept update_udev_hwdb
${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX}
rootlibexecdir="${nonarch_base_libdir}"
PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}"
base_bindir="${base_bindir}"
Didn't want to break that line as part of the change as this is basically a sed.
Can break and send a v2 if needed.
Cheers,
Ricardo
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [OE-core] Patchtest results for [PATCH 2/2] systemd: remove custom rootlibexecdir and replace with nonarch_base_libdir
2024-11-29 18:57 ` Ricardo de Araujo (Salveti)
@ 2024-11-30 2:23 ` Khem Raj
2024-11-30 7:59 ` Richard Purdie
0 siblings, 1 reply; 9+ messages in thread
From: Khem Raj @ 2024-11-30 2:23 UTC (permalink / raw)
To: ricardo.salveti; +Cc: patchtest, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1898 bytes --]
On Fri, Nov 29, 2024 at 10:58 AM Ricardo Salveti via lists.openembedded.org
<ricardo.salveti=oss.qualcomm.com@lists.openembedded.org> wrote:
> On Fri, Nov 29, 2024 at 12:46 AM <patchtest@automation.yoctoproject.org>
> wrote:
> >
> > Thank you for your submission. Patchtest identified one
> > or more issues with the patch. Please see the log below for
> > more information:
> >
> > ---
> > Testing patch
> /home/patchtest/share/mboxes/2-2-systemd-remove-custom-rootlibexecdir-and-replace-with-nonarch_base_libdir.patch
> >
> > FAIL: test max line length: Patch line too long (current length 224,
> maximum is 200) (test_metadata.TestMetadata.test_max_line_length)
>
> Caused by:
>
> - $INTERCEPT_DIR/postinst_intercept update_udev_hwdb
> ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX}
> rootlibexecdir="${rootlibexecdir}"
> PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}"
> base_bindir="${base_bindir}"
> + $INTERCEPT_DIR/postinst_intercept update_udev_hwdb
> ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX}
> rootlibexecdir="${nonarch_base_libdir}"
> PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}"
> base_bindir="${base_bindir}"
>
> Didn't want to break that line as part of the change as this is basically
> a sed.
>
> Can break and send a v2 if needed.
Perhaps send a separate patch since it’s a formatting improvement
>
>
> Cheers,
>
> Ricardo
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#208032):
> https://lists.openembedded.org/g/openembedded-core/message/208032
> Mute This Topic: https://lists.openembedded.org/mt/109830002/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
[-- Attachment #2: Type: text/html, Size: 3225 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [OE-core] Patchtest results for [PATCH 2/2] systemd: remove custom rootlibexecdir and replace with nonarch_base_libdir
2024-11-30 2:23 ` [OE-core] " Khem Raj
@ 2024-11-30 7:59 ` Richard Purdie
0 siblings, 0 replies; 9+ messages in thread
From: Richard Purdie @ 2024-11-30 7:59 UTC (permalink / raw)
To: raj.khem, ricardo.salveti; +Cc: patchtest, openembedded-core
On Fri, 2024-11-29 at 18:23 -0800, Khem Raj via lists.openembedded.org
wrote:
>
>
> On Fri, Nov 29, 2024 at 10:58 AM Ricardo Salveti via
> lists.openembedded.org
> <ricardo.salveti=oss.qualcomm.com@lists.openembedded.org> wrote:
> > On Fri, Nov 29, 2024 at 12:46 AM
> > <patchtest@automation.yoctoproject.org> wrote:
> > >
> > > Thank you for your submission. Patchtest identified one
> > > or more issues with the patch. Please see the log below for
> > > more information:
> > >
> > > ---
> > > Testing patch /home/patchtest/share/mboxes/2-2-systemd-remove-
> > > custom-rootlibexecdir-and-replace-with-nonarch_base_libdir.patch
> > >
> > > FAIL: test max line length: Patch line too long (current length
> > > 224, maximum is 200)
> > > (test_metadata.TestMetadata.test_max_line_length)
> >
> > Caused by:
> >
> > - $INTERCEPT_DIR/postinst_intercept update_udev_hwdb
> > ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX}
> > rootlibexecdir="${rootlibexecdir}"
> > PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}"
> > base_bindir="${base_bindir}"
> > + $INTERCEPT_DIR/postinst_intercept update_udev_hwdb
> > ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX}
> > rootlibexecdir="${nonarch_base_libdir}"
> > PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}"
> > base_bindir="${base_bindir}"
> >
> > Didn't want to break that line as part of the change as this is
> > basically a sed.
> >
> > Can break and send a v2 if needed.
> >
>
>
> Perhaps send a separate patch since it’s a formatting improvement
>
I think it is fine. The check is there to stop people introducing
really long lines if we can help it but this already exists and
personally, I find it hard to get worked up about line length...
Cheers,
Richard
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [OE-core] [PATCH 1/2] systemd: drop deprecated rootlibdir, rootprefix and split-usr options
2024-11-29 3:36 [PATCH 1/2] systemd: drop deprecated rootlibdir, rootprefix and split-usr options Ricardo Salveti
2024-11-29 3:36 ` [PATCH 2/2] systemd: remove custom rootlibexecdir and replace with nonarch_base_libdir Ricardo Salveti
@ 2024-12-02 8:40 ` Mathieu Dubois-Briand
2024-12-02 19:49 ` Peter Kjellerstedt
2 siblings, 0 replies; 9+ messages in thread
From: Mathieu Dubois-Briand @ 2024-12-02 8:40 UTC (permalink / raw)
To: ricardo.salveti; +Cc: openembedded-core
On Fri, Nov 29, 2024 at 12:36:53AM -0300, Ricardo Salveti via lists.openembedded.org wrote:
> Support for split-usr and unmerged-usr were both removed as part of the
> systemd 255 release, so remove the current deprecated rootlibdir,
> rootprefix and split-usr options from the recipe.
>
> Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
> ---
Hi,
I believe these patches are breaking some builds on the autobuilder:
ERROR: systemd-1_256.8-r0 do_package: QA Issue: systemd: Files/directories were installed but not shipped in any package:
/usr/lib64/libnss_resolve.so.2
/usr/lib64/libudev.so.1.7.9
/usr/lib64/libnss_systemd.so.2
/usr/lib64/libsystemd.so.0.39.0
/usr/lib64/libsystemd.so.0
/usr/lib64/libnss_myhostname.so.2
/usr/lib64/libnss_mymachines.so.2
/usr/lib64/libudev.so.1
/usr/lib64/systemd/libsystemd-core-256.so
/usr/lib64/systemd/libsystemd-shared-256.so
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
systemd: 10 installed and not shipped files. [installed-vs-shipped]
https://valkyrie.yoctoproject.org/#/builders/17/builds/491/steps/12/logs/stdio
Can you have a look at this failure, please ?
--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* RE: [OE-core] [PATCH 1/2] systemd: drop deprecated rootlibdir, rootprefix and split-usr options
2024-11-29 3:36 [PATCH 1/2] systemd: drop deprecated rootlibdir, rootprefix and split-usr options Ricardo Salveti
2024-11-29 3:36 ` [PATCH 2/2] systemd: remove custom rootlibexecdir and replace with nonarch_base_libdir Ricardo Salveti
2024-12-02 8:40 ` [OE-core] [PATCH 1/2] systemd: drop deprecated rootlibdir, rootprefix and split-usr options Mathieu Dubois-Briand
@ 2024-12-02 19:49 ` Peter Kjellerstedt
2024-12-03 2:41 ` Ricardo de Araujo (Salveti)
2 siblings, 1 reply; 9+ messages in thread
From: Peter Kjellerstedt @ 2024-12-02 19:49 UTC (permalink / raw)
To: ricardo.salveti@oss.qualcomm.com,
openembedded-core@lists.openembedded.org
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Ricardo Salveti via lists.openembedded.org
> Sent: den 29 november 2024 04:37
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 1/2] systemd: drop deprecated rootlibdir, rootprefix and split-usr options
>
> Support for split-usr and unmerged-usr were both removed as part of the
> systemd 255 release, so remove the current deprecated rootlibdir,
> rootprefix and split-usr options from the recipe.
>
> Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
> ---
> meta/recipes-core/systemd/systemd_256.8.bb | 15 +++++----------
> 1 file changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/meta/recipes-core/systemd/systemd_256.8.bb b/meta/recipes-core/systemd/systemd_256.8.bb
> index c17100a636a..26d2237ce3a 100644
> --- a/meta/recipes-core/systemd/systemd_256.8.bb
> +++ b/meta/recipes-core/systemd/systemd_256.8.bb
> @@ -69,7 +69,7 @@ PAM_PLUGINS = " \
> "
>
> PACKAGECONFIG ??= " \
> - ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam pni-names selinux smack usrmerge polkit seccomp', d)} \
> + ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam pni-names selinux smack polkit seccomp', d)} \
> ${@bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', 'coredump elfutils', '', d)} \
> ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
> ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
> @@ -218,7 +218,6 @@ def build_epoch(d):
> PACKAGECONFIG[set-time-epoch] = "${@build_epoch(d)},-Dtime-epoch=0"
> PACKAGECONFIG[timedated] = "-Dtimedated=true,-Dtimedated=false"
> PACKAGECONFIG[timesyncd] = "-Dtimesyncd=true,-Dtimesyncd=false"
> -PACKAGECONFIG[usrmerge] = "-Dsplit-usr=false,-Dsplit-usr=true"
> PACKAGECONFIG[sbinmerge] = "-Dsplit-bin=false,-Dsplit-bin=true"
> PACKAGECONFIG[userdb] = "-Duserdb=true,-Duserdb=false"
> PACKAGECONFIG[utmp] = "-Dutmp=true,-Dutmp=false"
> @@ -240,14 +239,10 @@ CFLAGS:append = " --sysroot=${STAGING_DIR_TARGET}"
>
> # Helper variables to clarify locations. This mirrors the logic in systemd's
> # build system.
> -rootprefix ?= "${root_prefix}"
> -rootlibdir ?= "${base_libdir}"
> -rootlibexecdir = "${rootprefix}/lib"
> +rootlibexecdir = "${nonarch_base_libdir}"
Why use ${nonarch_base_libdir} here? ${nonarch_libdir} should be
more appropriate now that usrmerge is removed.
>
> EXTRA_OEMESON += "-Dnobody-user=nobody \
> -Dnobody-group=nogroup \
> - -Drootlibdir=${rootlibdir} \
> - -Drootprefix=${rootprefix} \
> -Ddefault-locale=C \
> -Dmode=release \
> -Dsystem-alloc-uid-min=101 \
> @@ -403,7 +398,7 @@ do_install() {
> }
>
> python populate_packages:prepend (){
> - systemdlibdir = d.getVar("rootlibdir")
> + systemdlibdir = d.getVar("nonarch_base_libdir")
This should be using base_libdir (or libdir as suggested above).
> do_split_packages(d, systemdlibdir, r'^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
> }
> PACKAGES_DYNAMIC += "^lib(udev|systemd|nss).*"
> @@ -678,7 +673,7 @@ FILES:${PN} = " ${base_bindir}/* \
> ${sysconfdir}/ssh/ssh_config.d/20-systemd-ssh-proxy.conf \
> ${sysconfdir}/ssh/sshd_config.d/20-systemd-userdb.conf \
> ${rootlibexecdir}/systemd/* \
> - ${rootlibdir}/systemd/libsystemd-core* \
> + ${nonarch_base_libdir}/systemd/libsystemd-core* \
This should be using ${base_libdir} (or ${libdir} as suggested above).
> ${libdir}/pam.d \
> ${nonarch_libdir}/pam.d \
> ${systemd_unitdir}/* \
> @@ -739,7 +734,7 @@ INSANE_SKIP:${PN}-dbg += "libdir"
> INSANE_SKIP:${PN}-doc += " libdir"
> INSANE_SKIP:libsystemd-shared += "libdir"
>
> -FILES:libsystemd-shared = "${rootlibdir}/systemd/libsystemd-shared*.so"
> +FILES:libsystemd-shared = "${nonarch_base_libdir}/systemd/libsystemd-shared*.so"
This should be using ${base_libdir} (or ${libdir} as suggested above).
>
> RPROVIDES:udev = "hotplug"
>
> --
> 2.34.1
//Peter
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [OE-core] [PATCH 1/2] systemd: drop deprecated rootlibdir, rootprefix and split-usr options
2024-12-02 19:49 ` Peter Kjellerstedt
@ 2024-12-03 2:41 ` Ricardo de Araujo (Salveti)
0 siblings, 0 replies; 9+ messages in thread
From: Ricardo de Araujo (Salveti) @ 2024-12-03 2:41 UTC (permalink / raw)
To: Peter Kjellerstedt; +Cc: openembedded-core@lists.openembedded.org
On Mon, Dec 2, 2024 at 4:50 PM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
> > -----Original Message-----
> > From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Ricardo Salveti via lists.openembedded.org
> > Sent: den 29 november 2024 04:37
> > To: openembedded-core@lists.openembedded.org
> > Subject: [OE-core] [PATCH 1/2] systemd: drop deprecated rootlibdir, rootprefix and split-usr options
> >
> > Support for split-usr and unmerged-usr were both removed as part of the
> > systemd 255 release, so remove the current deprecated rootlibdir,
> > rootprefix and split-usr options from the recipe.
> >
> > Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
> > ---
> > meta/recipes-core/systemd/systemd_256.8.bb | 15 +++++----------
> > 1 file changed, 5 insertions(+), 10 deletions(-)
> >
> > diff --git a/meta/recipes-core/systemd/systemd_256.8.bb b/meta/recipes-core/systemd/systemd_256.8.bb
> > index c17100a636a..26d2237ce3a 100644
> > --- a/meta/recipes-core/systemd/systemd_256.8.bb
> > +++ b/meta/recipes-core/systemd/systemd_256.8.bb
> > @@ -69,7 +69,7 @@ PAM_PLUGINS = " \
> > "
> >
> > PACKAGECONFIG ??= " \
> > - ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam pni-names selinux smack usrmerge polkit seccomp', d)} \
> > + ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam pni-names selinux smack polkit seccomp', d)} \
> > ${@bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', 'coredump elfutils', '', d)} \
> > ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
> > ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
> > @@ -218,7 +218,6 @@ def build_epoch(d):
> > PACKAGECONFIG[set-time-epoch] = "${@build_epoch(d)},-Dtime-epoch=0"
> > PACKAGECONFIG[timedated] = "-Dtimedated=true,-Dtimedated=false"
> > PACKAGECONFIG[timesyncd] = "-Dtimesyncd=true,-Dtimesyncd=false"
> > -PACKAGECONFIG[usrmerge] = "-Dsplit-usr=false,-Dsplit-usr=true"
> > PACKAGECONFIG[sbinmerge] = "-Dsplit-bin=false,-Dsplit-bin=true"
> > PACKAGECONFIG[userdb] = "-Duserdb=true,-Duserdb=false"
> > PACKAGECONFIG[utmp] = "-Dutmp=true,-Dutmp=false"
> > @@ -240,14 +239,10 @@ CFLAGS:append = " --sysroot=${STAGING_DIR_TARGET}"
> >
> > # Helper variables to clarify locations. This mirrors the logic in systemd's
> > # build system.
> > -rootprefix ?= "${root_prefix}"
> > -rootlibdir ?= "${base_libdir}"
> > -rootlibexecdir = "${rootprefix}/lib"
> > +rootlibexecdir = "${nonarch_base_libdir}"
>
> Why use ${nonarch_base_libdir} here? ${nonarch_libdir} should be
> more appropriate now that usrmerge is removed.
Agree, will change on v2.
> > EXTRA_OEMESON += "-Dnobody-user=nobody \
> > -Dnobody-group=nogroup \
> > - -Drootlibdir=${rootlibdir} \
> > - -Drootprefix=${rootprefix} \
> > -Ddefault-locale=C \
> > -Dmode=release \
> > -Dsystem-alloc-uid-min=101 \
> > @@ -403,7 +398,7 @@ do_install() {
> > }
> >
> > python populate_packages:prepend (){
> > - systemdlibdir = d.getVar("rootlibdir")
> > + systemdlibdir = d.getVar("nonarch_base_libdir")
>
> This should be using base_libdir (or libdir as suggested above).
Yeah, nonarch will fail on cases where it is different than
base_libdir/libdir, as noticed by Mathieu. Will fix on v2.
Same for the other suggestions.
Thanks for the review.
Cheers,
Ricardo
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-12-03 2:42 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-29 3:36 [PATCH 1/2] systemd: drop deprecated rootlibdir, rootprefix and split-usr options Ricardo Salveti
2024-11-29 3:36 ` [PATCH 2/2] systemd: remove custom rootlibexecdir and replace with nonarch_base_libdir Ricardo Salveti
2024-11-29 3:46 ` Patchtest results for " patchtest
2024-11-29 18:57 ` Ricardo de Araujo (Salveti)
2024-11-30 2:23 ` [OE-core] " Khem Raj
2024-11-30 7:59 ` Richard Purdie
2024-12-02 8:40 ` [OE-core] [PATCH 1/2] systemd: drop deprecated rootlibdir, rootprefix and split-usr options Mathieu Dubois-Briand
2024-12-02 19:49 ` Peter Kjellerstedt
2024-12-03 2:41 ` Ricardo de Araujo (Salveti)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox