summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeshav Amburay2013-09-07 01:45:25 +0530
committerKeshav Amburay2013-09-07 01:45:25 +0530
commit4715708cffab464e9e5e83fc0641908bec9324f3 (patch)
tree02e6cd460cffb2aefa6b37acea16f25b3ef8940a
parentdf09c01646f43352125bf7a2a043e9389b256158 (diff)
downloadaur-4715708cffab464e9e5e83fc0641908bec9324f3.tar.gz
Bump pkgver
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--efibootmgr-remove-loader-path-chars-limit.patch30
3 files changed, 4 insertions, 42 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 93e52c0a92d0..186b2ac48187 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = efibootmgr-pjones-git
pkgdesc = Tool to modify UEFI Firmware Boot Manager Variables - Built from Fedora's Peter Jones GitHub Repo - libefivars branch
- pkgver = 0.6.0.136.867bfd5
+ pkgver = 0.6.0.138.1132342
pkgrel = 1
url = https://github.com/vathpela/efibootmgr
arch = x86_64
@@ -20,9 +20,7 @@ pkgbase = efibootmgr-pjones-git
options = !emptydirs
options = !libtool
source = efibootmgr-pjones::git+https://github.com/vathpela/efibootmgr.git#branch=libefivars
- source = efibootmgr-remove-loader-path-chars-limit.patch
sha1sums = SKIP
- sha1sums = 57cb0e01d9c102491fc1758766f530813cad97d2
pkgname = efibootmgr-pjones-git
diff --git a/PKGBUILD b/PKGBUILD
index 64c43ff95274..100f097e1502 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ _gitroot="https://github.com/vathpela/efibootmgr.git"
_gitname="${_pkgname}"
_gitbranch="libefivars"
-pkgver=0.6.0.136.867bfd5
+pkgver=0.6.0.138.1132342
pkgrel=1
pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables - Built from Fedora's Peter Jones GitHub Repo - libefivars branch"
arch=('x86_64' 'i686')
@@ -21,11 +21,8 @@ conflicts=("${__pkgname}" "${__pkgname}-git" "${_pkgname}")
provides=("${__pkgname}" "${__pkgname}-git" "${_pkgname}")
options=('!strip' 'zipman' '!emptydirs' '!libtool')
-source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}"
- 'efibootmgr-remove-loader-path-chars-limit.patch')
-
-sha1sums=('SKIP'
- '57cb0e01d9c102491fc1758766f530813cad97d2')
+source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}")
+sha1sums=('SKIP')
pkgver() {
cd "${srcdir}/${_gitname}/"
@@ -46,9 +43,6 @@ build() {
cd "${srcdir}/${_gitname}_build/"
- patch -Np1 -i "${srcdir}/efibootmgr-remove-loader-path-chars-limit.patch"
- echo
-
make EXTRA_CFLAGS="-Os"
echo
diff --git a/efibootmgr-remove-loader-path-chars-limit.patch b/efibootmgr-remove-loader-path-chars-limit.patch
deleted file mode 100644
index a8d1067fc058..000000000000
--- a/efibootmgr-remove-loader-path-chars-limit.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/lib/efi.c b/src/lib/efi.c
-index cc8a73a..c34d29f 100644
---- a/src/lib/efi.c
-+++ b/src/lib/efi.c
-@@ -476,7 +476,7 @@ make_disk_load_option(char *disk, uint8_t *buf, size_t size)
- int rc, edd_version=0;
- uint8_t mbr_type=0, signature_type=0;
- uint64_t part_start=0, part_size=0;
-- efi_char16_t os_loader_path[40];
-+ efi_char16_t *os_loader_path;
- size_t needed = 0;
- off_t buf_offset = 0;
-
-@@ -519,10 +519,15 @@ make_disk_load_option(char *disk, uint8_t *buf, size_t size)
- return needed;
- buf_offset += needed;
-
-+ needed = (strlen(opts.loader) + 1) * sizeof (*os_loader_path);
-+ os_loader_path = malloc(needed);
-+ if (!os_loader_path)
-+ return -1;
- efichar_from_char(os_loader_path, tilt_slashes(opts.loader),
-- sizeof(os_loader_path));
-+ needed);
- needed = make_file_path_device_path(os_loader_path, buf + buf_offset,
- size == 0 ? 0 : size - buf_offset);
-+ free(os_loader_path);
- if (needed < 0)
- return needed;
- buf_offset += needed;