mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

systemd: drop deprecated rootlibdir, rootprefix and split-usr options

Browse Source 
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.

(From OE-Core rev: 94ec821600c36baaeeb81f3d2ce0cc6d2d22082a)

Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ricardo Salveti
2024-12-03 00:05:18 -03:00
committed by Richard Purdie
parent f5a2ea77ca
commit eac509b9ed
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/systemd/systemd_256.8.bb
+5 -10
View File
@@ -69,7 +69,7 @@ PAM_PLUGINS = " \
" "
PACKAGECONFIG ??= " \ 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', 'minidebuginfo', 'coredump elfutils', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', 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[set-time-epoch] = "${@build_epoch(d)},-Dtime-epoch=0"
PACKAGECONFIG[timedated] = "-Dtimedated=true,-Dtimedated=false" PACKAGECONFIG[timedated] = "-Dtimedated=true,-Dtimedated=false"
PACKAGECONFIG[timesyncd] = "-Dtimesyncd=true,-Dtimesyncd=false" PACKAGECONFIG[timesyncd] = "-Dtimesyncd=true,-Dtimesyncd=false"
PACKAGECONFIG[usrmerge] = "-Dsplit-usr=false,-Dsplit-usr=true"
PACKAGECONFIG[sbinmerge] = "-Dsplit-bin=false,-Dsplit-bin=true" PACKAGECONFIG[sbinmerge] = "-Dsplit-bin=false,-Dsplit-bin=true"
PACKAGECONFIG[userdb] = "-Duserdb=true,-Duserdb=false" PACKAGECONFIG[userdb] = "-Duserdb=true,-Duserdb=false"
PACKAGECONFIG[utmp] = "-Dutmp=true,-Dutmp=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 # Helper variables to clarify locations. This mirrors the logic in systemd's
# build system. # build system.
rootprefix ?= "${root_prefix}" rootlibexecdir = "${nonarch_libdir}"
rootlibdir ?= "${base_libdir}"
rootlibexecdir = "${rootprefix}/lib"
EXTRA_OEMESON += "-Dnobody-user=nobody \ EXTRA_OEMESON += "-Dnobody-user=nobody \
-Dnobody-group=nogroup \ -Dnobody-group=nogroup \
-Drootlibdir=${rootlibdir} \
-Drootprefix=${rootprefix} \
-Ddefault-locale=C \ -Ddefault-locale=C \
-Dmode=release \ -Dmode=release \
-Dsystem-alloc-uid-min=101 \ -Dsystem-alloc-uid-min=101 \
@@ -403,7 +398,7 @@ do_install() {
} }
python populate_packages:prepend (){ python populate_packages:prepend (){
systemdlibdir = d.getVar("rootlibdir") systemdlibdir = d.getVar("libdir")
do_split_packages(d, systemdlibdir, r'^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) do_split_packages(d, systemdlibdir, r'^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
} }
PACKAGES_DYNAMIC += "^lib(udev|systemd|nss).*" 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/ssh_config.d/20-systemd-ssh-proxy.conf \
${sysconfdir}/ssh/sshd_config.d/20-systemd-userdb.conf \ ${sysconfdir}/ssh/sshd_config.d/20-systemd-userdb.conf \
${rootlibexecdir}/systemd/* \ ${rootlibexecdir}/systemd/* \
${rootlibdir}/systemd/libsystemd-core* \ ${libdir}/systemd/libsystemd-core* \
${libdir}/pam.d \ ${libdir}/pam.d \
${nonarch_libdir}/pam.d \ ${nonarch_libdir}/pam.d \
${systemd_unitdir}/* \ ${systemd_unitdir}/* \
@@ -739,7 +734,7 @@ INSANE_SKIP:${PN}-dbg += "libdir"
INSANE_SKIP:${PN}-doc += " libdir" INSANE_SKIP:${PN}-doc += " libdir"
INSANE_SKIP:libsystemd-shared += "libdir" INSANE_SKIP:libsystemd-shared += "libdir"
FILES:libsystemd-shared = "${rootlibdir}/systemd/libsystemd-shared*.so" FILES:libsystemd-shared = "${libdir}/systemd/libsystemd-shared*.so"
RPROVIDES:udev = "hotplug" RPROVIDES:udev = "hotplug"