Revision bump with error reporting patch. Now you can see error messages, not just return codes.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 116 insertions, 7 deletions

diff --git a/sys-boot/efibootmgr/ChangeLog b/sys-boot/efibootmgr/ChangeLog
index eb1cc275486c..5bc2713c7e3e 100644
--- a/sys-boot/efibootmgr/ChangeLog
+++ b/sys-boot/efibootmgr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/efibootmgr
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/efibootmgr/ChangeLog,v 1.22 2012/05/03 04:50:13 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/efibootmgr/ChangeLog,v 1.23 2013/07/10 20:11:28 scarabeus Exp $
+
+*efibootmgr-0.5.4-r1 (10 Jul 2013)
+
+  10 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> +efibootmgr-0.5.4-r1.ebuild,
+  +files/efibootmgr-error-reporting.patch:
+  Revision bump with error reporting patch. Now you can see error messages, not
+  just return codes.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> efibootmgr-0.5.4.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -78,4 +85,3 @@
   files/efibootmgr-0.4.1-makefile.patch:
   Add efibootmgr for IA-64. This program allows you to configure the EFI boot
   partition on IA-64 systems
-
diff --git a/sys-boot/efibootmgr/Manifest b/sys-boot/efibootmgr/Manifest
index 32f76ec314f2..501fd22e5737 100644
--- a/sys-boot/efibootmgr/Manifest
+++ b/sys-boot/efibootmgr/Manifest
@@ -1,4 +1,26 @@
-DIST efibootmgr-0.5.4.tar.gz 59121 RMD160 c7fb9710ad1773f36a9e1410ba0be2c4877885ea SHA1 eebdb671638f3a7901690df2a8f647e7f8666ed2 SHA256 b562a47a4f5327494992f2ee6ae14a75c5aeb9b4a3a78a06749d5cd2917b8e71
-EBUILD efibootmgr-0.5.4.ebuild 989 RMD160 2782b6f4021be4fd468cf7c38f71f7ff68b2f628 SHA1 9a7c769bf84e8c35aa81d416a0362770e3d84512 SHA256 fba04ab5fc753dc74e4ef3ba37e4c26a6dd1c96225ee60d5e2e5ccb16d5e7be1
-MISC ChangeLog 2891 RMD160 82a3af527cc335dc9bc958d4cd85cd425a409c5c SHA1 4eb9aade6f7e09f5f17d161181ed2b94ea6966ae SHA256 40d2c9b82847a141dabe375edd98a117906abacc447318143f369299a8464a6e
-MISC metadata.xml 157 RMD160 d78bc90d4c0fdb88250c9822e913c6f0159b2e8b SHA1 337a3ca895783b15c7f1fdf721f88b41a4b2e94e SHA256 7e261fbe78f2088ab2a27fe3bd23a4224dde9a11031edcb4b7bb95dd3ba1fe4a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX efibootmgr-error-reporting.patch 950 SHA256 aeaf696f933ce251f866c669b08a2e0c7b8a5d95011f17076f79041298d1861c SHA512 6f1f71e73d8168db397a2270b89900ab48fb67281ca49749bd6320aed13964fd1113a545ae1b30b6d5d7b9928588c54696d513861547ecb4054565cb498edec0 WHIRLPOOL 117e1fc0b5ad95122fd0d56b098f92d5bbfea3ba2482f6e4f08adacbc625ff8db8ee0a8e870c6b7f11732a27f8465f6c64335a8343a99a33bf834fabf8fbe743
+DIST efibootmgr-0.5.4.tar.gz 59121 SHA256 b562a47a4f5327494992f2ee6ae14a75c5aeb9b4a3a78a06749d5cd2917b8e71 SHA512 1fbc3bc442e848b7f6a7e5d8851d92efe271abd090cfeda253baf7b11b9f7b9e984b9703c02ed57f718d5de5b26ec45f1eaeff55b50e4a7bc9e25cf3a958c4ad WHIRLPOOL e17d2a2ecb666eb6644794b48535d8141ee2b79470cdb8d28c927032724efd59dcfdef278d6895bf3c3ec5af91ea559a2df1c938fb406fb2a8c0256a67da05a6
+EBUILD efibootmgr-0.5.4-r1.ebuild 1025 SHA256 d55a8e6a259d988d9018e61d1bc25beb3d0a53070fbf10ccbc90cd51cf5743b7 SHA512 cdb3e995c1720169d5cbb733fe80bdc119e67d79464d4f572276c4e492524295c34cc61d9b0d55b62bbfa057e19ffd5c2cc638753cf63f7371c07b8cb13c0b8c WHIRLPOOL 63f9decab1fd38620e1b10ec10e9f802660d46846ccfeb6f2e2695cf8bda32eac648c4a62637f14dbb26c22b39082a1163ce8a98bc9f2be617b8262033bec6d0
+EBUILD efibootmgr-0.5.4.ebuild 989 SHA256 fba04ab5fc753dc74e4ef3ba37e4c26a6dd1c96225ee60d5e2e5ccb16d5e7be1 SHA512 43967bff6bd3c71a9b54420e38263c2045712ec11e7e08cae70ab310ad25a60fdb0d2f3fca80e5864f285c6eef0ed2ecee37c0ffd3f9bbb038165d948a98614a WHIRLPOOL ce84a317252107045f776998cefd387d64c48796289135db01330753ea130ad0cc1eab8f66207a5f69cb287629e61c7218c6e17eb1356ea5bfcacfff748ed83a
+MISC ChangeLog 3158 SHA256 bdb3bdef2404a9e319fcf34da87c11cba2ba8d87fe58e7355d6530038bc94126 SHA512 afdc737dbfdeeaeecf3179bc5a89c1a40397784cc076e9511755b7080a0de0f66fa9ace1b7c5998f737987f59150288f5da3943300eccce7ebb1c19ad35b3c39 WHIRLPOOL baaec223ab151ceb259c0bc835d1daca657dc5f03c379ee7cc626d6eb6b1cd54b6008138317fc8ad3df3a26fa9677dc8904b036b15ae376ed1ebcdaa74d1e3c1
+MISC metadata.xml 157 SHA256 7e261fbe78f2088ab2a27fe3bd23a4224dde9a11031edcb4b7bb95dd3ba1fe4a SHA512 0d0a45c88d8f80bd12c6f182387db789e11fb77de5f17f6896e638d1f57be0e207f8a0bdb63c4cbf570d30fb9d4d9928374bddd26bd035dd13485779158e078f WHIRLPOOL 431702b09d79742c3946fca1ee4adc8c7dc7bc1f35b8baa9db077208d540808a9dd774077e268a18b72cbe97305165b599a2cb4553f514691697da7f2251418b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQIcBAEBCAAGBQJR3b/xAAoJEOSiRoyO7jvoL98QAI8KBbmtaUOVRanNuOhhNTRC
+f+j8m2U5lJtV0MWgXKnHAAA42gZTfp9VO3DUSopIHSrEt5CAJDOwvChk5t/354XY
+fr7g/L6aWbxd8s0MKgrZ+IOuQKVpYTUIyIABVu9WGv1OgZtXHRxo7FdrkpZsZKzC
+Uvh0aj/iMYcQIGW6XO+De+xiDGCl24g/Vk5+DrnueWw3J92LGDgNmbiw6d4Ft9Q4
+qWHutp2Bgxa0Be/xjI6B1n7m9/8Z1qPMTvDUOW5meXAAthh4wNdTNTHPVOZ+S2Yj
+fYwemH6PGpVQezOQGMalTKmiJAsfCBACPHnRCnEmVDqVZ+shX5HuEPGS1OH2R/As
+7d0xRDkwNEGQo081vOv9s+rhJVtNXIc16FRaEwidE0YbAut9FXgooRbfc3nBDN8x
+z5u0/yI8tFvNiPXiWVNGREwvIQQoRjLgfiQxefLJwGj/ZeuEeo6ZwkuIky+90rP7
+K+LxvGpUZPsJv/sAsQgOfpetS86X3xI6AzJfQo8cRRsfGzXA2ryj/xe9K7Bo8gbr
+x3fohc5yeP26umMylXT3WFSGT7eg5+A7OMjA/Sz57XcfNsBjvQkXtJtNf2ftckkX
+eYjiOMN+qgYY4rmMQfMfLvgs3cNlOhpWOCKAE3IjpoldanNKBZPyM0S406AeDEVi
++jaQO5LBskXBndJQhhSJ
+=Q04F
+-----END PGP SIGNATURE-----
diff --git a/sys-boot/efibootmgr/efibootmgr-0.5.4-r1.ebuild b/sys-boot/efibootmgr/efibootmgr-0.5.4-r1.ebuild
new file mode 100644
index 000000000000..3dcfedaa4c5c
--- /dev/null
+++ b/sys-boot/efibootmgr/efibootmgr-0.5.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/efibootmgr/efibootmgr-0.5.4-r1.ebuild,v 1.1 2013/07/10 20:11:28 scarabeus Exp $
+
+EAPI=5
+
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="Interact with the EFI Boot Manager on IA-64 Systems"
+HOMEPAGE="http://developer.intel.com/technology/efi"
+SRC_URI="http://linux.dell.com/efibootmgr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/pciutils"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e "/^LIBS/s:=.*:=$($(tc-getPKG_CONFIG) libpci --libs):" \
+		src/efibootmgr/module.mk || die
+
+	epatch "${FILESDIR}/${PN}-error-reporting.patch"
+}
+
+src_compile() {
+	strip-flags
+	tc-export CC
+	emake EXTRA_CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	# build system uses perl, so just do it ourselves
+	dosbin src/efibootmgr/efibootmgr
+	doman src/man/man8/efibootmgr.8
+	dodoc AUTHORS README doc/ChangeLog doc/TODO
+}
diff --git a/sys-boot/efibootmgr/files/efibootmgr-error-reporting.patch b/sys-boot/efibootmgr/files/efibootmgr-error-reporting.patch
new file mode 100644
index 000000000000..2c769db23047
--- /dev/null
+++ b/sys-boot/efibootmgr/files/efibootmgr-error-reporting.patch
@@ -0,0 +1,40 @@
+@@ -, +, @@ 
+---
+ src/lib/efivars_sysfs.c |   16 +++++++++++++---
+ 1 files changed, 13 insertions(+), 3 deletions(-)
+--- a/src/lib/efivars_sysfs.c	
++++ a/src/lib/efivars_sysfs.c	
+@@ -66,6 +66,7 @@ static efi_status_t
+ sysfs_write_variable(const char *filename, efi_variable_t *var)
+ {
+ 	int fd;
++	int rc = EFI_SUCCESS;
+ 	size_t writesize;
+ 	char buffer[PATH_MAX+40];
+ 
+@@ -77,12 +78,21 @@ sysfs_write_variable(const char *filename, efi_variable_t *var)
+ 		return EFI_INVALID_PARAMETER;
+ 	}
+ 	writesize = write(fd, var, sizeof(*var));
++	if (writesize == -1) {
++		if (errno == -ENOSPC)
++			rc = EFI_OUT_OF_RESOURCES;
++		else
++			rc = EFI_INVALID_PARAMETER;
++		goto out;
++	}
+ 	if (writesize != sizeof(*var)) {
+-		close(fd);
+-		return EFI_INVALID_PARAMETER;
++		rc = EFI_INVALID_PARAMETER;
+ 	}
++out:
++	if (rc != EFI_SUCCESS)
++		fprintf(stderr, "Failed to write variable: %s\n", strerror(errno));
+ 	close(fd);
+-	return EFI_SUCCESS;
++	return rc;
+ }
+ 
+ 
+--