Date: Saturday, August 30, 2014 @ 00:54:26 Author: dreisner Revision: 220802
upgpkg: systemd 216-2 - link against lz4 (FS#41721) - fallback on uuidgen to machine-id creation (FS#41711) Modified: systemd/trunk/PKGBUILD systemd/trunk/systemd.install -----------------+ PKGBUILD | 10 ++++++---- systemd.install | 12 ++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-08-29 18:40:01 UTC (rev 220801) +++ PKGBUILD 2014-08-29 22:54:26 UTC (rev 220802) @@ -4,13 +4,13 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat') pkgver=216 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt' - 'util-linux' 'linux-api-headers' 'pam' 'python' 'python-lxml' 'quota-tools' - 'shadow' 'xz') + 'lz4' 'util-linux' 'linux-api-headers' 'pam' 'python' 'python-lxml' + 'quota-tools' 'shadow' 'xz') options=('strip' 'debug') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' @@ -31,6 +31,7 @@ --enable-introspection \ --enable-gtk-doc \ --enable-compat-libs \ + --enable-lz4 \ --disable-audit \ --disable-ima \ --disable-kdbus \ @@ -45,7 +46,7 @@ pkgdesc="system and service manager" license=('GPL2' 'LGPL2.1' 'MIT') depends=('acl' 'bash' 'dbus' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' - 'libsystemd' 'pam' 'libseccomp' 'util-linux' 'xz') + 'libsystemd' 'lz4' 'pam' 'libseccomp' 'util-linux' 'xz') provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver") replaces=('nss-myhostname' 'systemd-tools' 'udev') conflicts=('nss-myhostname' 'systemd-tools' 'udev') @@ -63,6 +64,7 @@ etc/dbus-1/system.d/org.freedesktop.timedate1.conf etc/pam.d/systemd-user etc/systemd/bootchart.conf + etc/systemd/coredump.conf etc/systemd/journald.conf etc/systemd/logind.conf etc/systemd/system.conf Modified: systemd.install =================================================================== --- systemd.install 2014-08-29 18:40:01 UTC (rev 220801) +++ systemd.install 2014-08-29 22:54:26 UTC (rev 220802) @@ -37,7 +37,6 @@ post_common() { systemd-sysusers - systemd-tmpfiles --create udevadm hwdb --update journalctl --update-catalog } @@ -142,13 +141,17 @@ systemd-tmpfiles --create etc.conf } -_216_1_changes() { +_216_2_changes() { echo ':: Coredumps are handled by systemd by default. Collection behavior can be' echo ' tuned in /etc/systemd/coredump.conf.' } post_install() { - systemd-firstboot --setup-machine-id + # because systemd can't sanely manage this meanial task... + uuidgen | { + read + echo "${REPLY//-}">etc/machine-id + } post_common "$@" @@ -175,7 +178,8 @@ 210-1 213-4 214-2 - 215-2) + 215-2 + 216-2) for v in "${upgrades[@]}"; do if [[ $(vercmp "$v" "$2") -eq 1 ]]; then