[arch-commits] Commit in systemd/trunk (PKGBUILD arch.conf loader.conf)

[Bartłomiej Piotrowski]

    Date: Saturday, June 6, 2015 @ 20:46:37
  Author: bpiotrowski
Revision: 240379

upgpkg: systemd 220-4

Cherry-pick fix[1] that silences those harmless messages on shutdown:

systemd-shutdown[1]: Failed to detach loop devices: Invalid argument
systemd-shutdown[1]: Failed to detach loop devices: Invalid argument
systemd-shutdown[1]: Failed to detach loop devices: Invalid argument
systemd-shutdown[1]: Failed to finalize _ loop devices, ignoring

Closes FS#45111.

[1] https://github.com/systemd/systemd/commit/54f0b4d9a3e

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/arch.conf
  systemd/trunk/loader.conf

-------------+
 PKGBUILD    |   16 ++++++++++------
 arch.conf   |    2 +-
 loader.conf |    1 -
 3 files changed, 11 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-06 18:07:49 UTC (rev 240378)
+++ PKGBUILD	2015-06-06 18:46:37 UTC (rev 240379)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=220
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -12,7 +12,7 @@
              'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers' 'lz4' 'pam'
              'python' 'python-lxml' 'quota-tools' 'shadow' 'xz' 'gnu-efi-libs' 'git')
 options=('strip' 'debug')
-source=("git://anongit.freedesktop.org/systemd/systemd#tag=v$pkgver"
+source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
@@ -23,8 +23,8 @@
          '90ea67a7bb237502094914622a39e281'
          '8516a7bd65157d0115c113118c10c3f3'
          'bde43090d4ac0ef048e3eaee8202a407'
-         '82bda9612e3a361a74cf8de2a0134b15'
-         '6ea803e5179d623716e3be0b636de658'
+         '20ead378f5d6df4b2a3e670301510a7d'
+         'ddaef54f68f6c86c6c07835fc668f62a'
          '1e2f9a8b0fa32022bf0a8f39123e5f4e')
 
 prepare() {
@@ -31,13 +31,17 @@
   cd "$pkgname"
 
   # udevd: event - fix event queue in daemenozied mode
-  # http://cgit.freedesktop.org/systemd/systemd/commit/?id=040e689654ef
+  # https://github.com/systemd/systemd/commit/040e689654ef
   git cherry-pick -n 040e689654ef
 
   # udevd: fix SIGCHLD handling in --daemon mode
-  # http://cgit.freedesktop.org/systemd/systemd/commit/?id=86c3bece38bc
+  # https://github.com/systemd/systemd/commit/86c3bece38bc
   git cherry-pick -n 86c3bece38bc
 
+  # libudev: enumerate - accept NULL parameters in add_match()
+  # https://github.com/systemd/systemd/commit/54f0b4d9a3e3
+  git cherry-pick -n 54f0b4d9a3e3
+
   ./autogen.sh
 }
 

Modified: arch.conf
===================================================================
--- arch.conf	2015-06-06 18:07:49 UTC (rev 240378)
+++ arch.conf	2015-06-06 18:46:37 UTC (rev 240379)
@@ -1,4 +1,4 @@
-## This is just an exmaple config file.
+## This is just an example config file.
 ## Please edit the paths and kernel parameters according to your system.
 
 title   Arch Linux

Modified: loader.conf
===================================================================
--- loader.conf	2015-06-06 18:07:49 UTC (rev 240378)
+++ loader.conf	2015-06-06 18:46:37 UTC (rev 240379)
@@ -1,2 +1 @@
-timeout 10
 default arch