upgrade to 255.4-2

5 files changed, 2 insertions, 249 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6573deb0f625..04e04cdacd9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -51,13 +51,11 @@ pkgbase = systemd-chromiumos
 	makedepends = qrencode
 	makedepends = lib32-gcc-libs
 	makedepends = python-pefile
+	conflicts = mkinitcpio<38-1
 	source = git+https://github.com/systemd/systemd-stable#tag=4003dd6754e3446691402d3cc389fbfd4faccc90?signed
 	source = git+https://github.com/systemd/systemd#tag=v255?signed
 	source = 0001-Use-Arch-Linux-device-access-groups.patch
 	source = 0002-Disable-mount_nofollow-for-ChromiumOS-kernels.patch
-	source = initcpio-hook-udev
-	source = initcpio-install-systemd
-	source = initcpio-install-udev
 	source = arch.conf
 	source = loader.conf
 	source = splash-arch.bmp
@@ -81,9 +79,6 @@ pkgbase = systemd-chromiumos
 	sha512sums = SKIP
 	sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e
 	sha512sums = 14279a57ec414dc68c25d9e0fd688c94cd078143bf144ac9081ffaa1e369527f3f04369fc27a88c03ae15cc879ac9678c38ca4c7ebfc1d7cbb40a2c2941266d1
-	sha512sums = 4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e
-	sha512sums = ada692514d758fa11e2be6b4c5e1dc2d9d47548f24ada35afdce1dcac918e72ae2251c892773e6cf41fa431c3613a1608668e999eb86a565870fecb55c47b4ba
-	sha512sums = a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6
 	sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
 	sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
 	sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
diff --git a/PKGBUILD b/PKGBUILD
index bf8ec6dde0d0..c1cf17585313 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,6 +30,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync'
              'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls' 'python-pyelftools'
              'libpwquality' 'qrencode' 'lib32-gcc-libs' 'python-pefile')
+conflicts=("mkinitcpio<38-1")
 validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart@poettering.net>
               'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E'  # Luca Boccassi <luca.boccassi@gmail.com>
               '9A774DB5DB996C154EBBFBFDA0099A18E29326E1'  # Yu Watanabe <watanabe.yu+github@gmail.com>
@@ -38,10 +39,6 @@ source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
         "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed"
         '0001-Use-Arch-Linux-device-access-groups.patch'
         '0002-Disable-mount_nofollow-for-ChromiumOS-kernels.patch'
-        # mkinitcpio files
-        'initcpio-hook-udev'
-        'initcpio-install-systemd'
-        'initcpio-install-udev'
         # bootloader files
         'arch.conf'
         'loader.conf'
@@ -64,9 +61,6 @@ sha512sums=('SKIP'
             'SKIP'
             '3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e'
             '14279a57ec414dc68c25d9e0fd688c94cd078143bf144ac9081ffaa1e369527f3f04369fc27a88c03ae15cc879ac9678c38ca4c7ebfc1d7cbb40a2c2941266d1'
-            '4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e'
-            'ada692514d758fa11e2be6b4c5e1dc2d9d47548f24ada35afdce1dcac918e72ae2251c892773e6cf41fa431c3613a1608668e999eb86a565870fecb55c47b4ba'
-            'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6'
             '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
             '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
@@ -267,11 +261,6 @@ package_systemd-chromiumos() {
   # ship default policy to leave services disabled
   echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
 
-  # add mkinitcpio hooks
-  install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd
-  install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev
-  install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev
-
   # The group 'systemd-journal' is allocated dynamically and may have varying
   # gid on different systems. Let's install with gid 0 (root), systemd-tmpfiles
   # will fix the permissions for us. (see /usr/lib/tmpfiles.d/systemd.conf)
diff --git a/initcpio-hook-udev b/initcpio-hook-udev
deleted file mode 100644
index dfa875067ee3..000000000000
--- a/initcpio-hook-udev
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
-    kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
-    systemd-tmpfiles --prefix=/dev --create --boot
-    if [ "${quiet}" = "y" ]; then
-        /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never >/dev/null 2>&1
-    else
-        /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
-    fi
-    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:
diff --git a/initcpio-install-systemd b/initcpio-install-systemd
deleted file mode 100644
index 3355f4b85e99..000000000000
--- a/initcpio-install-systemd
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/bash
-
-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*)
-                # do not add binaries unless they are required,
-                # strip special executable prefixes
-                case ${values[0]} in
-                    -*)  ;;
-                    !!*) add_binary "${values[0]#!!}" ;;
-                    *)   add_binary "${values[0]#[@!:+]}" ;;
-                esac
-                ;;
-        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
-
-    add_binary /usr/bin/kmod /usr/bin/modprobe
-    add_binary /usr/bin/mount
-    add_binary /usr/bin/sulogin
-    add_binary /usr/bin/umount
-    add_binary /usr/lib/systemd/systemd /init
-
-    map add_binary \
-        /usr/bin/journalctl \
-        /usr/bin/systemd-tmpfiles \
-        /usr/lib/systemd/systemd-executor \
-        /usr/lib/systemd/systemd-hibernate-resume \
-        /usr/lib/systemd/systemd-shutdown \
-        /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
-
-    # udev rules
-    map add_udev_rule "$rules" \
-        50-udev-default.rules \
-        60-persistent-storage.rules \
-        64-btrfs.rules \
-        80-drivers.rules \
-        99-systemd.rules
-
-    # systemd units
-    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-battery-check.service \
-        systemd-bsod.service \
-        systemd-fsck@.service \
-        systemd-hibernate-resume.service \
-        systemd-journald-audit.socket \
-        systemd-journald-dev-log.socket \
-        systemd-journald.service \
-        systemd-modules-load.service \
-        systemd-pcrphase-initrd.service \
-        systemd-tmpfiles-setup-dev.service \
-        systemd-udevd-control.socket \
-        systemd-udevd-kernel.socket \
-        systemd-udevd.service \
-        systemd-udev-trigger.service \
-        systemd-vconsole-setup.service \
-        timers.target \
-        rescue.target \
-        emergency.target
-
-    # add libraries dlopen()ed (hard and optional dependencies):
-    #  tss2-*   -> tpm2-util
-    #  qrencode -> bsod
-    for LIB in tss2-{esys,rc,mu,tcti-'*'} qrencode; do
-        for FILE in $(find /usr/lib/ -maxdepth 1 -name "lib${LIB}.so*"); do
-            if [[ -L "${FILE}" ]]; then
-                add_symlink "${FILE}"
-            else
-                add_binary "${FILE}"
-            fi
-        done
-    done
-
-    add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
-    add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
-
-    printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \
-        'passwd: files' \
-        'group: files' \
-        'shadow: files'
-
-    echo "root:x:0:0:root:/root:/bin/sh" >"$BUILDROOT/etc/passwd"
-    echo 'root:*:::::::' >"$BUILDROOT/etc/shadow"
-    getent group root audio disk input kmem kvm lp optical render sgx storage tty uucp video | awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group"
-
-    add_dir "/etc/modules-load.d"
-    (
-      . "$_f_config"
-      set -f
-      printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
-    )
-
-    [[ -f /etc/fstab.initramfs ]] && add_file "/etc/fstab.initramfs" "/etc/fstab"
-}
-
-help() {
-    cat <<HELPEOF
-This will install a basic systemd setup in your initramfs, and is meant to
-replace the 'base', 'usr', 'udev' and 'resume' 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:
diff --git a/initcpio-install-udev b/initcpio-install-udev
deleted file mode 100644
index fef6f9bb7235..000000000000
--- a/initcpio-install-udev
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-build() {
-    local rules tool
-
-    map add_binary \
-        '/usr/lib/systemd/systemd-udevd' \
-        '/usr/bin/udevadm' \
-        '/usr/bin/systemd-tmpfiles'
-
-    map add_udev_rule \
-        '50-udev-default.rules' \
-        '60-persistent-storage.rules' \
-        '64-btrfs.rules' \
-        '80-drivers.rules'
-    
-    map add_file \
-        '/usr/lib/udev/ata_id' \
-        '/usr/lib/udev/scsi_id'
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-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
-}
-
-# vim: set ft=sh ts=4 sw=4 et: