From f93efd08302e29b772c5f3fe4c5c0dae367e71d4 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 3 Sep 2019 16:40:28 +0200 Subject: [PATCH 1/4] systemd: Update version from 242 to 243 https://github.com/systemd/systemd/blob/v243/NEWS#L3 --- systemd.be0 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/systemd.be0 b/systemd.be0 index 0918b77a1..f7d0a41e6 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION systemd-242-3 +# BEE_VERSION systemd-243-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -15,8 +15,7 @@ SRCURL[0]="https://github.com/systemd/systemd/archive/v${PKGVERSION}.tar.gz" ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -PATCHURL+=(/src/mariux/patches/systemd-v242-0001-Prevent-loop-when-stopping-datagram-socket-units.patch) -PATCHURL+=(/src/mariux/patches/systemd-v242-0001-cgroup-Continue-unit-reset-if-cgroup-are-busy.patch) +# PATCHURL+=() BEE_BUILDTYPE=meson From a8f3e305eb01dc6dc5267a1e8625d0c19cce7f2e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 5 Sep 2019 09:42:33 +0200 Subject: [PATCH 2/4] systemd: Build manual pages From the [NEWS][1]: > * Man pages are not built by default anymore (html pages were already > disabled by default), to make development builds quicker. When > building systemd for a full installation with documentation, meson > should be called with -Dman=true and/or -Dhtml=true as appropriate. > The default was changed based on the assumption that quick one-off or > repeated development builds are much more common than full optimized > builds for installation, and people need to pass various other > options to when doing "proper" builds anyway, so the gain from making > development builds quicker is bigger than the one time disruption for > packagers. [1]: https://github.com/systemd/systemd/blob/f06530d86ba7688067fc2758b5e54599bda1e4a0/NEWS#L66-L81 --- systemd.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/systemd.be0 b/systemd.be0 index f7d0a41e6..d6c463bcb 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -66,6 +66,7 @@ mee_configure() { -Dfirstboot=false \ -Dinstall-tests=false \ -Dldconfig=false \ + -Dman=true \ -Drootprefix= \ -Drootlibdir=/lib \ -Dsplit-usr=true \ From b194034275e4d16a1ef9aa9d5b7c9dbdafa997d7 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 5 Sep 2019 09:52:50 +0200 Subject: [PATCH 3/4] systemd: Do not create `/var/log/journal` in the first place Instead of removing `/var/log/journal` after installation, configure systemd to not create it in the first place. --- systemd.be0 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/systemd.be0 b/systemd.be0 index d6c463bcb..6ce0677c0 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -59,6 +59,7 @@ mee_configure() { bee_configure \ -Dblkid=true \ -Dbuildtype=release \ + -Dcreate-log-dirs=false \ -Ddefault-dnssec=yes \ -Ddns-over-tls=false \ -Ddns-servers='141.14.16.1' \ @@ -96,9 +97,6 @@ mee_install_post() { # Remove systemd’s sysctl configuration rm -rv ${D}/${LIBDIR}/sysctl.d/* - # Remove directory to disable persistent storage of logs - rm -rv ${D}/var/log/journal - # Restore historical RLIMIT_NOFILE resource limit echo "DefaultLimitNOFILE=1024:4096" >> ${D}/etc/systemd/system.conf } From e9b3ffac74b6ea0870204a343eed8397e2eda6b2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 5 Sep 2019 15:27:55 +0200 Subject: [PATCH 4/4] systemd: Add package name to downloaded source archive Fixes: https://github.molgen.mpg.de/mariux64/bee-files/issues/1216 --- systemd.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemd.be0 b/systemd.be0 index 6ce0677c0..216281fdd 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -9,7 +9,7 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="https://github.com/systemd/systemd/archive/v${PKGVERSION}.tar.gz" +SRCURL[0]="https://github.com/systemd/systemd/archive/v${PKGVERSION}.tar.gz systemd-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array.