summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeshav Amburay2013-06-17 14:47:13 +0530
committerKeshav Amburay2013-06-17 14:47:13 +0530
commitb07bab41396a6dabee02821d9bf3ec77a942f6fc (patch)
tree9357224dcbc05a1fee476cb4c02e26e51d986270
parentd7a5808024370b1b454d1221ffebd3a5b8ace1b2 (diff)
downloadaur-b07bab41396a6dabee02821d9bf3ec77a942f6fc.tar.gz
Fix PKGBUILD and add pesign depends
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD17
-rw-r--r--shim-efi-x86_64.install2
3 files changed, 9 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cb9c65f710f8..15e22773da94 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = shim-efi-x86_64-git
pkgdesc = Simple bootloader for x86_64 UEFI Secure Boot - GIT Version
- pkgver = 53ba265
+ pkgver = 0.4.1.g23002e8.23002e8
pkgrel = 1
url = https://github.com/mjg59/shim
install = shim-efi-x86_64.install
@@ -8,6 +8,7 @@ pkgbase = shim-efi-x86_64-git
license = GPL
makedepends = git
makedepends = gnu-efi-libs
+ depends = pesign
depends = dosfstools
depends = efibootmgr
optdepends = mactel-boot: For bless command in Apple Mac systems
diff --git a/PKGBUILD b/PKGBUILD
index 6030cab26fbe..ccb0e3e0d123 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _gitbranch="master"
_pkgname="shim-efi-x86_64"
pkgname="${_pkgname}-git"
-pkgver=53ba265
+pkgver=0.4.1.g23002e8.23002e8
pkgrel=1
pkgdesc="Simple bootloader for x86_64 UEFI Secure Boot - GIT Version"
url="https://github.com/mjg59/shim"
@@ -16,7 +16,7 @@ license=('GPL')
makedepends=('git' 'gnu-efi-libs')
-depends=('dosfstools' 'efibootmgr')
+depends=('pesign' 'dosfstools' 'efibootmgr')
optdepends=('mactel-boot: For bless command in Apple Mac systems')
conflicts=("${_pkgname}")
@@ -30,7 +30,7 @@ sha1sums=('SKIP')
pkgver() {
cd "${srcdir}/${_gitname}/"
- git describe --always | sed 's|-|.|g'
+ echo "$(git describe --tags).$(git describe --always)" | sed 's|-|.|g'
}
build() {
@@ -43,18 +43,13 @@ build() {
rm -rf "${srcdir}/${_gitname}_build/" || true
cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build"
- cd "${srcdir}/${_gitname}_build"
+ cd "${srcdir}/${_gitname}_build/"
+
+ git clean -x -d -f
echo
sed 's|/usr/lib64/gnuefi|/usr/lib|g' -i "${srcdir}/${_gitname}_build/Makefile"
sed 's|/usr/lib64|/usr/lib|g' -i "${srcdir}/${_gitname}_build/Makefile"
- echo
-
- make clean || true
- rm -f "${srcdir}/${_gitname}_build/shim.so" || true
- rm -f "${srcdir}/${_gitname}_build/shim.efi" || true
- rm -f "${srcdir}/${_gitname}_build/shim.efi.debug" || true
- echo
unset CFLAGS
unset CPPFLAGS
diff --git a/shim-efi-x86_64.install b/shim-efi-x86_64.install
index 1b1a1a2c5fb8..eb10df47ee11 100644
--- a/shim-efi-x86_64.install
+++ b/shim-efi-x86_64.install
@@ -2,7 +2,7 @@ post_install() {
cat << EOF
-shim-efi-x86_64 is installed at /usr/lib/shim/shimx64.efi
+shim-efi-x86_64 has been installed at /usr/lib/shim/shimx64.efi
EOF