Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (8f710a991d4ef5c770fdf25f17b91cdda2a6c67d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (8f710a991d4ef5c770fdf25f17b91cdda2a6c67d)
  • Date: Wed, 10 Oct 2018 12:03:24 +0000

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

disk/fuse/HISTORY | 3 +++
disk/fuse/PRE_INSTALL | 3 +++
utils/util-linux/HISTORY | 3 +++
utils/util-linux/PRE_INSTALL | 17 -----------------
4 files changed, 9 insertions(+), 17 deletions(-)

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

utils/util-linux: removed now useless backup of old binaries and libraries

commit de36867005ac2ab8ab312c9e65b66634a6af3a50
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

disk/fuse: fixed staged installation

diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 0aeeac4..066da2b 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,6 @@
+2018-10-09 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_INSTALL: added to fix staging
+
2018-07-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.9.8

diff --git a/disk/fuse/PRE_INSTALL b/disk/fuse/PRE_INSTALL
new file mode 100755
index 0000000..637baf0
--- /dev/null
+++ b/disk/fuse/PRE_INSTALL
@@ -0,0 +1,3 @@
+default_pre_install &&
+
+export LD_LIBRARY_PATH="${SOURCE_DIRECTORY}/lib/.libs:${LD_LIBRARY_PATH}"
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index bae080c..2657e0f 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,6 @@
+2018-10-09 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_INSTALL: removed now useless copying
+
2018-09-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* INSTALL: do not create broken library symlinks

diff --git a/utils/util-linux/PRE_INSTALL b/utils/util-linux/PRE_INSTALL
index a0e5343..269bbbc 100755
--- a/utils/util-linux/PRE_INSTALL
+++ b/utils/util-linux/PRE_INSTALL
@@ -1,20 +1,3 @@
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/usr/bin/*mount \
- "$INSTALL_ROOT/bin" || true
- install -vm 755 "$SOURCE_DIRECTORY"/old.binaries/usr/bin/column \
- "$INSTALL_ROOT/usr/bin"
-fi &&
-if [[ -d "$SOURCE_DIRECTORY/old.libraries" ]]; then
- install -vm 644 "$SOURCE_DIRECTORY"/old.libraries/libblkid* \
- "$SOURCE_DIRECTORY"/old.libraries/libfdisk* \
- "$SOURCE_DIRECTORY"/old.libraries/libmount* \
- "$SOURCE_DIRECTORY"/old.libraries/pylibmount* \
- "$SOURCE_DIRECTORY"/old.libraries/libsmartcols* \
- "$SOURCE_DIRECTORY/.libs/"
-fi ||
-
export LD_LIBRARY_PATH="${SOURCE_DIRECTORY}/.libs:${LD_LIBRARY_PATH}"



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (8f710a991d4ef5c770fdf25f17b91cdda2a6c67d), Pavel Vinogradov, 10/10/2018

Archive powered by MHonArc 2.6.24.

Top of Page