diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-06-13 05:43:00 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-06-13 09:44:21 +0200 |
commit | d8095c1e90c817c5c1bd4cbb892be7218946279b (patch) | |
tree | 031d60b6fcf278de9783be42a3a77d253a03a1ea /testing/source/efibootmgr | |
parent | 2c20c6847e0caa3b62f6e5a0506790393c141932 (diff) | |
download | current-d8095c1e90c817c5c1bd4cbb892be7218946279b.tar.gz current-d8095c1e90c817c5c1bd4cbb892be7218946279b.tar.xz |
Wed Jun 13 05:43:00 UTC 201820180613054300
a/dcron-4.5-x86_64-7.txz: Rebuilt.
Added init script and defaults file.
Moved TMPDIR to /run/cron.
Thanks to Robby Workman and shasta.
a/efibootmgr-16-x86_64-1.txz: Upgraded.
a/efivar-36-x86_64-1.txz: Added.
a/elilo-3.16-x86_64-7.txz: Rebuilt.
a/glibc-solibs-2.27-x86_64-4.txz: Rebuilt.
Don't restart init in the install script, let rc.6 handle it.
a/haveged-1.9.2-x86_64-1.txz: Added.
a/pkgtools-15.0-noarch-18.txz: Rebuilt.
setup.services: add support for rc.atd and rc.crond
a/sysvinit-scripts-2.1-noarch-10.txz: Rebuilt.
rc.6: restart init when shutting down - this prevents it from holding file
handles to removed/upgraded versions of the glibc shared libraries which
would interfere with shutdown.
rc.K: use full path to telinit
rc.M: start rc.atd and rc.crond
rc.M: don't remove cron tempfiles (moved to /run/cron)
rc.S: start rc.haveged
ap/at-3.1.20-x86_64-3.txz: Rebuilt.
Added init script and defaults file.
l/glibc-2.27-x86_64-4.txz: Rebuilt.
Don't restart init in the install script, let rc.6 handle it.
l/glibc-i18n-2.27-x86_64-4.txz: Rebuilt.
l/glibc-profile-2.27-x86_64-4.txz: Rebuilt.
l/gnu-efi-3.0.8-x86_64-1.txz: Upgraded.
Diffstat (limited to '')
-rwxr-xr-x | source/a/efivar/efivar.SlackBuild (renamed from testing/source/efibootmgr/efibootmgr.SlackBuild) | 65 | ||||
-rw-r--r-- | testing/source/efibootmgr/slack-desc | 19 |
2 files changed, 33 insertions, 51 deletions
diff --git a/testing/source/efibootmgr/efibootmgr.SlackBuild b/source/a/efivar/efivar.SlackBuild index b5aeec81d..f954ff90d 100755 --- a/testing/source/efibootmgr/efibootmgr.SlackBuild +++ b/source/a/efivar/efivar.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,29 +20,34 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=efibootmgr -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +PKGNAM=efivar +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac export ARCH fi -if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then @@ -62,7 +67,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -71,8 +75,8 @@ mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -81,28 +85,25 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Build: -export EXTRA_CFLAGS="$SLKCFLAGS -fgnu89-inline" -make || exit 1 - -# Install: -mkdir -p $PKG/usr/sbin -cp src/efibootmgr/efibootmgr $PKG/usr/sbin -chown root:root $PKG/usr/sbin/efibootmgr -chmod 755 $PKG/usr/sbin/efibootmgr -mkdir -p $PKG/usr/man/man8 -cat src/man/man8/efibootmgr.8 | gzip -9c > $PKG/usr/man/man8/efibootmgr.8.gz +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +make $NUMJOBS libdir=/usr/lib$LIBDIRSUFFIX/ mandir=/usr/man/ +make $NUMJOBS install DESTDIR=${PKG}/ libdir=/usr/lib$LIBDIRSUFFIX/ mandir=/usr/man/ # Strip binaries: -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - AUTHORS COPYING* INSTALL README* doc/* \ + COPYING* README* TODO* \ $PKG/usr/doc/${PKGNAM}-$VERSION mkdir -p $PKG/install diff --git a/testing/source/efibootmgr/slack-desc b/testing/source/efibootmgr/slack-desc deleted file mode 100644 index dee525ac5..000000000 --- a/testing/source/efibootmgr/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -efibootmgr: efibootmgr (tool to modify UEFI boot entries) -efibootmgr: -efibootmgr: efibootmgr is a Linux userspace application to modify the Intel -efibootmgr: Extensible Firmware Interface (EFI) Boot Manager. This application -efibootmgr: can create and destroy boot entries, change the boot order, change -efibootmgr: the next running boot option, and more. -efibootmgr: -efibootmgr: Homepage: http://linux.dell.com/efibootmgr -efibootmgr: -efibootmgr: -efibootmgr: |