efibootmgr: update to 0.12

This commit is contained in:
Alessio Sergi 2015-08-30 02:02:30 +02:00
parent 41c306dca9
commit a529b91dea
3 changed files with 16 additions and 33 deletions

View file

@ -1,9 +1,9 @@
--- src/efibootmgr/efibootmgr.c.orig 2013-05-01 08:47:28.191213068 +0200
+++ src/efibootmgr/efibootmgr.c 2013-05-01 08:49:21.578759005 +0200
@@ -786,8 +786,8 @@ usage()
printf("\t-g | --gpt force disk with invalid PMBR to be treated as GPT\n");
printf("\t-H | --acpi_hid XXXX set the ACPI HID (used with -i)\n");
printf("\t-i | --iface name create a netboot entry for the named interface\n");
--- src/efibootmgr/efibootmgr.c
+++ src/efibootmgr/efibootmgr.c
@@ -985,8 +985,8 @@ usage()
printf("\t --ip-port <local>,<remote> set local and remote IP ports\n");
printf("\t --ip-origin { {dhcp|static} | { static|stateless|stateful} }\n");
#endif
- printf("\t-l | --loader name (defaults to \\EFI\\redhat\\grub.efi)\n");
- printf("\t-L | --label label Boot manager display label (defaults to \"Linux\")\n");
+ printf("\t-l | --loader name (defaults to \\EFI\\void\\grubx64.efi)\n");
@ -11,14 +11,14 @@
printf("\t-n | --bootnext XXXX set BootNext to XXXX (hex)\n");
printf("\t-N | --delete-bootnext delete BootNext\n");
printf("\t-o | --bootorder XXXX,YYYY,ZZZZ,... explicitly set BootOrder (hex)\n");
@@ -814,8 +814,8 @@ set_default_opts()
@@ -1012,8 +1012,8 @@ set_default_opts()
opts.active = -1; /* Don't set it */
opts.timeout = -1; /* Don't set it */
opts.edd10_devicenum = 0x80;
- opts.loader = "\\EFI\\redhat\\grub.efi";
- opts.label = "Linux";
- opts.label = (unsigned char *)"Linux";
+ opts.loader = "\\EFI\\void\\grubx64.efi";
+ opts.label = "Void Linux (GRUB2)";
+ opts.label = (unsigned char *)"Void Linux (GRUB2)";
opts.disk = "/dev/sda";
opts.iface = NULL;
opts.part = 1;
}

View file

@ -1,17 +0,0 @@
Use pci.h from linux... sys/pci.h is glibc specific.
--- src/lib/scsi_ioctls.c.orig 2014-12-28 10:43:35.513305649 +0100
+++ src/lib/scsi_ioctls.c 2014-12-28 10:43:45.024306074 +0100
@@ -19,11 +19,11 @@
*/
#include <stdio.h>
-#include <sys/pci.h>
#include <stdint.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/ioctl.h>
+#include <linux/pci.h>
#include <linux/nvme.h>
#include "scsi_ioctls.h"

View file

@ -1,16 +1,16 @@
# Template file for 'efibootmgr'
pkgname=efibootmgr
version=0.11.0
revision=5
version=0.12
revision=1
build_pie=yes
hostmakedepends="pkg-config"
makedepends="libefivar-devel zlib-devel pciutils-devel"
short_desc="Tool to modify UEFI Firmware Boot Manager Variables"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
homepage="https://github.com/vathpela/efibootmgr"
distfiles="https://github.com/vathpela/efibootmgr/releases/download/efibootmgr-${version}/efibootmgr-${version}.tar.bz2"
checksum=f27ce3d7588512017bceb2d2a29aef110499a662a21550afa1158f9950f976d1
homepage="https://github.com/rhinstaller/efibootmgr"
distfiles="https://github.com/rhinstaller/efibootmgr/releases/download/efibootmgr-${version}/efibootmgr-${version}.tar.bz2"
checksum=a66f5850677e86255d93cb1cead04c3c48a823a2b864c579321f2a07f00256e6
only_for_archs="i686 i686-musl x86_64 x86_64-musl"
do_build() {