diff options
Diffstat (limited to 'source/a/elilo')
| -rwxr-xr-x | source/a/elilo/elilo.SlackBuild | 18 | ||||
| -rw-r--r-- | source/a/elilo/eliloconfig | 6 |
2 files changed, 15 insertions, 9 deletions
diff --git a/source/a/elilo/elilo.SlackBuild b/source/a/elilo/elilo.SlackBuild index ad2ffc146..2fa31a7af 100755 --- a/source/a/elilo/elilo.SlackBuild +++ b/source/a/elilo/elilo.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2013, 2014, 2016 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,11 +22,11 @@ PKGNAM=elilo VERSION=${VERSION:-$(echo $PKGNAM*.tar.?z* | rev | cut -f 2 -d - | rev)} -BUILD=${BUILD:-6} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -36,8 +36,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -58,12 +58,18 @@ mkdir elilo cd elilo tar xvf $CWD/${PKGNAM}-$VERSION-all.tar.?z* || exit 1 tar xvf elilo-${VERSION}-source.tar.gz || exit 1 +# This is a rebuilt version of the x86_64 elilo (which is really the only +# useful one), fetched from $TMP/elilo/elilo-${VERSION}-source/ after +# running this script. Elilo can be rather fragile, so we don't want to +# rebuild it all the time and risk breaking it. +tar xvf $CWD/elilo.x64.rebuilt.tar.xz || exit 1 chown -R root:root . chmod -R u+w,go+r-w,a-s . -cd elilo +cd elilo-${VERSION}-source || cd elilo || exit sed -i "s,/usr/lib,/usr/lib${LIBDIRSUFFIX},g" Make.defaults sed -i "s,EFICRT0.*= /usr/lib${LIBDIRSUFFIX},EFICRT0 = /usr/lib${LIBDIRSUFFIX}/gnuefi,g" Make.defaults +sed -i "s,dpkg-architecture -qDEB_BUILD_ARCH,uname -m,g" Make.defaults # We will build this from source. # However, we will package the pre-built EFI binaries, since we would diff --git a/source/a/elilo/eliloconfig b/source/a/elilo/eliloconfig index 91f66d692..912d65057 100644 --- a/source/a/elilo/eliloconfig +++ b/source/a/elilo/eliloconfig @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2013 Patrick Volkerding, Sebeka, Minnesota, USA +# Copyright 2013, 2016 Patrick Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -88,10 +88,10 @@ fi # Figure out the device and partition number of the ESP: if mount | grep vfat | grep -wq /boot/efi ; then EFI_DEVICE=$(mount | grep vfat | grep -w /boot/efi | cut -b 1-8) - EFI_PARTITION=$(mount | grep vfat | grep -w /boot/efi | cut -f 1 -d ' ' | cut -b 9-) + EFI_PARTITION=$(mount | grep vfat | grep -w /boot/efi | cut -f 1 -d ' ' | cut -b 9- | tr -d [a-z]) else EFI_DEVICE=$(mount | grep vfat | grep -w /mnt/boot/efi | cut -b 1-8) - EFI_PARTITION=$(mount | grep vfat | grep -w /mnt/boot/efi | cut -f 1 -d ' ' | cut -b 9-) + EFI_PARTITION=$(mount | grep vfat | grep -w /mnt/boot/efi | cut -f 1 -d ' ' | cut -b 9- | tr -d [a-z]) fi # There better be a kernel: |