diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 62 |
1 files changed, 28 insertions, 34 deletions
@@ -3,42 +3,44 @@ # Credit: Tom Gundersen <teg@jklm.no> pkgbase=systemd-git -_realpkgname=systemd pkgname=('systemd-git' 'libsystemd-git' 'systemd-sysvcompat-git') pkgdesc="systemd from git" -pkgver=230.r197.g7f40134 -pkgrel=2 -_branch='master' +pkgver=232.r485.g4b2419165 +pkgrel=1 +branch='master' arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt' 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers' 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git') -options=('strip' 'debug') -source=("git://github.com/systemd/systemd.git#branch=${_branch}" +options=('strip') +source=("systemd-git::git://github.com/systemd/systemd.git#branch=${branch}" 'initcpio-hook-udev' 'initcpio-install-systemd' 'initcpio-install-udev' 'arch.conf' 'loader.conf' -# 'splash-arch.bmp' - 'udev-hwdb.hook') -md5sums=('SKIP' - '90ea67a7bb237502094914622a39e281' - 'cfb3f8ea657ab24535cc061bb38ec4c1' - '1b3aa3a0551b08af9305d33f85b5c2fc' - '20ead378f5d6df4b2a3e670301510a7d' - 'ddaef54f68f6c86c6c07835fc668f62a' - 'a475a5ed8f03fb0f6b58b4684998d05c') + 'udev-hwdb.hook' + 'systemd-user.pam') +sha512sums=('SKIP' + 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' + '52af734947a768758d5eb3f18e31a1cfec6699eca6fa10e40b90c7f11991509186c0a696e3490af3eaba80064ea4cb93e041579abf05addf072d294300aa4b28' + 'fec639de0d99967ed3e67289eff5ff78fff0c5829d350e73bed536a8391f1daa1d118d72dbdc1f480ffd33fc22b72f4817d0973bd09ec7f182fd26ad87b24355' + '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' + 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' + '888ab01bc6e09beb08d7126472c34c9e1aa35ea34e62a09e900ae34c93b1de2fcc988586efd8d0dc962393974f45c77b206d59a86cf53e370f061bf9a1b1a862' + 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19') pkgver() { - cd "${srcdir}/$_realpkgname" + cd "${srcdir}/$pkgbase" # cutting off 'foo-' prefix that presents in the git tag git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } prepare() { - cd "$_realpkgname" + cd "$pkgbase" + + #_validate_tag || return if (( ${#_backports[*]} > 0 )); then git cherry-pick -n "${_backports[@]}" @@ -48,7 +50,7 @@ prepare() { } build() { - cd "$_realpkgname" + cd "$pkgbase" local timeservers=({0..3}.arch.pool.ntp.org) @@ -88,15 +90,7 @@ package_systemd-git() { 'quota-tools: kernel-level quota management' 'systemd-sysvcompat-git: symlink package to provide sysvinit binaries' 'polkit: allow administration as unprivileged user') - backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf - etc/dbus-1/system.d/org.freedesktop.hostname1.conf - etc/dbus-1/system.d/org.freedesktop.login1.conf - etc/dbus-1/system.d/org.freedesktop.locale1.conf - etc/dbus-1/system.d/org.freedesktop.machine1.conf - etc/dbus-1/system.d/org.freedesktop.timedate1.conf - etc/dbus-1/system.d/org.freedesktop.import1.conf - etc/dbus-1/system.d/org.freedesktop.network1.conf - etc/pam.d/systemd-user + backup=(etc/pam.d/systemd-user etc/systemd/coredump.conf etc/systemd/journald.conf etc/systemd/journal-remote.conf @@ -109,7 +103,7 @@ package_systemd-git() { etc/udev/udev.conf) install="systemd-git.install" - make -C "$_realpkgname" DESTDIR="$pkgdir" install + make -C "$pkgbase" DESTDIR="$pkgdir" install # don't write units to /etc by default. some of these will be re-enabled on # post_install. @@ -119,7 +113,7 @@ package_systemd-git() { rm -r "$pkgdir/usr/lib/rpm" # add back tmpfiles.d/legacy.conf - install -m644 "$_realpkgname/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" + install -m644 "$pkgbase/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group sed -i 's#GROUP="dialout"#GROUP="uucp"#g; @@ -141,9 +135,6 @@ package_systemd-git() { # we'll create this on installation rmdir "$pkgdir/var/log/journal/remote" - # fix pam file - sed 's|system-auth|system-login|g' -i "$pkgdir/etc/pam.d/systemd-user" - # ship default policy to leave services disabled echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset @@ -159,6 +150,9 @@ package_systemd-git() { #install -Dm644 "$srcdir/splash-arch.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp install -Dm644 "$srcdir/udev-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook" + + # overwrite the systemd-user PAM configuration with our own + install -Dm644 systemd-user.pam "$pkgdir/etc/pam.d/systemd-user" } package_libsystemd-git() { @@ -168,7 +162,7 @@ package_libsystemd-git() { provides=('libsystemd.so' 'libudev.so' 'libsystemd') conflicts=('libsystemd') - make -C "$_realpkgname" DESTDIR="$pkgdir" install-libLTLIBRARIES + make -C "$pkgbase" DESTDIR="$pkgdir" install-rootlibLTLIBRARIES } package_systemd-sysvcompat-git() { @@ -181,7 +175,7 @@ package_systemd-sysvcompat-git() { install -dm755 "$pkgdir"/usr/share/man/man8 cp -d --no-preserve=ownership,timestamp \ - "$_realpkgname"/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ + "$pkgbase"/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ "$pkgdir"/usr/share/man/man8 install -dm755 "$pkgdir/usr/bin" |