forked from webosose/meta-webosose
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
webos: systemd: update patches to apply on v253.7
:Release Notes: :Detailed Notes: Fixes: http://gecko.lge.com:8000/Errors/Details/650050 NOTE: --- Patch fuzz start --- Applying patch 0001-systemd-oomd-depend-on-swap-on.patch patching file units/systemd-oomd.service.in Hunk #1 succeeded at 13 with fuzz 1 (offset 1 line). Now at patch 0001-systemd-oomd-depend-on-swap-on.patch
- Loading branch information
1 parent
03810a6
commit 57d6725
Showing
6 changed files
with
22 additions
and
27 deletions.
There are no files selected for viewing
11 changes: 5 additions & 6 deletions
11
meta-webos/recipes-core/systemd/systemd/0001-systemd-oomd-depend-on-swap-on.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,19 @@ | ||
From e87069cdb975185a0e53fcccc8ebd04b3ffe628b Mon Sep 17 00:00:00 2001 | ||
From 8ca1ac4a4452c4a3b272d5fc3f2de152d4e9eee2 Mon Sep 17 00:00:00 2001 | ||
From: Hotaek Jung <[email protected]> | ||
Date: Mon, 12 Jul 2021 19:16:26 +0900 | ||
Subject: [PATCH] systemd-oomd: depend on swap-on | ||
|
||
--- | ||
Upstream-Status: Pending | ||
|
||
--- | ||
units/systemd-oomd.service.in | 2 ++ | ||
1 file changed, 2 insertions(+) | ||
|
||
diff --git a/units/systemd-oomd.service.in b/units/systemd-oomd.service.in | ||
index 9f248e2ba4..7af552ffe3 100644 | ||
index c138f5eefa..ad187c6453 100644 | ||
--- a/units/systemd-oomd.service.in | ||
+++ b/units/systemd-oomd.service.in | ||
@@ -12,6 +12,8 @@ Description=Userspace Out-Of-Memory (OOM) Killer | ||
Documentation=man:systemd-oomd.service(8) | ||
@@ -13,6 +13,8 @@ Documentation=man:systemd-oomd.service(8) | ||
Documentation=man:org.freedesktop.oom1(5) | ||
DefaultDependencies=no | ||
Before=multi-user.target shutdown.target | ||
+Wants=swap-on.service | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,10 @@ | ||
From 25fbd333cb82d4dc647c151103fd24d6871604ef Mon Sep 17 00:00:00 2001 | ||
From 316b49b080bc7019fa0298e19cd957e564d67ad1 Mon Sep 17 00:00:00 2001 | ||
From: Hotaek Jung <[email protected]> | ||
Date: Mon, 12 Jul 2021 19:16:26 +0900 | ||
Subject: [PATCH] Add webos interface | ||
|
||
--- | ||
Upstream-Status: Pending | ||
|
||
--- | ||
src/oom/com.webos.MemoryManager1.conf | 40 ++++++++++++++++++++++++ | ||
src/oom/meson.build | 7 +++++ | ||
src/oom/oomd-manager.c | 7 +++++ | ||
|
@@ -94,7 +93,7 @@ index 1c4e7f1e64..33f25f55e5 100644 | |
install_dir : dbussystemservicedir) | ||
|
||
diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c | ||
index 4a43807b87..7636fab919 100644 | ||
index 08a29ec77b..bfed4bebd0 100644 | ||
--- a/src/oom/oomd-manager.c | ||
+++ b/src/oom/oomd-manager.c | ||
@@ -14,6 +14,8 @@ | ||
|
@@ -123,10 +122,10 @@ index 4a43807b87..7636fab919 100644 | |
+ // send MemoryPressure signal | ||
+ send_signal_pressure(m, WEBOS_SIGNAL_TYPE_PSI); | ||
|
||
r = oomd_kill_by_pgscan_rate(m->monitored_mem_pressure_cgroup_contexts_candidates, t->path, m->dry_run, &selected); | ||
if (r == -ENOMEM) | ||
r = oomd_kill_by_pgscan_rate(m->monitored_mem_pressure_cgroup_contexts_candidates, | ||
/* prefix= */ t->path, | ||
diff --git a/src/oom/oomd.c b/src/oom/oomd.c | ||
index eb1b830605..61a8800389 100644 | ||
index 60e81e7abe..588f7c6866 100644 | ||
--- a/src/oom/oomd.c | ||
+++ b/src/oom/oomd.c | ||
@@ -17,6 +17,8 @@ | ||
|
@@ -266,10 +265,10 @@ index 0000000000..bed7413c6a | |
+ | ||
+int webos_manager_start(Manager *m); | ||
diff --git a/units/systemd-oomd.service.in b/units/systemd-oomd.service.in | ||
index 7af552ffe3..747f225b12 100644 | ||
index ad187c6453..d853fe5490 100644 | ||
--- a/units/systemd-oomd.service.in | ||
+++ b/units/systemd-oomd.service.in | ||
@@ -27,7 +27,7 @@ After=systemd-oomd.socket | ||
@@ -28,7 +28,7 @@ After=systemd-oomd.socket | ||
AmbientCapabilities=CAP_KILL CAP_DAC_OVERRIDE | ||
BusName=org.freedesktop.oom1 | ||
CapabilityBoundingSet=CAP_KILL CAP_DAC_OVERRIDE | ||
|
5 changes: 2 additions & 3 deletions
5
meta-webos/recipes-core/systemd/systemd/0003-systemd-oomd-modify-oomd.conf.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,10 @@ | ||
From abe0bdd46c8d59378c59b6fbf649ecc70a4ab92b Mon Sep 17 00:00:00 2001 | ||
From 11983bece6c2e5e859ed99d919a3cf8dcf833897 Mon Sep 17 00:00:00 2001 | ||
From: Hotaek Jung <[email protected]> | ||
Date: Mon, 12 Jul 2021 19:16:26 +0900 | ||
Subject: [PATCH] systemd-oomd: modify oomd.conf | ||
|
||
--- | ||
Upstream-Status: Pending | ||
|
||
--- | ||
src/oom/oomd.conf | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
|
7 changes: 3 additions & 4 deletions
7
meta-webos/recipes-core/systemd/systemd/0004-oomd-to-some.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,15 @@ | ||
From 60fa455604f8b867b8a1aa887a1a9ab324fef35a Mon Sep 17 00:00:00 2001 | ||
From 9e7234138a02dcb6fbbd1bbb49e52929605d9210 Mon Sep 17 00:00:00 2001 | ||
From: Hotaek Jung <[email protected]> | ||
Date: Tue, 23 Nov 2021 10:42:42 +0900 | ||
Subject: [PATCH] oomd: to some | ||
|
||
--- | ||
Upstream-Status: Pending | ||
|
||
--- | ||
src/oom/oomd-util.c | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/src/oom/oomd-util.c b/src/oom/oomd-util.c | ||
index f97b771c50..67a4afcdc2 100644 | ||
index 49c10b5e16..884866665a 100644 | ||
--- a/src/oom/oomd-util.c | ||
+++ b/src/oom/oomd-util.c | ||
@@ -408,7 +408,7 @@ int oomd_cgroup_context_acquire(const char *path, OomdCGroupContext **ret) { | ||
|
5 changes: 2 additions & 3 deletions
5
meta-webos/recipes-core/systemd/systemd/0005-oomd-change-duration.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,10 @@ | ||
From b9e3630604b0a6adb7942588a9a9f4f8e26c8b74 Mon Sep 17 00:00:00 2001 | ||
From d997013d3cae842ff5bfea4cbc59978ad118dec7 Mon Sep 17 00:00:00 2001 | ||
From: Hotaek Jung <[email protected]> | ||
Date: Tue, 23 Nov 2021 10:42:42 +0900 | ||
Subject: [PATCH] oomd: change duration | ||
|
||
--- | ||
Upstream-Status: Pending | ||
|
||
--- | ||
src/oom/oomd-manager.h | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 624b95da2063a56295e4168c109e487f35206a00 Mon Sep 17 00:00:00 2001 | ||
From f7724069d4a076db6978b7ae05bce77e1b5961e0 Mon Sep 17 00:00:00 2001 | ||
From: "gaurav.mahajan" <[email protected]> | ||
Date: Mon, 22 May 2023 15:47:15 +0530 | ||
Subject: [PATCH] Change ownership of media directory to support non-root media | ||
|
@@ -13,7 +13,7 @@ Upstream-Status: Inappropriate [webOS specific] | |
1 file changed, 1 insertion(+) | ||
|
||
diff --git a/tmpfiles.d/systemd.conf.in b/tmpfiles.d/systemd.conf.in | ||
index fa838d8d06..326e1bfd14 100644 | ||
index fa838d8d06..6afc630662 100644 | ||
--- a/tmpfiles.d/systemd.conf.in | ||
+++ b/tmpfiles.d/systemd.conf.in | ||
@@ -64,6 +64,7 @@ d /var/lib/systemd/coredump 0755 root root 3d | ||
|