diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-11-28 07:25:32 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-11-28 17:59:44 +0100 |
commit | 388986876373b8d6d9053c36196978464bd3362e (patch) | |
tree | 2447049c22eb45bd771fa0132638b508ecff9992 /source/a | |
parent | bec25255185f3eb2e43abf4a495c275fe3c70fbf (diff) | |
download | current-388986876373b8d6d9053c36196978464bd3362e.tar.gz current-388986876373b8d6d9053c36196978464bd3362e.tar.xz |
Wed Nov 28 07:25:32 UTC 201820181128072532
a/elilo-3.16-x86_64-9.txz: Rebuilt.
eliloconfig: don't assume that mount output lists the / partition first.
a/f2fs-tools-1.12.0-x86_64-1.txz: Added.
a/kernel-generic-4.19.5-x86_64-1.txz: Upgraded.
a/kernel-huge-4.19.5-x86_64-1.txz: Upgraded.
CRYPTO_CRC32 m -> y
F2FS_FS m -> y
a/kernel-modules-4.19.5-x86_64-1.txz: Upgraded.
a/sysvinit-scripts-2.1-noarch-22.txz: Rebuilt.
rc.S: if we're using F2FS for the root filesystem, don't try to check it as
fsck.f2fs throws an error on trying to check a read-only filesystem.
d/clisp-2.49_20181112_df3b9f6fd-x86_64-1.txz: Upgraded.
d/kernel-headers-4.19.5-x86-1.txz: Upgraded.
k/kernel-source-4.19.5-noarch-1.txz: Upgraded.
l/graphite2-1.3.12-x86_64-1.txz: Added.
Required by harfbuzz in order to use it as a system library for TeXlive.
l/harfbuzz-2.1.3-x86_64-1.txz: Upgraded.
Requires graphite2-1.3.12.
t/texlive-2018.180822-x86_64-4.txz: Rebuilt.
Use system harfbuzz, not the bundled version.
isolinux/initrd.img: Rebuilt.
Activate LVM volumes at boot, not only when setup is run.
Make /etc/mtab a symlink to /proc/mounts on the installer.
On a freshly installed system, make /etc/mtab a symlink to /proc/mounts.
Include f2fs-tools on the installer.
Support installing on F2FS partitions.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/a')
-rwxr-xr-x | source/a/elilo/elilo.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/elilo/eliloconfig | 4 | ||||
-rwxr-xr-x | source/a/f2fs-tools/f2fs-tools.SlackBuild | 159 | ||||
-rw-r--r-- | source/a/f2fs-tools/slack-desc | 19 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.S | 9 | ||||
-rwxr-xr-x | source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild | 2 |
6 files changed, 190 insertions, 5 deletions
diff --git a/source/a/elilo/elilo.SlackBuild b/source/a/elilo/elilo.SlackBuild index 933a67b55..b4c2e98e0 100755 --- a/source/a/elilo/elilo.SlackBuild +++ b/source/a/elilo/elilo.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=elilo VERSION=${VERSION:-$(echo $PKGNAM*.tar.?z* | rev | cut -f 2 -d - | rev)} -BUILD=${BUILD:-8} +BUILD=${BUILD:-9} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/a/elilo/eliloconfig b/source/a/elilo/eliloconfig index 43616d563..e1866859a 100644 --- a/source/a/elilo/eliloconfig +++ b/source/a/elilo/eliloconfig @@ -63,7 +63,7 @@ if [ "$ROOT_DEVICE" = "" ]; then if [ -r $TMP/SeTrootdev ]; then ROOT_DEVICE="$(cat $TMP/SeTrootdev)" else - ROOT_DEVICE="$(mount | cut -f 1 -d ' ' | head -n 1)" + ROOT_DEVICE="$(mount | grep ' / ' | cut -f 1 -d ' ' | head -n 1)" fi fi @@ -196,9 +196,11 @@ entry? This is recommended.\n\nOld EFI boot menu entry:\n$ENTRY" 13 70 fi # Remove the boot entry: efibootmgr -q -B -b $(echo $line | cut -b5-8) + sleep 1 done efibootmgr -q -c -d $EFI_DEVICE -p $EFI_PARTITION -l "\\EFI\\Slackware\\elilo.efi" -L "Slackware" +sleep 1 efibootmgr -v | rev | cut -f 2- | rev | grep Boot0 | grep Slackware | while read line ; do # Reject entries that don't exactly match as not our business diff --git a/source/a/f2fs-tools/f2fs-tools.SlackBuild b/source/a/f2fs-tools/f2fs-tools.SlackBuild new file mode 100755 index 000000000..7fbded7b4 --- /dev/null +++ b/source/a/f2fs-tools/f2fs-tools.SlackBuild @@ -0,0 +1,159 @@ +#!/bin/bash + +# Copyright 2018 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=f2fs-tools +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=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 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:-" -j$(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +NOCONFIGURE=1 sh ./autogen.sh + +# Configure, build, and install: +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --disable-static \ + --build=$ARCH-slackware-linux || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +# Don't ship sg_write_buffer - it comes with sg_utils: +rm -f $PKG/usr/sbin/sg_write_buffer + +# Move libraries out of /usr: +mkdir $PKG/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + for file in lib*.so.?.* ; do + mv $file ../../lib${LIBDIRSUFFIX} + ln -sf ../../lib${LIBDIRSUFFIX}/$file . + done + cp -a lib*.so.? ../../lib${LIBDIRSUFFIX} +) + +# Move some tools out of /usr: +mkdir -p $PKG/sbin +( cd $PKG/usr/sbin + for file in defrag.f2fs dump.f2fs fsck.f2fs mkfs.f2fs resize.f2fs sload.f2fs ; do + mv $file ../../sbin + ln -sf ../../sbin/$file . + done +) + +# Strip binaries: +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* ChangeLog COPYING* LICENSE* NEWS* README* THANKS* TODO* VERSION* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/f2fs-tools/slack-desc b/source/a/f2fs-tools/slack-desc new file mode 100644 index 000000000..8359ea76b --- /dev/null +++ b/source/a/f2fs-tools/slack-desc @@ -0,0 +1,19 @@ +# 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 ':'. + + |-----handy-ruler------------------------------------------------------| +f2fs-tools: f2fs-tools (Flash-Friendly File System) +f2fs-tools: +f2fs-tools: F2FS is a new file system designed for NAND flash memory-based storage +f2fs-tools: devices. It uses a log structure file system approach adapted for this +f2fs-tools: type of storage, and supports various parameters not only for +f2fs-tools: configuring on-disk layout, but also for selecting allocation and +f2fs-tools: cleaning algorithms. +f2fs-tools: +f2fs-tools: Homepage: +f2fs-tools: https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git +f2fs-tools: diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S index e689e4589..a382bd556 100644 --- a/source/a/sysvinit-scripts/scripts/rc.S +++ b/source/a/sysvinit-scripts/scripts/rc.S @@ -229,8 +229,13 @@ if [ -r /etc/forcefsck ]; then FORCEFSCK="-f" fi -# Check the root filesystem: -if [ ! $READWRITE = yes ]; then +# If we're using F2FS for the root filesystem, don't check it as it doesn't +# allow checking a read-only filesystem: +if [ "$(cat /etc/fstab | tr '\t' ' ' | tr -s ' ' | grep ' / ' | cut -f 3 -d ' ')" = "f2fs" ]; then + echo "Remounting root device with read-write enabled." + /sbin/mount -w -v -n -o remount / +elif [ ! $READWRITE = yes ]; then + # Check the root filesystem: RETVAL=0 if [ ! -r /etc/fastboot ]; then echo "Checking root filesystem:" diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index 9b3575966..aafd0143a 100755 --- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sysvinit-scripts VERSION=${VERSION:-2.1} ARCH=noarch -BUILD=${BUILD:-21} +BUILD=${BUILD:-22} # 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 |