From a5dedd5ac845c6f9da27884788c86961795a771b Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 28 Feb 2021 15:38:20 +0100 Subject: [PATCH 1/6] Add support for memory cgroup Current build throws error "cgroups: memory cgroup not supported on this system". See https://archlinuxarm.org/forum/viewtopic.php?f=15&t=12086 for more information. --- stage1/00-boot-files/files/cmdline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage1/00-boot-files/files/cmdline.txt b/stage1/00-boot-files/files/cmdline.txt index eafccd6d..24ee1e8b 100644 --- a/stage1/00-boot-files/files/cmdline.txt +++ b/stage1/00-boot-files/files/cmdline.txt @@ -1 +1 @@ -usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u,174c:55aa:u,04e8:61f5:u,04e8:4001:u,1058:082a:u,2109:0711:u,152d:0562:u,7825:a2a4:u,04e8:4001:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait +usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u,174c:55aa:u,04e8:61f5:u,04e8:4001:u,1058:082a:u,2109:0711:u,152d:0562:u,7825:a2a4:u,04e8:4001:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait cgroup_enable=memory cgroup_memory=1 From f5cd3404d52c2395e88210e7c4f38b46d17367ca Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 12 Mar 2021 18:37:14 +0100 Subject: [PATCH 2/6] Include cgroup_enable=memory cgroup_memory=1 --- stage2/00-sys-tweaks/00-patches/07-resize-init.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage2/00-sys-tweaks/00-patches/07-resize-init.diff b/stage2/00-sys-tweaks/00-patches/07-resize-init.diff index 5ca1f824..419648f8 100644 --- a/stage2/00-sys-tweaks/00-patches/07-resize-init.diff +++ b/stage2/00-sys-tweaks/00-patches/07-resize-init.diff @@ -2,4 +2,4 @@ +++ stage2/rootfs/boot/cmdline.txt @@ -1 +1 @@ -usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u,174c:55aa:u,04e8:61f5:u,04e8:4001:u,1058:082a:u,2109:0711:u,152d:0562:u,7825:a2a4:u,04e8:4001:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait -+usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u,174c:55aa:u,04e8:61f5:u,04e8:4001:u,1058:082a:u,2109:0711:u,152d:0562:u,7825:a2a4:u,04e8:4001:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet init=/usr/lib/raspi-config/init_resize.sh ++usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u,174c:55aa:u,04e8:61f5:u,04e8:4001:u,1058:082a:u,2109:0711:u,152d:0562:u,7825:a2a4:u,04e8:4001:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet cgroup_enable=memory cgroup_memory=1 init=/usr/lib/raspi-config/init_resize.sh From 615fa47a2ddab0ac16b4bdc1122338a8b12b8999 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 12 Mar 2021 20:44:45 +0100 Subject: [PATCH 3/6] Update stage2/00-sys-tweaks/00-patches/07-resize-init.diff Co-authored-by: Aaron Dewes --- stage2/00-sys-tweaks/00-patches/07-resize-init.diff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stage2/00-sys-tweaks/00-patches/07-resize-init.diff b/stage2/00-sys-tweaks/00-patches/07-resize-init.diff index 9ba3e29d..7e8ce3bd 100644 --- a/stage2/00-sys-tweaks/00-patches/07-resize-init.diff +++ b/stage2/00-sys-tweaks/00-patches/07-resize-init.diff @@ -1,5 +1,5 @@ --- stage2.orig/rootfs/boot/cmdline.txt +++ stage2/rootfs/boot/cmdline.txt @@ -1 +1 @@ --usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait -+usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet cgroup_enable=memory cgroup_memory=1 init=/usr/lib/raspi-config/init_resize.sh \ No newline at end of file +-usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait cgroup_enable=memory cgroup_memory=1 ++usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet cgroup_enable=memory cgroup_memory=1 init=/usr/lib/raspi-config/init_resize.sh From 6d06b1a19e9828f6c3696640d21c2c01285a2c5c Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 12 Mar 2021 20:47:42 +0100 Subject: [PATCH 4/6] Update 07-resize-init.diff --- stage2/00-sys-tweaks/00-patches/07-resize-init.diff | 1 + 1 file changed, 1 insertion(+) diff --git a/stage2/00-sys-tweaks/00-patches/07-resize-init.diff b/stage2/00-sys-tweaks/00-patches/07-resize-init.diff index 7e8ce3bd..256cf9da 100644 --- a/stage2/00-sys-tweaks/00-patches/07-resize-init.diff +++ b/stage2/00-sys-tweaks/00-patches/07-resize-init.diff @@ -3,3 +3,4 @@ @@ -1 +1 @@ -usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait cgroup_enable=memory cgroup_memory=1 +usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet cgroup_enable=memory cgroup_memory=1 init=/usr/lib/raspi-config/init_resize.sh + From 3023b98b5d4f6d07c5cf21d91aba15125bd2798a Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 10 Apr 2021 13:31:08 +0200 Subject: [PATCH 5/6] Update stage2/00-sys-tweaks/00-patches/07-resize-init.diff Co-authored-by: Aaron Dewes --- stage2/00-sys-tweaks/00-patches/07-resize-init.diff | 1 - 1 file changed, 1 deletion(-) diff --git a/stage2/00-sys-tweaks/00-patches/07-resize-init.diff b/stage2/00-sys-tweaks/00-patches/07-resize-init.diff index 256cf9da..7e8ce3bd 100644 --- a/stage2/00-sys-tweaks/00-patches/07-resize-init.diff +++ b/stage2/00-sys-tweaks/00-patches/07-resize-init.diff @@ -3,4 +3,3 @@ @@ -1 +1 @@ -usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait cgroup_enable=memory cgroup_memory=1 +usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet cgroup_enable=memory cgroup_memory=1 init=/usr/lib/raspi-config/init_resize.sh - From b3c4a039627784919fd4d2eb59113e1325570a2a Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 10 Apr 2021 13:31:18 +0200 Subject: [PATCH 6/6] Update stage2/00-sys-tweaks/00-patches/07-resize-init.diff Co-authored-by: Aaron Dewes --- stage2/00-sys-tweaks/00-patches/07-resize-init.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage2/00-sys-tweaks/00-patches/07-resize-init.diff b/stage2/00-sys-tweaks/00-patches/07-resize-init.diff index 7e8ce3bd..9b2e812a 100644 --- a/stage2/00-sys-tweaks/00-patches/07-resize-init.diff +++ b/stage2/00-sys-tweaks/00-patches/07-resize-init.diff @@ -2,4 +2,4 @@ +++ stage2/rootfs/boot/cmdline.txt @@ -1 +1 @@ -usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait cgroup_enable=memory cgroup_memory=1 -+usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet cgroup_enable=memory cgroup_memory=1 init=/usr/lib/raspi-config/init_resize.sh ++usb-storage.quirks=152d:1561:u,152d:1576:u,152d:0578:u,125f:a76a:u,04e8:61b6:u console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait cgroup_enable=memory cgroup_memory=1 quiet init=/usr/lib/raspi-config/init_resize.sh