diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2023-09-07 19:41:00 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2023-09-07 22:01:03 +0200 |
| commit | b6b0663c2b4f8ba0150fcbb958e667e337ee3596 (patch) | |
| tree | 8666ac06129472d47490f10dfb34ca25e9f7d18d /source/n/iproute2/iproute2.SlackBuild | |
| parent | bb5293798e5696f1e72797a298a9bc7d7c68f102 (diff) | |
| download | current-b6b0663c2b4f8ba0150fcbb958e667e337ee3596.tar.gz current-b6b0663c2b4f8ba0150fcbb958e667e337ee3596.tar.xz | |
Thu Sep 7 19:41:00 UTC 202320230907194100
d/rust-bindgen-0.68.1-x86_64-1.txz: Upgraded.
l/glib2-2.76.5-x86_64-2.txz: Rebuilt.
[PATCH] gkeyfile: Temporarily re-allow invalid escapes when parsing strings.
l/netpbm-11.03.05-x86_64-1.txz: Upgraded.
n/iproute2-6.5.0-x86_64-2.txz: Rebuilt.
Fixed build/install script issues due to config files moving from /etc.
Diffstat (limited to '')
| -rwxr-xr-x | source/n/iproute2/iproute2.SlackBuild | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source/n/iproute2/iproute2.SlackBuild b/source/n/iproute2/iproute2.SlackBuild index 65415b864..079ff0e2a 100755 --- a/source/n/iproute2/iproute2.SlackBuild +++ b/source/n/iproute2/iproute2.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=iproute2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} #NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -82,7 +82,8 @@ find . \ make \ CCOPTS="$SLKCFLAGS" \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ - CONFDIR=/etc/iproute2 \ + CONF_ETC_DIR?=/etc/iproute2 \ + CONF_USR_DIR?=/usr/lib/iproute2 \ DOCDIR=/usr/doc/iproute2-$VERSION \ MANDIR=/usr/man \ DBM_INCLUDE=/usr/include/db48 \ @@ -90,7 +91,8 @@ make \ make install \ LIBDIR=/usr/lib${LIBDIRSUFFIX} \ - CONFDIR=/etc/iproute2 \ + CONF_ETC_DIR?=/etc/iproute2 \ + CONF_USR_DIR?=/usr/lib/iproute2 \ DOCDIR=/usr/doc/iproute2-$VERSION \ MANDIR=/usr/man \ DBM_INCLUDE=/usr/include/db48 \ @@ -99,6 +101,9 @@ make install \ mkdir -p $PKG/usr make install LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG/usr/ || exit 1 +# Add a configuration override directory: +mkdir -p $PKG/etc/iproute2 + # This stuff has always been installed under /sbin rather than # /usr/sbin, as the latter could possibly be network-mounted, and # these utilities may be needed to set up that network, so move @@ -113,7 +118,7 @@ mv $PKG/usr/sbin/* $PKG/sbin ) # Don't clobber existing config files -for file in $PKG/etc/iproute2/* ; do +for file in $PKG/usr/lib/iproute2/* ; do mv $file ${file}.new done @@ -158,4 +163,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/iproute2-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz - |