From 82c02ea325b9b7e24ae170faed4999269a762017 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Fri, 10 Mar 2023 22:52:38 -0800 Subject: [PATCH] main/postmarketos-initramfs: support initramfs-extra as gzip (MR 3948) This is a revert of the change introduced in 4eda0715 to support an uncompressed initramfs-extra. osk-sdl support results in an initramfs-extra that is too big for some devices with a small (traditional) /boot partition Also see: https://gitlab.com/postmarketOS/pmaports/-/issues/2009 [ci:skip-build]: Already built successfully in CI --- main/postmarketos-initramfs/APKBUILD | 4 ++-- main/postmarketos-initramfs/init_functions.sh | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/main/postmarketos-initramfs/APKBUILD b/main/postmarketos-initramfs/APKBUILD index 30f1d18cd..8f1ba02b8 100644 --- a/main/postmarketos-initramfs/APKBUILD +++ b/main/postmarketos-initramfs/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Oliver Smith # Co-Maintainer: Clayton Craft pkgname=postmarketos-initramfs -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=0 pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra" url="https://postmarketos.org" @@ -68,5 +68,5 @@ bed319179bcd0b894d6267c7e73f2890db07bc07df71542936947dfb3bdb17fade8a7b4e7b577f27 3c47e9169ee8cfe78e1a554cf325962f5425c41a0125dcba8561f377d8c52cbfccdd791b269656478c92604644fb286b1ee8df42db9f5a771657e415da35e619 00-initramfs-base.files e984cd3033ce8752ebc71127828b964b46259a5263c2ebfab32c1394b674bcff464862ff00b8e920d3d31386c54ca0b94f84bc77580d275ecfeea33e76c07ef4 00-initramfs-extra-base.files 347637ba837c75d2e7c5e93b10364de6a784d70067c65dcc3b95277f5feb89fc9b243822022b2380846dd977c4a3f6f96877f547e6ffc7cd3051845d7907d6a1 init.sh -6978bb42349bc318a4cd8894aff77de05ad3d70345a232e683fdcf98270e71087669d05f750f55256b1af3a3b747ce5e224aa939a43b5c61b9675d9dd44c9080 init_functions.sh +2a5dc96b38c6dbd079bbab0a296acee42499af3b317b3995abcc89554abd5863558f990caf9dace3a56dd6071cea45c9b0809ed4a26ae679a3cdc6c3adff2057 init_functions.sh " diff --git a/main/postmarketos-initramfs/init_functions.sh b/main/postmarketos-initramfs/init_functions.sh index ee0b88069..5b642f8a4 100644 --- a/main/postmarketos-initramfs/init_functions.sh +++ b/main/postmarketos-initramfs/init_functions.sh @@ -282,7 +282,9 @@ extract_initramfs_extra() { loop_forever fi echo "Extract $initramfs_extra" - cpio -di < "$initramfs_extra" + # uncompressed: + # cpio -di < "$initramfs_extra" + gzip -d -c "$initramfs_extra" | cpio -i } wait_root_partition() {