summaryrefslogtreecommitdiff
path: root/source/a/efibootmgr
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-07-29 23:17:22 +0000
committerEric Hameleers <alien@slackware.com>2019-07-30 08:59:48 +0200
commitaf4fda568788c131ce0a660dc40f621e2bbec3e1 (patch)
treeb16fee5c2b9d93c898f85f11206dc3a68da5390c /source/a/efibootmgr
parent110278b262dbdbd27af3dc1e21c4e072462208c4 (diff)
downloadcurrent-af4fda568788c131ce0a660dc40f621e2bbec3e1.tar.gz
Mon Jul 29 23:17:22 UTC 201920190729231722
a/aaa_elflibs-15.0-x86_64-10.txz: Rebuilt. Upgraded: libglib-2.0.so.0.6000.6, libgmodule-2.0.so.0.6000.6, libgobject-2.0.so.0.6000.6, libgthread-2.0.so.0.6000.6, liblber-2.4.so.2.10.11, libldap-2.4.so.2.10.11. Added: libargon2.so.1, libjson-c.so.4.0.0. a/cryptsetup-2.1.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. Thanks to Robby Workman. a/efibootmgr-20190528_d9eb7f1-x86_64-1.txz: Upgraded. Even though efibootmgr-17 will compile against efivar from git, it's probably best to take this from git as well to keep things closely synced. a/efivar-20190618_272b216-x86_64-1.txz: Upgraded. Switch to git to fix "efibootmgr -v" failing with a parse error. a/elilo-3.16-x86_64-10.txz: Rebuilt. eliloconfig: If /boot/initrd.gz exists, install the generic kernel and initrd. Otherwise, install the huge kernel. a/lvm2-2.03.05-x86_64-1.txz: Upgraded. Back to lvm2-2.03.x (cryptsetup needs it). Hopefully there's been enough time for most of the bugs to have been ironed out. l/argon2-20190702-x86_64-3.txz: Rebuilt. Fix shared library permissions. l/aspell-0.60.7-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_57-x86_64-1.txz: Upgraded. l/python-docutils-0.15.1-x86_64-1.txz: Upgraded. n/ipset-7.3-x86_64-1.txz: Upgraded. xap/geeqie-1.5-x86_64-1.txz: Upgraded. xfce/garcon-0.6.4-x86_64-1.txz: Upgraded. xfce/thunar-volman-0.9.4-x86_64-1.txz: Upgraded. xfce/tumbler-0.2.6-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/efibootmgr')
-rwxr-xr-xsource/a/efibootmgr/efibootmgr.SlackBuild4
-rw-r--r--source/a/efibootmgr/efibootmgr.efi_set_verbose.diff12
-rwxr-xr-xsource/a/efibootmgr/fetch-efibootmgr.sh47
3 files changed, 48 insertions, 15 deletions
diff --git a/source/a/efibootmgr/efibootmgr.SlackBuild b/source/a/efibootmgr/efibootmgr.SlackBuild
index 5618c09d..4a9ac73d 100755
--- a/source/a/efibootmgr/efibootmgr.SlackBuild
+++ b/source/a/efibootmgr/efibootmgr.SlackBuild
@@ -79,8 +79,6 @@ rm -rf $PKGNAM-$VERSION
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
cd $PKGNAM-$VERSION
-zcat $CWD/efibootmgr.efi_set_verbose.diff.gz | patch -p1 --verbose || exit 1
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -92,7 +90,7 @@ find . \
export EFIDIR=/boot/efi
# Build:
-export EXTRA_CFLAGS="$SLKCFLAGS"
+export CFLAGS="$SLKCFLAGS -Wno-pointer-sign"
make mandir=/usr/man || exit 1
make install mandir=/usr/man DESTDIR=$PKG || exit 1
diff --git a/source/a/efibootmgr/efibootmgr.efi_set_verbose.diff b/source/a/efibootmgr/efibootmgr.efi_set_verbose.diff
deleted file mode 100644
index cea96487..00000000
--- a/source/a/efibootmgr/efibootmgr.efi_set_verbose.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./src/efibootmgr.c.orig 2018-06-10 15:12:10.000000000 -0500
-+++ ./src/efibootmgr.c 2018-12-31 13:23:27.284013090 -0600
-@@ -1536,9 +1536,6 @@
- "invalid numeric value %s\n",
- optarg);
- }
-- /* XXX efivar-36 accidentally doesn't have a public
-- * header for this */
-- extern int efi_set_verbose(int verbosity, FILE *errlog);
- efi_set_verbose(opts.verbose - 2, stderr);
- break;
- case 'V':
diff --git a/source/a/efibootmgr/fetch-efibootmgr.sh b/source/a/efibootmgr/fetch-efibootmgr.sh
new file mode 100755
index 00000000..995c8187
--- /dev/null
+++ b/source/a/efibootmgr/fetch-efibootmgr.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Pull a stable branch + patches
+BRANCH=${1:-master}
+
+# Clear download area:
+rm -rf efibootmgr
+
+# Clone repository:
+git clone https://github.com/rhboot/efibootmgr
+
+# checkout $BRANCH:
+( cd efibootmgr
+ git checkout $BRANCH || exit 1
+)
+
+HEADISAT="$( cd efibootmgr && git log -1 --format=%h )"
+DATE="$( cd efibootmgr && git log -1 --format=%ad --date=format:%Y%m%d )"
+# Cleanup. We're not packing up the whole git repo.
+( cd efibootmgr && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+mv efibootmgr efibootmgr-${DATE}_${HEADISAT}
+tar cf efibootmgr-${DATE}_${HEADISAT}.tar efibootmgr-${DATE}_${HEADISAT}
+xz -9 -f efibootmgr-${DATE}_${HEADISAT}.tar
+rm -rf efibootmgr-${DATE}_${HEADISAT}
+echo
+echo "efibootmgr branch $BRANCH with HEAD at $HEADISAT packaged as efibootmgr-${DATE}_${HEADISAT}.tar.xz"
+echo