summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch29
-rw-r--r--libre/systemd/PKGBUILD65
-rw-r--r--libre/systemd/initcpio-install-systemd3
-rw-r--r--libre/systemd/systemd.install8
-rw-r--r--libre/systemd/udev-hwdb.hook11
5 files changed, 74 insertions, 42 deletions
diff --git a/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch b/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch
index c247cb3ad..59ab5bee4 100644
--- a/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch
+++ b/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch
@@ -8,10 +8,10 @@ Subject: [PATCH 2/6] FSDG: os-release: Default to PRETTY_NAME "GNU/Linux"
man/kernel-install.xml | 2 +-
man/os-release.xml | 2 +-
src/analyze/analyze.c | 2 +-
- src/core/main.c | 2 +-
+ src/core/main.c | 4 +-
src/firstboot/firstboot.c | 2 +-
src/kernel-install/90-loaderentry.install | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
+ 6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/man/kernel-install.xml b/man/kernel-install.xml
index d7e27de..eb51918 100644
@@ -40,10 +40,10 @@ index 4557abc..767a1c7 100644
Miracle)"</literal>.</para></listitem>
</varlistentry>
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
-index a847084..1a28093 100644
+index d621f66..53c97f9 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
-@@ -660,7 +660,7 @@ static int analyze_plot(sd_bus *bus) {
+@@ -653,7 +653,7 @@ static int analyze_plot(sd_bus *bus) {
svg("<rect class=\"background\" width=\"100%%\" height=\"100%%\" />\n");
svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);
svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>",
@@ -53,20 +53,25 @@ index a847084..1a28093 100644
strempty(host->kernel_name),
strempty(host->kernel_release),
diff --git a/src/core/main.c b/src/core/main.c
-index e208857..5346392 100644
+index 93098da..b9cac92 100644
--- a/src/core/main.c
+++ b/src/core/main.c
-@@ -1233,7 +1233,7 @@ static int status_welcome(void) {
- return status_printf(NULL, false, false,
- "\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);
+@@ -1238,11 +1238,11 @@ static int status_welcome(void) {
+ return status_printf(NULL, false, false,
+ "\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, false, false,
+ "\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 7790ab8..8e57a24 100644
+index 3df7246..1e1a592 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -96,7 +96,7 @@ static void print_welcome(void) {
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 48b23cfde..d35849dad 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -6,8 +6,8 @@
pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat'
'libsystemd-standalone' 'libudev' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
-pkgver=229
-pkgrel=3.parabola2
+pkgver=230
+pkgrel=3.parabola1
arch=('i686' 'x86_64' 'armv7h')
url="http://www.freedesktop.org/wiki/Software/systemd"
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -23,6 +23,7 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
'initcpio-install-udev'
'parabola.conf'
'loader.conf'
+ 'udev-hwdb.hook'
'0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch'
'0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch'
'0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch'
@@ -32,12 +33,13 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
"https://repo.parabola.nu/other/systemd/splash-parabola.bmp"{,.sig})
md5sums=('SKIP'
'90ea67a7bb237502094914622a39e281'
- '976c5511b6493715e381f43f16cdb151'
+ 'cfb3f8ea657ab24535cc061bb38ec4c1'
'1b3aa3a0551b08af9305d33f85b5c2fc'
'36ee74767ac8734dede1cbd0f4f275d7'
'9b9f4a58e4c4009bf5290c5b297600c3'
+ 'a475a5ed8f03fb0f6b58b4684998d05c'
'92a4bb5e527e1e956743c1ffa622adc7'
- '35e9e89add0243f77f0b1c9be6f7bdcb'
+ '397e2262bf96df3bc1762a3b0bef2f75'
'e592f6778c12627d46982ddfe0698361'
'c4c559f9916806f5162ccff3e7c433e8'
'5166fe700ef5991c2da3876206c699fb'
@@ -46,20 +48,23 @@ md5sums=('SKIP'
'SKIP')
validpgpkeys=('684D54A189305A9CC95446D36B888913DDB59515') # Márcio Silva
-prepare() {
- cd "$pkgbase"
+_backports=(
+ # Revert "rules: allow users to access frame buffer devices" (#3333)
+ e77813ca9f4e0735fd0e3e2caae4d7d1ee436011
- # networkd: FIONREAD is not reliable on some sockets
- git cherry-pick -n 4edc2c9b6b5b921873eb82e58719ed4d9e0d69bf
+ # {machine,system}ctl: always pass &changes and &n_changes (#3350)
+ acc0269cad31d1aaef2034a055b34c07c88a353d
- # fix assertion failure in src/core/timer.c on bootup (FS#48197)
- git cherry-pick -n 3f51aec8647fe13f4b1e46b2f75ff635403adf91
+ # systemctl: fix return values on success
+ 5f056378b0ceffb6e6fba3513f7eae72e2d09dc8
+)
- # fix udevd error checking from cg_unified() (FS#48188)
- git cherry-pick -n 6d2353394fc33e923d1ab464c8f88df2a5105ffb
+prepare() {
+ cd "$pkgbase"
- # revert "core: resolve specifier in config_parse_exec()"
- git cherry-pick -n bd1b973fb326e9b7587494fd6108e5ded46e9163
+ if (( ${#_backports[*]} > 0 )); then
+ git cherry-pick -n "${_backports[@]}"
+ fi
# apply FSDG patches
local patchfile
@@ -89,17 +94,24 @@ build() {
enable_gnuefi='--enable-gnuefi'
fi
- ./configure \
- --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[*]}"
+ 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
+ --without-kill-user-processes
+ )
+
+ ./configure "${configure_options[@]}"
make
@@ -159,7 +171,6 @@ package_systemd() {
etc/dbus-1/system.d/org.freedesktop.import1.conf
etc/dbus-1/system.d/org.freedesktop.network1.conf
etc/pam.d/systemd-user
- etc/systemd/bootchart.conf
etc/systemd/coredump.conf
etc/systemd/journald.conf
etc/systemd/journal-remote.conf
@@ -214,6 +225,8 @@ package_systemd() {
install -Dm644 "$srcdir/parabola.conf" "$pkgdir"/usr/share/systemd/bootctl/parabola.conf
install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf
install -Dm644 "$srcdir/splash-parabola.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-parabola.bmp
+
+ install -Dm644 "$srcdir/udev-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook"
}
package_libsystemd() {
diff --git a/libre/systemd/initcpio-install-systemd b/libre/systemd/initcpio-install-systemd
index 96df98ada..d8d30aa3d 100644
--- a/libre/systemd/initcpio-install-systemd
+++ b/libre/systemd/initcpio-install-systemd
@@ -108,8 +108,6 @@ build() {
/usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
/usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
- add_module "kdbus?"
-
# udev rules and systemd units
map add_udev_rule "$rules" \
50-udev-default.rules \
@@ -123,6 +121,7 @@ build() {
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 \
diff --git a/libre/systemd/systemd.install b/libre/systemd/systemd.install
index b0a3e1fa4..60d0cfb5a 100644
--- a/libre/systemd/systemd.install
+++ b/libre/systemd/systemd.install
@@ -37,7 +37,6 @@ _dir_empty() {
post_common() {
systemd-sysusers
- udevadm hwdb --update
journalctl --update-catalog
}
@@ -158,6 +157,10 @@ _219_4_changes() {
fi
}
+_230_1_changes() {
+ echo ':: systemd-bootchart is no longer included with systemd'
+}
+
post_install() {
systemd-machine-id-setup
@@ -193,7 +196,8 @@ post_upgrade() {
215-2
216-2
219-2
- 219-4)
+ 219-4
+ 230-1)
for v in "${upgrades[@]}"; do
if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
diff --git a/libre/systemd/udev-hwdb.hook b/libre/systemd/udev-hwdb.hook
new file mode 100644
index 000000000..7bc055b4e
--- /dev/null
+++ b/libre/systemd/udev-hwdb.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/udev/hwdb.d/*
+
+[Action]
+Description = Updating udev Hardware Database...
+When = PostTransaction
+Exec = /usr/bin/udevadm hwdb --update
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 13:54:57 +0000