From d1fbbd05906a0b9cd41db2fe5f0b4c03bfb50426 Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Sat, 21 Mar 2020 12:01:26 +0000 Subject: [PATCH] MultiLib: Merge changes from trunk git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11794 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 10 ++++++++++ chapter01/whatsnew.xml | 4 ++-- chapter06/dbus.xml | 5 +++++ chapter06/systemd.xml | 33 +++++++++++++++++++++++++++------ general.ent | 6 +++--- lfs-latest.php | 2 ++ packages.ent | 14 +++++++------- 7 files changed, 56 insertions(+), 18 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index dd08235a0..b0c1e8ee9 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,6 +44,16 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2020-03-19 + + + [renodr] - Update to systemd-245. Fixes + #4593. + + + + 2020-03-18 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 399786ce4..eacd16f22 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -227,9 +227,9 @@ - + diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml index 7d148d5ce..bb4bffc76 100644 --- a/chapter06/dbus.xml +++ b/chapter06/dbus.xml @@ -96,6 +96,11 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.soln -sfv /etc/machine-id /var/lib/dbus + Move the socket file to /run instead of the deprecated + /var/run: + + sed -i 's:/var/run:/run:' /lib/systemd/system/dbus.socket + diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index 7c6cd584d..6bd7f2893 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -63,7 +63,7 @@ done Remove tests that cannot be built in chroot: -sed '177,$ d' -i src/resolve/meson.build +sed '179,$ d' -i src/resolve/meson.build Remove an unneeded group, render, from the default udev @@ -97,6 +97,8 @@ meson --prefix=/usr \ -Dumount-path=/bin/umount \ -Db_lto=false \ -Drpmmacrosdir=no \ + -Dhomed=false \ + -Duserdb=false \ .. @@ -182,6 +184,15 @@ meson --prefix=/usr \ for use with systemd because LFS does not support RPM. + + + -D{userdb,homed}=false + + Remove two daemons that have dependencies that do not fit + the scope of LFS. + + + Compile the package: @@ -216,13 +227,12 @@ meson --prefix=/usr \ systemctl disable systemd-time-wait-sync.service - Cleanup symbolic links to Util-Linux libraries: rm -fv /usr/lib/lib{blkid,uuid,mount}.so* @@ -397,7 +407,7 @@ rm -f /usr/bin/xsltproc systemd-delta, systemd-detect-virt, systemd-escape, systemd-hwdb, systemd-id128, systemd-inhibit, systemd-machine-id-setup, systemd-mount, systemd-notify, systemd-nspawn, systemd-path, - systemd-resolve (symlink to resolvectl), systemd-run, + systemd-repart, systemd-resolve (symlink to resolvectl), systemd-run, systemd-socket-activate, systemd-stdio-bridge, systemd-tmpfiles, systemd-tty-ask-password-agent, systemd-umount (symlink to systemd-mount), telinit (symlink to systemctl), timedatectl, and @@ -815,6 +825,17 @@ rm -f /usr/bin/xsltproc + + systemd-repart + + Used go grow and add partitions to a partition table when + systemd is used in an OS image (e.g. a container). + + systemd-repart + + + + systemd-resolve diff --git a/general.ent b/general.ent index f6d4ad829..f8ae867aa 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/lfs-latest.php b/lfs-latest.php index 3d1c243e3..629ce3192 100644 --- a/lfs-latest.php +++ b/lfs-latest.php @@ -16,6 +16,7 @@ $regex[ 'check' ] = "/^.*Check (\d[\d\.]+\d).*$/"; $regex[ 'intltool' ] = "/^.*Latest version is (\d[\d\.]+\d).*$/"; $regex[ 'less' ] = "/^.*current released version is less-(\d+).*$/"; $regex[ 'mpfr' ] = "/^mpfr-([\d\.]+)\.tar.*$/"; +$regex[ 'Python' ] = "/^.*Latest Python 3.*Python (3[\d\.]+\d).*$/"; $regex[ 'systemd' ] = "/^.*v([\d]+)$/"; //$regex[ 'sysvinit' ] = "/^.*sysvinit-([\d\.]+)dsf\.tar.*$/"; $regex[ 'tzdata' ] = "/^.*tzdata([\d]+[a-z]).*$/"; @@ -124,6 +125,7 @@ if ( $package == "ninja" ) $dirpath = "https://github.com/ninja-build/ninja if ( $package == "procps-ng" ) $dirpath = "https://gitlab.com/procps-ng/procps/-/tags"; //if ( $package == "psmisc" ) $dirpath = "http://sourceforge.net/projects/$package/files"; if ( $package == "psmisc" ) $dirpath = "https://gitlab.com/psmisc/psmisc/-/tags"; +if ( $package == "Python" ) $dirpath = "https://www.python.org/downloads/source/"; if ( $package == "shadow" ) $dirpath = "https://github.com/shadow-maint/shadow/releases"; if ( $package == "systemd" ) $dirpath = "https://github.com/systemd/systemd/releases"; if ( $package == "tcl" ) $dirpath = "http://sourceforge.net/projects/tcl/files"; diff --git a/packages.ent b/packages.ent index 6bce75c77..de7913eed 100644 --- a/packages.ent +++ b/packages.ent @@ -640,21 +640,21 @@ - + - + - + - + - - - + + +