diff options
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | 0001-Use-Arch-Linux-device-access-groups.patch | 16 | ||||
| -rw-r--r-- | PKGBUILD | 28 |
3 files changed, 23 insertions, 41 deletions
@@ -1,6 +1,6 @@ pkgbase = systemd-light - pkgver = 243.162 - pkgrel = 2 + pkgver = 244 + pkgrel = 1 url = https://www.github.com/systemd/systemd arch = x86_64 makedepends = acl @@ -34,8 +34,8 @@ pkgbase = systemd-light makedepends = cryptsetup makedepends = libseccomp options = strip - source = git+https://github.com/systemd/systemd-stable#tag=v243?signed - source = git+https://github.com/systemd/systemd#tag=v243?signed + source = git+https://github.com/systemd/systemd-stable#tag=ec298e702b87e2859f7f7864f51eef3360daf163?signed + source = git+https://github.com/systemd/systemd#tag=v244?signed source = 0001-Use-Arch-Linux-device-access-groups.patch source = initcpio-hook-udev source = initcpio-install-systemd @@ -58,7 +58,7 @@ pkgbase = systemd-light validpgpkeys = 5C251B5FC54EB2F80F407AAAC54CA336CFEB557E sha512sums = SKIP sha512sums = SKIP - sha512sums = 9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e + sha512sums = e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4 sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73 sha512sums = 01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691 sha512sums = a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a @@ -91,7 +91,7 @@ pkgname = systemd-light depends = hwids depends = libcap depends = libgcrypt - depends = systemd-light-libs=243.162 + depends = systemd-light-libs=244 depends = libidn2 depends = libidn2.so depends = lz4 @@ -112,10 +112,10 @@ pkgname = systemd-light optdepends = systemd: replacement for systemd-networkd optdepends = systemd: replacement for systemd-resolved optdepends = systemd: replacement for systemd-timesyncd - provides = systemd=243.162 + provides = systemd=244 provides = nss-myhostname - provides = systemd-tools=243.162 - provides = udev=243.162 + provides = systemd-tools=244 + provides = udev=244 conflicts = systemd conflicts = nss-myhostname conflicts = systemd-tools @@ -146,7 +146,7 @@ pkgname = systemd-light-libs depends = libgcrypt depends = lz4 depends = xz - provides = systemd-libs=243.162 + provides = systemd-libs=244 provides = libsystemd provides = libsystemd.so provides = libudev.so diff --git a/0001-Use-Arch-Linux-device-access-groups.patch b/0001-Use-Arch-Linux-device-access-groups.patch index c511144dee45..ccc9ad2ade00 100644 --- a/0001-Use-Arch-Linux-device-access-groups.patch +++ b/0001-Use-Arch-Linux-device-access-groups.patch @@ -1,24 +1,19 @@ -From 34e4b4953cb99642e9144d97823edf32b06ffe93 Mon Sep 17 00:00:00 2001 -Message-Id: <34e4b4953cb99642e9144d97823edf32b06ffe93.1520376078.git.jan.steffens@gmail.com> From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Tue, 6 Mar 2018 23:39:47 +0100 Subject: [PATCH] Use Arch Linux' device access groups -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit cdrom → optical dialout → uucp tape → storage --- - rules/50-udev-default.rules.in | 14 +++++++------- + rules.d/50-udev-default.rules.in | 14 +++++++------- sysusers.d/basic.conf.in | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) -diff --git a/rules/50-udev-default.rules.in b/rules/50-udev-default.rules.in +diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in index 191f56f42..f81c4d0fc 100644 ---- a/rules/50-udev-default.rules.in -+++ b/rules/50-udev-default.rules.in +--- a/rules.d/50-udev-default.rules.in ++++ b/rules.d/50-udev-default.rules.in @@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620" SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" @@ -70,6 +65,3 @@ index 8e358c02d..33e513a36 100644 g video - - - # Default group for normal users --- -2.16.2 - @@ -33,9 +33,9 @@ pkgbase=systemd-light _pkgbase=${pkgbase%-light} pkgname=('systemd-light' 'systemd-light-libs') # Can be from either systemd or systemd-stable -_commit='e51d9bf9e5ac5a6618c175cd9b5cfdc6733cd5d1' -pkgver=243.162 -pkgrel=2 +_tag='ec298e702b87e2859f7f7864f51eef3360daf163' # git rev-parse v${pkgver} +pkgver=244 +pkgrel=1 arch=('x86_64') url='https://www.github.com/systemd/systemd' makedepends=('acl' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' @@ -47,8 +47,7 @@ makedepends=('acl' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' options=('strip') validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net> '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> -source=(# fragment is latest tag for source verification, final merge in prepare() - "git+https://github.com/systemd/systemd-stable#tag=v${pkgver%.*}?signed" +source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed" "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed" '0001-Use-Arch-Linux-device-access-groups.patch' 'initcpio-hook-udev' @@ -70,7 +69,7 @@ source=(# fragment is latest tag for source verification, final merge in prepare '30-systemd-update.hook') sha512sums=('SKIP' 'SKIP' - '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e' + 'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691' 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' @@ -159,9 +158,6 @@ prepare() { # add upstream repository for cherry-picking git remote add -f upstream ../systemd - # merge the latest stable commit (fast-foward only to make sure - # the verified tag is in) - git merge --ff-only "${_commit}" local _c for _c in "${_backports[@]}"; do @@ -183,15 +179,6 @@ prepare() { patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch } -pkgver() { - cd "$_pkgbase-stable" - - local _version _count - _version="$(git describe --abbrev=0 --tags)" - _count="$(git rev-list --count ${_version}..)" - printf '%s.%s' "${_version#v}" "${_count}" -} - build() { local _timeservers=({0..3}.arch.pool.ntp.org) local _nameservers=( @@ -218,9 +205,10 @@ build() { -Ddbuspolicydir=/usr/share/dbus-1/system.d -Ddefault-hierarchy=hybrid - -Ddefault-locale=C -Ddefault-kill-user-processes=false + -Ddefault-locale=C -Dfallback-hostname='archlinux' + -Dnologin-path=/usr/bin/nologin -Dntp-servers="${_timeservers[*]}" -Ddns-servers="${_nameservers[*]}" -Drpmmacrosdir=no @@ -231,6 +219,7 @@ build() { -Dbacklight=$(is_systemd "$_backlight") -Defi=$(is_systemd "$_bootloader") -Dgnu-efi=$(is_systemd "$_bootloader") + -Dhibernate=$(is_nonempty "$_hibernate") -Dlibcryptsetup=$(is_nonempty "$_cryptsetup") -Dnetworkd=$(is_systemd "$_network") -Dnss-mymachines=$(bool_opt 'machined' "${_features[@]}") @@ -239,6 +228,7 @@ build() { -Dresolve=$(is_systemd "$_resolver") -Dtimedated=$(is_systemd "$_timesync") -Dtimesyncd=$(is_systemd "$_timesync") + -Dzlib=$(bool_opt 'importd' "${_features[@]}") ) for opt in hostnamed localed machined portabled firstboot importd rfkill; do |