summaryrefslogtreecommitdiffstats
path: root/abs/core/systemd/PKGBUILD
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2014-02-17 00:01:05 (GMT)
committerJames Meyer <james.meyer@operamail.com>2014-02-19 19:03:04 (GMT)
commit84a8c2bb49e91f5e94c2c6c7245172994f517a91 (patch)
treee309992948648f2fabf4c7591c5dc805df23e291 /abs/core/systemd/PKGBUILD
parent7083b169234e350cec8ad3213b3e4a07e078a36d (diff)
downloadlinhes_pkgbuild-84a8c2bb49e91f5e94c2c6c7245172994f517a91.zip
linhes_pkgbuild-84a8c2bb49e91f5e94c2c6c7245172994f517a91.tar.gz
linhes_pkgbuild-84a8c2bb49e91f5e94c2c6c7245172994f517a91.tar.bz2
systemd: 208
Diffstat (limited to 'abs/core/systemd/PKGBUILD')
-rwxr-xr-x[-rw-r--r--]abs/core/systemd/PKGBUILD258
1 files changed, 116 insertions, 142 deletions
diff --git a/abs/core/systemd/PKGBUILD b/abs/core/systemd/PKGBUILD
index d677cfc..de605e8 100644..100755
--- a/abs/core/systemd/PKGBUILD
+++ b/abs/core/systemd/PKGBUILD
@@ -1,103 +1,140 @@
# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
+# Maintainer: Tom Gundersen <teg@jklm.no>
pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
-pkgver=187
-pkgrel=2
+pkgname=('systemd' 'systemd-sysvcompat')
+pkgver=208
+pkgrel=4
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2' 'LGPL2.1' 'MIT')
makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
- 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'xz')
-options=('!libtool')
+ 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt'
+ 'linux-api-headers' 'pam' 'python2' 'quota-tools' 'xz')
+options=('strip' 'debug')
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'initcpio-hook-udev'
+ 'initcpio-install-systemd'
'initcpio-install-udev'
- 'initcpio-install-timestamp'
- '0001-Reinstate-TIMEOUT-handling.patch'
- 'locale.sh')
-md5sums=('26606e3c84448800ef0b3ffd57e6e8b6'
- 'e99e9189aa2f6084ac28b8ddf605aeb8'
- '59e91c4d7a69b7bf12c86a9982e37ced'
- 'df69615503ad293c9ddf9d8b7755282d'
- '5543be25f205f853a21fa5ee68e03f0d'
- 'f15956945052bb911e5df81cf5e7e5dc')
+ '0001-fix-lingering-references-to-var-lib-backlight-random.patch'
+ '0001-mount-check-for-NULL-before-reading-pm-what.patch'
+ '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch'
+ '0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch'
+ '0001-fstab-generator-When-parsing-the-root-cmdline-option.patch'
+ '0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch'
+ '0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch'
+ '0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch'
+ '0005-mount-service-drop-FsckPassNo-support.patch'
+ '0006-efi-boot-generator-hookup-to-fsck.patch'
+ '0007-fsck-root-only-run-when-requested-in-fstab.patch')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 < "$srcdir"/0001-fix-lingering-references-to-var-lib-backlight-random.patch
+ patch -Np1 < "$srcdir"/0001-mount-check-for-NULL-before-reading-pm-what.patch
+ patch -Np1 < "$srcdir"/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
+ # Fix lingering user managers
+ patch -Np1 < "$srcdir"/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch
+ # Backport changes in fstab passno handling
+ # Basically, we only need 0001 and 0007, but 0007 is based on earlier patches,
+ # and it doesn't hurt to backport them all.
+ patch -Np1 < "$srcdir"/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch
+ patch -Np1 < "$srcdir"/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch
+ patch -Np1 < "$srcdir"/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch
+ patch -Np1 < "$srcdir"/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch
+ patch -Np1 < "$srcdir"/0005-mount-service-drop-FsckPassNo-support.patch
+ patch -Np1 < "$srcdir"/0006-efi-boot-generator-hookup-to-fsck.patch
+ patch -Np1 < "$srcdir"/0007-fsck-root-only-run-when-requested-in-fstab.patch
+
+ autoreconf
+}
build() {
cd "$pkgname-$pkgver"
- # still waiting on ipw2x00 to get fixed...
- patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
-
./configure \
--libexecdir=/usr/lib \
--localstatedir=/var \
--sysconfdir=/etc \
- --enable-split-usr \
--enable-introspection \
--enable-gtk-doc \
--disable-audit \
--disable-ima \
- --with-pamlibdir=/usr/lib/security \
- --with-distro=arch \
- --with-usb-ids-path=/usr/share/hwdata/usb.ids \
- --with-pci-ids-path=/usr/share/hwdata/pci.ids \
- --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware
+ --with-sysvinit-path= \
+ --with-sysvrcnd-path= \
+ --with-firmware-path="/usr/lib/firmware/updates:/usr/lib/firmware"
make
}
+check() {
+ make -C "$pkgname-$pkgver" check || :
+}
+
package_systemd() {
pkgdesc="system and service manager"
- depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam'
- "systemd-tools=$pkgver" 'util-linux' 'xz')
- optdepends=('initscripts: legacy support for hostname and vconsole setup'
- 'initscripts-systemd: legacy generator for initialization scripts'
- 'python2-cairo: systemd-analyze'
- 'python2-dbus: systemd-analyze'
- 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
+ license=('GPL2' 'LGPL2.1' 'MIT')
+ depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
+ 'pam' 'util-linux' 'xz')
+ provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver"
+ 'libgudev-1.0.so' 'libsystemd-daemon.so' 'libsystemd-id128.so'
+ 'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so')
+ replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
+ conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
+ optdepends=('cryptsetup: required for encrypted block devices'
+ 'libmicrohttpd: systemd-journal-gatewayd'
+ 'quota-tools: kernel-level quota management'
+ 'python2: systemd library bindings'
'systemd-sysvcompat: symlink package to provide sysvinit binaries')
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/pam.d/systemd-user
+ etc/systemd/bootchart.conf
+ etc/systemd/journald.conf
+ etc/systemd/logind.conf
etc/systemd/system.conf
etc/systemd/user.conf
- etc/systemd/logind.conf
- etc/systemd/journald.conf)
+ etc/udev/udev.conf)
install="systemd.install"
make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
- install -dm755 "$pkgdir/bin"
- ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
-
- # move bash-completion and symlink for loginctl
- install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
- "$pkgdir/usr/share/bash-completion/completions/systemctl"
- ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl"
- rm -rf "$pkgdir/etc/bash_completion.d"
+ # fix .so links in manpage stubs
+ find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
+ -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} +
# don't write units to /etc by default -- we'll enable this on post_install
# as a sane default
rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
- # fix systemd-analyze for python2. the 'plot' verb does not work
- # with py3k due to a bug in python-cairo
- sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+ # get rid of RPM macros
+ rm -r "$pkgdir/usr/lib/rpm"
+
+ # add back tmpfiles.d/legacy.conf
+ install -m644 "systemd-$pkgver/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;
+ s#GROUP="tape"#GROUP="storage"#g;
+ s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
- ### split off libsystemd (libs, includes, pkgconfig, man3)
- rm -rf "$srcdir/_libsystemd"
- install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig}
- cd "$srcdir"/_libsystemd
- mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
- mv "$pkgdir/usr/include/systemd" usr/include
- mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
+ # add mkinitcpio hooks
+ install -Dm644 "$srcdir/initcpio-install-systemd" "$pkgdir/usr/lib/initcpio/install/systemd"
+ install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
+ install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
+
+ # ensure proper permissions for /var/log/journal
+ chown root:systemd-journal "$pkgdir/var/log/journal"
+ chmod 2755 "$pkgdir/var/log/journal"
+
+ # fix pam file
+ sed 's|system-auth|system-login|g' -i "$pkgdir/etc/pam.d/systemd-user"
### split out manpages for sysvcompat
rm -rf "$srcdir/_sysvcompat"
@@ -105,105 +142,42 @@ package_systemd() {
mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
"$srcdir"/_sysvcompat/usr/share/man/man8
- ### split out systemd-tools/udev
- rm -rf "$srcdir/_tools"
- install -dm755 \
- "$srcdir"/_tools/etc/udev \
- "$srcdir"/_tools/usr/bin \
- "$srcdir"/_tools/usr/include \
- "$srcdir"/_tools/usr/lib/udev \
- "$srcdir"/_tools/usr/lib/systemd/system/{sysinit,sockets}.target.wants \
- "$srcdir"/_tools/usr/lib/girepository-1.0 \
- "$srcdir"/_tools/usr/share/pkgconfig \
- "$srcdir"/_tools/usr/share/gir-1.0 \
- "$srcdir"/_tools/usr/share/gtk-doc/html/{g,lib}udev \
- "$srcdir"/_tools/usr/share/man/man{1,5,7,8}
-
- cd "$srcdir/_tools"
- mv "$pkgdir"/etc/udev etc
- mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc
- mv "$pkgdir"/usr/bin/udevadm usr/bin
- mv "$pkgdir"/usr/bin/systemd-machine-id-setup usr/bin
- mv "$pkgdir"/usr/lib/pkgconfig usr/lib
- mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd
- mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system
- mv "$pkgdir"/usr/lib/systemd/system/sysinit.target.wants/systemd-udev* usr/lib/systemd/system/sysinit.target.wants
- mv "$pkgdir"/usr/lib/systemd/system/sockets.target.wants/systemd-udev* usr/lib/systemd/system/sockets.target.wants
- mv "$pkgdir"/usr/lib/lib{,g}udev* usr/lib
- mv "$pkgdir"/usr/lib/{binfmt,sysctl,modules-load,tmpfiles}.d usr/lib
- mv "$pkgdir"/usr/lib/udev usr/lib
- mv "$pkgdir"/usr/include/{libudev.h,gudev-1.0} usr/include
- mv "$pkgdir"/usr/lib/girepository-1.0 usr/lib
- mv "$pkgdir"/usr/share/pkgconfig/udev.pc usr/share/pkgconfig
- mv "$pkgdir"/usr/share/gir-1.0 usr/share
- mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html
- mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7
- mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8
- mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1
- mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5
- mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf,crypttab}.5 usr/share/man/man5
- mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin
- mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd
+ # include MIT license, since it's technically custom
+ install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \
+ "$pkgdir/usr/share/licenses/systemd/LICENSE.MIT"
}
package_systemd-sysvcompat() {
pkgdesc="sysvinit compat for systemd"
- conflicts=('sysvinit' 'initscripts')
+ license=('GPL2')
+ groups=('base')
+ conflicts=('sysvinit')
+ depends=('systemd')
mv "$srcdir/_sysvcompat"/* "$pkgdir"
- install -dm755 "$pkgdir/sbin"
- for tool in runlevel reboot shutdown poweroff halt telinit; do
- ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool"
+ install -dm755 "$pkgdir/usr/bin"
+ #for tool in runlevel reboot shutdown poweroff halt telinit; do
+ for tool in runlevel telinit; do
+ ln -s 'systemctl' "$pkgdir/usr/bin/$tool"
done
- ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init"
-
- install -Dm755 "$srcdir/locale.sh" "$pkgdir/etc/profile.d/locale.sh"
-}
-
-package_libsystemd() {
- pkgdesc="systemd client libraries"
- depends=('xz')
-
- mv "$srcdir/_libsystemd"/* "$pkgdir"
-}
-
-package_systemd-tools() {
- pkgdesc='standalone tools from systemd'
- url='http://www.freedesktop.org/wiki/Software/systemd'
- depends=('acl' 'bash' 'glibc' 'glib2' 'libsystemd' 'kmod' 'hwids' 'util-linux' 'kbd')
- optdepends=('cryptsetup: required for encrypted block devices')
- provides=("udev=$pkgver")
- conflicts=('udev')
- replaces=('udev')
- install='systemd-tools.install'
-
- mv "$srcdir/_tools/"* "$pkgdir"
-
- # the path to udevadm is hardcoded in some places
- install -d "$pkgdir/sbin"
- ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
-
- # udevd is no longer udevd because systemd. why isn't udevadm now udevctl?
- ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd"
-
- # add back tmpfiles.d/legacy.conf
- install -m644 "systemd-$pkgver/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;
- s#GROUP="tape"#GROUP="storage"#g;
- s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
-
- # add mkinitcpio hooks
- install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
- install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
- install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
-
- # XXX: kill off coredump rule until the journal can recover coredumps
- # this file needs to come back as part of systemd, not systemd-tools
- rm "$pkgdir/usr/lib/sysctl.d/coredump.conf"
+ ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
}
# vim: ft=sh syn=sh et
+md5sums=('df64550d92afbffb4f67a434193ee165'
+ '29245f7a240bfba66e2b1783b63b6b40'
+ '8b68b0218a3897d4d37a6ccf47914774'
+ 'bde43090d4ac0ef048e3eaee8202a407'
+ '1b191c4e7a209d322675fd199e3abc66'
+ 'a693bef63548163ffc165f4c4801ebf7'
+ 'ccafe716d87df9c42af0d1960b5a4105'
+ '441e3d464ee6af5fe4af6a8bc10d7980'
+ '718d841203cf2ea9e24a7d0f1d19d48b'
+ '623c77bad0d2968e44963d72924825f1'
+ 'e52fc8368853c7800ab03ab8868cfd41'
+ '2096f33bd36dfa0a7f0431d0a429787a'
+ 'd2481a6ea199b581e243a950125b0ca6'
+ 'c2aee634a3a6c50778968f0d5c756f40'
+ 'ef8b8212d504bb73c10bf4e85f0703b2')