Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ec72bffa7f1457152bcebaa794de9aff833679ff)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ec72bffa7f1457152bcebaa794de9aff833679ff)
  • Date: Wed, 8 Aug 2007 03:34:09 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

utils/util-linux/BUILD | 6 +-----
utils/util-linux/HISTORY | 7 +++++++
utils/util-linux/PRE_BUILD | 14 +++++++++-----
utils/util-linux/PRE_INSTALL | 7 +++++++
4 files changed, 24 insertions(+), 10 deletions(-)

New commits:
commit ec72bffa7f1457152bcebaa794de9aff833679ff
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

util-linux - fix bug #13926

diff --git a/utils/util-linux/BUILD b/utils/util-linux/BUILD
index 57a5b7d..181809e 100755
--- a/utils/util-linux/BUILD
+++ b/utils/util-linux/BUILD
@@ -11,8 +11,4 @@ disable_pic &&
--mandir=${TRACK_ROOT}/usr/share/man \
--infodir=${TRACK_ROOT}/usr/share/info \
$OPTS &&
-make &&
-
-if spell_ok util-linux-crypto
- then dispel --nosustain util-linux-crypto
-fi
+make
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 7a0d894..66602a1 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,10 @@
+2007-08-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: add some &&
+ make it EXECUTABLE
+ don't patch util-linux-ng or do sedits
+ * BUILD: remove reference to non-existent util-linux-crypto
+ * PRE_INSTALL: added, fixes bug #13926
+
2007-08-07 David Brown <dmlb2000 AT gmail.com>
* DETAILS: updated util-linux-ng to rc3

diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD
old mode 100644
new mode 100755
index 56c11b7..f737d99
--- a/utils/util-linux/PRE_BUILD
+++ b/utils/util-linux/PRE_BUILD
@@ -1,9 +1,11 @@
-default_pre_build && cd $SOURCE_DIRECTORY
-
-patch -p1 < $SCRIPT_DIRECTORY/util-linux-2.12p-cramfs-1.patch
-patch -p1 < $SCRIPT_DIRECTORY/glibc-fix.patch
-patch -p1 < $SCRIPT_DIRECTORY/glibc-umount2.patch
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&

+if [[ $UTIL_LINUX_NG == n ]]
+then
+patch -p1 < $SCRIPT_DIRECTORY/util-linux-2.12p-cramfs-1.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/glibc-fix.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/glibc-umount2.patch &&
sedit "s/HAVE_SLN=no/HAVE_SLN=yes/" MCONFIG &&
sedit "s/# ADD_RAW=yes/ADD_RAW=yes/" MCONFIG &&
sedit "s/\$(OPT)//" MCONFIG &&
@@ -27,3 +29,5 @@ if [ "$SELINUX" == "y" ]; then
sedit "s/HAVE_SELINUX=no/HAVE_SELINUX=yes/" MCONFIG &&
message "${MESSAGE_COLOR} SELINUX is enabled ${DEFAULT_COLOR}"
fi
+
+fi
diff --git a/utils/util-linux/PRE_INSTALL b/utils/util-linux/PRE_INSTALL
new file mode 100755
index 0000000..5c93818
--- /dev/null
+++ b/utils/util-linux/PRE_INSTALL
@@ -0,0 +1,7 @@
+# ensure that mount is available for staged install
+local SVMNT &&
+SVMNT-$SOURCE_DIRECTORY/old.bin &&
+mkdir -p $SVMNT &&
+cp /bin/mount /bin/umount $SVMNT &&
+PATH=$PATH:$SVMNT &&
+default_pre_install




Archive powered by MHonArc 2.6.24.

Top of Page