beenull/linux-surface
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pkg: fedora: Ship the default-kernel service from contrib with the kernel package

Browse source
This commit is contained in:
Dorian Stoll 2023-06-03 11:49:16 +02:00
parent e4d4ccb5c9
commit 1190026119
No known key found for this signature in database
GPG key ID: F1DACD02C619442A
4 changed files with 84 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/fedora/kernel-surface/files/linux-surface-default-kernel.path Normal file
View file

@ -0,0 +1,8 @@
[Unit]
Description=linux-surface default kernel watchdog
[Path]
PathChanged=/boot
[Install]
WantedBy=default.target

6
pkg/fedora/kernel-surface/files/linux-surface-default-kernel.service Normal file
View file

@ -0,0 +1,6 @@
[Unit]
Description=linux-surface default kernel watchdog
[Service]
Type=oneshot
ExecStart=/usr/bin/linux-surface-default-kernel.sh

20
pkg/fedora/kernel-surface/files/linux-surface-default-kernel.sh Executable file
View file

@ -0,0 +1,20 @@
#!/bin/bash
set -euo pipefail
# get list of surface kernels with timestamp
kernels=$(find /boot -maxdepth 1 -name "vmlinuz-*.surface.*" -printf '%T@\t%p\n')
# sort by timestamp
kernels=$(echo "${kernels}" | sort -n)
# get latest kernel (last line) and extract path
kernel=$(echo "${kernels}" | tail -n1 | cut -f2)
echo $kernel
# update GRUB config
grubby --set-default "${kernel}"
# update timestamp for rEFInd (ensure it's marked as latest across all kernels,
# not just surface ones)
touch "${kernel}"

50
pkg/fedora/kernel-surface/patches/0004-default-kernel.patch Normal file
View file

@ -0,0 +1,50 @@
From 5d16b0aca7c07c1e3df5c47c61f5b6f402dd987b Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Sat, 3 Jun 2023 11:47:02 +0200
Subject: [PATCH] Install scripts and service files for keeping the surface
kernel the default
Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
---
redhat/kernel.spec.template | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index 9ad0c720d467..5a367c936e05 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -911,6 +911,10 @@ Source4000: README.rst
Source4001: rpminspect.yaml
Source4002: gating.yaml
+Source4100: linux-surface-default-kernel.path
+Source4101: linux-surface-default-kernel.service
+Source4102: linux-surface-default-kernel.sh
+
## Patches needed for building this package
%if !%{nopatches}
@@ -2674,6 +2678,10 @@ find Documentation -type d | xargs chmod u+w
cd linux-%{KVERREL}
+install -D -m644 "%{SOURCE4100}" -t "%{buildroot}%{_unitdir}"
+install -D -m644 "%{SOURCE4101}" -t "%{buildroot}%{_unitdir}"
+install -D -m755 "%{SOURCE4102}" -t "%{buildroot}%{_bindir}"
+
%if %{with_doc}
docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
@@ -3331,6 +3339,9 @@ fi
%ghost %attr(0600, root, root) /boot/symvers-%{KVERREL}%{?3:+%{3}}.gz\
%ghost %attr(0600, root, root) /boot/initramfs-%{KVERREL}%{?3:+%{3}}.img\
%ghost %attr(0644, root, root) /boot/config-%{KVERREL}%{?3:+%{3}}\
+%{_bindir}/linux-surface-default-kernel.sh\
+%{_unitdir}/linux-surface-default-kernel.path\
+%{_unitdir}/linux-surface-default-kernel.service\
%{expand:%%files -f kernel-%{?3:%{3}-}modules-core.list %{?3:%{3}-}modules-core}\
%dir /lib/modules\
%dir /lib/modules/%{KVERREL}%{?3:+%{3}}\
--
2.40.1