Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 utils/util-linux/DETAILS     |    4 +---
 utils/util-linux/HISTORY     |    7 +++++++
 utils/util-linux/INSTALL     |    2 +-
 utils/util-linux/PRE_INSTALL |    7 +++++--
 4 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit f23c13c7304f85e78143cc1be6e8f2c9ce04dec8
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    utils/util--linux: fixed staging, tmpfs and bad symlinking

diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 70e5436..4aadbbd 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -16,7 +16,7 @@ else
      
SOURCE_HASH=sha512:320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482
   SECURITY_PATCH=3
 fi
-      PATCHLEVEL=2
+      PATCHLEVEL=3
           BRANCH=`echo $VERSION | cut -d.  -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.xz
 #         SOURCE2=$SOURCE.asc
@@ -29,8 +29,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
          ENTERED=20010922
       LICENSE[0]=GPL
         KEYWORDS="utils"
-  STAGED_INSTALL=off
-           TMPFS=off
            SHORT="essential utilities for any Linux box"
 cat << EOF
 Util-linux is a suite of essential utilities for any Linux system. Its 
primary
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 1c4c992..b8e514c 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,10 @@
+2018-05-16 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: PATCHLEVEL++, staging and tmpfs are available now
+       * INSTALL: fixed bad symlinking of libblkid
+       * PRE_INSTALL: ensured error free copying, corrected *mount path,
+         added library path preloading for staging, got libsmartcols*
+         to be copied as well
+
 2018-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * INSTALL: create missing symlink to libsmartcols
        * DETAILS: PATCHLEVEL++
diff --git a/utils/util-linux/INSTALL b/utils/util-linux/INSTALL
index d1767bc..70b4ad9 100755
--- a/utils/util-linux/INSTALL
+++ b/utils/util-linux/INSTALL
@@ -15,6 +15,6 @@ fi &&
 
 ln -sfn libmount.so.1.1.0 "${INSTALL_ROOT}/usr/lib/libmount.so.1" &&
 ln -sfn libuuid.so.1.3.0  "${INSTALL_ROOT}/usr/lib/libuuid.so.1"  &&
-ln -sfn libblkid.so.1.3.0 "${INSTALL_ROOT}/usr/lib/libblkid.so.1" &&
+ln -sfn libblkid.so.1.1.0 "${INSTALL_ROOT}/usr/lib/libblkid.so.1" &&
 ln -sfn libsmartcols.so.1.1.0 "${INSTALL_ROOT}/usr/lib/libsmartcols.so.1"
 
diff --git a/utils/util-linux/PRE_INSTALL b/utils/util-linux/PRE_INSTALL
index 647bd82..a0e5343 100755
--- a/utils/util-linux/PRE_INSTALL
+++ b/utils/util-linux/PRE_INSTALL
@@ -3,7 +3,7 @@ default_pre_install &&
 # ensure that mount is available - needed for and only for staged install
 # older sorceries don't have this backup
 if [[ -d "$SOURCE_DIRECTORY/old.binaries" ]]; then
-  install -vm 755 "$SOURCE_DIRECTORY"/old.binaries/bin/*mount \
+  install -vm 755 "$SOURCE_DIRECTORY"/old.binaries/usr/bin/*mount \
                   "$INSTALL_ROOT/bin" || true
   install -vm 755 "$SOURCE_DIRECTORY"/old.binaries/usr/bin/column \
                   "$INSTALL_ROOT/usr/bin"
@@ -13,5 +13,8 @@ if [[ -d "$SOURCE_DIRECTORY/old.libraries" ]]; then
                   "$SOURCE_DIRECTORY"/old.libraries/libfdisk* \
                   "$SOURCE_DIRECTORY"/old.libraries/libmount* \
                   "$SOURCE_DIRECTORY"/old.libraries/pylibmount* \
+                  "$SOURCE_DIRECTORY"/old.libraries/libsmartcols* \
                   "$SOURCE_DIRECTORY/.libs/"
-fi
+fi ||
+
+export LD_LIBRARY_PATH="${SOURCE_DIRECTORY}/.libs:${LD_LIBRARY_PATH}"