summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYurii Kolesnykov <yurikoles@gmail.com>2017-01-23 22:44:56 +0300
committerYurii Kolesnykov <yurikoles@gmail.com>2017-01-23 22:44:56 +0300
commitaa3a338fdff304bc789d6f0d0085495927ae61c5 (patch)
tree5e56f7ccc8eb5a4e61707b80c6859fcc7fbf69fd
parentc3ff255f8a97c99c062d422a5a793c00864d4064 (diff)
downloadsystemd-git-aa3a338fdff304bc789d6f0d0085495927ae61c5.tar.gz
systemd-git-aa3a338fdff304bc789d6f0d0085495927ae61c5.tar.bz2
fix deps
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rw-r--r--udev-hwdb.hook11
3 files changed, 9 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 967d24d..e12a77e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = systemd-git
pkgdesc = systemd from git
pkgver = 232.r615.g88e4dbd50
- pkgrel = 1
+ pkgrel = 2
url = https://www.github.com/systemd/systemd
arch = i686
arch = x86_64
@@ -70,7 +70,7 @@ pkgname = systemd-git
depends = hwids
depends = libcap
depends = libgcrypt
- depends = libsystemd
+ depends = libsystemd-git
depends = libidn
depends = lz4
depends = pam
@@ -90,9 +90,11 @@ pkgname = systemd-git
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev
+ conflicts = systemd
replaces = nss-myhostname
replaces = systemd-tools
replaces = udev
+ replaces = systemd
backup = etc/pam.d/systemd-user
backup = etc/systemd/coredump.conf
backup = etc/systemd/journald.conf
diff --git a/PKGBUILD b/PKGBUILD
index abe7598..349f665 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=systemd-git
pkgname=('systemd-git' 'libsystemd-git' 'systemd-sysvcompat-git')
pkgdesc="systemd from git"
pkgver=232.r615.g88e4dbd50
-pkgrel=1
+pkgrel=2
branch='master'
arch=('i686' 'x86_64')
url="https://www.github.com/systemd/systemd"
@@ -16,7 +16,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git')
options=('strip' '!distcc' '!ccache')
source=("systemd-git::git://github.com/systemd/systemd.git#branch=${branch}"
- 'initcpio-hook-udev'
+ 'initcpio-hook-udev'
'initcpio-install-systemd'
'initcpio-install-udev'
'arch.conf'
@@ -89,11 +89,11 @@ package_systemd-git() {
pkgdesc="system and service manager"
license=('GPL2' 'LGPL2.1')
depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
- 'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
+ 'libgcrypt' 'libsystemd-git' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
'util-linux' 'xz')
provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" "systemd=$pkgver")
- replaces=('nss-myhostname' 'systemd-tools' 'udev')
- conflicts=('nss-myhostname' 'systemd-tools' 'udev')
+ replaces=('nss-myhostname' 'systemd-tools' 'udev' 'systemd')
+ conflicts=('nss-myhostname' 'systemd-tools' 'udev' 'systemd')
optdepends=('cryptsetup: required for encrypted block devices'
'libmicrohttpd: remote journald capabilities'
'quota-tools: kernel-level quota management'
diff --git a/udev-hwdb.hook b/udev-hwdb.hook
deleted file mode 100644
index 7bc055b..0000000
--- a/udev-hwdb.hook
+++ /dev/null
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/udev/hwdb.d/*
-
-[Action]
-Description = Updating udev Hardware Database...
-When = PostTransaction
-Exec = /usr/bin/udevadm hwdb --update