Date: Saturday, June 7, 2014 @ 00:54:35 Author: dreisner Revision: 214342
upgpkg: systemd 213-6 - backport fix for faily MACAddress matching (FS#40675) - backport fix for fsck/udev mess (FS#40706) - re-enable LTO Added: systemd/trunk/0001-fsck-disable-l-option-for-now.patch systemd/trunk/0001-networkd-link-intialize-mac-address.patch Modified: systemd/trunk/PKGBUILD ------------------------------------------------+ 0001-fsck-disable-l-option-for-now.patch | 58 +++++++++++++++++++++++ 0001-networkd-link-intialize-mac-address.patch | 33 +++++++++++++ PKGBUILD | 15 +++-- 3 files changed, 101 insertions(+), 5 deletions(-) Added: 0001-fsck-disable-l-option-for-now.patch =================================================================== --- 0001-fsck-disable-l-option-for-now.patch (rev 0) +++ 0001-fsck-disable-l-option-for-now.patch 2014-06-06 22:54:35 UTC (rev 214342) @@ -0,0 +1,58 @@ +From c343be283b7152554bac0c02493a4e1759c163f7 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <[email protected]> +Date: Wed, 4 Jun 2014 11:14:48 +0200 +Subject: [PATCH] fsck: disable "-l" option for now + + https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5 +--- + TODO | 4 +++- + src/fsck/fsck.c | 13 ++++++++++++- + 2 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/TODO b/TODO +index 8169a57..fb118f1 100644 +--- a/TODO ++++ b/TODO +@@ -1,4 +1,7 @@ + Bugfixes: ++* Re-enable "fsck -l" when it is ready: ++ https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5 ++ + * Should systemctl status \* work on all unit types, not just .service? + + * enabling an instance unit creates a pointless link, and +@@ -20,7 +23,6 @@ Bugfixes: + See the comment in sd_bus_unref() for more.. + + External: +- + * Fedora: when installing fedora with yum --installroot /var/run is a directory, not a symlink + https://bugzilla.redhat.com/show_bug.cgi?id=975864 + +diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c +index 56cb52d..cb2f573 100644 +--- a/src/fsck/fsck.c ++++ b/src/fsck/fsck.c +@@ -319,7 +319,18 @@ int main(int argc, char *argv[]) { + cmdline[i++] = "/sbin/fsck"; + cmdline[i++] = arg_repair; + cmdline[i++] = "-T"; +- cmdline[i++] = "-l"; ++ ++ /* ++ * Disable locking which conflict with udev's event ++ * ownershipi, until util-linux moves the flock ++ * synchronization file which prevents multiple fsck running ++ * on the same rotationg media, from the disk device ++ * node to a privately owned regular file. ++ * ++ * https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5 ++ * ++ * cmdline[i++] = "-l"; ++ */ + + if (!root_directory) + cmdline[i++] = "-M"; +-- +2.0.0 + Added: 0001-networkd-link-intialize-mac-address.patch =================================================================== --- 0001-networkd-link-intialize-mac-address.patch (rev 0) +++ 0001-networkd-link-intialize-mac-address.patch 2014-06-06 22:54:35 UTC (rev 214342) @@ -0,0 +1,33 @@ +From 2ae6cda520f5c925ba313b8e83ea8b58bc00112c Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <[email protected]> +Date: Wed, 4 Jun 2014 21:29:08 +0200 +Subject: [PATCH] networkd: link - intialize mac address + +Otherwise .netwrok matching on MAC address will not work. + +Based on patch by Dave Reisner, and bug originally reported by Max Pray. + +Conflicts: + src/network/networkd-link.c +--- + src/network/networkd-link.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c +index 6677b94..9afb871 100644 +--- a/src/network/networkd-link.c ++++ b/src/network/networkd-link.c +@@ -75,6 +75,10 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { + if (!link->ifname) + return -ENOMEM; + ++ r = sd_rtnl_message_read_ether_addr(message, IFLA_ADDRESS, &link->mac); ++ if (r < 0) ++ return r; ++ + r = asprintf(&link->state_file, "/run/systemd/network/links/%"PRIu64, + link->ifindex); + if (r < 0) +-- +2.0.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-06-06 22:03:53 UTC (rev 214341) +++ PKGBUILD 2014-06-06 22:54:35 UTC (rev 214342) @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat') pkgver=213 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd"; makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf' @@ -16,24 +16,29 @@ 'initcpio-hook-udev' 'initcpio-install-systemd' 'initcpio-install-udev' - '0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch') + '0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch' + '0001-fsck-disable-l-option-for-now.patch' + '0001-networkd-link-intialize-mac-address.patch') md5sums=('06496edcf86ddf6d8c12d72ba78e735d' '29245f7a240bfba66e2b1783b63b6b40' '66cca7318e13eaf37c5b7db2efa69846' 'bde43090d4ac0ef048e3eaee8202a407' - '5f8ad7126970855614c7fa34b317728d') + '5f8ad7126970855614c7fa34b317728d' + '888cf85a92dd28bcf80e18539fef3915' + '3d53d3bcd85ca0b2ff9f4e79d012808d') prepare() { cd "$pkgname-$pkgver" patch -Np1 <"$srcdir/0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch" + patch -Np1 <"$srcdir/0001-networkd-link-intialize-mac-address.patch" + patch -Np1 <"$srcdir/0001-fsck-disable-l-option-for-now.patch" } build() { cd "$pkgname-$pkgver" - # LTO currently breaks the build because of libtool failures - CFLAGS+=' -fno-lto' + export NM=gcc-nm RANLIB=gcc-ranlib ./configure \ --libexecdir=/usr/lib \
