From 464fd24324b4d87e8378f7463800a2e65bf74678 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 2 Jun 2024 19:38:25 +0800 Subject: [PATCH 1/2] udev & systemd: Emphasis "API headers" for linux compatibility Or people will ask "why no-break-userspace rule does not apply?" --- chapter08/systemd.xml | 2 +- chapter08/udev.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index 30b99fc17..effd15165 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -48,7 +48,7 @@ sed -i -e 's/GROUP="render"/GROUP="video"/' \ -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in - Next, fix compatibility with linux-6.9 and later: + Next, fix compatibility with API headers from linux-6.9 and later: sed -i '/DEVMEM_MAGIC 0/{n;n;a \ /* cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b (6.8) */ diff --git a/chapter08/udev.xml b/chapter08/udev.xml index 8f71237b8..1c293a851 100644 --- a/chapter08/udev.xml +++ b/chapter08/udev.xml @@ -55,7 +55,7 @@ sed '/systemd-sysctl/s/^/#/' -i rules.d/99-systemd.rules.in - Next, fix compatibility with linux-6.9 and later: + Next, fix compatibility with API headers from linux-6.9 and later: sed -i '/DEVMEM_MAGIC 0/{n;n;a \ /* cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b (6.8) */ \ From b3c50e06f676f2dfbb3b709c3cf86784d0c5b275 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 2 Jun 2024 19:45:09 +0800 Subject: [PATCH 2/2] systemd: Fix the sed adding PID_FS_MAGIC into src/basic/missing_magic.h Without this trailing backslash only one line (the comment) is added. Note that udev.xml contains the correct sed. --- chapter08/systemd.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index effd15165..e798b6d6b 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -51,7 +51,7 @@ Next, fix compatibility with API headers from linux-6.9 and later: sed -i '/DEVMEM_MAGIC 0/{n;n;a \ -/* cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b (6.8) */ +/* cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b (6.8) */ \ #ifndef PID_FS_MAGIC \ #define PID_FS_MAGIC 0x50494446 \ #endif