diff options
| -rw-r--r-- | .SRCINFO | 19 | ||||
| -rw-r--r-- | PKGBUILD | 100 | ||||
| -rw-r--r-- | initcpio-install-systemd | 7 | ||||
| -rw-r--r-- | initcpio-install-udev | 7 | ||||
| -rw-r--r-- | systemd.install | 11 |
5 files changed, 79 insertions, 65 deletions
@@ -1,6 +1,6 @@ pkgbase = systemd-git pkgdesc = systemd from git - pkgver = 233.r595.g4b57a2720 + pkgver = 234.r171.gb1f24b75a pkgrel = 1 url = https://www.github.com/systemd/systemd arch = i686 @@ -28,6 +28,7 @@ pkgbase = systemd-git makedepends = shadow makedepends = gnu-efi-libs makedepends = git + makedepends = meson options = strip options = !distcc options = !ccache @@ -45,8 +46,8 @@ pkgbase = systemd-git source = systemd-update.hook sha512sums = SKIP sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73 - sha512sums = 52af734947a768758d5eb3f18e31a1cfec6699eca6fa10e40b90c7f11991509186c0a696e3490af3eaba80064ea4cb93e041579abf05addf072d294300aa4b28 - sha512sums = fec639de0d99967ed3e67289eff5ff78fff0c5829d350e73bed536a8391f1daa1d118d72dbdc1f480ffd33fc22b72f4817d0973bd09ec7f182fd26ad87b24355 + sha512sums = a70a779828e03c91275df1e046f78bdface08e2a8df0245a3f6e8d5904e3dbbe5d498cbf7f32d5ce61f2fb0d0a3d440d47ce9e41352a5547d80fa1bc29687159 + sha512sums = a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648 sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5 sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75 @@ -63,6 +64,7 @@ pkgname = systemd-git license = LGPL2.1 depends = acl depends = bash + depends = cryptsetup depends = dbus depends = iptables depends = kbd @@ -78,23 +80,22 @@ pkgname = systemd-git depends = libseccomp depends = util-linux depends = xz - optdepends = cryptsetup: required for encrypted block devices optdepends = libmicrohttpd: remote journald capabilities optdepends = quota-tools: kernel-level quota management optdepends = systemd-sysvcompat-git: symlink package to provide sysvinit binaries optdepends = polkit: allow administration as unprivileged user - provides = systemd=233.r595.g4b57a2720 - provides = udev=233.r595.g4b57a2720 provides = nss-myhostname - provides = systemd-tools=233.r595.g4b57a2720 - conflicts = systemd + provides = systemd-tools=234.r171.gb1f24b75a + provides = udev=234.r171.gb1f24b75a + provides = systemd=234.r171.gb1f24b75a conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev - replaces = systemd + conflicts = systemd replaces = nss-myhostname replaces = systemd-tools replaces = udev + replaces = systemd backup = etc/pam.d/systemd-user backup = etc/systemd/coredump.conf backup = etc/systemd/journald.conf @@ -5,7 +5,7 @@ pkgbase=systemd-git pkgname=('systemd-git' 'libsystemd-git' 'systemd-sysvcompat-git') pkgdesc="systemd from git" -pkgver=233.r595.g4b57a2720 +pkgver=234.r171.gb1f24b75a pkgrel=1 branch='master' arch=('i686' 'x86_64') @@ -13,7 +13,8 @@ url="https://www.github.com/systemd/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') + 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git' + 'meson') options=('strip' '!distcc' '!ccache') source=("systemd-git::git://github.com/systemd/systemd.git#branch=${branch}" 'initcpio-hook-udev' @@ -29,8 +30,8 @@ source=("systemd-git::git://github.com/systemd/systemd.git#branch=${branch}" 'systemd-update.hook') sha512sums=('SKIP' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - '52af734947a768758d5eb3f18e31a1cfec6699eca6fa10e40b90c7f11991509186c0a696e3490af3eaba80064ea4cb93e041579abf05addf072d294300aa4b28' - 'fec639de0d99967ed3e67289eff5ff78fff0c5829d350e73bed536a8391f1daa1d118d72dbdc1f480ffd33fc22b72f4817d0973bd09ec7f182fd26ad87b24355' + 'a70a779828e03c91275df1e046f78bdface08e2a8df0245a3f6e8d5904e3dbbe5d498cbf7f32d5ce61f2fb0d0a3d440d47ce9e41352a5547d80fa1bc29687159' + 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75' @@ -45,57 +46,45 @@ pkgver() { git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } -prepare() { - cd "$pkgbase" - - #_validate_tag || return - - 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 + local meson_options=( + --buildtype=release + -Db_lto=true + + -Daudit=false + -Dgnuefi=true + -Dima=false + -Dlz4=true + + -Ddbuspolicydir=/usr/share/dbus-1/system.d + -Ddefault-dnssec=no + # TODO(dreisner): consider changing this to unified + -Ddefault-hierarchy=hybrid + -Ddefault-kill-user-processes=false + -Dfallback-hostname='archlinux' + -Dntp-servers="${timeservers[*]}" + -Drpmmacrosdir=no + -Dsysvinit-path= + -Dsysvrcnd-path= ) - ./configure "${configure_options[@]}" + meson "$pkgbase" build "${meson_options[@]}" - make + ninja -C build } package_systemd-git() { pkgdesc="system and service manager" license=('GPL2' 'LGPL2.1') - depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' + depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' 'libsystemd-git' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp' 'util-linux' 'xz') - provides=("systemd=$pkgver" "udev=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver") - replaces=('systemd' 'nss-myhostname' 'systemd-tools' 'udev') - conflicts=('systemd' 'nss-myhostname' 'systemd-tools' 'udev' ) - optdepends=('cryptsetup: required for encrypted block devices' - 'libmicrohttpd: remote journald capabilities' + provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" "systemd=$pkgver") + replaces=('nss-myhostname' 'systemd-tools' 'udev' 'systemd') + conflicts=('nss-myhostname' 'systemd-tools' 'udev' 'systemd') + optdepends=('libmicrohttpd: remote journald capabilities' 'quota-tools: kernel-level quota management' 'systemd-sysvcompat-git: symlink package to provide sysvinit binaries' 'polkit: allow administration as unprivileged user') @@ -112,14 +101,12 @@ package_systemd-git() { etc/udev/udev.conf) install="systemd.install" - make -C "$pkgbase" DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C build 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" + rm -r "$pkgdir/etc/systemd/system/"*.service # add back tmpfiles.d/legacy.conf install -m644 "$pkgbase/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" @@ -141,18 +128,26 @@ package_systemd-git() { chown root:systemd-journal "$pkgdir/var/log/journal" chmod 2755 "$pkgdir/var/log/journal" + # match directory owner/group and mode from extra/polkit + chown root:102 "$pkgdir"/usr/share/polkit-1/rules.d + chmod 0750 "$pkgdir"/usr/share/polkit-1/rules.d + # we'll create this on installation rmdir "$pkgdir/var/log/journal/remote" # ship default policy to leave services disabled echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset - ### manpages shipped with systemd-sysvcompat + # manpages shipped with systemd-sysvcompat rm "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 - ### runtime libraries shipped with libsystemd + # runtime libraries shipped with libsystemd rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* + # allow core/filesystem to pristine nsswitch.conf + rm "$pkgdir/usr/share/factory/etc/nsswitch.conf" + sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir/usr/lib/tmpfiles.d/etc.conf" + # 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 @@ -174,7 +169,12 @@ package_libsystemd-git() { provides=('libsystemd.so' 'libudev.so' 'libsystemd') conflicts=('libsystemd') - make -C "$pkgbase" DESTDIR="$pkgdir" install-rootlibLTLIBRARIES + # meson does not support installing subsets of files, no? + # So do a full install to temporary directory, then install what we need. + DESTDIR="$srcdir"/full-install ninja -C build install + + install -dm755 "$pkgdir"/usr/lib/ + cp --archive "$srcdir"/full-install/usr/lib/lib{nss_*,systemd,udev}.so* "$pkgdir"/usr/lib/ } package_systemd-sysvcompat-git() { @@ -187,7 +187,7 @@ package_systemd-sysvcompat-git() { install -dm755 "$pkgdir"/usr/share/man/man8 cp -d --no-preserve=ownership,timestamp \ - "$pkgbase"/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ + build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ "$pkgdir"/usr/share/man/man8 install -dm755 "$pkgdir/usr/bin" diff --git a/initcpio-install-systemd b/initcpio-install-systemd index f6d0afdb8285..5bf7b7f1639e 100644 --- a/initcpio-install-systemd +++ b/initcpio-install-systemd @@ -112,6 +112,7 @@ build() { map add_binary \ /usr/bin/systemd-tmpfiles \ /usr/lib/systemd/systemd-hibernate-resume \ + /usr/lib/systemd/systemd-sulogin-shell \ /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 @@ -160,9 +161,11 @@ build() { 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)" + printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \ + 'passwd: files' \ + 'group: files' \ + 'shadow: files' echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd" echo "root:x:0:root" >"$BUILDROOT/etc/group" diff --git a/initcpio-install-udev b/initcpio-install-udev index 7f0301a48856..31d9827129e7 100644 --- a/initcpio-install-udev +++ b/initcpio-install-udev @@ -19,9 +19,10 @@ build() { 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. +This hook adds the udev daemon to the initramfs, allowing for dynamic loading +of modules and reliable detection of the root device via tags (e.g. UUID or +LABEL). Do not remove this hook unless you are using the systemd hook, or you +know what you're doing. HELPEOF } diff --git a/systemd.install b/systemd.install index f799c882d53a..fedc747ea6e8 100644 --- a/systemd.install +++ b/systemd.install @@ -45,6 +45,14 @@ _232_8_changes() { fi } +_233_75_3_changes() { + # upstream installs services to /etc, which we remove + # to keep bus activation we re-enable systemd-resolved + if systemctl is-enabled -q systemd-resolved.service; then + systemctl reenable systemd-resolved.service 2>/dev/null + fi +} + post_install() { systemd-machine-id-setup @@ -78,11 +86,12 @@ post_upgrade() { 219-4 230-1 232-8 + 233.75-3 ) for v in "${upgrades[@]}"; do if [[ $(vercmp "$v" "$2") -eq 1 ]]; then - "_${v//-/_}_changes" + "_${v//[.-]/_}_changes" fi done } |