summaryrefslogtreecommitdiffstats
path: root/abs/core/systemd/PKGBUILD
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2015-08-07 18:56:23 (GMT)
committerBritney Fransen <brfransen@gmail.com>2015-08-07 18:56:23 (GMT)
commitbc3c70f5ecf22018224f20ed9add8799de133194 (patch)
tree561dc933c84577b4aeebf5ed7ef9725e6a43dc40 /abs/core/systemd/PKGBUILD
parent7e9d5ed1e5eeefe36fed0522dc993e76d29587c8 (diff)
downloadlinhes_pkgbuild-bc3c70f5ecf22018224f20ed9add8799de133194.zip
linhes_pkgbuild-bc3c70f5ecf22018224f20ed9add8799de133194.tar.gz
linhes_pkgbuild-bc3c70f5ecf22018224f20ed9add8799de133194.tar.bz2
systemd: update to 224
Diffstat (limited to 'abs/core/systemd/PKGBUILD')
-rw-r--r--[-rwxr-xr-x]abs/core/systemd/PKGBUILD171
1 files changed, 85 insertions, 86 deletions
diff --git a/abs/core/systemd/PKGBUILD b/abs/core/systemd/PKGBUILD
index 59b0955..6e4bc37 100755..100644
--- a/abs/core/systemd/PKGBUILD
+++ b/abs/core/systemd/PKGBUILD
@@ -2,149 +2,163 @@
# Maintainer: Tom Gundersen <teg@jklm.no>
pkgbase=systemd
-pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=208
-pkgrel=6
+pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
+pkgver=224
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
- 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt'
- 'linux-api-headers' 'pam' 'python2' 'quota-tools' 'xz')
+makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam'
+ 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
+ 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
+ 'python2-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git')
options=('strip' 'debug')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
'initcpio-hook-udev'
'initcpio-install-systemd'
'initcpio-install-udev'
- '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')
+ 'arch.conf'
+ 'loader.conf'
+ 'splash-arch.bmp')
+md5sums=('SKIP'
+ '90ea67a7bb237502094914622a39e281'
+ '976c5511b6493715e381f43f16cdb151'
+ '1b3aa3a0551b08af9305d33f85b5c2fc'
+ '20ead378f5d6df4b2a3e670301510a7d'
+ 'ddaef54f68f6c86c6c07835fc668f62a'
+ '1e2f9a8b0fa32022bf0a8f39123e5f4e')
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
+ cd "$pkgname"
+
+ # networkd: fix neworkd crash
+ # https://github.com/systemd/systemd/commit/49f6e11e89b4
+ git cherry-pick -n 49f6e11e89b4
+
+ ./autogen.sh
}
build() {
- cd "$pkgname-$pkgver"
+ cd "$pkgname"
+
+ local timeservers=({0..3}.arch.pool.ntp.org)
./configure \
--libexecdir=/usr/lib \
--localstatedir=/var \
--sysconfdir=/etc \
- --enable-introspection \
- --enable-gtk-doc \
+ --enable-lz4 \
+ --enable-compat-libs \
+ --enable-gnuefi \
--disable-audit \
--disable-ima \
+ --disable-kdbus \
--with-sysvinit-path= \
--with-sysvrcnd-path= \
- --with-firmware-path="/usr/lib/firmware/updates:/usr/lib/firmware"
+ --with-ntp-servers="${timeservers[*]}"
make
}
-check() {
- make -C "$pkgname-$pkgver" check || :
-}
-
package_systemd() {
pkgdesc="system and service manager"
- 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')
+ license=('GPL2' 'LGPL2.1')
+ depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
+ 'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libseccomp' 'util-linux'
+ 'xz')
+ provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
+ replaces=('nss-myhostname' 'systemd-tools' 'udev')
+ conflicts=('nss-myhostname' 'systemd-tools' 'udev')
optdepends=('cryptsetup: required for encrypted block devices'
- 'libmicrohttpd: systemd-journal-gatewayd'
+ 'libmicrohttpd: remote journald capabilities'
'quota-tools: kernel-level quota management'
- 'python2: systemd library bindings'
- 'systemd-sysvcompat: symlink package to provide sysvinit binaries')
+ 'systemd-sysvcompat: 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
etc/systemd/bootchart.conf
+ etc/systemd/coredump.conf
etc/systemd/journald.conf
+ etc/systemd/journal-remote.conf
+ etc/systemd/journal-upload.conf
etc/systemd/logind.conf
etc/systemd/system.conf
+ etc/systemd/timesyncd.conf
+ etc/systemd/resolved.conf
etc/systemd/user.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"
-
- # 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|' {} +
+ make -C "$pkgname" DESTDIR="$pkgdir" install
- # 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"
+ # don't write units to /etc by default. some of these will be re-enabled on
+ # post_install.
+ rm -r "$pkgdir/etc/systemd/system/"*.wants
# 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"
+ install -m644 "$pkgname/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
+ sed -i 's/dialout/uucp/g;
+ s/tape/storage/g;
+ s/cdrom/optical/g' "$pkgdir"/usr/lib/sysusers.d/basic.conf
# 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
+ # ensure proper permissions for /var/log/journal. This is only to placate
chown root:systemd-journal "$pkgdir/var/log/journal"
chmod 2755 "$pkgdir/var/log/journal"
+ # 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
+
### split out manpages for sysvcompat
rm -rf "$srcdir/_sysvcompat"
install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
"$srcdir"/_sysvcompat/usr/share/man/man8
- # include MIT license, since it's technically custom
- install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \
- "$pkgdir/usr/share/licenses/systemd/LICENSE.MIT"
+ ### split off runtime libraries
+ rm -rf "$srcdir/_libsystemd"
+ install -dm755 "$srcdir"/_libsystemd/usr/lib
+ cd "$srcdir"/_libsystemd
+ mv "$pkgdir"/usr/lib/lib{systemd,udev}*.so* usr/lib
+
+ # add example bootctl configuration
+ install -Dm644 "$srcdir/arch.conf" "$pkgdir"/usr/share/systemd/bootctl/arch.conf
+ install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf
+ install -Dm644 "$srcdir/splash-arch.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp
+}
+
+package_libsystemd() {
+ pkgdesc="systemd client libraries"
+ depends=('glibc' 'libgcrypt' 'lz4' 'xz')
+ license=('GPL2')
+ provides=('libsystemd.so' 'libsystemd-daemon.so' 'libsystemd-id128.so'
+ 'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so')
+
+ mv "$srcdir/_libsystemd"/* "$pkgdir"
}
package_systemd-sysvcompat() {
@@ -166,18 +180,3 @@ package_systemd-sysvcompat() {
}
# vim: ft=sh syn=sh et
-md5sums=('df64550d92afbffb4f67a434193ee165'
- '29245f7a240bfba66e2b1783b63b6b40'
- '8b68b0218a3897d4d37a6ccf47914774'
- 'bde43090d4ac0ef048e3eaee8202a407'
- '1b191c4e7a209d322675fd199e3abc66'
- 'a693bef63548163ffc165f4c4801ebf7'
- 'ccafe716d87df9c42af0d1960b5a4105'
- '441e3d464ee6af5fe4af6a8bc10d7980'
- '718d841203cf2ea9e24a7d0f1d19d48b'
- '623c77bad0d2968e44963d72924825f1'
- 'e52fc8368853c7800ab03ab8868cfd41'
- '2096f33bd36dfa0a7f0431d0a429787a'
- 'd2481a6ea199b581e243a950125b0ca6'
- 'c2aee634a3a6c50778968f0d5c756f40'
- 'ef8b8212d504bb73c10bf4e85f0703b2')