Date: Monday, May 30, 2016 @ 22:14:50 Author: tpowa Revision: 268756 archrelease: copy trunk to testing-x86_64, testing-i686
Added: efibootmgr/repos/testing-i686/PKGBUILD (from rev 268755, efibootmgr/trunk/PKGBUILD) efibootmgr/repos/testing-i686/efibootmgr-tilt_slashes-func.patch (from rev 268755, efibootmgr/trunk/efibootmgr-tilt_slashes-func.patch) efibootmgr/repos/testing-x86_64/PKGBUILD (from rev 268755, efibootmgr/trunk/PKGBUILD) efibootmgr/repos/testing-x86_64/efibootmgr-tilt_slashes-func.patch (from rev 268755, efibootmgr/trunk/efibootmgr-tilt_slashes-func.patch) Deleted: efibootmgr/repos/testing-i686/PKGBUILD efibootmgr/repos/testing-i686/efibootmgr-tilt_slashes-func.patch efibootmgr/repos/testing-x86_64/PKGBUILD efibootmgr/repos/testing-x86_64/efibootmgr-tilt_slashes-func.patch ---------------------------------------------------+ /PKGBUILD | 106 +++++++++++++++++ /efibootmgr-tilt_slashes-func.patch | 122 ++++++++++++++++++++ testing-i686/PKGBUILD | 53 -------- testing-i686/efibootmgr-tilt_slashes-func.patch | 61 ---------- testing-x86_64/PKGBUILD | 53 -------- testing-x86_64/efibootmgr-tilt_slashes-func.patch | 61 ---------- 6 files changed, 228 insertions(+), 228 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2016-05-30 19:33:26 UTC (rev 268755) +++ testing-i686/PKGBUILD 2016-05-30 20:14:50 UTC (rev 268756) @@ -1,53 +0,0 @@ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> -# Contributor: Murtuza Akhtari <inxsible at gmail dot com> -# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> - -pkgname="efibootmgr" -pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables" -pkgver=0.12.27.g5e9700c -pkgrel=1 -arch=('x86_64' 'i686') -url="https://github.com/rhinstaller/efibootmgr" -license=('GPL2') -makedepends=('git') -depends=('pciutils' 'efivar' 'zlib') -options=('strip' 'zipman' 'docs' '!emptydirs') - -#source=("efibootmgr::git+https://github.com/rhinstaller/efibootmgr.git#tag=efibootmgr-${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 - -} - -build() { - - cd "${srcdir}/efibootmgr/" - - make EXTRA_CFLAGS="-Os" - echo - -} - -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" - -} Copied: efibootmgr/repos/testing-i686/PKGBUILD (from rev 268755, efibootmgr/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2016-05-30 20:14:50 UTC (rev 268756) @@ -0,0 +1,53 @@ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributor: Murtuza Akhtari <inxsible at gmail dot com> +# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> + +pkgname="efibootmgr" +pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables" +pkgver=0.12.27.g5e9700c +pkgrel=1 +arch=('x86_64' 'i686') +url="https://github.com/rhinstaller/efibootmgr" +license=('GPL2') +makedepends=('git') +depends=('pciutils' 'efivar' 'zlib') +options=('strip' 'zipman' 'docs' '!emptydirs') + +#source=("efibootmgr::git+https://github.com/rhinstaller/efibootmgr.git#tag=efibootmgr-${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 + +} + +build() { + + cd "${srcdir}/efibootmgr/" + + make EXTRA_CFLAGS="-Os" + echo + +} + +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" + +} Deleted: testing-i686/efibootmgr-tilt_slashes-func.patch =================================================================== --- testing-i686/efibootmgr-tilt_slashes-func.patch 2016-05-30 19:33:26 UTC (rev 268755) +++ testing-i686/efibootmgr-tilt_slashes-func.patch 2016-05-30 20:14:50 UTC (rev 268756) @@ -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) - 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); - Copied: efibootmgr/repos/testing-i686/efibootmgr-tilt_slashes-func.patch (from rev 268755, efibootmgr/trunk/efibootmgr-tilt_slashes-func.patch) =================================================================== --- testing-i686/efibootmgr-tilt_slashes-func.patch (rev 0) +++ testing-i686/efibootmgr-tilt_slashes-func.patch 2016-05-30 20:14:50 UTC (rev 268756) @@ -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); + Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2016-05-30 19:33:26 UTC (rev 268755) +++ testing-x86_64/PKGBUILD 2016-05-30 20:14:50 UTC (rev 268756) @@ -1,53 +0,0 @@ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> -# Contributor: Murtuza Akhtari <inxsible at gmail dot com> -# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> - -pkgname="efibootmgr" -pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables" -pkgver=0.12.27.g5e9700c -pkgrel=1 -arch=('x86_64' 'i686') -url="https://github.com/rhinstaller/efibootmgr" -license=('GPL2') -makedepends=('git') -depends=('pciutils' 'efivar' 'zlib') -options=('strip' 'zipman' 'docs' '!emptydirs') - -#source=("efibootmgr::git+https://github.com/rhinstaller/efibootmgr.git#tag=efibootmgr-${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 - -} - -build() { - - cd "${srcdir}/efibootmgr/" - - make EXTRA_CFLAGS="-Os" - echo - -} - -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" - -} Copied: efibootmgr/repos/testing-x86_64/PKGBUILD (from rev 268755, efibootmgr/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2016-05-30 20:14:50 UTC (rev 268756) @@ -0,0 +1,53 @@ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributor: Murtuza Akhtari <inxsible at gmail dot com> +# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> + +pkgname="efibootmgr" +pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables" +pkgver=0.12.27.g5e9700c +pkgrel=1 +arch=('x86_64' 'i686') +url="https://github.com/rhinstaller/efibootmgr" +license=('GPL2') +makedepends=('git') +depends=('pciutils' 'efivar' 'zlib') +options=('strip' 'zipman' 'docs' '!emptydirs') + +#source=("efibootmgr::git+https://github.com/rhinstaller/efibootmgr.git#tag=efibootmgr-${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 + +} + +build() { + + cd "${srcdir}/efibootmgr/" + + make EXTRA_CFLAGS="-Os" + echo + +} + +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" + +} Deleted: testing-x86_64/efibootmgr-tilt_slashes-func.patch =================================================================== --- testing-x86_64/efibootmgr-tilt_slashes-func.patch 2016-05-30 19:33:26 UTC (rev 268755) +++ testing-x86_64/efibootmgr-tilt_slashes-func.patch 2016-05-30 20:14:50 UTC (rev 268756) @@ -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) - 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); - Copied: efibootmgr/repos/testing-x86_64/efibootmgr-tilt_slashes-func.patch (from rev 268755, efibootmgr/trunk/efibootmgr-tilt_slashes-func.patch) =================================================================== --- testing-x86_64/efibootmgr-tilt_slashes-func.patch (rev 0) +++ testing-x86_64/efibootmgr-tilt_slashes-func.patch 2016-05-30 20:14:50 UTC (rev 268756) @@ -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); +