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

[Christian Hesse]

    Date: Saturday, March 27, 2021 @ 08:16:41
  Author: eworm
Revision: 411097

upgpkg: systemd 248rc4-2: pull in latest changes

For testing only, do not move!

Modified:
  systemd/trunk/PKGBUILD

----------+
 PKGBUILD |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-27 08:11:48 UTC (rev 411096)
+++ PKGBUILD	2021-03-27 08:16:41 UTC (rev 411097)
@@ -7,7 +7,7 @@
 _tag='e878547b1a4aaee27c90e835a986a6a96a00c507' # git rev-parse v${_tag_name}
 _tag_name=248-rc4
 pkgver="${_tag_name/-/}"
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -82,6 +82,8 @@
     git revert -n "${_c}"
   done
 
+  git merge --ff-only 'a81c7ac8d408a2618d488e708b40530bcdad6bd1'
+
   # Replace cdrom/dialout/tape groups with optical/uucp/storage
   patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch
 }