From e83df022152ee4766c375b8cf628ee7151670299 Mon Sep 17 00:00:00 2001 From: Eivind Uggedal Date: Thu, 6 Nov 2014 01:03:27 +0100 Subject: [PATCH] gummiboot: fix removal of loader entries Stop using $PKGNAME (linux3.XX) in post-install since post-remove gets $PKGNAME as linux through vkpurge. --- srcpkgs/gummiboot/files/kernel.d/gummiboot.post-install | 4 ++-- srcpkgs/gummiboot/files/kernel.d/gummiboot.post-remove | 2 +- srcpkgs/gummiboot/template | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-install b/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-install index c4410397838..b2bf190be5f 100644 --- a/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-install +++ b/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-install @@ -9,7 +9,7 @@ VERSION="$2" boot=$ROOTDIR/boot entries=$boot/loader/entries -name=void-$PKGNAME-$VERSION +name=void-$VERSION entry=$entries/$name.conf options=$boot/loader/void-options.conf loader=$boot/loader/loader.conf @@ -19,7 +19,7 @@ loader=$boot/loader/loader.conf mkdir -p $entries cat <<-EOF > $entry - title Void $PKGNAME + title Void Linux version $VERSION linux /vmlinuz-$VERSION initrd /initramfs-$VERSION.img diff --git a/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-remove b/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-remove index b928e956043..b946d62456a 100644 --- a/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-remove +++ b/srcpkgs/gummiboot/files/kernel.d/gummiboot.post-remove @@ -9,7 +9,7 @@ VERSION="$2" boot=$ROOTDIR/boot entries=$boot/loader/entries -name=void-$PKGNAME-$VERSION +name=void-$VERSION entry=$entries/$name.conf loader=$boot/loader/loader.conf diff --git a/srcpkgs/gummiboot/template b/srcpkgs/gummiboot/template index e418fdb8b99..ae2eeeca2d2 100644 --- a/srcpkgs/gummiboot/template +++ b/srcpkgs/gummiboot/template @@ -1,7 +1,7 @@ # Template file for 'gummiboot' pkgname=gummiboot version=45 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="automake pkg-config libxslt docbook-xsl" makedepends="gnu-efi-libs liblzma-devel libblkid-devel"