From 7c511d677e2f88dfb091efb8858837b960cbc08f Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Tue, 7 Sep 2021 14:08:48 -0700 Subject: [PATCH] pine64-pinephone: remove old u-boot legacy images from /boot on upgrade (MR 2494) fixes #1228 --- device/main/device-pine64-pinephone/APKBUILD | 4 ++-- .../device-pine64-pinephone.pre-upgrade | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 device/main/device-pine64-pinephone/device-pine64-pinephone.pre-upgrade diff --git a/device/main/device-pine64-pinephone/APKBUILD b/device/main/device-pine64-pinephone/APKBUILD index 6940bceb7..d5828057d 100644 --- a/device/main/device-pine64-pinephone/APKBUILD +++ b/device/main/device-pine64-pinephone/APKBUILD @@ -6,7 +6,7 @@ # Co-Maintainer: Dylan Van Assche pkgname=device-pine64-pinephone pkgver=0.35 -pkgrel=0 +pkgrel=1 pkgdesc="PINE64 PinePhone" url="https://postmarketos.org" license="MIT" @@ -33,7 +33,7 @@ depends=" u-boot-tools " makedepends="devicepkg-dev" -install="$pkgname.post-install $pkgname.post-upgrade" +install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-upgrade" source=" 00_alsa_pinephone_dshare.conf 10-pinephone-proximity.rules diff --git a/device/main/device-pine64-pinephone/device-pine64-pinephone.pre-upgrade b/device/main/device-pine64-pinephone/device-pine64-pinephone.pre-upgrade new file mode 100644 index 000000000..68592f5db --- /dev/null +++ b/device/main/device-pine64-pinephone/device-pine64-pinephone.pre-upgrade @@ -0,0 +1,8 @@ +#!/bin/sh + +# legacy u-boot images are no longer necessary, but were generated outside of +# packaging so remove them here to prevent a failed upgrade if /boot is too +# full +# see: https://gitlab.com/postmarketOS/pmaports/-/merge_requests/2449 +rm /boot/uImage-postmarketos-allwinner 2>/dev/null 1>&2 +rm /boot/uInitrd-postmarketos-allwinner 2>/dev/null 1>&2