From 5194ebe8bde0469aa8989722fd45bbdd3baabf3a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 20 Jul 2018 12:35:17 +0100 Subject: [PATCH 01/17] update build details --- noautobuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 noautobuild diff --git a/noautobuild b/noautobuild new file mode 100644 index 0000000..de47f54 --- /dev/null +++ b/noautobuild @@ -0,0 +1 @@ +it's a couple of bash scripts, no need for rebuilds From 043ae07d629326ce3463c991b2280baca25b2e1e Mon Sep 17 00:00:00 2001 From: pda Date: Sat, 24 Nov 2018 21:04:49 +0300 Subject: [PATCH 02/17] Added support for swap priority Signed-off-by: pda --- zram.conf | 2 ++ zramstart | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/zram.conf b/zram.conf index 27f54fb..c4c5cb5 100644 --- a/zram.conf +++ b/zram.conf @@ -1,2 +1,4 @@ # The factor is the percentage of total system RAM to allocate to the ZRAM block device(s). FACTOR=2 + +PRIORITY=1000 diff --git a/zramstart b/zramstart index ed5d2e5..91bdd64 100755 --- a/zramstart +++ b/zramstart @@ -2,8 +2,11 @@ #set -x # default factor of 1/3 of RAM factor=3 +# default priority is maximum priority +priority=32767 [ -f /etc/zram.conf ] && source /etc/zram.conf || true -factor=$FACTOR +[ -z "$FACTOR" ] || factor=$FACTOR +[ -z "$PRIORITY" ] || priority=$PRIORITY # Calculate ZRAM size mem_total=$(free -w |grep "^Mem" |awk '{printf("%d",$2)}') @@ -16,7 +19,7 @@ modprobe -q zram num_devices=1 zramdev=$(zramctl --find --algorithm lz4 --size ${zram_size}MB 2>&1) # The above returns the device. Use it below mkswap $zramdev -swapon $zramdev +swapon -p $priority $zramdev # Investigate this and swapiness # echo 0 > /proc/sys/vm/page-cluster From e120d8aa5fcd60d4376aaf5717c74d87b716e170 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 24 Nov 2018 18:21:18 +0000 Subject: [PATCH 03/17] Add support for swap priority --- zram.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zram.spec b/zram.spec index 2611c4c..1d1d026 100644 --- a/zram.spec +++ b/zram.spec @@ -1,5 +1,5 @@ Name: zram -Version: 0.2 +Version: 0.3 Release: 1%{?dist} Summary: ZRAM for swap config and services for Fedora License: GPLv2+ @@ -53,6 +53,9 @@ install -pm 0755 %{SOURCE4} %{buildroot}%{_sbindir} %{_sbindir}/zramstop %changelog +* Sat Nov 24 2018 Peter Robinson 0.3-1 +- Add support for swap priority + * Thu Jul 19 2018 Peter Robinson 0.2-1 - Service ordering fixes, minor cleanup From 52b786a6b30b8eb34245ba3244cab42d3aa0bb82 Mon Sep 17 00:00:00 2001 From: Chris Murphy Date: Wed, 26 Jun 2019 01:13:02 +0000 Subject: [PATCH 04/17] clarify factor relationship --- zram.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zram.conf b/zram.conf index c4c5cb5..bff45ba 100644 --- a/zram.conf +++ b/zram.conf @@ -1,4 +1,4 @@ -# The factor is the percentage of total system RAM to allocate to the ZRAM block device(s). +# The factor determines the ratio 1/n of RAM to allocate to the ZRAM block device, where FACTOR = n. FACTOR=2 PRIORITY=1000 From b41e31f20549630bd57521694cf139b9ad26055c Mon Sep 17 00:00:00 2001 From: Chris Murphy Date: Wed, 26 Jun 2019 01:13:53 +0000 Subject: [PATCH 05/17] fix typos --- zramstart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zramstart b/zramstart index 91bdd64..f6a05e6 100755 --- a/zramstart +++ b/zramstart @@ -12,7 +12,7 @@ priority=32767 mem_total=$(free -w |grep "^Mem" |awk '{printf("%d",$2)}') zram_size=$((${mem_total} / ${factor} /1024)) -# zram in recent kernels is multitreaded so we don't need to balance across CPUs +# ZRAM in recent kernels is multithreaded so we don't need to balance across CPUs modprobe -q zram num_devices=1 # Create ZRAM with first device, lz4 algorithm From 606846f61f7c4d2839152f2905aca2713d19eed4 Mon Sep 17 00:00:00 2001 From: Chris Murphy Date: Wed, 26 Jun 2019 01:15:28 +0000 Subject: [PATCH 06/17] reset zram device following swapoff This will hot remove the /dev/zram device node following successful swapoff, unloading the module is unnecessary. --- zramstop | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/zramstop b/zramstop index 42eea41..0777797 100755 --- a/zramstop +++ b/zramstop @@ -1,10 +1,5 @@ #!/bin/sh for i in $(grep '^/dev/zram' /proc/swaps | awk '{ print $1 }'); do - swapoff "$i" + swapoff "$i" && zramctl --reset "$i" done - -if grep -q "^zram " /proc/modules; then - sleep 1 - rmmod zram -fi From 052183931a16c9b208287669988fe3f26b033211 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 26 Jun 2019 06:46:37 +0100 Subject: [PATCH 07/17] General improvements (Chris Murphy) --- zram.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zram.spec b/zram.spec index 1d1d026..a7d5265 100644 --- a/zram.spec +++ b/zram.spec @@ -1,5 +1,5 @@ Name: zram -Version: 0.3 +Version: 0.4 Release: 1%{?dist} Summary: ZRAM for swap config and services for Fedora License: GPLv2+ @@ -53,6 +53,9 @@ install -pm 0755 %{SOURCE4} %{buildroot}%{_sbindir} %{_sbindir}/zramstop %changelog +* Wed Jun 26 2019 Peter Robinson 0.4-1 +- General improvements (Chris Murphy) + * Sat Nov 24 2018 Peter Robinson 0.3-1 - Add support for swap priority From d84b300dbdbfa1f7ba06ae61a7fc77d6e1e3d866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 6 Oct 2021 12:48:43 +0200 Subject: [PATCH 08/17] Do not avoid automatic rebuilds See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/E33BXNFLE5WMJIPLITYEFOFTXYOGUMBW/ --- noautobuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 noautobuild diff --git a/noautobuild b/noautobuild deleted file mode 100644 index de47f54..0000000 --- a/noautobuild +++ /dev/null @@ -1 +0,0 @@ -it's a couple of bash scripts, no need for rebuilds From efceafb77685fd21b3e5d7987ff7f66a6deae4bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:56:17 +0000 Subject: [PATCH 09/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zram.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zram.spec b/zram.spec index a7d5265..4d2c6ed 100644 --- a/zram.spec +++ b/zram.spec @@ -1,6 +1,6 @@ Name: zram Version: 0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ZRAM for swap config and services for Fedora License: GPLv2+ @@ -53,6 +53,9 @@ install -pm 0755 %{SOURCE4} %{buildroot}%{_sbindir} %{_sbindir}/zramstop %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jun 26 2019 Peter Robinson 0.4-1 - General improvements (Chris Murphy) From cab06e5edecb61b33537cb4576b885d1502a0c95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 14:00:17 +0000 Subject: [PATCH 10/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zram.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zram.spec b/zram.spec index 4d2c6ed..c562fb5 100644 --- a/zram.spec +++ b/zram.spec @@ -1,6 +1,6 @@ Name: zram Version: 0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: ZRAM for swap config and services for Fedora License: GPLv2+ @@ -53,6 +53,9 @@ install -pm 0755 %{SOURCE4} %{buildroot}%{_sbindir} %{_sbindir}/zramstop %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 3246ac92e8b22148af40a5deb6f4d241c02b1013 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:20:58 +0000 Subject: [PATCH 11/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zram.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zram.spec b/zram.spec index c562fb5..4a2edfd 100644 --- a/zram.spec +++ b/zram.spec @@ -1,6 +1,6 @@ Name: zram Version: 0.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: ZRAM for swap config and services for Fedora License: GPLv2+ @@ -53,6 +53,9 @@ install -pm 0755 %{SOURCE4} %{buildroot}%{_sbindir} %{_sbindir}/zramstop %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From aa06ded33affc0dbd2f6cd268a9d0a00284250e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:47:09 +0000 Subject: [PATCH 12/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zram.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zram.spec b/zram.spec index 4a2edfd..b183ca0 100644 --- a/zram.spec +++ b/zram.spec @@ -1,6 +1,6 @@ Name: zram Version: 0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: ZRAM for swap config and services for Fedora License: GPLv2+ @@ -53,6 +53,9 @@ install -pm 0755 %{SOURCE4} %{buildroot}%{_sbindir} %{_sbindir}/zramstop %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f5fd1413f9268ca338aebb3c71a83b9f25a62904 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:17:25 +0000 Subject: [PATCH 13/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zram.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zram.spec b/zram.spec index b183ca0..461c876 100644 --- a/zram.spec +++ b/zram.spec @@ -1,6 +1,6 @@ Name: zram Version: 0.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: ZRAM for swap config and services for Fedora License: GPLv2+ @@ -53,6 +53,9 @@ install -pm 0755 %{SOURCE4} %{buildroot}%{_sbindir} %{_sbindir}/zramstop %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 84f4421480a10b09e51f0b611f25e085a37b4b78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:57:03 +0000 Subject: [PATCH 14/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zram.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zram.spec b/zram.spec index 461c876..f2c72c4 100644 --- a/zram.spec +++ b/zram.spec @@ -1,6 +1,6 @@ Name: zram Version: 0.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: ZRAM for swap config and services for Fedora License: GPLv2+ @@ -53,6 +53,9 @@ install -pm 0755 %{SOURCE4} %{buildroot}%{_sbindir} %{_sbindir}/zramstop %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9cb77acd978a2aa1f244e21d96d89fc5dceb1b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 04:06:09 +0200 Subject: [PATCH 15/17] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- zram.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zram.spec b/zram.spec index f2c72c4..5e70e1f 100644 --- a/zram.spec +++ b/zram.spec @@ -1,8 +1,9 @@ Name: zram Version: 0.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: ZRAM for swap config and services for Fedora -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later # No upstream as it's Fedora specific. Source0: COPYING @@ -53,6 +54,9 @@ install -pm 0755 %{SOURCE4} %{buildroot}%{_sbindir} %{_sbindir}/zramstop %changelog +* Fri Jul 26 2024 Miroslav Suchý - 0.4-8 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 0.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6a46ca5ab4a775b4d9008807e18b4485622c1b00 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:52:20 +0000 Subject: [PATCH 16/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zram.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zram.spec b/zram.spec index 5e70e1f..d0e776c 100644 --- a/zram.spec +++ b/zram.spec @@ -1,6 +1,6 @@ Name: zram Version: 0.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: ZRAM for swap config and services for Fedora # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -54,6 +54,9 @@ install -pm 0755 %{SOURCE4} %{buildroot}%{_sbindir} %{_sbindir}/zramstop %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 0.4-8 - convert license to SPDX From 142265ec13bdadd95333ea4fef5213846c8a4538 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:20:50 +0000 Subject: [PATCH 17/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zram.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zram.spec b/zram.spec index d0e776c..4c775a1 100644 --- a/zram.spec +++ b/zram.spec @@ -1,6 +1,6 @@ Name: zram Version: 0.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: ZRAM for swap config and services for Fedora # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -54,6 +54,9 @@ install -pm 0755 %{SOURCE4} %{buildroot}%{_sbindir} %{_sbindir}/zramstop %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 0.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild