[arch-commits] Commit in efibootmgr/trunk (2 files)
Date: Tuesday, April 7, 2020 @ 22:13:23
Author: dvzrv
Revision: 379774
upgpkg: efibootmgr 17-1: Upgrading to 17.
Updating maintainer info. Updating pkgdesc.
Removing unrequired packages from depends (pciutils, zlib) and adding required
(glibc).
Building from signed tag, instead of having no verification whatsoever.
Removing unrequired options array and pkgver() function.
Removing unrequired echos and git calls.
Removing upstream hotfix for efivar 36, which breaks the build.
Using make install to install to pkgdir instead of doing things manually.
Installing docs. General cleanups.
Modified:
efibootmgr/trunk/PKGBUILD
Deleted:
efibootmgr/trunk/efibootmgr-tilt_slashes-func.patch
+
PKGBUILD | 63 ++-
efibootmgr-tilt_slashes-func.patch | 61 -
2 files changed, 26 insertions(+), 98 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-04-07 21:57:21 UTC (rev 379773)
+++ PKGBUILD2020-04-07 22:13:23 UTC (rev 379774)
@@ -1,53 +1,42 @@
-# Maintainer: Tobias Powalowski
+# Maintainer: David Runge
+# Contributor: Tobias Powalowski
# Contributor: Murtuza Akhtari
# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt)
(gemmaeiil) (ddoott) (ccoomm)>
-pkgname="efibootmgr"
-pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables"
-pkgver=16
-pkgrel=2
+pkgname=efibootmgr
+pkgdesc="Linux user-space application to modify the EFI Boot Manager"
+pkgver=17
+_commit=e067160ecef8208e1944002e5d50b275733211fb # 17
+pkgrel=1
arch=('x86_64')
url="https://github.com/rhinstaller/efibootmgr;
license=('GPL2')
+depends=('glibc' 'efivar')
makedepends=('git')
-depends=('pciutils' 'efivar' 'zlib')
-options=('strip' 'zipman' 'docs' '!emptydirs')
+source=("${pkgname}::git+https://github.com/rhboot/efibootmgr#tag=${pkgver}?signed;)
+sha512sums=('SKIP')
+validpgpkeys=('B00B48BC731AA8840FED9FB0EED266B70F4FEF10') # Peter Jones
-source=("efibootmgr::git+https://github.com/rhinstaller/efibootmgr.git#tag=${pkgver};)
-#source=("efibootmgr::git+https://github.com/rhinstaller/efibootmgr.git#commit=5e9700c2252eed45f4568f3a7c08c866c2c83c0b;)
-sha1sums=('SKIP')
-
-pkgver() {
- cd "${srcdir}/efibootmgr/"
- echo "$(git describe --tags)" | sed -e 's|efibootmgr-||g' -e 's|-|\.|g'
-}
-
prepare() {
-
- cd "${srcdir}/efibootmgr/"
-
- git clean -x -d -f
- echo
-
+ mv -v "${pkgname}" "${pkgname}-${pkgver}"
+ cd "${pkgname}-${pkgver}"
+ # removing hotfix function declaration:
+ # https://github.com/rhboot/efibootmgr/issues/128
+ sed -e '/extern int efi_set_verbose/d' -i "src/${pkgname}.c"
}
build() {
-
- cd "${srcdir}/efibootmgr/"
-
- make EXTRA_CFLAGS="-Os" EFIDIR="/boot/EFI"
- echo
-
+ cd "${pkgname}-${pkgver}"
+ make libdir='/usr/lib' sbindir='/usr/bin' EFIDIR='/boot/EFI'
}
package() {
-
- cd "${srcdir}/efibootmgr/"
-
- install -d "${pkgdir}/usr/bin/"
- install -D -m0755 "${srcdir}/efibootmgr/src/efibootmgr"
"${pkgdir}/usr/bin/efibootmgr"
-
- install -d "${pkgdir}/usr/share/man/man8/"
- install -D -m0644 "${srcdir}/efibootmgr/src/efibootmgr.8"
"${pkgdir}/usr/share/man/man8/efibootmgr.8"
-
+ cd "${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" \
+ libdir='/usr/lib' \
+ sbindir='/usr/bin' \
+ EFIDIR='/boot/EFI' \
+ install
+ install -vDm 644 {AUTHORS,README,README.md,TODO} \
+-t "${pkgdir}/usr/share/doc/${pkgname}"
}
Deleted: efibootmgr-tilt_slashes-func.patch
===
--- efibootmgr-tilt_slashes-func.patch 2020-04-07 21:57:21 UTC (rev 379773)
+++ efibootmgr-tilt_slashes-func.patch 2020-04-07 22:13:23 UTC (rev 379774)
@@ -1,61 +0,0 @@
-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)
-
[arch-commits] Commit in efibootmgr/trunk (2 files)
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
===
--- PKGBUILD2013-06-03 19:31:06 UTC (rev 187098)
+++ PKGBUILD2013-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);
+
