[arch-commits] Commit in systemd/repos (36 files)
Dave Reisner
dreisner at archlinux.org
Sun Oct 2 11:39:46 UTC 2016
Date: Sunday, October 2, 2016 @ 11:39:46
Author: dreisner
Revision: 277543
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
systemd/repos/testing-i686/PKGBUILD
(from rev 277542, systemd/trunk/PKGBUILD)
systemd/repos/testing-i686/arch.conf
(from rev 277542, systemd/trunk/arch.conf)
systemd/repos/testing-i686/initcpio-hook-udev
(from rev 277542, systemd/trunk/initcpio-hook-udev)
systemd/repos/testing-i686/initcpio-install-systemd
(from rev 277542, systemd/trunk/initcpio-install-systemd)
systemd/repos/testing-i686/initcpio-install-udev
(from rev 277542, systemd/trunk/initcpio-install-udev)
systemd/repos/testing-i686/loader.conf
(from rev 277542, systemd/trunk/loader.conf)
systemd/repos/testing-i686/splash-arch.bmp
(from rev 277542, systemd/trunk/splash-arch.bmp)
systemd/repos/testing-i686/systemd.install
(from rev 277542, systemd/trunk/systemd.install)
systemd/repos/testing-i686/udev-hwdb.hook
(from rev 277542, systemd/trunk/udev-hwdb.hook)
systemd/repos/testing-x86_64/PKGBUILD
(from rev 277542, systemd/trunk/PKGBUILD)
systemd/repos/testing-x86_64/arch.conf
(from rev 277542, systemd/trunk/arch.conf)
systemd/repos/testing-x86_64/initcpio-hook-udev
(from rev 277542, systemd/trunk/initcpio-hook-udev)
systemd/repos/testing-x86_64/initcpio-install-systemd
(from rev 277542, systemd/trunk/initcpio-install-systemd)
systemd/repos/testing-x86_64/initcpio-install-udev
(from rev 277542, systemd/trunk/initcpio-install-udev)
systemd/repos/testing-x86_64/loader.conf
(from rev 277542, systemd/trunk/loader.conf)
systemd/repos/testing-x86_64/splash-arch.bmp
(from rev 277542, systemd/trunk/splash-arch.bmp)
systemd/repos/testing-x86_64/systemd.install
(from rev 277542, systemd/trunk/systemd.install)
systemd/repos/testing-x86_64/udev-hwdb.hook
(from rev 277542, systemd/trunk/udev-hwdb.hook)
Deleted:
systemd/repos/testing-i686/PKGBUILD
systemd/repos/testing-i686/arch.conf
systemd/repos/testing-i686/initcpio-hook-udev
systemd/repos/testing-i686/initcpio-install-systemd
systemd/repos/testing-i686/initcpio-install-udev
systemd/repos/testing-i686/loader.conf
systemd/repos/testing-i686/splash-arch.bmp
systemd/repos/testing-i686/systemd.install
systemd/repos/testing-i686/udev-hwdb.hook
systemd/repos/testing-x86_64/PKGBUILD
systemd/repos/testing-x86_64/arch.conf
systemd/repos/testing-x86_64/initcpio-hook-udev
systemd/repos/testing-x86_64/initcpio-install-systemd
systemd/repos/testing-x86_64/initcpio-install-udev
systemd/repos/testing-x86_64/loader.conf
systemd/repos/testing-x86_64/splash-arch.bmp
systemd/repos/testing-x86_64/systemd.install
systemd/repos/testing-x86_64/udev-hwdb.hook
-----------------------------------------+
/PKGBUILD | 372 ++++++++++++++++++++++++++++
/arch.conf | 14 +
/initcpio-hook-udev | 44 +++
/initcpio-install-systemd | 390 ++++++++++++++++++++++++++++++
/initcpio-install-udev | 56 ++++
/loader.conf | 2
/systemd.install | 164 ++++++++++++
/udev-hwdb.hook | 22 +
testing-i686/PKGBUILD | 185 --------------
testing-i686/arch.conf | 7
testing-i686/initcpio-hook-udev | 22 -
testing-i686/initcpio-install-systemd | 195 ---------------
testing-i686/initcpio-install-udev | 28 --
testing-i686/loader.conf | 1
testing-i686/systemd.install | 82 ------
testing-i686/udev-hwdb.hook | 11
testing-x86_64/PKGBUILD | 185 --------------
testing-x86_64/arch.conf | 7
testing-x86_64/initcpio-hook-udev | 22 -
testing-x86_64/initcpio-install-systemd | 195 ---------------
testing-x86_64/initcpio-install-udev | 28 --
testing-x86_64/loader.conf | 1
testing-x86_64/systemd.install | 82 ------
testing-x86_64/udev-hwdb.hook | 11
24 files changed, 1064 insertions(+), 1062 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-i686/PKGBUILD 2016-10-02 11:39:46 UTC (rev 277543)
@@ -1,185 +0,0 @@
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Maintainer: Tom Gundersen <teg at jklm.no>
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
-pkgver=231
-pkgrel=2
-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#tag=v$pkgver"
- 'initcpio-hook-udev'
- 'initcpio-install-systemd'
- 'initcpio-install-udev'
- 'arch.conf'
- 'loader.conf'
- 'splash-arch.bmp'
- 'udev-hwdb.hook')
-md5sums=('SKIP'
- '90ea67a7bb237502094914622a39e281'
- '55ea7d81c02d090b65c42a88f1a5a21a'
- '1b3aa3a0551b08af9305d33f85b5c2fc'
- '20ead378f5d6df4b2a3e670301510a7d'
- 'ddaef54f68f6c86c6c07835fc668f62a'
- '1e2f9a8b0fa32022bf0a8f39123e5f4e'
- 'a475a5ed8f03fb0f6b58b4684998d05c')
-
-_backports=(
- '531ac2b2349da02acc9c382849758e07eb92b020'
- 'b2922837d67a4bf66c7862b06eb5b513a7fe6ef6'
- '6bd74eb055ad278904d152b08e26d5ad4241ddb0'
-)
-
-prepare() {
- cd "$pkgbase"
-
- if (( ${#_backports[*]} > 0 )); then
- git cherry-pick -n "${_backports[@]}"
- fi
-
- ./autogen.sh
-}
-
-build() {
- cd "$pkgbase"
-
- local timeservers=({0..3}.arch.pool.ntp.org)
-
- local configure_options=(
- --libexecdir=/usr/lib
- --localstatedir=/var
- --sysconfdir=/etc
-
- --enable-lz4
- --enable-gnuefi
- --disable-audit
- --disable-ima
-
- --with-sysvinit-path=
- --with-sysvrcnd-path=
- --with-ntp-servers="${timeservers[*]}"
- --with-default-dnssec=no
- --with-dbuspolicydir=/usr/share/dbus-1/system.d
- --without-kill-user-processes
- )
-
- ./configure "${configure_options[@]}"
-
- make
-}
-
-package_systemd() {
- 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'
- '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: remote journald capabilities'
- 'quota-tools: kernel-level quota management'
- 'systemd-sysvcompat: symlink package to provide sysvinit binaries'
- 'polkit: allow administration as unprivileged user')
- backup=(etc/pam.d/systemd-user
- 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 "$pkgbase" DESTDIR="$pkgdir" install
-
- # 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 "$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;
- 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. 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
-
- ### manpages shipped with systemd-sysvcompat
- rm "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
-
- ### runtime libraries shipped with libsystemd
- rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so*
-
- # 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
-
- install -Dm644 "$srcdir/udev-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook"
-}
-
-package_libsystemd() {
- pkgdesc="systemd client libraries"
- depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
- license=('GPL2')
- provides=('libsystemd.so' 'libudev.so')
-
- # TODO(dreisner): for v232, this should be install-rootlibLTLIBRARIES.
- make -C "$pkgbase" DESTDIR="$pkgdir" install-libLTLIBRARIES
-}
-
-package_systemd-sysvcompat() {
- pkgdesc="sysvinit compat for systemd"
- license=('GPL2')
- groups=('base')
- conflicts=('sysvinit')
- depends=('systemd')
-
- install -dm755 "$pkgdir"/usr/share/man/man8
- cp -d --no-preserve=ownership,timestamp \
- "$pkgbase"/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
- "$pkgdir"/usr/share/man/man8
-
- install -dm755 "$pkgdir/usr/bin"
- for tool in runlevel reboot shutdown poweroff halt telinit; do
- ln -s 'systemctl' "$pkgdir/usr/bin/$tool"
- done
-
- ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
-}
-
-# vim: ft=sh syn=sh et
Copied: systemd/repos/testing-i686/PKGBUILD (from rev 277542, systemd/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1,186 @@
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Tom Gundersen <teg at jklm.no>
+
+pkgbase=systemd
+pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
+pkgver=231
+pkgrel=3
+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#tag=v$pkgver"
+ 'initcpio-hook-udev'
+ 'initcpio-install-systemd'
+ 'initcpio-install-udev'
+ 'arch.conf'
+ 'loader.conf'
+ 'splash-arch.bmp'
+ 'udev-hwdb.hook')
+md5sums=('SKIP'
+ '90ea67a7bb237502094914622a39e281'
+ '55ea7d81c02d090b65c42a88f1a5a21a'
+ '1b3aa3a0551b08af9305d33f85b5c2fc'
+ '20ead378f5d6df4b2a3e670301510a7d'
+ 'ddaef54f68f6c86c6c07835fc668f62a'
+ '1e2f9a8b0fa32022bf0a8f39123e5f4e'
+ 'a475a5ed8f03fb0f6b58b4684998d05c')
+
+_backports=(
+ '531ac2b2349da02acc9c382849758e07eb92b020' # If the notification message length is 0, ignore the message
+ '8523bf7dd514a3a2c6114b7b8fb8f308b4f09fc4' # pid1: process zero-length notification messages again
+ '9987750e7a4c62e0eb8473603150596ba7c3a015' # pid1: don't return any error in manager_dispatch_notify_fd()
+ 'bd64d82c1c0e3fe2a5f9b3dd9132d62834f50b2d' # Revert "pid1: reconnect to the console before being re-executed"
+)
+
+prepare() {
+ cd "$pkgbase"
+
+ if (( ${#_backports[*]} > 0 )); then
+ git cherry-pick -n "${_backports[@]}"
+ fi
+
+ ./autogen.sh
+}
+
+build() {
+ cd "$pkgbase"
+
+ local timeservers=({0..3}.arch.pool.ntp.org)
+
+ local configure_options=(
+ --libexecdir=/usr/lib
+ --localstatedir=/var
+ --sysconfdir=/etc
+
+ --enable-lz4
+ --enable-gnuefi
+ --disable-audit
+ --disable-ima
+
+ --with-sysvinit-path=
+ --with-sysvrcnd-path=
+ --with-ntp-servers="${timeservers[*]}"
+ --with-default-dnssec=no
+ --with-dbuspolicydir=/usr/share/dbus-1/system.d
+ --without-kill-user-processes
+ )
+
+ ./configure "${configure_options[@]}"
+
+ make
+}
+
+package_systemd() {
+ 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'
+ '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: remote journald capabilities'
+ 'quota-tools: kernel-level quota management'
+ 'systemd-sysvcompat: symlink package to provide sysvinit binaries'
+ 'polkit: allow administration as unprivileged user')
+ backup=(etc/pam.d/systemd-user
+ 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 "$pkgbase" DESTDIR="$pkgdir" install
+
+ # 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 "$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;
+ 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. 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
+
+ ### manpages shipped with systemd-sysvcompat
+ rm "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+
+ ### runtime libraries shipped with libsystemd
+ rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so*
+
+ # 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
+
+ install -Dm644 "$srcdir/udev-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook"
+}
+
+package_libsystemd() {
+ pkgdesc="systemd client libraries"
+ depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
+ license=('GPL2')
+ provides=('libsystemd.so' 'libudev.so')
+
+ # TODO(dreisner): for v232, this should be install-rootlibLTLIBRARIES.
+ make -C "$pkgbase" DESTDIR="$pkgdir" install-libLTLIBRARIES
+}
+
+package_systemd-sysvcompat() {
+ pkgdesc="sysvinit compat for systemd"
+ license=('GPL2')
+ groups=('base')
+ conflicts=('sysvinit')
+ depends=('systemd')
+
+ install -dm755 "$pkgdir"/usr/share/man/man8
+ cp -d --no-preserve=ownership,timestamp \
+ "$pkgbase"/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
+ "$pkgdir"/usr/share/man/man8
+
+ install -dm755 "$pkgdir/usr/bin"
+ for tool in runlevel reboot shutdown poweroff halt telinit; do
+ ln -s 'systemctl' "$pkgdir/usr/bin/$tool"
+ done
+
+ ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
+}
+
+# vim: ft=sh syn=sh et
Deleted: testing-i686/arch.conf
===================================================================
--- testing-i686/arch.conf 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-i686/arch.conf 2016-10-02 11:39:46 UTC (rev 277543)
@@ -1,7 +0,0 @@
-## This is just an example config file.
-## Please edit the paths and kernel parameters according to your system.
-
-title Arch Linux
-linux /vmlinuz-linux
-initrd /initramfs-linux.img
-options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap
Copied: systemd/repos/testing-i686/arch.conf (from rev 277542, systemd/trunk/arch.conf)
===================================================================
--- testing-i686/arch.conf (rev 0)
+++ testing-i686/arch.conf 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1,7 @@
+## This is just an example config file.
+## Please edit the paths and kernel parameters according to your system.
+
+title Arch Linux
+linux /vmlinuz-linux
+initrd /initramfs-linux.img
+options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap
Deleted: testing-i686/initcpio-hook-udev
===================================================================
--- testing-i686/initcpio-hook-udev 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-i686/initcpio-hook-udev 2016-10-02 11:39:46 UTC (rev 277543)
@@ -1,22 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
- kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
- systemd-tmpfiles --prefix=/dev --create --boot
- /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
- udevd_running=1
-}
-
-run_hook() {
- msg ":: Triggering uevents..."
- udevadm trigger --action=add --type=subsystems
- udevadm trigger --action=add --type=devices
- udevadm settle
-}
-
-run_cleanuphook() {
- udevadm control --exit
- udevadm info --cleanup-db
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: systemd/repos/testing-i686/initcpio-hook-udev (from rev 277542, systemd/trunk/initcpio-hook-udev)
===================================================================
--- testing-i686/initcpio-hook-udev (rev 0)
+++ testing-i686/initcpio-hook-udev 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1,22 @@
+#!/usr/bin/ash
+
+run_earlyhook() {
+ kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
+ systemd-tmpfiles --prefix=/dev --create --boot
+ /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
+ udevd_running=1
+}
+
+run_hook() {
+ msg ":: Triggering uevents..."
+ udevadm trigger --action=add --type=subsystems
+ udevadm trigger --action=add --type=devices
+ udevadm settle
+}
+
+run_cleanuphook() {
+ udevadm control --exit
+ udevadm info --cleanup-db
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Deleted: testing-i686/initcpio-install-systemd
===================================================================
--- testing-i686/initcpio-install-systemd 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-i686/initcpio-install-systemd 2016-10-02 11:39:46 UTC (rev 277543)
@@ -1,195 +0,0 @@
-#!/bin/bash
-
-strip_quotes() {
- local len=${#1} quotes=$'[\'"]' str=${!1}
-
- if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then
- printf -v "$1" %s "${str:1:-1}"
- fi
-}
-
-add_udev_rule() {
- # Add an udev rules file to the initcpio image. Dependencies on binaries
- # will be discovered and added.
- # $1: path to rules file (or name of rules file)
-
- local rules= rule= key= value= binary=
-
- rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")
- if [[ -z $rules ]]; then
- # complain about not found rules
- return 1
- fi
-
- add_file "$rules"
-
- while IFS=, read -ra rule; do
- # skip empty lines, comments
- [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
-
- for pair in "${rule[@]}"; do
- IFS=' =' read -r key value <<< "$pair"
- case $key in
- RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
- strip_quotes 'value'
- # just take the first word as the binary name
- binary=${value%% *}
- [[ ${binary:0:1} == '$' ]] && continue
- if [[ ${binary:0:1} != '/' ]]; then
- binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")
- fi
- add_binary "$binary"
- ;;
- esac
- done
- done <"$rules"
-}
-
-add_systemd_unit() {
- # Add a systemd unit file to the initcpio image. Hard dependencies on binaries
- # and other unit files will be discovered and added.
- # $1: path to rules file (or name of rules file)
-
- local unit= rule= entry= key= value= binary= dep=
-
- unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")
- if [[ -z $unit ]]; then
- # complain about not found unit file
- return 1
- fi
-
- add_file "$unit"
-
- while IFS='=' read -r key values; do
- read -ra values <<< "$values"
-
- case $key in
- Requires|OnFailure)
- # only add hard dependencies (not Wants)
- map add_systemd_unit "${values[@]}"
- ;;
- Exec*)
- # don't add binaries unless they are required
- if [[ ${values[0]:0:1} != '-' ]]; then
- add_binary "${values[0]}"
- fi
- ;;
- esac
-
- done <"$unit"
-
- # preserve reverse soft dependency
- for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do
- if [[ -L $dep ]]; then
- add_symlink "$dep"
- fi
- done
-
- # add hard dependencies
- if [[ -d $unit.requires ]]; then
- for dep in "$unit".requires/*; do
- add_systemd_unit ${dep##*/}
- done
- fi
-}
-
-add_systemd_drop_in() {
- local unit=$1 dropin_name=$2
-
- mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"
- cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"
-}
-
-build() {
- local rules unit
-
- # from base
- add_binary /bin/mount
- add_binary /usr/bin/kmod /usr/bin/modprobe
- add_binary /usr/lib/systemd/systemd /init
- add_binary /usr/bin/sulogin
-
- map add_binary \
- /usr/bin/systemd-tmpfiles \
- /usr/lib/systemd/systemd-hibernate-resume \
- /usr/lib/systemd/system-generators/systemd-fstab-generator \
- /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
- /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
-
- # udev rules and systemd units
- map add_udev_rule "$rules" \
- 50-udev-default.rules \
- 60-persistent-storage.rules \
- 64-btrfs.rules \
- 80-drivers.rules \
- 99-systemd.rules
-
- map add_systemd_unit \
- initrd-cleanup.service \
- initrd-fs.target \
- initrd-parse-etc.service \
- initrd-root-fs.target \
- initrd-root-device.target \
- initrd-switch-root.service \
- initrd-switch-root.target \
- initrd-udevadm-cleanup-db.service \
- initrd.target \
- kmod-static-nodes.service \
- local-fs.target \
- local-fs-pre.target \
- paths.target \
- reboot.target \
- slices.target \
- sockets.target \
- swap.target \
- systemd-fsck at .service \
- systemd-hibernate-resume at .service \
- systemd-journald.service \
- systemd-journald-audit.socket \
- systemd-journald-dev-log.socket \
- systemd-modules-load.service \
- systemd-tmpfiles-setup-dev.service \
- systemd-udev-trigger.service \
- systemd-udevd-control.socket \
- systemd-udevd-kernel.socket \
- systemd-udevd.service \
- timers.target \
- rescue.target \
- emergency.target
-
- add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
- add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
-
- # udev wants /etc/group since it doesn't launch with --resolve-names=never
- add_file "/etc/nsswitch.conf"
- add_binary "$(readlink -f /usr/lib/libnss_files.so)"
-
- echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
- echo "root:x:0:root" >"$BUILDROOT/etc/group"
- echo "root::::::::" >"$BUILDROOT/etc/shadow"
-
- add_systemd_drop_in systemd-udevd.service resolve-names <<EOF
-[Service]
-ExecStart=
-ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never
-EOF
-
- add_dir "/etc/modules-load.d"
- (
- . "$_f_config"
- set -f
- printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
- )
-}
-
-help() {
- cat <<HELPEOF
-This will install a basic systemd setup in your initramfs, and is meant to
-replace the 'base', 'usr', 'udev' and 'timestamp' hooks. Other hooks with runtime
-components will need to be ported, and will not work as intended. You also may
-wish to still include the 'base' hook (before this hook) to ensure that a
-rescue shell exists on your initramfs.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: systemd/repos/testing-i686/initcpio-install-systemd (from rev 277542, systemd/trunk/initcpio-install-systemd)
===================================================================
--- testing-i686/initcpio-install-systemd (rev 0)
+++ testing-i686/initcpio-install-systemd 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1,195 @@
+#!/bin/bash
+
+strip_quotes() {
+ local len=${#1} quotes=$'[\'"]' str=${!1}
+
+ if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then
+ printf -v "$1" %s "${str:1:-1}"
+ fi
+}
+
+add_udev_rule() {
+ # Add an udev rules file to the initcpio image. Dependencies on binaries
+ # will be discovered and added.
+ # $1: path to rules file (or name of rules file)
+
+ local rules= rule= key= value= binary=
+
+ rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")
+ if [[ -z $rules ]]; then
+ # complain about not found rules
+ return 1
+ fi
+
+ add_file "$rules"
+
+ while IFS=, read -ra rule; do
+ # skip empty lines, comments
+ [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
+
+ for pair in "${rule[@]}"; do
+ IFS=' =' read -r key value <<< "$pair"
+ case $key in
+ RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
+ strip_quotes 'value'
+ # just take the first word as the binary name
+ binary=${value%% *}
+ [[ ${binary:0:1} == '$' ]] && continue
+ if [[ ${binary:0:1} != '/' ]]; then
+ binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")
+ fi
+ add_binary "$binary"
+ ;;
+ esac
+ done
+ done <"$rules"
+}
+
+add_systemd_unit() {
+ # Add a systemd unit file to the initcpio image. Hard dependencies on binaries
+ # and other unit files will be discovered and added.
+ # $1: path to rules file (or name of rules file)
+
+ local unit= rule= entry= key= value= binary= dep=
+
+ unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")
+ if [[ -z $unit ]]; then
+ # complain about not found unit file
+ return 1
+ fi
+
+ add_file "$unit"
+
+ while IFS='=' read -r key values; do
+ read -ra values <<< "$values"
+
+ case $key in
+ Requires|OnFailure)
+ # only add hard dependencies (not Wants)
+ map add_systemd_unit "${values[@]}"
+ ;;
+ Exec*)
+ # don't add binaries unless they are required
+ if [[ ${values[0]:0:1} != '-' ]]; then
+ add_binary "${values[0]}"
+ fi
+ ;;
+ esac
+
+ done <"$unit"
+
+ # preserve reverse soft dependency
+ for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do
+ if [[ -L $dep ]]; then
+ add_symlink "$dep"
+ fi
+ done
+
+ # add hard dependencies
+ if [[ -d $unit.requires ]]; then
+ for dep in "$unit".requires/*; do
+ add_systemd_unit ${dep##*/}
+ done
+ fi
+}
+
+add_systemd_drop_in() {
+ local unit=$1 dropin_name=$2
+
+ mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"
+ cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"
+}
+
+build() {
+ local rules unit
+
+ # from base
+ add_binary /bin/mount
+ add_binary /usr/bin/kmod /usr/bin/modprobe
+ add_binary /usr/lib/systemd/systemd /init
+ add_binary /usr/bin/sulogin
+
+ map add_binary \
+ /usr/bin/systemd-tmpfiles \
+ /usr/lib/systemd/systemd-hibernate-resume \
+ /usr/lib/systemd/system-generators/systemd-fstab-generator \
+ /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
+ /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
+
+ # udev rules and systemd units
+ map add_udev_rule "$rules" \
+ 50-udev-default.rules \
+ 60-persistent-storage.rules \
+ 64-btrfs.rules \
+ 80-drivers.rules \
+ 99-systemd.rules
+
+ map add_systemd_unit \
+ initrd-cleanup.service \
+ initrd-fs.target \
+ initrd-parse-etc.service \
+ initrd-root-fs.target \
+ initrd-root-device.target \
+ initrd-switch-root.service \
+ initrd-switch-root.target \
+ initrd-udevadm-cleanup-db.service \
+ initrd.target \
+ kmod-static-nodes.service \
+ local-fs.target \
+ local-fs-pre.target \
+ paths.target \
+ reboot.target \
+ slices.target \
+ sockets.target \
+ swap.target \
+ systemd-fsck at .service \
+ systemd-hibernate-resume at .service \
+ systemd-journald.service \
+ systemd-journald-audit.socket \
+ systemd-journald-dev-log.socket \
+ systemd-modules-load.service \
+ systemd-tmpfiles-setup-dev.service \
+ systemd-udev-trigger.service \
+ systemd-udevd-control.socket \
+ systemd-udevd-kernel.socket \
+ systemd-udevd.service \
+ timers.target \
+ rescue.target \
+ emergency.target
+
+ add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
+ add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
+
+ # udev wants /etc/group since it doesn't launch with --resolve-names=never
+ add_file "/etc/nsswitch.conf"
+ add_binary "$(readlink -f /usr/lib/libnss_files.so)"
+
+ echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
+ echo "root:x:0:root" >"$BUILDROOT/etc/group"
+ echo "root::::::::" >"$BUILDROOT/etc/shadow"
+
+ add_systemd_drop_in systemd-udevd.service resolve-names <<EOF
+[Service]
+ExecStart=
+ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never
+EOF
+
+ add_dir "/etc/modules-load.d"
+ (
+ . "$_f_config"
+ set -f
+ printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
+ )
+}
+
+help() {
+ cat <<HELPEOF
+This will install a basic systemd setup in your initramfs, and is meant to
+replace the 'base', 'usr', 'udev' and 'timestamp' hooks. Other hooks with runtime
+components will need to be ported, and will not work as intended. You also may
+wish to still include the 'base' hook (before this hook) to ensure that a
+rescue shell exists on your initramfs.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Deleted: testing-i686/initcpio-install-udev
===================================================================
--- testing-i686/initcpio-install-udev 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-i686/initcpio-install-udev 2016-10-02 11:39:46 UTC (rev 277543)
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-build() {
- local rules tool
-
- add_binary /usr/lib/systemd/systemd-udevd
- add_binary /usr/bin/udevadm
- add_binary /usr/bin/systemd-tmpfiles
-
- for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
- add_file "/usr/lib/udev/rules.d/$rules"
- done
- for tool in ata_id scsi_id; do
- add_file "/usr/lib/udev/$tool"
- done
-
- add_runscript
-}
-
-help() {
- cat <<HELPEOF
-This hook will use udev to create your root device node and detect the needed
-modules for your root device. It is also required for firmware loading in
-initramfs. It is recommended to use this hook.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: systemd/repos/testing-i686/initcpio-install-udev (from rev 277542, systemd/trunk/initcpio-install-udev)
===================================================================
--- testing-i686/initcpio-install-udev (rev 0)
+++ testing-i686/initcpio-install-udev 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+build() {
+ local rules tool
+
+ add_binary /usr/lib/systemd/systemd-udevd
+ add_binary /usr/bin/udevadm
+ add_binary /usr/bin/systemd-tmpfiles
+
+ for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
+ add_file "/usr/lib/udev/rules.d/$rules"
+ done
+ for tool in ata_id scsi_id; do
+ add_file "/usr/lib/udev/$tool"
+ done
+
+ add_runscript
+}
+
+help() {
+ cat <<HELPEOF
+This hook will use udev to create your root device node and detect the needed
+modules for your root device. It is also required for firmware loading in
+initramfs. It is recommended to use this hook.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Deleted: testing-i686/loader.conf
===================================================================
--- testing-i686/loader.conf 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-i686/loader.conf 2016-10-02 11:39:46 UTC (rev 277543)
@@ -1 +0,0 @@
-default arch
Copied: systemd/repos/testing-i686/loader.conf (from rev 277542, systemd/trunk/loader.conf)
===================================================================
--- testing-i686/loader.conf (rev 0)
+++ testing-i686/loader.conf 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1 @@
+default arch
Deleted: testing-i686/splash-arch.bmp
===================================================================
(Binary files differ)
Copied: systemd/repos/testing-i686/splash-arch.bmp (from rev 277542, systemd/trunk/splash-arch.bmp)
===================================================================
(Binary files differ)
Deleted: testing-i686/systemd.install
===================================================================
--- testing-i686/systemd.install 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-i686/systemd.install 2016-10-02 11:39:46 UTC (rev 277543)
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-sd_booted() {
- [[ -d run/systemd/system && ! -L run/systemd/system ]]
-}
-
-add_journal_acls() {
- # ignore errors, since the filesystem might not support ACLs
- setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null
- :
-}
-
-maybe_reexec() {
- if sd_booted; then
- systemctl --system daemon-reexec
- fi
-}
-
-post_common() {
- systemd-sysusers
- journalctl --update-catalog
-}
-
-_216_2_changes() {
- echo ':: Coredumps are handled by systemd by default. Collection behavior can be'
- echo ' tuned in /etc/systemd/coredump.conf.'
-}
-
-_219_2_changes() {
- if mkdir -m2755 var/log/journal/remote 2>/dev/null; then
- chgrp systemd-journal-remote var/log/journal/remote
- fi
-}
-
-_219_4_changes() {
- if ! systemctl is-enabled -q remote-fs.target; then
- systemctl enable -q remote-fs.target
- fi
-}
-
-_230_1_changes() {
- echo ':: systemd-bootchart is no longer included with systemd'
-}
-
-post_install() {
- systemd-machine-id-setup
-
- post_common "$@"
-
- add_journal_acls
-
- # enable some services by default, but don't track them
- systemctl enable getty at tty1.service remote-fs.target
-
- echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"
- echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"
-
- # group 'systemd-journal-remote' is created by systemd-sysusers
- mkdir -m2755 var/log/journal/remote
- chgrp systemd-journal-remote var/log/journal/remote
-}
-
-post_upgrade() {
- post_common "$@"
-
- maybe_reexec "$@"
-
- local v upgrades=(
- 216-2
- 219-2
- 219-4
- 230-1
- )
-
- for v in "${upgrades[@]}"; do
- if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
- "_${v//-/_}_changes"
- fi
- done
-}
-
-# vim:set ts=2 sw=2 et:
Copied: systemd/repos/testing-i686/systemd.install (from rev 277542, systemd/trunk/systemd.install)
===================================================================
--- testing-i686/systemd.install (rev 0)
+++ testing-i686/systemd.install 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+sd_booted() {
+ [[ -d run/systemd/system && ! -L run/systemd/system ]]
+}
+
+add_journal_acls() {
+ # ignore errors, since the filesystem might not support ACLs
+ setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null
+ :
+}
+
+maybe_reexec() {
+ if sd_booted; then
+ systemctl --system daemon-reexec
+ fi
+}
+
+post_common() {
+ systemd-sysusers
+ journalctl --update-catalog
+}
+
+_216_2_changes() {
+ echo ':: Coredumps are handled by systemd by default. Collection behavior can be'
+ echo ' tuned in /etc/systemd/coredump.conf.'
+}
+
+_219_2_changes() {
+ if mkdir -m2755 var/log/journal/remote 2>/dev/null; then
+ chgrp systemd-journal-remote var/log/journal/remote
+ fi
+}
+
+_219_4_changes() {
+ if ! systemctl is-enabled -q remote-fs.target; then
+ systemctl enable -q remote-fs.target
+ fi
+}
+
+_230_1_changes() {
+ echo ':: systemd-bootchart is no longer included with systemd'
+}
+
+post_install() {
+ systemd-machine-id-setup
+
+ post_common "$@"
+
+ add_journal_acls
+
+ # enable some services by default, but don't track them
+ systemctl enable getty at tty1.service remote-fs.target
+
+ echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"
+ echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"
+
+ # group 'systemd-journal-remote' is created by systemd-sysusers
+ mkdir -m2755 var/log/journal/remote
+ chgrp systemd-journal-remote var/log/journal/remote
+}
+
+post_upgrade() {
+ post_common "$@"
+
+ maybe_reexec "$@"
+
+ local v upgrades=(
+ 216-2
+ 219-2
+ 219-4
+ 230-1
+ )
+
+ for v in "${upgrades[@]}"; do
+ if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
+ "_${v//-/_}_changes"
+ fi
+ done
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: testing-i686/udev-hwdb.hook
===================================================================
--- testing-i686/udev-hwdb.hook 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-i686/udev-hwdb.hook 2016-10-02 11:39:46 UTC (rev 277543)
@@ -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
Copied: systemd/repos/testing-i686/udev-hwdb.hook (from rev 277542, systemd/trunk/udev-hwdb.hook)
===================================================================
--- testing-i686/udev-hwdb.hook (rev 0)
+++ testing-i686/udev-hwdb.hook 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1,11 @@
+[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
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-x86_64/PKGBUILD 2016-10-02 11:39:46 UTC (rev 277543)
@@ -1,185 +0,0 @@
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Maintainer: Tom Gundersen <teg at jklm.no>
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
-pkgver=231
-pkgrel=2
-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#tag=v$pkgver"
- 'initcpio-hook-udev'
- 'initcpio-install-systemd'
- 'initcpio-install-udev'
- 'arch.conf'
- 'loader.conf'
- 'splash-arch.bmp'
- 'udev-hwdb.hook')
-md5sums=('SKIP'
- '90ea67a7bb237502094914622a39e281'
- '55ea7d81c02d090b65c42a88f1a5a21a'
- '1b3aa3a0551b08af9305d33f85b5c2fc'
- '20ead378f5d6df4b2a3e670301510a7d'
- 'ddaef54f68f6c86c6c07835fc668f62a'
- '1e2f9a8b0fa32022bf0a8f39123e5f4e'
- 'a475a5ed8f03fb0f6b58b4684998d05c')
-
-_backports=(
- '531ac2b2349da02acc9c382849758e07eb92b020'
- 'b2922837d67a4bf66c7862b06eb5b513a7fe6ef6'
- '6bd74eb055ad278904d152b08e26d5ad4241ddb0'
-)
-
-prepare() {
- cd "$pkgbase"
-
- if (( ${#_backports[*]} > 0 )); then
- git cherry-pick -n "${_backports[@]}"
- fi
-
- ./autogen.sh
-}
-
-build() {
- cd "$pkgbase"
-
- local timeservers=({0..3}.arch.pool.ntp.org)
-
- local configure_options=(
- --libexecdir=/usr/lib
- --localstatedir=/var
- --sysconfdir=/etc
-
- --enable-lz4
- --enable-gnuefi
- --disable-audit
- --disable-ima
-
- --with-sysvinit-path=
- --with-sysvrcnd-path=
- --with-ntp-servers="${timeservers[*]}"
- --with-default-dnssec=no
- --with-dbuspolicydir=/usr/share/dbus-1/system.d
- --without-kill-user-processes
- )
-
- ./configure "${configure_options[@]}"
-
- make
-}
-
-package_systemd() {
- 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'
- '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: remote journald capabilities'
- 'quota-tools: kernel-level quota management'
- 'systemd-sysvcompat: symlink package to provide sysvinit binaries'
- 'polkit: allow administration as unprivileged user')
- backup=(etc/pam.d/systemd-user
- 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 "$pkgbase" DESTDIR="$pkgdir" install
-
- # 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 "$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;
- 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. 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
-
- ### manpages shipped with systemd-sysvcompat
- rm "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
-
- ### runtime libraries shipped with libsystemd
- rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so*
-
- # 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
-
- install -Dm644 "$srcdir/udev-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook"
-}
-
-package_libsystemd() {
- pkgdesc="systemd client libraries"
- depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
- license=('GPL2')
- provides=('libsystemd.so' 'libudev.so')
-
- # TODO(dreisner): for v232, this should be install-rootlibLTLIBRARIES.
- make -C "$pkgbase" DESTDIR="$pkgdir" install-libLTLIBRARIES
-}
-
-package_systemd-sysvcompat() {
- pkgdesc="sysvinit compat for systemd"
- license=('GPL2')
- groups=('base')
- conflicts=('sysvinit')
- depends=('systemd')
-
- install -dm755 "$pkgdir"/usr/share/man/man8
- cp -d --no-preserve=ownership,timestamp \
- "$pkgbase"/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
- "$pkgdir"/usr/share/man/man8
-
- install -dm755 "$pkgdir/usr/bin"
- for tool in runlevel reboot shutdown poweroff halt telinit; do
- ln -s 'systemctl' "$pkgdir/usr/bin/$tool"
- done
-
- ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
-}
-
-# vim: ft=sh syn=sh et
Copied: systemd/repos/testing-x86_64/PKGBUILD (from rev 277542, systemd/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1,186 @@
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Tom Gundersen <teg at jklm.no>
+
+pkgbase=systemd
+pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
+pkgver=231
+pkgrel=3
+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#tag=v$pkgver"
+ 'initcpio-hook-udev'
+ 'initcpio-install-systemd'
+ 'initcpio-install-udev'
+ 'arch.conf'
+ 'loader.conf'
+ 'splash-arch.bmp'
+ 'udev-hwdb.hook')
+md5sums=('SKIP'
+ '90ea67a7bb237502094914622a39e281'
+ '55ea7d81c02d090b65c42a88f1a5a21a'
+ '1b3aa3a0551b08af9305d33f85b5c2fc'
+ '20ead378f5d6df4b2a3e670301510a7d'
+ 'ddaef54f68f6c86c6c07835fc668f62a'
+ '1e2f9a8b0fa32022bf0a8f39123e5f4e'
+ 'a475a5ed8f03fb0f6b58b4684998d05c')
+
+_backports=(
+ '531ac2b2349da02acc9c382849758e07eb92b020' # If the notification message length is 0, ignore the message
+ '8523bf7dd514a3a2c6114b7b8fb8f308b4f09fc4' # pid1: process zero-length notification messages again
+ '9987750e7a4c62e0eb8473603150596ba7c3a015' # pid1: don't return any error in manager_dispatch_notify_fd()
+ 'bd64d82c1c0e3fe2a5f9b3dd9132d62834f50b2d' # Revert "pid1: reconnect to the console before being re-executed"
+)
+
+prepare() {
+ cd "$pkgbase"
+
+ if (( ${#_backports[*]} > 0 )); then
+ git cherry-pick -n "${_backports[@]}"
+ fi
+
+ ./autogen.sh
+}
+
+build() {
+ cd "$pkgbase"
+
+ local timeservers=({0..3}.arch.pool.ntp.org)
+
+ local configure_options=(
+ --libexecdir=/usr/lib
+ --localstatedir=/var
+ --sysconfdir=/etc
+
+ --enable-lz4
+ --enable-gnuefi
+ --disable-audit
+ --disable-ima
+
+ --with-sysvinit-path=
+ --with-sysvrcnd-path=
+ --with-ntp-servers="${timeservers[*]}"
+ --with-default-dnssec=no
+ --with-dbuspolicydir=/usr/share/dbus-1/system.d
+ --without-kill-user-processes
+ )
+
+ ./configure "${configure_options[@]}"
+
+ make
+}
+
+package_systemd() {
+ 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'
+ '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: remote journald capabilities'
+ 'quota-tools: kernel-level quota management'
+ 'systemd-sysvcompat: symlink package to provide sysvinit binaries'
+ 'polkit: allow administration as unprivileged user')
+ backup=(etc/pam.d/systemd-user
+ 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 "$pkgbase" DESTDIR="$pkgdir" install
+
+ # 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 "$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;
+ 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. 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
+
+ ### manpages shipped with systemd-sysvcompat
+ rm "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+
+ ### runtime libraries shipped with libsystemd
+ rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so*
+
+ # 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
+
+ install -Dm644 "$srcdir/udev-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook"
+}
+
+package_libsystemd() {
+ pkgdesc="systemd client libraries"
+ depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
+ license=('GPL2')
+ provides=('libsystemd.so' 'libudev.so')
+
+ # TODO(dreisner): for v232, this should be install-rootlibLTLIBRARIES.
+ make -C "$pkgbase" DESTDIR="$pkgdir" install-libLTLIBRARIES
+}
+
+package_systemd-sysvcompat() {
+ pkgdesc="sysvinit compat for systemd"
+ license=('GPL2')
+ groups=('base')
+ conflicts=('sysvinit')
+ depends=('systemd')
+
+ install -dm755 "$pkgdir"/usr/share/man/man8
+ cp -d --no-preserve=ownership,timestamp \
+ "$pkgbase"/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
+ "$pkgdir"/usr/share/man/man8
+
+ install -dm755 "$pkgdir/usr/bin"
+ for tool in runlevel reboot shutdown poweroff halt telinit; do
+ ln -s 'systemctl' "$pkgdir/usr/bin/$tool"
+ done
+
+ ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
+}
+
+# vim: ft=sh syn=sh et
Deleted: testing-x86_64/arch.conf
===================================================================
--- testing-x86_64/arch.conf 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-x86_64/arch.conf 2016-10-02 11:39:46 UTC (rev 277543)
@@ -1,7 +0,0 @@
-## This is just an example config file.
-## Please edit the paths and kernel parameters according to your system.
-
-title Arch Linux
-linux /vmlinuz-linux
-initrd /initramfs-linux.img
-options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap
Copied: systemd/repos/testing-x86_64/arch.conf (from rev 277542, systemd/trunk/arch.conf)
===================================================================
--- testing-x86_64/arch.conf (rev 0)
+++ testing-x86_64/arch.conf 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1,7 @@
+## This is just an example config file.
+## Please edit the paths and kernel parameters according to your system.
+
+title Arch Linux
+linux /vmlinuz-linux
+initrd /initramfs-linux.img
+options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap
Deleted: testing-x86_64/initcpio-hook-udev
===================================================================
--- testing-x86_64/initcpio-hook-udev 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-x86_64/initcpio-hook-udev 2016-10-02 11:39:46 UTC (rev 277543)
@@ -1,22 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
- kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
- systemd-tmpfiles --prefix=/dev --create --boot
- /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
- udevd_running=1
-}
-
-run_hook() {
- msg ":: Triggering uevents..."
- udevadm trigger --action=add --type=subsystems
- udevadm trigger --action=add --type=devices
- udevadm settle
-}
-
-run_cleanuphook() {
- udevadm control --exit
- udevadm info --cleanup-db
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: systemd/repos/testing-x86_64/initcpio-hook-udev (from rev 277542, systemd/trunk/initcpio-hook-udev)
===================================================================
--- testing-x86_64/initcpio-hook-udev (rev 0)
+++ testing-x86_64/initcpio-hook-udev 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1,22 @@
+#!/usr/bin/ash
+
+run_earlyhook() {
+ kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
+ systemd-tmpfiles --prefix=/dev --create --boot
+ /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
+ udevd_running=1
+}
+
+run_hook() {
+ msg ":: Triggering uevents..."
+ udevadm trigger --action=add --type=subsystems
+ udevadm trigger --action=add --type=devices
+ udevadm settle
+}
+
+run_cleanuphook() {
+ udevadm control --exit
+ udevadm info --cleanup-db
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Deleted: testing-x86_64/initcpio-install-systemd
===================================================================
--- testing-x86_64/initcpio-install-systemd 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-x86_64/initcpio-install-systemd 2016-10-02 11:39:46 UTC (rev 277543)
@@ -1,195 +0,0 @@
-#!/bin/bash
-
-strip_quotes() {
- local len=${#1} quotes=$'[\'"]' str=${!1}
-
- if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then
- printf -v "$1" %s "${str:1:-1}"
- fi
-}
-
-add_udev_rule() {
- # Add an udev rules file to the initcpio image. Dependencies on binaries
- # will be discovered and added.
- # $1: path to rules file (or name of rules file)
-
- local rules= rule= key= value= binary=
-
- rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")
- if [[ -z $rules ]]; then
- # complain about not found rules
- return 1
- fi
-
- add_file "$rules"
-
- while IFS=, read -ra rule; do
- # skip empty lines, comments
- [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
-
- for pair in "${rule[@]}"; do
- IFS=' =' read -r key value <<< "$pair"
- case $key in
- RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
- strip_quotes 'value'
- # just take the first word as the binary name
- binary=${value%% *}
- [[ ${binary:0:1} == '$' ]] && continue
- if [[ ${binary:0:1} != '/' ]]; then
- binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")
- fi
- add_binary "$binary"
- ;;
- esac
- done
- done <"$rules"
-}
-
-add_systemd_unit() {
- # Add a systemd unit file to the initcpio image. Hard dependencies on binaries
- # and other unit files will be discovered and added.
- # $1: path to rules file (or name of rules file)
-
- local unit= rule= entry= key= value= binary= dep=
-
- unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")
- if [[ -z $unit ]]; then
- # complain about not found unit file
- return 1
- fi
-
- add_file "$unit"
-
- while IFS='=' read -r key values; do
- read -ra values <<< "$values"
-
- case $key in
- Requires|OnFailure)
- # only add hard dependencies (not Wants)
- map add_systemd_unit "${values[@]}"
- ;;
- Exec*)
- # don't add binaries unless they are required
- if [[ ${values[0]:0:1} != '-' ]]; then
- add_binary "${values[0]}"
- fi
- ;;
- esac
-
- done <"$unit"
-
- # preserve reverse soft dependency
- for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do
- if [[ -L $dep ]]; then
- add_symlink "$dep"
- fi
- done
-
- # add hard dependencies
- if [[ -d $unit.requires ]]; then
- for dep in "$unit".requires/*; do
- add_systemd_unit ${dep##*/}
- done
- fi
-}
-
-add_systemd_drop_in() {
- local unit=$1 dropin_name=$2
-
- mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"
- cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"
-}
-
-build() {
- local rules unit
-
- # from base
- add_binary /bin/mount
- add_binary /usr/bin/kmod /usr/bin/modprobe
- add_binary /usr/lib/systemd/systemd /init
- add_binary /usr/bin/sulogin
-
- map add_binary \
- /usr/bin/systemd-tmpfiles \
- /usr/lib/systemd/systemd-hibernate-resume \
- /usr/lib/systemd/system-generators/systemd-fstab-generator \
- /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
- /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
-
- # udev rules and systemd units
- map add_udev_rule "$rules" \
- 50-udev-default.rules \
- 60-persistent-storage.rules \
- 64-btrfs.rules \
- 80-drivers.rules \
- 99-systemd.rules
-
- map add_systemd_unit \
- initrd-cleanup.service \
- initrd-fs.target \
- initrd-parse-etc.service \
- initrd-root-fs.target \
- initrd-root-device.target \
- initrd-switch-root.service \
- initrd-switch-root.target \
- initrd-udevadm-cleanup-db.service \
- initrd.target \
- kmod-static-nodes.service \
- local-fs.target \
- local-fs-pre.target \
- paths.target \
- reboot.target \
- slices.target \
- sockets.target \
- swap.target \
- systemd-fsck at .service \
- systemd-hibernate-resume at .service \
- systemd-journald.service \
- systemd-journald-audit.socket \
- systemd-journald-dev-log.socket \
- systemd-modules-load.service \
- systemd-tmpfiles-setup-dev.service \
- systemd-udev-trigger.service \
- systemd-udevd-control.socket \
- systemd-udevd-kernel.socket \
- systemd-udevd.service \
- timers.target \
- rescue.target \
- emergency.target
-
- add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
- add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
-
- # udev wants /etc/group since it doesn't launch with --resolve-names=never
- add_file "/etc/nsswitch.conf"
- add_binary "$(readlink -f /usr/lib/libnss_files.so)"
-
- echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
- echo "root:x:0:root" >"$BUILDROOT/etc/group"
- echo "root::::::::" >"$BUILDROOT/etc/shadow"
-
- add_systemd_drop_in systemd-udevd.service resolve-names <<EOF
-[Service]
-ExecStart=
-ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never
-EOF
-
- add_dir "/etc/modules-load.d"
- (
- . "$_f_config"
- set -f
- printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
- )
-}
-
-help() {
- cat <<HELPEOF
-This will install a basic systemd setup in your initramfs, and is meant to
-replace the 'base', 'usr', 'udev' and 'timestamp' hooks. Other hooks with runtime
-components will need to be ported, and will not work as intended. You also may
-wish to still include the 'base' hook (before this hook) to ensure that a
-rescue shell exists on your initramfs.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: systemd/repos/testing-x86_64/initcpio-install-systemd (from rev 277542, systemd/trunk/initcpio-install-systemd)
===================================================================
--- testing-x86_64/initcpio-install-systemd (rev 0)
+++ testing-x86_64/initcpio-install-systemd 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1,195 @@
+#!/bin/bash
+
+strip_quotes() {
+ local len=${#1} quotes=$'[\'"]' str=${!1}
+
+ if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then
+ printf -v "$1" %s "${str:1:-1}"
+ fi
+}
+
+add_udev_rule() {
+ # Add an udev rules file to the initcpio image. Dependencies on binaries
+ # will be discovered and added.
+ # $1: path to rules file (or name of rules file)
+
+ local rules= rule= key= value= binary=
+
+ rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")
+ if [[ -z $rules ]]; then
+ # complain about not found rules
+ return 1
+ fi
+
+ add_file "$rules"
+
+ while IFS=, read -ra rule; do
+ # skip empty lines, comments
+ [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
+
+ for pair in "${rule[@]}"; do
+ IFS=' =' read -r key value <<< "$pair"
+ case $key in
+ RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
+ strip_quotes 'value'
+ # just take the first word as the binary name
+ binary=${value%% *}
+ [[ ${binary:0:1} == '$' ]] && continue
+ if [[ ${binary:0:1} != '/' ]]; then
+ binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")
+ fi
+ add_binary "$binary"
+ ;;
+ esac
+ done
+ done <"$rules"
+}
+
+add_systemd_unit() {
+ # Add a systemd unit file to the initcpio image. Hard dependencies on binaries
+ # and other unit files will be discovered and added.
+ # $1: path to rules file (or name of rules file)
+
+ local unit= rule= entry= key= value= binary= dep=
+
+ unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")
+ if [[ -z $unit ]]; then
+ # complain about not found unit file
+ return 1
+ fi
+
+ add_file "$unit"
+
+ while IFS='=' read -r key values; do
+ read -ra values <<< "$values"
+
+ case $key in
+ Requires|OnFailure)
+ # only add hard dependencies (not Wants)
+ map add_systemd_unit "${values[@]}"
+ ;;
+ Exec*)
+ # don't add binaries unless they are required
+ if [[ ${values[0]:0:1} != '-' ]]; then
+ add_binary "${values[0]}"
+ fi
+ ;;
+ esac
+
+ done <"$unit"
+
+ # preserve reverse soft dependency
+ for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do
+ if [[ -L $dep ]]; then
+ add_symlink "$dep"
+ fi
+ done
+
+ # add hard dependencies
+ if [[ -d $unit.requires ]]; then
+ for dep in "$unit".requires/*; do
+ add_systemd_unit ${dep##*/}
+ done
+ fi
+}
+
+add_systemd_drop_in() {
+ local unit=$1 dropin_name=$2
+
+ mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"
+ cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"
+}
+
+build() {
+ local rules unit
+
+ # from base
+ add_binary /bin/mount
+ add_binary /usr/bin/kmod /usr/bin/modprobe
+ add_binary /usr/lib/systemd/systemd /init
+ add_binary /usr/bin/sulogin
+
+ map add_binary \
+ /usr/bin/systemd-tmpfiles \
+ /usr/lib/systemd/systemd-hibernate-resume \
+ /usr/lib/systemd/system-generators/systemd-fstab-generator \
+ /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
+ /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
+
+ # udev rules and systemd units
+ map add_udev_rule "$rules" \
+ 50-udev-default.rules \
+ 60-persistent-storage.rules \
+ 64-btrfs.rules \
+ 80-drivers.rules \
+ 99-systemd.rules
+
+ map add_systemd_unit \
+ initrd-cleanup.service \
+ initrd-fs.target \
+ initrd-parse-etc.service \
+ initrd-root-fs.target \
+ initrd-root-device.target \
+ initrd-switch-root.service \
+ initrd-switch-root.target \
+ initrd-udevadm-cleanup-db.service \
+ initrd.target \
+ kmod-static-nodes.service \
+ local-fs.target \
+ local-fs-pre.target \
+ paths.target \
+ reboot.target \
+ slices.target \
+ sockets.target \
+ swap.target \
+ systemd-fsck at .service \
+ systemd-hibernate-resume at .service \
+ systemd-journald.service \
+ systemd-journald-audit.socket \
+ systemd-journald-dev-log.socket \
+ systemd-modules-load.service \
+ systemd-tmpfiles-setup-dev.service \
+ systemd-udev-trigger.service \
+ systemd-udevd-control.socket \
+ systemd-udevd-kernel.socket \
+ systemd-udevd.service \
+ timers.target \
+ rescue.target \
+ emergency.target
+
+ add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
+ add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
+
+ # udev wants /etc/group since it doesn't launch with --resolve-names=never
+ add_file "/etc/nsswitch.conf"
+ add_binary "$(readlink -f /usr/lib/libnss_files.so)"
+
+ echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
+ echo "root:x:0:root" >"$BUILDROOT/etc/group"
+ echo "root::::::::" >"$BUILDROOT/etc/shadow"
+
+ add_systemd_drop_in systemd-udevd.service resolve-names <<EOF
+[Service]
+ExecStart=
+ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never
+EOF
+
+ add_dir "/etc/modules-load.d"
+ (
+ . "$_f_config"
+ set -f
+ printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
+ )
+}
+
+help() {
+ cat <<HELPEOF
+This will install a basic systemd setup in your initramfs, and is meant to
+replace the 'base', 'usr', 'udev' and 'timestamp' hooks. Other hooks with runtime
+components will need to be ported, and will not work as intended. You also may
+wish to still include the 'base' hook (before this hook) to ensure that a
+rescue shell exists on your initramfs.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Deleted: testing-x86_64/initcpio-install-udev
===================================================================
--- testing-x86_64/initcpio-install-udev 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-x86_64/initcpio-install-udev 2016-10-02 11:39:46 UTC (rev 277543)
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-build() {
- local rules tool
-
- add_binary /usr/lib/systemd/systemd-udevd
- add_binary /usr/bin/udevadm
- add_binary /usr/bin/systemd-tmpfiles
-
- for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
- add_file "/usr/lib/udev/rules.d/$rules"
- done
- for tool in ata_id scsi_id; do
- add_file "/usr/lib/udev/$tool"
- done
-
- add_runscript
-}
-
-help() {
- cat <<HELPEOF
-This hook will use udev to create your root device node and detect the needed
-modules for your root device. It is also required for firmware loading in
-initramfs. It is recommended to use this hook.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: systemd/repos/testing-x86_64/initcpio-install-udev (from rev 277542, systemd/trunk/initcpio-install-udev)
===================================================================
--- testing-x86_64/initcpio-install-udev (rev 0)
+++ testing-x86_64/initcpio-install-udev 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+build() {
+ local rules tool
+
+ add_binary /usr/lib/systemd/systemd-udevd
+ add_binary /usr/bin/udevadm
+ add_binary /usr/bin/systemd-tmpfiles
+
+ for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
+ add_file "/usr/lib/udev/rules.d/$rules"
+ done
+ for tool in ata_id scsi_id; do
+ add_file "/usr/lib/udev/$tool"
+ done
+
+ add_runscript
+}
+
+help() {
+ cat <<HELPEOF
+This hook will use udev to create your root device node and detect the needed
+modules for your root device. It is also required for firmware loading in
+initramfs. It is recommended to use this hook.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Deleted: testing-x86_64/loader.conf
===================================================================
--- testing-x86_64/loader.conf 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-x86_64/loader.conf 2016-10-02 11:39:46 UTC (rev 277543)
@@ -1 +0,0 @@
-default arch
Copied: systemd/repos/testing-x86_64/loader.conf (from rev 277542, systemd/trunk/loader.conf)
===================================================================
--- testing-x86_64/loader.conf (rev 0)
+++ testing-x86_64/loader.conf 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1 @@
+default arch
Deleted: testing-x86_64/splash-arch.bmp
===================================================================
(Binary files differ)
Copied: systemd/repos/testing-x86_64/splash-arch.bmp (from rev 277542, systemd/trunk/splash-arch.bmp)
===================================================================
(Binary files differ)
Deleted: testing-x86_64/systemd.install
===================================================================
--- testing-x86_64/systemd.install 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-x86_64/systemd.install 2016-10-02 11:39:46 UTC (rev 277543)
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-sd_booted() {
- [[ -d run/systemd/system && ! -L run/systemd/system ]]
-}
-
-add_journal_acls() {
- # ignore errors, since the filesystem might not support ACLs
- setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null
- :
-}
-
-maybe_reexec() {
- if sd_booted; then
- systemctl --system daemon-reexec
- fi
-}
-
-post_common() {
- systemd-sysusers
- journalctl --update-catalog
-}
-
-_216_2_changes() {
- echo ':: Coredumps are handled by systemd by default. Collection behavior can be'
- echo ' tuned in /etc/systemd/coredump.conf.'
-}
-
-_219_2_changes() {
- if mkdir -m2755 var/log/journal/remote 2>/dev/null; then
- chgrp systemd-journal-remote var/log/journal/remote
- fi
-}
-
-_219_4_changes() {
- if ! systemctl is-enabled -q remote-fs.target; then
- systemctl enable -q remote-fs.target
- fi
-}
-
-_230_1_changes() {
- echo ':: systemd-bootchart is no longer included with systemd'
-}
-
-post_install() {
- systemd-machine-id-setup
-
- post_common "$@"
-
- add_journal_acls
-
- # enable some services by default, but don't track them
- systemctl enable getty at tty1.service remote-fs.target
-
- echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"
- echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"
-
- # group 'systemd-journal-remote' is created by systemd-sysusers
- mkdir -m2755 var/log/journal/remote
- chgrp systemd-journal-remote var/log/journal/remote
-}
-
-post_upgrade() {
- post_common "$@"
-
- maybe_reexec "$@"
-
- local v upgrades=(
- 216-2
- 219-2
- 219-4
- 230-1
- )
-
- for v in "${upgrades[@]}"; do
- if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
- "_${v//-/_}_changes"
- fi
- done
-}
-
-# vim:set ts=2 sw=2 et:
Copied: systemd/repos/testing-x86_64/systemd.install (from rev 277542, systemd/trunk/systemd.install)
===================================================================
--- testing-x86_64/systemd.install (rev 0)
+++ testing-x86_64/systemd.install 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+sd_booted() {
+ [[ -d run/systemd/system && ! -L run/systemd/system ]]
+}
+
+add_journal_acls() {
+ # ignore errors, since the filesystem might not support ACLs
+ setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null
+ :
+}
+
+maybe_reexec() {
+ if sd_booted; then
+ systemctl --system daemon-reexec
+ fi
+}
+
+post_common() {
+ systemd-sysusers
+ journalctl --update-catalog
+}
+
+_216_2_changes() {
+ echo ':: Coredumps are handled by systemd by default. Collection behavior can be'
+ echo ' tuned in /etc/systemd/coredump.conf.'
+}
+
+_219_2_changes() {
+ if mkdir -m2755 var/log/journal/remote 2>/dev/null; then
+ chgrp systemd-journal-remote var/log/journal/remote
+ fi
+}
+
+_219_4_changes() {
+ if ! systemctl is-enabled -q remote-fs.target; then
+ systemctl enable -q remote-fs.target
+ fi
+}
+
+_230_1_changes() {
+ echo ':: systemd-bootchart is no longer included with systemd'
+}
+
+post_install() {
+ systemd-machine-id-setup
+
+ post_common "$@"
+
+ add_journal_acls
+
+ # enable some services by default, but don't track them
+ systemctl enable getty at tty1.service remote-fs.target
+
+ echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"
+ echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"
+
+ # group 'systemd-journal-remote' is created by systemd-sysusers
+ mkdir -m2755 var/log/journal/remote
+ chgrp systemd-journal-remote var/log/journal/remote
+}
+
+post_upgrade() {
+ post_common "$@"
+
+ maybe_reexec "$@"
+
+ local v upgrades=(
+ 216-2
+ 219-2
+ 219-4
+ 230-1
+ )
+
+ for v in "${upgrades[@]}"; do
+ if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
+ "_${v//-/_}_changes"
+ fi
+ done
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: testing-x86_64/udev-hwdb.hook
===================================================================
--- testing-x86_64/udev-hwdb.hook 2016-10-02 11:38:41 UTC (rev 277542)
+++ testing-x86_64/udev-hwdb.hook 2016-10-02 11:39:46 UTC (rev 277543)
@@ -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
Copied: systemd/repos/testing-x86_64/udev-hwdb.hook (from rev 277542, systemd/trunk/udev-hwdb.hook)
===================================================================
--- testing-x86_64/udev-hwdb.hook (rev 0)
+++ testing-x86_64/udev-hwdb.hook 2016-10-02 11:39:46 UTC (rev 277543)
@@ -0,0 +1,11 @@
+[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
More information about the arch-commits
mailing list