From df0847496725afd4a27450ba7b5bafa2bcb1a7eb Mon Sep 17 00:00:00 2001 From: Archlinux-Jerry Build Bot Date: Sun, 8 Mar 2020 13:09:21 +0800 Subject: [PATCH] update linux-phicomm-n1 to 5.5.8-2, fix #2 --- linux-phicomm-n1/PKGBUILD | 4 ++-- linux-phicomm-n1/linux-phicomm-n1.install | 5 ++++- linux-phicomm-n1/linux.preset | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/linux-phicomm-n1/PKGBUILD b/linux-phicomm-n1/PKGBUILD index d625bfd..5bdbd9d 100644 --- a/linux-phicomm-n1/PKGBUILD +++ b/linux-phicomm-n1/PKGBUILD @@ -8,7 +8,7 @@ _srcname=linux-5.5 _kernelname=${pkgbase#linux} _desc="AArch64 kernel for Phicomm N1" pkgver=5.5.8 -pkgrel=1 +pkgrel=2 arch=('aarch64') url="http://www.kernel.org/" license=('GPL2') @@ -28,7 +28,7 @@ source+=("http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz") md5sums=('0a78b1dc48dc032fe505b170c1b92339' 'caa2dbc19116d818e6d0d46baeca961b' '24e1591eba356a657ca6ddb1efcd99f8' - '66e0ae63183426b28c0ec0c7e10b5e16' + '30130b4dcd8ad4364ddbfd56c3058d5e' 'ce6c81ad1ad1f8b333fd6077d47abdaf' 'bdeb5fb852fd92b4e76b4796db500dd4' '74fdb27ae62f3ea870a86ff3546764e5') diff --git a/linux-phicomm-n1/linux-phicomm-n1.install b/linux-phicomm-n1/linux-phicomm-n1.install index 37ba374..f4a68ef 100644 --- a/linux-phicomm-n1/linux-phicomm-n1.install +++ b/linux-phicomm-n1/linux-phicomm-n1.install @@ -2,9 +2,12 @@ post_upgrade() { if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then echo "WARNING: /boot appears to be a separate partition but is not mounted." fi + if (( $(vercmp $2 5.5.8-2) < 0 )); then + echo '==> Fallback initramfs is not used, so it is being deleted now.' + rm -f boot/initramfs-%PKGBASE%-fallback.img + fi } post_remove() { rm -f boot/initramfs-%PKGBASE%.img - rm -f boot/initramfs-%PKGBASE%-fallback.img } diff --git a/linux-phicomm-n1/linux.preset b/linux-phicomm-n1/linux.preset index 3cec18c..aa776ac 100644 --- a/linux-phicomm-n1/linux.preset +++ b/linux-phicomm-n1/linux.preset @@ -3,7 +3,7 @@ ALL_config="/etc/mkinitcpio.conf" ALL_kver="%KERNVER%" -PRESETS=('default' 'fallback') +PRESETS=('default') #default_config="/etc/mkinitcpio.conf" default_image="/boot/initramfs-%PKGBASE%.img"