summaryrefslogtreecommitdiff
path: root/libre-testing
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-01-18 01:26:00 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-01-18 01:26:00 +0100
commit7262681e044dffa25820ea90c657ffac266c254c (patch)
tree129c6b76a842f9a9dadbcfe4526a8e05d2731ec0 /libre-testing
parentd9473a265ba35ed979d986804d843c2d1a43d520 (diff)
downloadabslibre-7262681e044dffa25820ea90c657ffac266c254c.tar.gz
abslibre-7262681e044dffa25820ea90c657ffac266c254c.tar.bz2
abslibre-7262681e044dffa25820ea90c657ffac266c254c.zip
Move systemd 240.34 from libre-testing to libre
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Diffstat (limited to 'libre-testing')
-rw-r--r--libre-testing/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch243
-rw-r--r--libre-testing/systemd/0001-Use-Arch-Linux-device-access-groups.patch75
-rw-r--r--libre-testing/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch101
-rw-r--r--libre-testing/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch40
-rw-r--r--libre-testing/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch28
-rw-r--r--libre-testing/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch30
-rw-r--r--libre-testing/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch248
-rw-r--r--libre-testing/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch33
-rw-r--r--libre-testing/systemd/PKGBUILD460
-rw-r--r--libre-testing/systemd/initcpio-hook-udev22
-rw-r--r--libre-testing/systemd/initcpio-install-systemd202
-rw-r--r--libre-testing/systemd/initcpio-install-udev29
-rw-r--r--libre-testing/systemd/loader.conf1
-rw-r--r--libre-testing/systemd/parabola.conf7
-rw-r--r--libre-testing/systemd/splash-parabola.bmpbin759378 -> 0 bytes
-rw-r--r--libre-testing/systemd/systemd-binfmt.hook10
-rw-r--r--libre-testing/systemd/systemd-catalog.hook11
-rw-r--r--libre-testing/systemd/systemd-daemon-reload.hook11
-rw-r--r--libre-testing/systemd/systemd-hook23
-rw-r--r--libre-testing/systemd/systemd-hwdb.hook11
-rw-r--r--libre-testing/systemd/systemd-sysctl.hook10
-rw-r--r--libre-testing/systemd/systemd-sysusers.hook10
-rw-r--r--libre-testing/systemd/systemd-tmpfiles.hook10
-rw-r--r--libre-testing/systemd/systemd-udev-reload.hook11
-rw-r--r--libre-testing/systemd/systemd-update.hook11
-rw-r--r--libre-testing/systemd/systemd-user.pam5
-rw-r--r--libre-testing/systemd/systemd.install99
-rw-r--r--libre-testing/systemd/udev-hook18
28 files changed, 0 insertions, 1759 deletions
diff --git a/libre-testing/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/libre-testing/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
deleted file mode 100644
index b0e9232b8..000000000
--- a/libre-testing/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-From dec7ae52e9352345e5627d02676b51f2facdd488 Mon Sep 17 00:00:00 2001
-From: Luke Shumaker <lukeshu@parabola.nu>
-Date: Wed, 25 May 2016 12:19:20 -0400
-Subject: [PATCH 1/7] FSDG: man/: Refer to the operating system as GNU/Linux
-
-This is not a blind replacement of "Linux" with "GNU/Linux". In some
-cases, "Linux" is (correctly) used to refer to just the kernel. In others,
-it is in a string for which code must also be adjusted; these instances
-are not included in this commit.
----
- man/daemon.xml | 4 ++--
- man/journald.conf.xml | 2 +-
- man/machinectl.xml | 2 +-
- man/sd-bus-errors.xml | 2 +-
- man/sd-login.xml | 2 +-
- man/sd_bus_error_add_map.xml | 2 +-
- man/sd_uid_get_state.xml | 2 +-
- man/systemd-detect-virt.xml | 4 ++--
- man/systemd-machine-id-setup.xml | 2 +-
- man/systemd-resolved.service.xml | 6 +++---
- man/systemd.exec.xml | 2 +-
- man/systemd.socket.xml | 2 +-
- man/systemd.xml | 6 +++---
- 13 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/man/daemon.xml b/man/daemon.xml
-index 36c7c09db1..730507ed7e 100644
---- a/man/daemon.xml
-+++ b/man/daemon.xml
-@@ -144,7 +144,7 @@
- <refsect2>
- <title>New-Style Daemons</title>
-
-- <para>Modern services for Linux should be implemented as
-+ <para>Modern services for GNU/Linux should be implemented as
- new-style daemons. This makes it easier to supervise and control
- them at runtime and simplifies their implementation.</para>
-
-@@ -285,7 +285,7 @@
- as detailed in the <ulink
- url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB
- Linux Standard Base Core Specification</ulink>. This method of
-- activation is supported ubiquitously on Linux init systems, both
-+ activation is supported ubiquitously on GNU/Linux init systems, both
- old-style and new-style systems. Among other issues, SysV init
- scripts have the disadvantage of involving shell scripts in the
- boot process. New-style init systems generally employ updated
-diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index ee8e8b7faf..28324ac102 100644
---- a/man/journald.conf.xml
-+++ b/man/journald.conf.xml
-@@ -111,7 +111,7 @@
- <term><varname>SplitMode=</varname></term>
-
- <listitem><para>Controls whether to split up journal files per user, either <literal>uid</literal> or
-- <literal>none</literal>. Split journal files are primarily useful for access control: on UNIX/Linux access
-+ <literal>none</literal>. Split journal files are primarily useful for access control: on GNU/Linux access
- control is managed per file, and the journal daemon will assign users read access to their journal files. If
- <literal>uid</literal>, all regular users will each get their own journal files, and system users will log to
- the system journal. If <literal>none</literal>, journal files are not split up by user and all messages are
-diff --git a/man/machinectl.xml b/man/machinectl.xml
-index affca1dec1..278ca8d677 100644
---- a/man/machinectl.xml
-+++ b/man/machinectl.xml
-@@ -867,7 +867,7 @@
- <para>The <command>machinectl</command> tool operates on machines
- and images whose names must be chosen following strict
- rules. Machine names must be suitable for use as host names
-- following a conservative subset of DNS and UNIX/Linux
-+ following a conservative subset of DNS and GNU/Linux
- semantics. Specifically, they must consist of one or more
- non-empty label strings, separated by dots. No leading or trailing
- dots are allowed. No sequences of multiple dots are allowed. The
-diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml
-index c834bde292..fdd2261fe9 100644
---- a/man/sd-bus-errors.xml
-+++ b/man/sd-bus-errors.xml
-@@ -102,7 +102,7 @@
-
- <para>In addition to this list, in sd-bus, the special error
- namespace <literal>System.Error.</literal> is used to map
-- arbitrary Linux system errors (as defined by <citerefentry
-+ arbitrary GNU/Linux system errors (as defined by <citerefentry
- project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
- to D-Bus errors and back. For example, the error
- <constant>EUCLEAN</constant> is mapped to
-diff --git a/man/sd-login.xml b/man/sd-login.xml
-index 83ef0b7307..93fd9ea782 100644
---- a/man/sd-login.xml
-+++ b/man/sd-login.xml
-@@ -244,7 +244,7 @@
-
- <para>
- <ulink url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink>
-- for an introduction to multi-seat support on Linux and the background for this set of APIs.
-+ for an introduction to multi-seat support on GNU/Linux and the background for this set of APIs.
- </para>
- </refsect1>
-
-diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml
-index 3eacbab660..b4b3b1bd17 100644
---- a/man/sd_bus_error_add_map.xml
-+++ b/man/sd_bus_error_add_map.xml
-@@ -58,7 +58,7 @@
-
- <para>The <function>sd_bus_error_add_map()</function> call may be
- used to register additional mappings for converting D-Bus errors
-- to Linux <varname>errno</varname>-style errors. The mappings
-+ to GNU/Linux <varname>errno</varname>-style errors. The mappings
- defined with this call are consulted by calls such as
- <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry>
- or
-diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
-index 02670e1bce..6f4ff77130 100644
---- a/man/sd_uid_get_state.xml
-+++ b/man/sd_uid_get_state.xml
-@@ -174,7 +174,7 @@
- <listitem><para>An input parameter was invalid (out of range,
- or NULL, where that is not accepted). This is also returned if
- the passed user ID is 0xFFFF or 0xFFFFFFFF, which are
-- undefined on Linux.</para></listitem>
-+ undefined on GNU/Linux.</para></listitem>
- </varlistentry>
-
- <varlistentry>
-diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
-index c4763fd561..54bba23666 100644
---- a/man/systemd-detect-virt.xml
-+++ b/man/systemd-detect-virt.xml
-@@ -133,12 +133,12 @@
-
- <row>
- <entry><varname>lxc</varname></entry>
-- <entry>Linux container implementation by LXC</entry>
-+ <entry>Container implementation by LXC</entry>
- </row>
-
- <row>
- <entry><varname>lxc-libvirt</varname></entry>
-- <entry>Linux container implementation by libvirt</entry>
-+ <entry>Container implementation by libvirt</entry>
- </row>
-
- <row>
-diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
-index 9e84fd8ccb..7f0dcd14d7 100644
---- a/man/systemd-machine-id-setup.xml
-+++ b/man/systemd-machine-id-setup.xml
-@@ -58,7 +58,7 @@
- and is different for every booted instance of the
- VM.</para></listitem>
-
-- <listitem><para>Similarly, if run inside a Linux container
-+ <listitem><para>Similarly, if run inside a container
- environment and a UUID is configured for the container, this is
- used to initialize the machine ID. For details, see the
- documentation of the <ulink
-diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
-index c895adaaf3..d2dc0538ca 100644
---- a/man/systemd-resolved.service.xml
-+++ b/man/systemd-resolved.service.xml
-@@ -47,7 +47,7 @@
- <citerefentry project='man-pages'><refentrytitle>getaddrinfo</refentrytitle><manvolnum>3</manvolnum></citerefentry> API as defined
- by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink> and its related resolver functions,
- including <citerefentry project='man-pages'><refentrytitle>gethostbyname</refentrytitle><manvolnum>3</manvolnum></citerefentry>. This
-- API is widely supported, including beyond the Linux platform. In its current form it does not expose DNSSEC
-+ API is widely supported, including beyond the GNU/Linux platform. In its current form it does not expose DNSSEC
- validation status information however, and is synchronous only. This API is backed by the glibc Name Service
- Switch (<citerefentry project='man-pages'><refentrytitle>nss</refentrytitle><manvolnum>5</manvolnum></citerefentry>). Usage of the
- glibc NSS module <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-@@ -153,7 +153,7 @@
-
- <itemizedlist>
- <listitem><para><command>systemd-resolved</command> maintains the
-- <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional Linux
-+ <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional GNU/Linux
- programs. This file may be symlinked from <filename>/etc/resolv.conf</filename>. This file lists the 127.0.0.53
- DNS stub (see above) as the only DNS server. It also contains a list of search domains that are in use by
- systemd-resolved. The list of search domains is always kept up-to-date. Note that
-@@ -169,7 +169,7 @@
- <command>systemd-resolved</command>. This file does not contain any search domains.</para></listitem>
-
- <listitem><para><command>systemd-resolved</command> maintains the
-- <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional Linux
-+ <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional GNU/Linux
- programs. This file may be symlinked from <filename>/etc/resolv.conf</filename> and is always kept up-to-date,
- containing information about all known DNS servers. Note the file format's limitations: it does not know a
- concept of per-interface DNS servers and hence only contains system-wide DNS server definitions. Note that
-diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 3bd790b485..a532b74a6e 100644
---- a/man/systemd.exec.xml
-+++ b/man/systemd.exec.xml
-@@ -191,7 +191,7 @@
- which must be one of a-z, A-Z or <literal>_</literal> (i.e. numbers and <literal>-</literal> are not permitted
- as first character). The user/group name must have at least one character, and at most 31. These restrictions
- are enforced in order to avoid ambiguities and to ensure user/group names and unit files remain portable among
-- Linux systems.</para>
-+ GNU/Linux systems.</para>
-
- <para>When used in conjunction with <varname>DynamicUser=</varname> the user/group name specified is
- dynamically allocated at the time the service is started, and released at the time the service is stopped —
-diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
-index 19c2ca9907..5fd6c1598f 100644
---- a/man/systemd.socket.xml
-+++ b/man/systemd.socket.xml
-@@ -280,7 +280,7 @@
- <listitem><para>Specifies a POSIX message queue name to listen
- on. This expects a valid message queue name (i.e. beginning
- with /). Behavior otherwise is very similar to the
-- <varname>ListenFIFO=</varname> directive above. On Linux
-+ <varname>ListenFIFO=</varname> directive above. On GNU/Linux
- message queue descriptors are actually file descriptors and
- can be inherited between processes.</para></listitem>
- </varlistentry>
-diff --git a/man/systemd.xml b/man/systemd.xml
-index 17ab59beb5..89086558c7 100644
---- a/man/systemd.xml
-+++ b/man/systemd.xml
-@@ -40,7 +40,7 @@
- <refsect1>
- <title>Description</title>
-
-- <para>systemd is a system and service manager for Linux operating
-+ <para>systemd is a system and service manager for GNU/Linux operating
- systems. When run as first process on boot (as PID 1), it acts as
- init system that brings up and maintains userspace
- services.</para>
-@@ -888,10 +888,10 @@
- <title>Kernel Command Line</title>
-
- <para>When run as system instance systemd parses a number of
-- kernel command line arguments<footnote><para>If run inside a Linux
-+ kernel command line arguments<footnote><para>If run inside a
- container these arguments may be passed as command line arguments
- to systemd itself, next to any of the command line options listed
-- in the Options section above. If run outside of Linux containers,
-+ in the Options section above. If run outside of a container,
- these arguments are parsed from <filename>/proc/cmdline</filename>
- instead.</para></footnote>:</para>
-
---
-2.18.0
-
diff --git a/libre-testing/systemd/0001-Use-Arch-Linux-device-access-groups.patch b/libre-testing/systemd/0001-Use-Arch-Linux-device-access-groups.patch
deleted file mode 100644
index c511144de..000000000
--- a/libre-testing/systemd/0001-Use-Arch-Linux-device-access-groups.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 34e4b4953cb99642e9144d97823edf32b06ffe93 Mon Sep 17 00:00:00 2001
-Message-Id: <34e4b4953cb99642e9144d97823edf32b06ffe93.1520376078.git.jan.steffens@gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Tue, 6 Mar 2018 23:39:47 +0100
-Subject: [PATCH] Use Arch Linux' device access groups
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
- cdrom → optical
- dialout → uucp
- tape → storage
----
- rules/50-udev-default.rules.in | 14 +++++++-------
- sysusers.d/basic.conf.in | 6 +++---
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/rules/50-udev-default.rules.in b/rules/50-udev-default.rules.in
-index 191f56f42..f81c4d0fc 100644
---- a/rules/50-udev-default.rules.in
-+++ b/rules/50-udev-default.rules.in
-@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
--KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
-+KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
-
- SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
-
-@@ -57,13 +57,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"
- SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
-
- SUBSYSTEM=="block", GROUP="disk"
--SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom"
--SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
--KERNEL=="sch[0-9]*", GROUP="cdrom"
--KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
--KERNEL=="pktcdvd", GROUP="cdrom"
-+SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="optical"
-+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical"
-+KERNEL=="sch[0-9]*", GROUP="optical"
-+KERNEL=="pktcdvd[0-9]*", GROUP="optical"
-+KERNEL=="pktcdvd", GROUP="optical"
-
--SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
-+SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage"
- SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"
- KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
- KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control"
-diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in
-index 8e358c02d..33e513a36 100644
---- a/sysusers.d/basic.conf.in
-+++ b/sysusers.d/basic.conf.in
-@@ -24,14 +24,14 @@ g utmp - - -
-
- # Hardware access groups
- g audio - - -
--g cdrom - - -
--g dialout - - -
- g disk - - -
- g input - - -
- g kvm - - -
- g lp - - -
-+g optical - - -
- g render - - -
--g tape - - -
-+g storage - - -
-+g uucp - - -
- g video - - -
-
- # Default group for normal users
---
-2.16.2
-
diff --git a/libre-testing/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch b/libre-testing/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
deleted file mode 100644
index 62cd0131c..000000000
--- a/libre-testing/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 301445311b5161c61270163c8921b729ab9e10d8 Mon Sep 17 00:00:00 2001
-From: Luke Shumaker <lukeshu@parabola.nu>
-Date: Wed, 25 May 2016 12:23:40 -0400
-Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux"
- instead of "Linux"
-
----
- man/kernel-install.xml | 2 +-
- man/os-release.xml | 2 +-
- src/analyze/analyze.c | 2 +-
- src/core/main.c | 4 ++--
- src/firstboot/firstboot.c | 2 +-
- src/kernel-install/90-loaderentry.install | 2 +-
- 6 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/man/kernel-install.xml b/man/kernel-install.xml
-index cd9756662a..9ead6ea39b 100644
---- a/man/kernel-install.xml
-+++ b/man/kernel-install.xml
-@@ -88,7 +88,7 @@
- <filename>/boot/loader/entries/<replaceable>MACHINE-ID</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>.
- The title of the entry is the <replaceable>PRETTY_NAME</replaceable> parameter specified in
- <filename>/etc/os-release</filename> or <filename>/usr/lib/os-release</filename> (if the former is
-- missing), or "Linux <replaceable>KERNEL-VERSION</replaceable>", if unset. If the file
-+ missing), or "GNU/Linux <replaceable>KERNEL-VERSION</replaceable>", if unset. If the file
- <filename>initrd</filename> is found next to the kernel image file, the initrd will be added to the
- configuration.</para></listitem>
- </itemizedlist>
-diff --git a/man/os-release.xml b/man/os-release.xml
-index a51edf3b8a..9ff4b7e8c2 100644
---- a/man/os-release.xml
-+++ b/man/os-release.xml
-@@ -187,7 +187,7 @@
- suitable for presentation to the user. May or may not contain
- a release code name or OS version of some kind, as suitable.
- If not set, defaults to
-- <literal>PRETTY_NAME="Linux"</literal>. Example:
-+ <literal>PRETTY_NAME="GNU/Linux"</literal>. Example:
- <literal>PRETTY_NAME="Fedora 17 (Beefy
- Miracle)"</literal>.</para></listitem>
- </varlistentry>
-diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
-index de0fe6eba8..9f239c8eeb 100644
---- a/src/analyze/analyze.c
-+++ b/src/analyze/analyze.c
-@@ -712,7 +712,7 @@ static int analyze_plot(int argc, char *argv[], void *userdata) {
- svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);
- if (use_full_bus)
- svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>",
-- isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name,
-+ isempty(host->os_pretty_name) ? "GNU/Linux" : host->os_pretty_name,
- strempty(host->hostname),
- strempty(host->kernel_name),
- strempty(host->kernel_release),
-diff --git a/src/core/main.c b/src/core/main.c
-index 44dd8348be..9a4fc26425 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -1375,11 +1375,11 @@
- return status_printf(NULL, 0,
- "\nWelcome to \x1B[%sm%s\x1B[0m!\n",
- isempty(ansi_color) ? "1" : ansi_color,
-- isempty(pretty_name) ? "Linux" : pretty_name);
-+ isempty(pretty_name) ? "GNU/Linux" : pretty_name);
- else
- return status_printf(NULL, 0,
- "\nWelcome to %s!\n",
-- isempty(pretty_name) ? "Linux" : pretty_name);
-+ isempty(pretty_name) ? "GNU/Linux" : pretty_name);
- }
-
- static int write_container_id(void) {
-diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index a98e53b3a3..41b212e32d 100644
---- a/src/firstboot/firstboot.c
-+++ b/src/firstboot/firstboot.c
-@@ -87,7 +87,7 @@ static void print_welcome(void) {
- "Failed to read os-release file, ignoring: %m");
-
- printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n",
-- isempty(pretty_name) ? "Linux" : pretty_name);
-+ isempty(pretty_name) ? "GNU/Linux" : pretty_name);
-
- press_any_key();
-
-diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
-index a271cdb8a0..29047ccbff 100644
---- a/src/kernel-install/90-loaderentry.install
-+++ b/src/kernel-install/90-loaderentry.install
-@@ -40,7 +40,7 @@ elif [[ -f /usr/lib/os-release ]]; then
- fi
-
- if ! [[ $PRETTY_NAME ]]; then
-- PRETTY_NAME="Linux $KERNEL_VERSION"
-+ PRETTY_NAME="GNU/Linux $KERNEL_VERSION"
- fi
-
- declare -a BOOT_OPTIONS
---
-2.18.0
-
diff --git a/libre-testing/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch b/libre-testing/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
deleted file mode 100644
index 401d284fd..000000000
--- a/libre-testing/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a6be5d2b2cd02f302ef70c76b601e7af912c3022 Mon Sep 17 00:00:00 2001
-From: Luke Shumaker <lukeshu@parabola.nu>
-Date: Wed, 25 May 2016 12:24:56 -0400
-Subject: [PATCH 3/7] FSDG: os-release: Default NAME to "GNU/Linux" instead of
- "Linux"
-
----
- man/os-release.xml | 2 +-
- src/journal-remote/journal-gatewayd.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/man/os-release.xml b/man/os-release.xml
-index 9ff4b7e8c2..1c069275c8 100644
---- a/man/os-release.xml
-+++ b/man/os-release.xml
-@@ -98,7 +98,7 @@
- <listitem><para>A string identifying the operating system,
- without a version component, and suitable for presentation to
- the user. If not set, defaults to
-- <literal>NAME=Linux</literal>. Example:
-+ <literal>NAME=GNU/Linux</literal>. Example:
- <literal>NAME=Fedora</literal> or <literal>NAME="Debian
- GNU/Linux"</literal>.</para></listitem>
- </varlistentry>
-diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
-index 9e77e314ff..3d0c3aafd7 100644
---- a/src/journal-remote/journal-gatewayd.c
-+++ b/src/journal-remote/journal-gatewayd.c
-@@ -788,7 +788,7 @@ static int request_handler_machine(
- SD_ID128_FORMAT_VAL(mid),
- SD_ID128_FORMAT_VAL(bid),
- hostname_cleanup(hostname),
-- os_name ? os_name : "Linux",
-+ os_name ? os_name : "GNU/Linux",
- v ? v : "bare",
- usage,
- cutoff_from,
---
-2.18.0
-
diff --git a/libre-testing/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch b/libre-testing/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
deleted file mode 100644
index 58e157b21..000000000
--- a/libre-testing/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8dab19e27e7d8c81cf3fec4413172a7597c9da44 Mon Sep 17 00:00:00 2001
-From: Luke Shumaker <lukeshu@parabola.nu>
-Date: Wed, 25 May 2016 12:28:30 -0400
-Subject: [PATCH 4/7] FSDG: os-release: Default ID to "gnu-linux" instead of
- "linux"
-
-As far as I can tell, no code in this repository actually uses the ID
-field, so this is just a man page change.
----
- man/os-release.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man/os-release.xml b/man/os-release.xml
-index 1c069275c8..272258b4e1 100644
---- a/man/os-release.xml
-+++ b/man/os-release.xml
-@@ -122,7 +122,7 @@
- the operating system, excluding any version information and
- suitable for processing by scripts or usage in generated
- filenames. If not set, defaults to
-- <literal>ID=linux</literal>. Example:
-+ <literal>ID=gnu-linux</literal>. Example:
- <literal>ID=fedora</literal> or
- <literal>ID=debian</literal>.</para></listitem>
- </varlistentry>
---
-2.18.0
-
diff --git a/libre-testing/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch b/libre-testing/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
deleted file mode 100644
index 5e170ce34..000000000
--- a/libre-testing/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 50b001e3d034825142c03e612af9d4a5a307472f Mon Sep 17 00:00:00 2001
-From: Luke Shumaker <lukeshu@parabola.nu>
-Date: Wed, 25 May 2016 12:31:20 -0400
-Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux"
- instead of "linux"
-
----
- src/resolve/resolved-manager.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
-index 01372fc66b..9155ce5c2e 100644
---- a/src/resolve/resolved-manager.c
-+++ b/src/resolve/resolved-manager.c
-@@ -387,10 +387,10 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char
- static const char *fallback_hostname(void) {
-
- /* Determine the fall back hostname. For exposing this system to the outside world, we cannot have it to be
-- * "localhost" even if that's the compiled in hostname. In this case, let's revert to "linux" instead. */
-+ * "localhost" even if that's the compiled in hostname. In this case, let's revert to "gnu-linux" instead. */
-
- if (is_localhost(FALLBACK_HOSTNAME))
-- return "linux";
-+ return "gnu-linux";
-
- return FALLBACK_HOSTNAME;
- }
---
-2.18.0
-
diff --git a/libre-testing/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/libre-testing/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
deleted file mode 100644
index 0905e6bad..000000000
--- a/libre-testing/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-From 35af892f1dffbb0daa9aa721f908f7c38b064ebe Mon Sep 17 00:00:00 2001
-From: Luke Shumaker <lukeshu@parabola.nu>
-Date: Wed, 25 May 2016 12:32:21 -0400
-Subject: [PATCH 6/7] FSDG: man/: Use FSDG operating systems as examples
-
----
- man/os-release.xml | 49 +++++++++++++++++++++--------------------
- man/systemd-nspawn.xml | 50 +++++++++++++++++++++++-------------------
- 2 files changed, 52 insertions(+), 47 deletions(-)
-
-diff --git a/man/os-release.xml b/man/os-release.xml
-index 272258b4e1..6cea40cb99 100644
---- a/man/os-release.xml
-+++ b/man/os-release.xml
-@@ -99,7 +99,7 @@
- without a version component, and suitable for presentation to
- the user. If not set, defaults to
- <literal>NAME=GNU/Linux</literal>. Example:
-- <literal>NAME=Fedora</literal> or <literal>NAME="Debian
-+ <literal>NAME=BLAG</literal> or <literal>NAME="gNewSense
- GNU/Linux"</literal>.</para></listitem>
- </varlistentry>
-
-@@ -110,8 +110,8 @@
- version, excluding any OS name information, possibly including
- a release code name, and suitable for presentation to the
- user. This field is optional. Example:
-- <literal>VERSION=17</literal> or <literal>VERSION="17 (Beefy
-- Miracle)"</literal>.</para></listitem>
-+ <literal>VERSION=210k</literal> or <literal>VERSION="210k
-+ (Spartakus)"</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry>
-@@ -123,8 +123,8 @@
- suitable for processing by scripts or usage in generated
- filenames. If not set, defaults to
- <literal>ID=gnu-linux</literal>. Example:
-- <literal>ID=fedora</literal> or
-- <literal>ID=debian</literal>.</para></listitem>
-+ <literal>ID=blag</literal> or
-+ <literal>ID=gnewsense</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry>
-@@ -145,9 +145,9 @@
- should be listed in order of how closely the local operating
- system relates to the listed ones, starting with the closest.
- This field is optional. Example: for an operating system with
-- <literal>ID=centos</literal>, an assignment of
-+ <literal>ID=blag</literal>, an assignment of
- <literal>ID_LIKE="rhel fedora"</literal> would be appropriate.
-- For an operating system with <literal>ID=ubuntu</literal>, an
-+ For an operating system with <literal>ID=gnewsense</literal>, an
- assignment of <literal>ID_LIKE=debian</literal> is
- appropriate.</para></listitem>
- </varlistentry>
-@@ -176,8 +176,8 @@
- identifying the operating system version, excluding any OS
- name information or release code name, and suitable for
- processing by scripts or usage in generated filenames. This
-- field is optional. Example: <literal>VERSION_ID=17</literal>
-- or <literal>VERSION_ID=11.04</literal>.</para></listitem>
-+ field is optional. Example: <literal>VERSION_ID=210k</literal>
-+ or <literal>VERSION_ID=7.0</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry>
-@@ -188,8 +188,8 @@
- a release code name or OS version of some kind, as suitable.
- If not set, defaults to
- <literal>PRETTY_NAME="GNU/Linux"</literal>. Example:
-- <literal>PRETTY_NAME="Fedora 17 (Beefy
-- Miracle)"</literal>.</para></listitem>
-+ <literal>PRETTY_NAME="BLAG 210k
-+ (Spartakus)"</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry>
-@@ -212,7 +212,7 @@
- <ulink url="http://scap.nist.gov/specifications/cpe/">Common
- Platform Enumeration Specification</ulink> as proposed by the
- NIST. This field is optional. Example:
-- <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal>
-+ <literal>CPE_NAME="cpe:/o:blagblagblag:blag:210k"</literal>
- </para></listitem>
- </varlistentry>
-
-@@ -247,8 +247,8 @@
- one URL shall be listed in each setting. If multiple resources
- need to be referenced, it is recommended to provide an online
- landing page linking all available resources. Examples:
-- <literal>HOME_URL="https://fedoraproject.org/"</literal> and
-- <literal>BUG_REPORT_URL="https://bugzilla.redhat.com/"</literal></para></listitem>
-+ <literal>HOME_URL="https://www.blagblagblag.org/"</literal> and
-+ <literal>BUG_REPORT_URL="https://blag.fsf.org/"</literal></para></listitem>
- </varlistentry>
-
- <varlistentry>
-@@ -323,21 +323,22 @@
- recommended to prefix new fields with an OS specific
- name in order to avoid name clashes. Applications
- reading this file must ignore unknown fields. Example:
-- <literal>DEBIAN_BTS="debbugs://bugs.debian.org/"</literal></para>
-+ <literal>DEBIAN_BTS="debbugs://bugs.gnewsense.org/"</literal></para>
- </refsect1>
-
- <refsect1>
- <title>Example</title>
-
-- <programlisting>NAME=Fedora
--VERSION="17 (Beefy Miracle)"
--ID=fedora
--VERSION_ID=17
--PRETTY_NAME="Fedora 17 (Beefy Miracle)"
--ANSI_COLOR="0;34"
--CPE_NAME="cpe:/o:fedoraproject:fedora:17"
--HOME_URL="https://fedoraproject.org/"
--BUG_REPORT_URL="https://bugzilla.redhat.com/"</programlisting>
-+ <programlisting>NAME=Parabola
-+VERSION="rolling-release"
-+ID=parabola
-+ID_LIKE=arch
-+VERSION_ID=rolling-release
-+PRETTY_NAME="Parabola GNU/Linux-libre"
-+ANSI_COLOR="1;35"
-+CPE_NAME="cpe:/o:parabola:parabola:rolling-release"
-+HOME_URL="https://www.parabola.nu/"
-+BUG_REPORT_URL="https://labs.parabola.nu/"</programlisting>
- </refsect1>
-
- <refsect1>
-diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index 284c9b294b..7b3d211161 100644
---- a/man/systemd-nspawn.xml
-+++ b/man/systemd-nspawn.xml
-@@ -1,7 +1,7 @@
- <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
- <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
--<!ENTITY fedora_latest_version "28">
-+<!ENTITY blag_latest_version "140">
- <!ENTITY fedora_cloud_release "1.1">
- ]>
-
-@@ -1176,11 +1176,12 @@
- <refsect1>
- <title>Examples</title>
-
-+<!-- TODO: This example needs switched to an FSDG OS; but I'm not sure of a good machinectl-compatible image to use.
- <example>
- <title>Download a
- <ulink url="https://getfedora.org">Fedora</ulink> image and start a shell in it</title>
-
-- <programlisting># machinectl pull-raw --verify=no \
-+ <programlisting># machinectl pull-raw -&2D;verify=no \
- https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz
- # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw</programlisting>
-
-@@ -1188,31 +1189,32 @@
- <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- and opens a shell in it.</para>
- </example>
-+-->
-
- <example>
-- <title>Build and boot a minimal Fedora distribution in a container</title>
-+ <title>Build and boot a minimal BLAG distribution in a container</title>
-
-- <programlisting># dnf -y --releasever=&fedora_latest_version; --installroot=/var/lib/machines/f&fedora_latest_version; \
-- --disablerepo='*' --enablerepo=fedora --enablerepo=updates install \
-- systemd passwd dnf fedora-release vim-minimal
--# systemd-nspawn -bD /var/lib/machines/f&fedora_latest_version;</programlisting>
-+ <programlisting># dnf -y --releasever=&blag_latest_version;k --installroot=/var/lib/machines/blag&blag_latest_version; \
-+ --disablerepo='*' --enablerepo=blag --enablerepo=updates install \
-+ systemd passwd dnf blag-release vim-minimal
-+# systemd-nspawn -bD /var/lib/machines/blag&blag_latest_version;</programlisting>
-
-- <para>This installs a minimal Fedora distribution into the
-- directory <filename noindex='true'>/var/lib/machines/f&fedora_latest_version;</filename>
-+ <para>This installs a minimal BLAG distribution into the
-+ directory <filename noindex='true'>/var/lib/machines/blag&blag_latest_version;</filename>
- and then boots an OS in a namespace container in it. Because the installation
- is located underneath the standard <filename>/var/lib/machines/</filename>
- directory, it is also possible to start the machine using
-- <command>systemd-nspawn -M f&fedora_latest_version;</command>.</para>
-+ <command>systemd-nspawn -M blag&blag_latest_version;</command>.</para>
- </example>
-
- <example>
-- <title>Spawn a shell in a container of a minimal Debian unstable distribution</title>
-+ <title>Spawn a shell in a container of a minimal gNewSense Ucclia distribution</title>
-
-- <programlisting># debootstrap unstable ~/debian-tree/
--# systemd-nspawn -D ~/debian-tree/</programlisting>
-+ <programlisting># debootstrap ucclia ~/gnewsense-tree/
-+# systemd-nspawn -D ~/gnewsense-tree/</programlisting>
-
-- <para>This installs a minimal Debian unstable distribution into
-- the directory <filename>~/debian-tree/</filename> and then
-+ <para>This installs a minimal gNewSense unstable distribution into
-+ the directory <filename>~/gnewsense-tree/</filename> and then
- spawns a shell in a namespace container in it.</para>
-
- <para><command>debootstrap</command> supports
-@@ -1227,29 +1229,31 @@
-
- <example>
- <title>Boot a minimal
-- <ulink url="https://www.archlinux.org">Arch Linux</ulink> distribution in a container</title>
-+ <ulink url="https://www.parabola.nu">Parabola GNU/Linux-libre</ulink> distribution in a container</title>
-
-- <programlisting># pacstrap -c -d ~/arch-tree/ base
--# systemd-nspawn -bD ~/arch-tree/</programlisting>
-+ <programlisting># pacstrap -c -d ~/parabola-tree/ base
-+# systemd-nspawn -bD ~/parabola-tree/</programlisting>
-
-- <para>This installs a minimal Arch Linux distribution into the
-- directory <filename>~/arch-tree/</filename> and then boots an OS
-+ <para>This installs a minimal Parabola distribution into the
-+ directory <filename>~/parabola-tree/</filename> and then boots an OS
- in a namespace container in it.</para>
- </example>
-
-+<!-- TODO: This example needs switched to an FSDG OS
- <example>
- <title>Install the
- <ulink url="https://software.opensuse.org/distributions/tumbleweed">OpenSUSE Tumbleweed</ulink>
- rolling distribution</title>
-
-- <programlisting># zypper --root=/var/lib/machines/tumbleweed ar -c \
-+ <programlisting># zypper -&2Droot=/var/lib/machines/tumbleweed ar -c \
- https://download.opensuse.org/tumbleweed/repo/oss tumbleweed
--# zypper --root=/var/lib/machines/tumbleweed refresh
--# zypper --root=/var/lib/machines/tumbleweed install --no-recommends \
-+# zypper -&2Droot=/var/lib/machines/tumbleweed refresh
-+# zypper -&2Droot=/var/lib/machines/tumbleweed install -&2Dno-recommends \
- systemd shadow zypper openSUSE-release vim
- # systemd-nspawn -M tumbleweed passwd root
- # systemd-nspawn -M tumbleweed -b</programlisting>
- </example>
-+-->
-
- <example>
- <title>Boot into an ephemeral snapshot of the host system</title>
---
-2.18.0
-
diff --git a/libre-testing/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch b/libre-testing/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch
deleted file mode 100644
index 0fe5def3c..000000000
--- a/libre-testing/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 31e5d50f17d3993839d8f7c9f344a620e3871812 Mon Sep 17 00:00:00 2001
-From: Luke Shumaker <lukeshu@parabola.nu>
-Date: Sat, 17 Dec 2016 00:56:43 -0500
-Subject: [PATCH 7/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of
- "Linux Boot Manager"
-
----
- src/boot/bootctl.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
-index 2832a39dd7..534870ee50 100644
---- a/src/boot/bootctl.c
-+++ b/src/boot/bootctl.c
-@@ -665,13 +665,13 @@ static int install_variables(const char *esp_path,
- "Failed to determine current boot order: %m");
-
- if (first || r == 0) {
-- r = efi_add_boot_option(slot, "Linux Boot Manager",
-+ r = efi_add_boot_option(slot, "Systemd Boot Manager",
- part, pstart, psize,
- uuid, path);
- if (r < 0)
- return log_error_errno(r, "Failed to create EFI Boot variable entry: %m");
-
-- log_info("Created EFI boot entry \"Linux Boot Manager\".");
-+ log_info("Created EFI boot entry \"Systemd Boot Manager\".");
- }
-
- return insert_into_order(slot, first);
---
-2.18.0
-
diff --git a/libre-testing/systemd/PKGBUILD b/libre-testing/systemd/PKGBUILD
deleted file mode 100644
index 43fb95245..000000000
--- a/libre-testing/systemd/PKGBUILD
+++ /dev/null
@@ -1,460 +0,0 @@
-# Maintainer (Arch): Christian Hesse <mail@eworm.de>
-# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
-# Maintainer (Arch): Tom Gundersen <teg@jklm.no>
-# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
-# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-resolvconf' 'systemd-sysvcompat')
-pkgname+=('systemd-common' 'systemd-udev')
-# We split Arch's libsystemd into systemd-$X, for the following $X:
-_libsystemd=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
-pkgname+=("${_libsystemd[@]/#/systemd-}")
-# Can be from either systemd or systemd-stable
-_commit='f02b5472c6f0c41e5dc8dc2c84590866baf937ff'
-pkgver=240.34
-pkgrel=3
-pkgrel+=.parabola1
-arch=('x86_64')
-arch+=('i686' 'armv7h' 'ppc64le')
-url='https://www.github.com/systemd/systemd'
-makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
- 'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt'
- 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
- 'python-lxml' 'quota-tools' 'shadow' 'git'
- 'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
- 'bash-completion')
-makedepends_i686=('gnu-efi-libs' 'pkgconf')
-makedepends_x86_64=('gnu-efi-libs')
-options=('strip')
-validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net>
- '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-source=(# fragment is latest tag for source verification, final merge in prepare()
- "git+https://github.com/systemd/systemd-stable#tag=v${pkgver%.*}?signed"
- "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed"
- '0001-Use-Arch-Linux-device-access-groups.patch'
- 'initcpio-hook-udev'
- 'initcpio-install-systemd'
- 'initcpio-install-udev'
- 'parabola.conf'
- 'loader.conf'
- 'splash-parabola.bmp'
- 'systemd-user.pam'
- 'systemd-hook'
- 'udev-hook'
- 'systemd-binfmt.hook'
- 'systemd-catalog.hook'
- 'systemd-daemon-reload.hook'
- 'systemd-hwdb.hook'
- 'systemd-sysctl.hook'
- 'systemd-sysusers.hook'
- 'systemd-tmpfiles.hook'
- 'systemd-udev-reload.hook'
- 'systemd-update.hook'
- '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch'
- '0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch'
- '0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch'
- '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch'
- '0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch'
- '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch'
- '0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch')
-sha512sums=('SKIP'
- 'SKIP'
- '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e'
- 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
- '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691'
- 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
- '70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8'
- '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9'
- 'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c'
- 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
- '12abea62121f4e0867ffbcf6ba96bb1540dd7d86775556fc180ae6c844abfd13310b6782ff6d0e665c8d875446c17b40495d6c2fbc7ddcb42f9a13e1b57a8c40'
- 'b7ee4f212c910df62c3472103a64a3cdf0d31292bc2f8fa839e5c86f34faa3ef1a3693601f5716779c4552a0d2b1d57538d45610f4c2e1c80e155ffbf0af187d'
- '5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'
- '4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'
- '872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'
- '96bb157de6921086a2bfc45a650414fbffa787bccff2cbd838cbe05c6fc635cbabd533360608eb7ca2f80ab7df795065a27abf4a1b1ea2b406612a3fcf420bdc'
- 'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a'
- '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
- '577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'
- 'c4463fdd25e14a836ac3b874109861a55a0169c4206b6356b53974dd4621f645652087ebf4c738b18734a718fe7fd9ec6b700ce8dd9736525274eb16b10385e6'
- '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67'
- 'a40678af1cd677535fb71084f70a10b74e61592c48a7f3901d6b51429c0bae179208b4aebd6700871fdf334d67703c955f01a0cd5165571f53435783c457d568'
- 'ff25035b5ed7b7b1720850573235159dee3d3aa5ca042cd5249094727f0e1d9dbf249d5612a1f2fefc20ed1618000277f2c3542ac513465764a98a3405455be2'
- 'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67'
- 'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c'
- '0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30'
- 'cf0dd60f56160f6add80ecebf698632bde55ed25e54ffa6cd0fa18da4aa2d446d3e4394295446555db22d32bf3b5f563c7e77a52eeb342a8ddaabd1347032e83'
- '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839')
-
-_backports=(
- # https://github.com/systemd/systemd/issues/11259
- '8ca9e92c742602b8bcd431001e6f5b78c28c184f'
-
- # https://github.com/systemd/systemd/issues/11314
- 'ee0b9e721a368742ac6fa9c3d9a33e45dc3203a2'
-)
-
-_reverts=(
-)
-
-prepare() {
- cd "$pkgbase-stable"
-
- # add upstream repository for cherry-picking
- git remote add -f upstream ../systemd
- # merge the latest stable commit (fast-foward only to make sure
- # the verified tag is in)
- git merge --ff-only "${_commit}"
-
- local _c
- for _c in "${_backports[@]}"; do
- git cherry-pick -n "${_c}"
- done
- for _c in "${_reverts[@]}"; do
- git revert -n "${_c}"
- done
-
- # Replace cdrom/dialout/tape groups with optical/uucp/storage
- patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch
-
- # apply FSDG patches
- local _patch
- for _patch in "$srcdir"/????-FSDG-*.patch; do
- patch -Np1 -i "$_patch"
- done
-}
-
-pkgver() {
- cd "$pkgbase-stable"
-
- local _version _count
- _version="$(git describe --abbrev=0 --tags)"
- _count="$(git rev-list --count ${_version}..)"
- printf '%s.%s' "${_version#v}" "${_count}"
-}
-
-build() {
- local _timeservers=({0..3}.arch.pool.ntp.org)
- local _nameservers=(
- # We use these public name services, ordered by their
- # privacy policy (hopefully):
- # * Cloudflare (https://1.1.1.1/)
- # * Quad9 without filtering (https://www.quad9.net/)
- # * Google (https://developers.google.com/speed/public-dns/)
- 1.1.1.1
- 9.9.9.10
- 8.8.8.8
- 2606:4700:4700::1111
- 2620:fe::10
- 2001:4860:4860::8888
- )
-
- if [ "$CARCH" = "armv7h" ]; then
- LDFLAGS+=" -Wl,-fuse-ld=bfd"
- CFLAGS+=" -fno-lto"
- CXXFLAGS+=" -fno-lto"
- fi
-
- local _meson_options=(
- -Dima=false
- -Dlibidn2=true
- -Dlz4=true
-
- -Ddbuspolicydir=/usr/share/dbus-1/system.d
- -Ddefault-hierarchy=hybrid
- -Ddefault-locale=C
- -Ddefault-kill-user-processes=false
- -Dfallback-hostname='parabola'
- -Ddns-servers="${_nameservers[*]}"
- -Dntp-servers="${_timeservers[*]}"
- -Drpmmacrosdir=no
- -Dsysvinit-path=
- -Dsysvrcnd-path=
- )
- if [ "$CARCH" != "armv7h" ]; then
- _meson_options+=(-Dgnu-efi=true)
- fi
-
- arch-meson "$pkgbase-stable" build "${_meson_options[@]}"
-
- ninja -C build
-
- # Go ahead and split the package now. It's easier this way, because
- # we can use mv instead of awkward, error-prone rm/cp pairs.
- rm -rf "$srcdir/dest"
-
- # Put things in the main systemd package by default
- DESTDIR="$srcdir/dest/systemd" meson install -C build
-
- install -dm755 "$srcdir/dest/common"/usr/lib/systemd
- mv -T "$srcdir/dest"/{systemd,common}/usr/lib/systemd/libsystemd-shared-${pkgver%%.*}.so
-
- install -dm755 "$srcdir/dest/libsystemd"/usr/{lib/pkgconfig,share/man/man3,include}
- mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/include/systemd
- mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/lib/pkgconfig/libsystemd.pc
- mv "$srcdir/dest"/systemd/usr/lib/libsystemd.so* -t "$srcdir/dest"/libsystemd/usr/lib/
- mv "$srcdir/dest"/systemd/usr/share/man/man3/{SD,sd}* -t "$srcdir/dest"/libsystemd/usr/share/man/man3/
-
- install -dm755 "$srcdir/dest/libudev"/usr/{lib/pkgconfig,share/man/man3,include}
- mv -T "$srcdir/dest"/{systemd,libudev}/usr/include/libudev.h
- mv -T "$srcdir/dest"/{systemd,libudev}/usr/lib/pkgconfig/libudev.pc
- mv "$srcdir/dest"/systemd/usr/lib/libudev.so* -t "$srcdir/dest"/libudev/usr/lib/
- mv "$srcdir/dest"/systemd/usr/share/man/man3/*udev* -t "$srcdir/dest"/libudev/usr/share/man/man3/
-
- install -dm755 "$srcdir/dest/udev"/{etc,usr/lib}
- mv -T "$srcdir/dest"/{systemd,udev}/etc/udev/
- mv -T "$srcdir/dest"/{systemd,udev}/usr/lib/udev/
- while read -d '' -r file; do
- install -dm755 "$srcdir/dest/udev/${file%/*}"
- mv -T "$srcdir/dest/systemd/$file" "$srcdir/dest/udev/$file"
- done < <(find "$srcdir/dest/systemd" \( -name '*udev*' -o -name '*hwdb*' \) -printf '%P\0')
-
- local nssmodule
- for nssmodule in systemd myhostname mymachines resolve; do
- install -dm755 "$srcdir/dest/nss-$nssmodule"/usr/{lib,share/man/man8}
- mv -t "$srcdir/dest"/nss-$nssmodule/usr/share/man/man8/ -- \
- "$srcdir/dest"/systemd/usr/share/man/man8/nss-$nssmodule.8 \
- "$srcdir/dest"/systemd/usr/share/man/man8/libnss_$nssmodule.*.8
- mv "$srcdir/dest"/systemd/usr/lib/libnss_$nssmodule.so* -t "$srcdir/dest"/nss-$nssmodule/usr/lib/
- done
-
- install -dm755 "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8
- mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
- -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8
-
- rmdir "$srcdir/dest"/systemd/usr/{share/man/man3,lib/pkgconfig,include}
-}
-
-check() {
- meson test -C build
-}
-
-package_systemd() {
- pkgdesc='system and service manager'
- license=('LGPL2.1')
- groups=('base-devel')
- depends=('bash' 'dbus' 'kbd' 'kmod'
- 'libsystemd' 'pam' 'libelf'
- 'util-linux' 'pcre2')
- depends+=("systemd-common=$pkgver-$pkgrel" 'udev')
- provides=("systemd-tools=$pkgver")
- replaces=('systemd-tools')
- conflicts=('systemd-tools')
- optdepends=('libmicrohttpd: remote journald capabilities'
- 'quota-tools: kernel-level quota management'
- 'systemd-sysvcompat: symlink package to provide sysvinit binaries'
- 'polkit: allow administration as unprivileged user'
- 'curl: machinectl pull-tar and pull-raw')
- 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)
- install=systemd.install
-
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
-
- # don't write units to /etc by default. some of these will be re-enabled on
- # post_install.
- rm -rv "$pkgdir"/etc/systemd/system/*
-
- # we'll create this on installation
- rmdir "$pkgdir"/var/log/journal/remote
-
- # executable (symlinks) shipped with systemd-sysvcompat
- rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}
-
- # files shipped with systemd-resolvconf
- rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1}
-
- # avoid a potential conflict with [core]/filesystem
- rm "$pkgdir"/usr/share/factory/etc/nsswitch.conf
- sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf
-
- # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat
- install -m0644 $pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d
-
- # 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
-
- # ensure proper permissions for /var/log/journal
- # The permissions are stored with named group by tar, so this works with
- # users and groups populated by systemd-sysusers. This is only to prevent a
- # warning from pacman as permissions are set by systemd-tmpfiles anyway.
- install -d -o root -g systemd-journal -m 2755 "$pkgdir"/var/log/journal
-
- # match directory owner/group and mode from [extra]/polkit
- install -d -o root -g 102 -m 0750 "$pkgdir"/usr/share/polkit-1/rules.d
-
- # add example bootctl configuration
- install -D -m0644 parabola.conf "$pkgdir"/usr/share/systemd/bootctl/parabola.conf
- install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf
- install -D -m0644 splash-parabola.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-parabola.bmp
-
- # pacman hooks
- install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook
- install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook
- rm -- "$pkgdir"/usr/share/libalpm/hooks/*{udev,hwdb}*
-
- # overwrite the systemd-user PAM configuration with our own
- install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user
-}
-
-package_systemd-common() {
- pkgdesc='systemd files shared between split packages'
- license=('LGPL2.1')
- depends=('acl' 'cryptsetup' 'libdbus' 'glibc' 'iptables' 'libcap'
- 'libgcrypt' 'libidn2' 'libseccomp' 'libsystemd.so'
- 'libudev.so' 'libblkid.so' 'libmount.so' 'libuuid.so' 'lz4'
- 'xz' 'audit')
-
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
-}
-
-package_systemd-udev() {
- pkgdesc='Userspace device file manager'
- license=('GPL2') # NB: different than the rest
- groups=('base' 'base-devel')
- depends=("systemd-common=$pkgver-$pkgrel" 'systemd-libudev'
- 'hwids' 'kmod' 'util-linux' 'zlib')
- backup=(etc/udev/udev.conf)
-
- provides+=("${pkgname#systemd-}=$pkgver")
- conflicts+=("${pkgname#systemd-}")
- replaces+=("${pkgname#systemd-}")
-
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
-
- # add mkinitcpio hooks
- install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev
- install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev
-
- # pacman hooks
- install -D -m0755 udev-hook "$pkgdir"/usr/share/libalpm/scripts/udev-hook
- install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *{udev,hwdb}*.hook
-}
-
-package_libsystemd() {
- pkgdesc='systemd client libraries metapackage'
- depends=("${_libsystemd[@]/libsystemd/libsystemd.so}")
- license=('LGPL2.1')
-}
-
-package_systemd-libsystemd() {
- pkgdesc='systemd client library'
- depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
- license=('LGPL2.1')
- provides=('libsystemd.so')
-
- provides+=("libsystemd-standalone=$pkgver")
- conflicts+=('libsystemd-standalone')
- replaces+=('libsystemd-standalone')
-
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
-}
-
-package_systemd-libudev() {
- pkgdesc='systemd library for enumerating and introspecting local devices'
- groups=('base' 'base-devel') # match systemd-udev
- depends=('glibc' 'libcap')
- license=('LGPL2.1')
- provides=('libudev.so')
-
- provides+=("${pkgname#systemd-}=$pkgver")
- conflicts+=("${pkgname#systemd-}")
- replaces+=("${pkgname#systemd-}")
-
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
-}
-
-package_systemd-nss-systemd() {
- pkgdesc='NSS module providing user and group resolution for dynamic users and groups'
- depends=('glibc' 'libcap')
- license=('LGPL2.1')
-
- provides+=("${pkgname#systemd-}=$pkgver")
- conflicts+=("${pkgname#systemd-}")
- replaces+=("${pkgname#systemd-}")
-
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
-}
-
-package_systemd-nss-myhostname() {
- pkgdesc='NSS module providing hostname resolution for the locally configured system hostname'
- depends=('glibc' 'libcap')
- license=('LGPL2.1')
-
- provides+=("${pkgname#systemd-}=$pkgver")
- conflicts+=("${pkgname#systemd-}")
- replaces+=("${pkgname#systemd-}")
-
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
-}
-
-package_systemd-nss-mymachines() {
- pkgdesc='NSS module providing hostname resolution for local systemd-machined container instances'
- depends=('glibc' 'libcap')
- license=('LGPL2.1')
-
- provides+=("${pkgname#systemd-}=$pkgver")
- conflicts+=("${pkgname#systemd-}")
- replaces+=("${pkgname#systemd-}")
-
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
-}
-
-package_systemd-nss-resolve() {
- pkgdesc='NSS module providing hostname resolution via systemd-resolved'
- depends=('glibc' 'libcap')
- license=('LGPL2.1')
-
- provides+=("${pkgname#systemd-}=$pkgver")
- conflicts+=("${pkgname#systemd-}")
- replaces+=("${pkgname#systemd-}")
-
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
-}
-
-package_systemd-resolvconf() {
- pkgdesc='systemd resolvconf replacement (for use with systemd-resolved)'
- license=('LGPL2.1')
- depends=('systemd')
- provides=('openresolv' 'resolvconf')
- conflicts=('openresolv')
-
- replaces+=('notsystemd-resolvconf') # notsystemd-resolvconf should have never existed
-
- install -d -m0755 "$pkgdir"/usr/bin
- ln -s resolvectl "$pkgdir"/usr/bin/resolvconf
-
- install -d -m0755 "$pkgdir"/usr/share/man/man1
- ln -s resolvectl.1.gz "$pkgdir"/usr/share/man/man1/resolvconf.1.gz
-}
-
-package_systemd-sysvcompat() {
- pkgdesc='sysvinit compat for systemd'
- license=('LGPL2.1')
- groups=('base')
- provides=('init')
- conflicts=('init' 'sysvinit')
- depends=('systemd')
-
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
-
- install -d -m0755 "$pkgdir"/usr/bin
- ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init
- for tool in runlevel reboot shutdown poweroff halt telinit; do
- ln -s systemctl "$pkgdir"/usr/bin/$tool
- done
-}
-
-# vim:ft=sh syn=sh et sw=2:
diff --git a/libre-testing/systemd/initcpio-hook-udev b/libre-testing/systemd/initcpio-hook-udev
deleted file mode 100644
index ea9a11f8c..000000000
--- a/libre-testing/systemd/initcpio-hook-udev
+++ /dev/null
@@ -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:
diff --git a/libre-testing/systemd/initcpio-install-systemd b/libre-testing/systemd/initcpio-install-systemd
deleted file mode 100644
index 8fb4441f7..000000000
--- a/libre-testing/systemd/initcpio-install-systemd
+++ /dev/null
@@ -1,202 +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/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
-
- # for journalctl in emergency shell
- add_binary journalctl
-
- # 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@.service \
- systemd-hibernate-resume@.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"
-
- 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"
- 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 '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/libre-testing/systemd/initcpio-install-udev b/libre-testing/systemd/initcpio-install-udev
deleted file mode 100644
index 31d982712..000000000
--- a/libre-testing/systemd/initcpio-install-udev
+++ /dev/null
@@ -1,29 +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 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:
diff --git a/libre-testing/systemd/loader.conf b/libre-testing/systemd/loader.conf
deleted file mode 100644
index a064e3463..000000000
--- a/libre-testing/systemd/loader.conf
+++ /dev/null
@@ -1 +0,0 @@
-default parabola
diff --git a/libre-testing/systemd/parabola.conf b/libre-testing/systemd/parabola.conf
deleted file mode 100644
index 111072ea2..000000000
--- a/libre-testing/systemd/parabola.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-## This is just an example config file.
-## Please edit the paths and kernel parameters according to your system.
-
-title Parabola GNU/Linux-libre
-linux /vmlinuz-linux-libre
-initrd /initramfs-linux-libre.img
-options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap
diff --git a/libre-testing/systemd/splash-parabola.bmp b/libre-testing/systemd/splash-parabola.bmp
deleted file mode 100644
index 471ac8ec3..000000000
--- a/libre-testing/systemd/splash-parabola.bmp
+++ /dev/null
Binary files differ
diff --git a/libre-testing/systemd/systemd-binfmt.hook b/libre-testing/systemd/systemd-binfmt.hook
deleted file mode 100644
index 9c31a4b16..000000000
--- a/libre-testing/systemd/systemd-binfmt.hook
+++ /dev/null
@@ -1,10 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/binfmt.d/*.conf
-
-[Action]
-Description = Registering binary formats...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook binfmt
diff --git a/libre-testing/systemd/systemd-catalog.hook b/libre-testing/systemd/systemd-catalog.hook
deleted file mode 100644
index d28bddc4b..000000000
--- a/libre-testing/systemd/systemd-catalog.hook
+++ /dev/null
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/systemd/catalog/*
-
-[Action]
-Description = Updating journal message catalog...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook catalog
diff --git a/libre-testing/systemd/systemd-daemon-reload.hook b/libre-testing/systemd/systemd-daemon-reload.hook
deleted file mode 100644
index 87923e862..000000000
--- a/libre-testing/systemd/systemd-daemon-reload.hook
+++ /dev/null
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/systemd/system/*
-
-[Action]
-Description = Reloading system manager configuration...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload
diff --git a/libre-testing/systemd/systemd-hook b/libre-testing/systemd/systemd-hook
deleted file mode 100644
index 793a42943..000000000
--- a/libre-testing/systemd/systemd-hook
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh -e
-
-systemd_live() {
- if [ ! -d /run/systemd/system ]; then
- echo >&2 " Skipped: Current root is not booted."
- exit 0
- fi
-}
-
-case $1 in
- catalog) /usr/bin/journalctl --update-catalog ;;
- update) touch -c /usr ;;
- sysusers) /usr/bin/systemd-sysusers ;;
- tmpfiles) /usr/bin/systemd-tmpfiles --create ;;
-
- daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;;
- binfmt) systemd_live; /usr/lib/systemd/systemd-binfmt ;;
- sysctl) systemd_live; /usr/lib/systemd/systemd-sysctl ;;
-
- *) echo >&2 " Invalid operation '$1'"; exit 1 ;;
-esac
-
-exit 0
diff --git a/libre-testing/systemd/systemd-hwdb.hook b/libre-testing/systemd/systemd-hwdb.hook
deleted file mode 100644
index ec5bcfb94..000000000
--- a/libre-testing/systemd/systemd-hwdb.hook
+++ /dev/null
@@ -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/share/libalpm/scripts/udev-hook hwdb
diff --git a/libre-testing/systemd/systemd-sysctl.hook b/libre-testing/systemd/systemd-sysctl.hook
deleted file mode 100644
index aec5ac1b0..000000000
--- a/libre-testing/systemd/systemd-sysctl.hook
+++ /dev/null
@@ -1,10 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/sysctl.d/*.conf
-
-[Action]
-Description = Applying kernel sysctl settings...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook sysctl
diff --git a/libre-testing/systemd/systemd-sysusers.hook b/libre-testing/systemd/systemd-sysusers.hook
deleted file mode 100644
index 9873dd402..000000000
--- a/libre-testing/systemd/systemd-sysusers.hook
+++ /dev/null
@@ -1,10 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/sysusers.d/*.conf
-
-[Action]
-Description = Creating system user accounts...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook sysusers
diff --git a/libre-testing/systemd/systemd-tmpfiles.hook b/libre-testing/systemd/systemd-tmpfiles.hook
deleted file mode 100644
index df60d8275..000000000
--- a/libre-testing/systemd/systemd-tmpfiles.hook
+++ /dev/null
@@ -1,10 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/tmpfiles.d/*.conf
-
-[Action]
-Description = Creating temporary files...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles
diff --git a/libre-testing/systemd/systemd-udev-reload.hook b/libre-testing/systemd/systemd-udev-reload.hook
deleted file mode 100644
index 418515daf..000000000
--- a/libre-testing/systemd/systemd-udev-reload.hook
+++ /dev/null
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/udev/rules.d/*
-
-[Action]
-Description = Reloading device manager configuration...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/udev-hook udev-reload
diff --git a/libre-testing/systemd/systemd-update.hook b/libre-testing/systemd/systemd-update.hook
deleted file mode 100644
index 7084a0c16..000000000
--- a/libre-testing/systemd/systemd-update.hook
+++ /dev/null
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/
-
-[Action]
-Description = Arming ConditionNeedsUpdate...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook update
diff --git a/libre-testing/systemd/systemd-user.pam b/libre-testing/systemd/systemd-user.pam
deleted file mode 100644
index 83f762696..000000000
--- a/libre-testing/systemd/systemd-user.pam
+++ /dev/null
@@ -1,5 +0,0 @@
-# Used by systemd --user instances.
-
-account include system-login
-session required pam_loginuid.so
-session include system-login
diff --git a/libre-testing/systemd/systemd.install b/libre-testing/systemd/systemd.install
deleted file mode 100644
index fedc747ea..000000000
--- a/libre-testing/systemd/systemd.install
+++ /dev/null
@@ -1,99 +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
- :
-}
-
-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'
-}
-
-_232_8_changes() {
- # paper over possible effects of CVE-2016-10156
- local stamps=(/var/lib/systemd/timers/*.timer)
-
- if [[ -f ${stamps[0]} ]]; then
- chmod 0644 "${stamps[@]}"
- 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
-
- post_common "$@"
-
- add_journal_acls
-
- # enable some services by default, but don't track them
- systemctl enable getty@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 "$@"
-
- # don't reexec if the old version is 231-1 or 231-2.
- # https://github.com/systemd/systemd/commit/bd64d82c1c
- if [[ $1 != 231-[12] ]] && sd_booted; then
- systemctl --system daemon-reexec
- fi
-
- local v upgrades=(
- 216-2
- 219-2
- 219-4
- 230-1
- 232-8
- 233.75-3
- )
-
- for v in "${upgrades[@]}"; do
- if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
- "_${v//[.-]/_}_changes"
- fi
- done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre-testing/systemd/udev-hook b/libre-testing/systemd/udev-hook
deleted file mode 100644
index 61d853293..000000000
--- a/libre-testing/systemd/udev-hook
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-udevd_live() {
- if [ ! -d /run/udev ]; then
- echo >&2 " Skipped: Device manager is not running."
- exit 0
- fi
-}
-
-case $1 in
- hwdb) /usr/bin/systemd-hwdb --usr update ;;
-
- udev-reload) udevd_live; /usr/bin/udevadm control --reload ;;
-
- *) echo >&2 " Invalid operation '$1'"; exit 1 ;;
-esac
-
-exit 0