Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (075165b3592613d0efa4d398caab48ed639d031f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (075165b3592613d0efa4d398caab48ed639d031f)
  • Date: Thu, 7 May 2015 09:08:51 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

libs/libmpc/DETAILS | 8 +++++---
libs/libmpc/HISTORY | 5 +++++
libs/libmpc/INSTALL | 5 +++--
utils/util-linux/HISTORY | 5 +++++
utils/util-linux/PREPARE | 38 +++++++++++++++++++++-----------------
5 files changed, 39 insertions(+), 22 deletions(-)

New commits:
commit 075165b3592613d0efa4d398caab48ed639d031f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libmpc: fixed install phase in dispel-less cases, ok flux@

commit cb776f63ef5588eeb0cfc86172e780db30e88954
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

util-linux: fixed a failure in PREPARE for the boxes without util-linux
installed on them, ok flux@

diff --git a/libs/libmpc/DETAILS b/libs/libmpc/DETAILS
index 7d7c750ae..f12ad96 100755
--- a/libs/libmpc/DETAILS
+++ b/libs/libmpc/DETAILS
@@ -1,10 +1,12 @@
SPELL=libmpc
+ SPELLX=mpc
VERSION=1.0.3

SOURCE_HASH=sha512:0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43
SECURITY_PATCH=1
- SOURCE="mpc-$VERSION.tar.gz"
- SOURCE_URL[0]=http://www.multiprecision.org/mpc/download/$SOURCE
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/mpc-$VERSION"
+ SOURCE="$SPELLX-$VERSION.tar.gz"
+ SOURCE_URL[0]=http://www.multiprecision.org/${SPELLX}/download/${SOURCE}
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ GATHER_DOCS=off
WEB_SITE="http://www.multiprecision.org/index.php?prog=mpc";
LICENSE[0]="LGPL"
ENTERED=20100410
diff --git a/libs/libmpc/HISTORY b/libs/libmpc/HISTORY
index 843575c..bf24616 100644
--- a/libs/libmpc/HISTORY
+++ b/libs/libmpc/HISTORY
@@ -1,3 +1,8 @@
+2015-05-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: use SPELLX; added GATHER_DOCS to drop dirty hack in INSTALL
+ * INSTALL: corrected install phase by adding a test case & '-f' flag
for
+ ln (thanks to Justin and his super-fresh rebuild)
+
2015-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.3

diff --git a/libs/libmpc/INSTALL b/libs/libmpc/INSTALL
index 7443a11..0efe3f0 100755
--- a/libs/libmpc/INSTALL
+++ b/libs/libmpc/INSTALL
@@ -1,4 +1,5 @@
default_install &&
# gcc needs previous libmpc
-ln -s $TRACK_ROOT/usr/lib/libmpc.so $INSTALL_ROOT/usr/lib/libmpc.so.2 &&
-rm -r doc # remove the remaining build system cruft
+if [[ ! -h "$INSTALL_ROOT/usr/lib/libmpc.so.2" ]]; then
+ ln -sf $TRACK_ROOT/usr/lib/libmpc.so $INSTALL_ROOT/usr/lib/libmpc.so.2
+fi
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 44855f8..bfcb082 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,8 @@
+2015-05-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * PREPARE: added forgotten spell_ok check (thanks to Justin and his
+ super-fresh rebuild); added a warning message for those who haven't
+ had util-linux installed yet
+
2015-01-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version to 2.25.2

diff --git a/utils/util-linux/PREPARE b/utils/util-linux/PREPARE
index f8acac4..5f29fbf 100755
--- a/utils/util-linux/PREPARE
+++ b/utils/util-linux/PREPARE
@@ -6,29 +6,33 @@ config_query_list UL_VERSION "What version do you want to
use?" \
latest \
aes &&

-local OLD_SPELL_VERSION="" &&
-spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
-
# util-linux 2.20 needs ttyX in /etc/inittab without /dev
# http://www.sourcemage.org/issues/110
message "${MESSAGE_COLOR}Checking sanity of
$INSTALL_ROOT/etc/inittab...${DEFAULT_COLOR}" &&

if grep -iq "/dev/tty" "$INSTALL_ROOT/etc/inittab"; then
- if is_version_less ${OLD_SPELL_VERSION} 2.20; then
- message "${PROBLEM_COLOR}" &&
- message "WARNING: $INSTALL_ROOT/etc/inittab needs syntax update. You
need to" &&
- message "replace all '/dev/tty*' lines to 'tty*' equivalents, e.g.:" &&
- message "${MESSAGE_COLOR}Before: tty1:linux:/sbin/agetty /dev/tty1 9600"
&&
- message "After: tty1:linux:/sbin/agetty tty1 9600${PROBLEM_COLOR}" &&
- message "Press 'n' to abort cast and do that manually by editing" &&
- message "$INSTALL_ROOT/etc/inittab file under superuser, then recast
$SPELL." &&
- message "${DEFAULT_COLOR}" &&
+ if spell_ok $SPELL; then
+ local OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
+
+ if is_version_less ${OLD_SPELL_VERSION} 2.20; then
+ message "${PROBLEM_COLOR}" &&
+ message "WARNING: $INSTALL_ROOT/etc/inittab needs syntax update. You
need to" &&
+ message "replace all '/dev/tty*' lines to 'tty*' equivalents, e.g.:" &&
+ message "${MESSAGE_COLOR}Before: tty1:linux:/sbin/agetty /dev/tty1
9600" &&
+ message "After: tty1:linux:/sbin/agetty tty1 9600${PROBLEM_COLOR}" &&
+ message "Press 'n' to abort cast and do that manually by editing" &&
+ message "$INSTALL_ROOT/etc/inittab file under superuser, then recast
$SPELL." &&
+ message "${DEFAULT_COLOR}" &&

- if ! query "Attempt to replace the lines automatically?" n; then
- return 1
- else
- persistent_add UL_DEV_AUTOREPLACE &&
- local UL_DEV_AUTOREPLACE="y"
+ if ! query "Attempt to replace the lines automatically?" n; then
+ return 1
+ else
+ persistent_add UL_DEV_AUTOREPLACE &&
+ UL_DEV_AUTOREPLACE="y"
+ fi
fi
+ else
+ message "${PROBLEM_COLOR}Your /etc/inittab was not managed by
${SPELL_COLOR}$SPELL${PROBLEM_COLOR} previously."
+ message "You should probably fix your '/dev/tty*' entries by removing
'/dev/' from them.${DEFAULT_COLOR}"
fi
fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (075165b3592613d0efa4d398caab48ed639d031f), Vlad Glagolev, 05/07/2015

Archive powered by MHonArc 2.6.24.

Top of Page