[arch-commits] Commit in efibootmgr/trunk (2 files)

[Tobias Powalowski]

    Date: Monday, June 3, 2013 @ 21:31:43
  Author: tpowa
Revision: 187099

upgpkg: efibootmgr 0.6.0-3

add slash_func patch

Added:
  efibootmgr/trunk/efibootmgr-tilt_slashes-func.patch
Modified:
  efibootmgr/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   11 ++++--
 efibootmgr-tilt_slashes-func.patch |   61 +++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-03 19:31:06 UTC (rev 187098)
+++ PKGBUILD	2013-06-03 19:31:43 UTC (rev 187099)
@@ -5,7 +5,7 @@
 
 pkgname=efibootmgr
 pkgver=0.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables."
 arch=('i686' 'x86_64')
 url="http://linux.dell.com/efibootmgr/"
@@ -15,7 +15,9 @@
 provides=()
 options=(strip purge docs zipman !emptydirs)
 
-source=("http://linux.dell.com/efibootmgr/permalink/${pkgname}-${pkgver}.tar.gz")
+source=("http://linux.dell.com/efibootmgr/permalink/${pkgname}-${pkgver}.tar.gz"
+        "efibootmgr-tilt_slashes-func.patch"
+)
 
 build () {	
 	rm -rf ${srcdir}/efibootmgr-${pkgver}_build/ || true
@@ -23,7 +25,7 @@
 	cp -r ${srcdir}/efibootmgr-${pkgver} ${srcdir}/efibootmgr-${pkgver}_build
 	
 	cd ${srcdir}/efibootmgr-${pkgver}_build/
-	
+	patch -Np1 -i ${srcdir}/efibootmgr-tilt_slashes-func.patch
 	echo
 	
 	CFLAGS= make
@@ -43,4 +45,5 @@
 	install -D -m644 ${srcdir}/efibootmgr-${pkgver}_build/src/man/man8/efibootmgr.8 ${pkgdir}/usr/share/man/man8/efibootmgr.8
 	
 }
-md5sums=('9e9a31d79e579644de83a14139b66d10')
+md5sums=('9e9a31d79e579644de83a14139b66d10'
+         '3622c0e978cf859cae60803a6b6a0c5e')

Added: efibootmgr-tilt_slashes-func.patch
===================================================================
--- efibootmgr-tilt_slashes-func.patch	                        (rev 0)
+++ efibootmgr-tilt_slashes-func.patch	2013-06-03 19:31:43 UTC (rev 187099)
@@ -0,0 +1,61 @@
+diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c
+index 236365a..9883961 100644
+--- a/src/efibootmgr/efibootmgr.c
++++ b/src/efibootmgr/efibootmgr.c
+@@ -803,6 +803,7 @@ usage()
+ 	printf("\t-V | --version          return version and exit\n");
+ 	printf("\t-w | --write-signature  write unique sig to MBR if needed\n");
+ 	printf("\t-@ | --append-binary-args file  append extra args from file (use \"-\" for stdin)\n");
++	printf("\t   | --help             show help/usage\n");
+ }
+ 
+ static void
+@@ -863,6 +864,7 @@ parse_opts(int argc, char **argv)
+ 			{"version",                no_argument, 0, 'V'},
+ 			{"write-signature",        no_argument, 0, 'w'},
+ 			{"append-binary-args", required_argument, 0, '@'},
++			{"help",                   no_argument, 0,   2},
+ 			{0, 0, 0, 0}
+ 		};
+ 
+@@ -1014,6 +1016,10 @@ parse_opts(int argc, char **argv)
+ 			opts.write_signature = 1;
+ 			break;
+ 
++		case 2:
++			usage();
++			exit(1);
++
+ 		default:
+ 			usage();
+ 			exit(1);
+diff --git a/src/lib/efi.c b/src/lib/efi.c
+index a4ce5cf..8ef8be8 100644
+--- a/src/lib/efi.c
++++ b/src/lib/efi.c
+@@ -70,6 +70,16 @@ efi_guid_unparse(efi_guid_t *guid, char *out)
+         return out;
+ }
+ 
++char *
++tilt_slashes(char *s)
++{
++	char *p;
++	for (p = s; *p; p++)
++		if (*p == '/')
++			*p = '\\';
++	return s;
++}
++
+ void
+ set_fs_kernel_calls()
+ {
+@@ -535,7 +545,7 @@ char *make_disk_load_option(char *p, char *disk)
+ 				     signature,
+ 				     mbr_type, signature_type);
+ 
+-    efichar_from_char(os_loader_path, opts.loader, sizeof(os_loader_path));
++    efichar_from_char(os_loader_path, tilt_slashes(opts.loader), sizeof(os_loader_path));
+     p += make_file_path_device_path (p, os_loader_path);
+     p += make_end_device_path       (p);
+