Rename pkg to shim-efi-git

4 files changed, 20 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 15e22773da94..8d413eb7f3e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,26 @@
-pkgbase = shim-efi-x86_64-git
+pkgbase = shim-efi-git
 	pkgdesc = Simple bootloader for x86_64 UEFI Secure Boot - GIT Version
-	pkgver = 0.4.1.g23002e8.23002e8
+	pkgver = 0.4.1.g23002e8
 	pkgrel = 1
 	url = https://github.com/mjg59/shim
-	install = shim-efi-x86_64.install
-	arch = any
+	arch = x86_64
 	license = GPL
 	makedepends = git
 	makedepends = gnu-efi-libs
 	depends = pesign
 	depends = dosfstools
+	depends = efivar
 	depends = efibootmgr
 	optdepends = mactel-boot: For bless command in Apple Mac systems
+	provides = shim-efi
 	provides = shim-efi-x86_64
+	provides = shim-efi-x86_64-git
+	conflicts = shim-efi
 	conflicts = shim-efi-x86_64
+	conflicts = shim-efi-x86_64-git
 	options = !strip
-	options = docs
 	source = shim::git+git://github.com/mjg59/shim.git#branch=master
 	sha1sums = SKIP
 
-pkgname = shim-efi-x86_64-git
+pkgname = shim-efi-git
 
diff --git a/.gitignore b/.gitignore
index f1307f4c59eb..3ccde5a9a794 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ pkg/
 *.tar.xz
 *.tar.gz
 *.log*
+*.pkg.tar*
diff --git a/PKGBUILD b/PKGBUILD
index ccb0e3e0d123..28c994a0c7ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,42 +4,34 @@ _gitroot="git://github.com/mjg59/shim.git"
 _gitname="shim"
 _gitbranch="master"
 
-_pkgname="shim-efi-x86_64"
+_pkgname="shim-efi"
 pkgname="${_pkgname}-git"
 
-pkgver=0.4.1.g23002e8.23002e8
+pkgver=0.4.1.g23002e8
 pkgrel=1
 pkgdesc="Simple bootloader for x86_64 UEFI Secure Boot - GIT Version"
 url="https://github.com/mjg59/shim"
-arch=('any')
+arch=('x86_64')
 license=('GPL')
+options=('!strip')
 
 makedepends=('git' 'gnu-efi-libs')
-
-depends=('pesign' 'dosfstools' 'efibootmgr')
+depends=('pesign' 'dosfstools' 'efivar' 'efibootmgr')
 optdepends=('mactel-boot: For bless command in Apple Mac systems')
 
-conflicts=("${_pkgname}")
-provides=("${_pkgname}")
-
-options=('!strip' 'docs')
-install="${_pkgname}.install"
+conflicts=("${_pkgname}" 'shim-efi-x86_64' 'shim-efi-x86_64-git')
+provides=("${_pkgname}" 'shim-efi-x86_64' 'shim-efi-x86_64-git')
 
 source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}")
 sha1sums=('SKIP')
 
 pkgver() {
 	cd "${srcdir}/${_gitname}/"
-	echo "$(git describe --tags).$(git describe --always)" | sed 's|-|.|g'
+	echo "$(git describe --tags)" | sed 's|-|.|g'
 }
 
 build() {
 	
-	if [[ "${CARCH}" != "x86_64" ]]; then
-		echo "${pkgname} package can be built only in a x86_64 system. Exiting."
-		exit 1
-	fi
-	
 	rm -rf "${srcdir}/${_gitname}_build/" || true
 	cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build"
 	
@@ -69,5 +61,7 @@ package() {
 	## Install shim x86_64 UEFI application
 	install -d "${pkgdir}/usr/lib/shim/"
 	install -D -m0644 "${srcdir}/${_gitname}_build/shim.efi" "${pkgdir}/usr/lib/shim/shimx64.efi"
+	install -D -m0644 "${srcdir}/${_gitname}_build/MokManager.efi.signed" "${pkgdir}/usr/lib/shim/MokManager.efi.signed"
+	install -D -m0644 "${srcdir}/${_gitname}_build/fallback.efi.signed" "${pkgdir}/usr/lib/shim/fallback.efi.signed"
 	
 }
diff --git a/shim-efi-x86_64.install b/shim-efi-x86_64.install
deleted file mode 100644
index eb10df47ee11..000000000000
--- a/shim-efi-x86_64.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-	
-	cat << EOF 
-
-shim-efi-x86_64 has been installed at /usr/lib/shim/shimx64.efi
-
-EOF
-	
-}
-
-post_upgrade() {
-	
-	post_install
-	
-}
-