From e4fad30e2ad64fd97652f51ac6ed13100899356e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Sz=C3=B6ll=C5=91si?= Date: Sat, 30 Sep 2017 23:59:08 +0200 Subject: [PATCH] android-recovery: Don't extract tar archive in tmpfs (#654) --- main/postmarketos-android-recovery-installer/APKBUILD | 6 +++--- main/postmarketos-android-recovery-installer/pmos_install | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main/postmarketos-android-recovery-installer/APKBUILD b/main/postmarketos-android-recovery-installer/APKBUILD index 7a62d0152..25b4ec24a 100644 --- a/main/postmarketos-android-recovery-installer/APKBUILD +++ b/main/postmarketos-android-recovery-installer/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-android-recovery-installer -pkgver=0.0.3 -pkgrel=1 +pkgver=0.0.4 +pkgrel=0 pkgdesc="TWRP compatible postmarketOS installer script" url="https://github.com/postmarketOS" # multipath-tools: kpartx @@ -28,6 +28,6 @@ package() { } sha512sums="d065577f587ee604cfa635c3eaba5c856800e9dafbbab65d4311dc89b72feab131fc23605bc0a344979f0760162bc509ac2056ee3c4d3e78e56be15032e314c1 build_zip.sh 156f889593d82d4b1c88f3873299fc054e70e78bf26af37af4dd7770ed31a0a581f2cf03cad9e11a60159f424d2d3869fd6cd28600ad305469ddf01eaff49f6c update-binary -bc60b75dcd499084d66453c9f9beb989ad386a4bb394d0018982dc16e4f23f05c2b3308119fc513a3a391d7878047e65f46557b214a543a6a4cdfd92f6f7cf5a pmos_install +8d888a7468e4e316c213911fcde60134f10c875dd21fcf95a7c3f805df1e90bada69553b595f5f74be0d8d48524c0a08f85ee7b1062b03675d1d0429bf7fd2f8 pmos_install b4c669ab6dfe330a30c575f864cea916ac357ae96547c2296d1b5399669c6f49570c60554985d2939a1d3e3cb464e3229e2b4724eba1dd5d920dcec1b0f7f0e3 pmos_install_functions 27dd89aa8471349995a1cbbc1034ead662a0d1dd70ca5490f3191ceaaeb853331003c20ffddbbd95fe822135a85c1beb1e2a32bb33b10c2a4177b30347a40555 pmos_setpw" diff --git a/main/postmarketos-android-recovery-installer/pmos_install b/main/postmarketos-android-recovery-installer/pmos_install index 008fa5012..e4661973d 100755 --- a/main/postmarketos-android-recovery-installer/pmos_install +++ b/main/postmarketos-android-recovery-installer/pmos_install @@ -55,7 +55,7 @@ ui_print " " ui_print "Entering working directory..." cd "$WORKING_DIR" ui_print "Extracting files..." -busybox unzip -o "$ZIP" +busybox unzip -o "$ZIP" -x rootfs.tar.gz mkdir /lib ui_print "Symlinking .so files to /lib/..." ln -s "$WORKING_DIR"/lib/* /lib/ @@ -97,7 +97,7 @@ mount -t ext2 -rw "$PMOS_BOOT" /"$INSTALL_PARTITION"/boot || { mount -t ext4 -rw "$PMOS_BOOT" /"$INSTALL_PARTITION"/boot } ui_print "Installing rootfs..." -tar -xf rootfs.tar.gz -C /"$INSTALL_PARTITION" +busybox unzip -p "$ZIP" rootfs.tar.gz | busybox tar -xz -C /"$INSTALL_PARTITION" if [ "$FLASH_KERNEL" = "true" ] then if [ "$ISOREC" = "true" ]