From 9f4522069a0e0f7858c035dc42d77ff8f9d5933c Mon Sep 17 00:00:00 2001 From: drebrez Date: Sat, 14 Oct 2017 17:41:12 +0200 Subject: [PATCH] [android-recovery-zip] Add missing apk keys (#747) --- .../main/postmarketos-android-recovery-installer/APKBUILD | 4 ++-- pmb/install/recovery.py | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/aports/main/postmarketos-android-recovery-installer/APKBUILD b/aports/main/postmarketos-android-recovery-installer/APKBUILD index 796e2f17..8348df3f 100644 --- a/aports/main/postmarketos-android-recovery-installer/APKBUILD +++ b/aports/main/postmarketos-android-recovery-installer/APKBUILD @@ -1,10 +1,10 @@ pkgname=postmarketos-android-recovery-installer -pkgver=0.0.5 +pkgver=0.0.6 pkgrel=0 pkgdesc="TWRP compatible postmarketOS installer script" url="https://github.com/postmarketOS" # multipath-tools: kpartx -depends="busybox-extras lddtree cryptsetup multipath-tools device-mapper parted util-linux zip e2fsprogs" +depends="busybox-extras lddtree cryptsetup multipath-tools device-mapper parted util-linux zip e2fsprogs tar" source="build_zip.sh update-binary pmos_install diff --git a/pmb/install/recovery.py b/pmb/install/recovery.py index 76c89f3d..7fbaf853 100644 --- a/pmb/install/recovery.py +++ b/pmb/install/recovery.py @@ -66,8 +66,12 @@ def create_zip(args, suffix): # Move config file from /tmp/ to zip root ["mv", "/tmp/install_options", "install_options"], # Create tar archive of the rootfs - ["tar", "-pczf", "rootfs.tar.gz", "--exclude", + ["tar", "-pcf", "rootfs.tar", "--exclude", "./home/" + args.user + "/*", "-C", rootfs, "."], + # Append packages keys + ["tar", "-prf", "rootfs.tar", "-C", "/", "./etc/apk/keys"], + # Compress with -1 for speed improvement + ["gzip", "-f1", "rootfs.tar"], ["build-recovery-zip"]] for command in commands: pmb.chroot.root(args, command, suffix, working_dir=zip_root)