diff options
Diffstat (limited to 'source/a')
-rwxr-xr-x | source/a/libblockdev/libblockdev.SlackBuild | 6 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.M | 24 | ||||
-rwxr-xr-x | source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild | 2 | ||||
-rwxr-xr-x | source/a/util-linux/util-linux.SlackBuild | 31 | ||||
-rwxr-xr-x | source/a/volume_key/volume_key.SlackBuild | 5 |
5 files changed, 26 insertions, 42 deletions
diff --git a/source/a/libblockdev/libblockdev.SlackBuild b/source/a/libblockdev/libblockdev.SlackBuild index 68681eee4..2a2dd5378 100755 --- a/source/a/libblockdev/libblockdev.SlackBuild +++ b/source/a/libblockdev/libblockdev.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2017-2019 Robby Workman, Tuscaloosa, Alabama, USA -# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2020, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libblockdev VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -107,6 +107,8 @@ CXXFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --disable-static \ --without-dm \ + --without-python2 \ + --with-python3 \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M index ecb510913..fc63ce083 100644 --- a/source/a/sysvinit-scripts/scripts/rc.M +++ b/source/a/sysvinit-scripts/scripts/rc.M @@ -88,6 +88,18 @@ if [ -x /etc/rc.d/rc.syslog ]; then /etc/rc.d/rc.syslog start fi +# Start the Icecream scheduler. This needs to run on only one machine that is +# part of the compile cluster: +if [ -x /etc/rc.d/rc.icecc-scheduler ]; then + /etc/rc.d/rc.icecc-scheduler start +fi + +# Start the Icecream daemon. This needs to run on every machine that will be +# part of the compile cluster (including the machine running the scheduler): +if [ -x /etc/rc.d/rc.iceccd ]; then + /etc/rc.d/rc.iceccd start +fi + # Update the X font indexes: if [ -x /usr/bin/fc-cache ]; then echo "Updating X font indexes: /usr/bin/fc-cache -f &" @@ -413,18 +425,6 @@ if [ -x /etc/rc.d/rc.gpm ]; then /etc/rc.d/rc.gpm start fi -# Start the Icecream scheduler. This needs to run on only one machine that is -# part of the compile cluster: -if [ -x /etc/rc.d/rc.icecc-scheduler ]; then - /etc/rc.d/rc.icecc-scheduler start -fi - -# Start the Icecream daemon. This needs to run on every machine that will be -# part of the compile cluster (including the machine running the scheduler): -if [ -x /etc/rc.d/rc.iceccd ]; then - /etc/rc.d/rc.iceccd start -fi - # If there are SystemV init scripts for this runlevel, run them. if [ -x /etc/rc.d/rc.sysvinit ]; then /etc/rc.d/rc.sysvinit diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index 06160485c..b4ea662e1 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:-15.1} ARCH=noarch -BUILD=${BUILD:-14} +BUILD=${BUILD:-15} # 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 diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 21ac283ea..35858a799 100755 --- a/source/a/util-linux/util-linux.SlackBuild +++ b/source/a/util-linux/util-linux.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2018, 2020, 2021, 2022, 2023 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2018, 2020, 2021, 2022, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=util-linux VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 @@ -129,15 +129,7 @@ zcat $CWD/util-linux.fdisk-no-solaris.diff.gz | patch -p1 --verbose || exit 1 # /dev/ram* devices in 'fdisk -l' output: zcat $CWD/util-linux.do.not.list.ram.devices.diff.gz | patch -p1 --verbose || exit 1 -# This just call the configure script with $1 either being 2 for python2 -# or 3 for python3. -# -# The releasenotes say to use --runstatedir, but it doesn't work and the -# configure script fails. So we'll leave things using localstatedir, but -# check again later: -# -# --runstatedir=/run -configure_with_python(){ +CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -167,12 +159,8 @@ configure_with_python(){ --disable-libmount-mountfd-support \ --enable-libuuid \ --disable-uuidd \ - --with-python=$1 \ - --build=$ARCH-slackware-linux -} - -CFLAGS="$SLKCFLAGS" \ - configure_with_python 2 || exit 1 + --with-python=3 \ + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install $NUMJOBS DESTDIR=$PKG || exit 1 @@ -185,15 +173,6 @@ if [ -r $PKG/usr/bin/chsh ]; then chmod 4711 $PKG/usr/bin/chsh fi -# Build python3 bindings for libmount: -make clean -CFLAGS="$SLKCFLAGS" \ - configure_with_python 3 || exit 1 -make $NUMJOBS \ - install-pylibmountexecLTLIBRARIES \ - install-pylibmountexecPYTHON \ - DESTDIR=$PKG || exit 1 - # Remove all overlap with the shadow package, since --disable-login doesn't quite do that: rm $PKG/sbin/nologin $PKG/usr/man/man8/nologin.8 $PKG/sbin/sulogin $PKG/usr/man/man8/sulogin.8 diff --git a/source/a/volume_key/volume_key.SlackBuild b/source/a/volume_key/volume_key.SlackBuild index 97b30eccc..0649ba48f 100755 --- a/source/a/volume_key/volume_key.SlackBuild +++ b/source/a/volume_key/volume_key.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=volume_key VERSION=${VERSION:-$(echo $PKGNAM-$PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -109,6 +109,9 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Nope. +rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/python2.7/ + # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la |