[SM-Commit] GIT changes to master grimoire by Eric Sandall (c3ff13022ef5564b2c6dbc28226532ec7ee39a34)

Eric Sandall scm at sourcemage.org
Wed May 13 02:51:56 EDT 2009


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 disk/e2fsprogs/DEPENDS     |    3 ++-
 disk/e2fsprogs/HISTORY     |    5 +++++
 utils/util-linux/CONFLICTS |    1 +
 utils/util-linux/DEPENDS   |    1 -
 utils/util-linux/HISTORY   |    5 +++++
 5 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit c3ff13022ef5564b2c6dbc28226532ec7ee39a34
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    e2fsprogs: Depends on util-linux for blkid
    checking for blkid_get_cache in -lblkid... configure: error:
    external blkid library not found

commit 1b70ea9a3082b3fde8f590c5a80f3a8b329aac5d
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    util-linux:  No longer depends on e2fsprogs for blkid
    Autoconflicts with e2fsprogs so that blkid from e2fsprogs
    is removed before installing blkid from util-linux

diff --git a/disk/e2fsprogs/DEPENDS b/disk/e2fsprogs/DEPENDS
index 95c4bbf..c1758a4 100755
--- a/disk/e2fsprogs/DEPENDS
+++ b/disk/e2fsprogs/DEPENDS
@@ -1,4 +1,5 @@
 depends gawk &&
 depends gnupg &&
 depends init.d &&
-depends smgl-fhs
+depends smgl-fhs &&
+depends util-linux
diff --git a/disk/e2fsprogs/HISTORY b/disk/e2fsprogs/HISTORY
index d2307ee..b689d9d 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -1,3 +1,8 @@
+2009-05-12 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: Depends on util-linux for blkid
+	  checking for blkid_get_cache in -lblkid... configure: error: external
+	  blkid library not found
+
 2009-05-12 Ladislav Hagara <hgr at vabo.cz>
 	* BUILD: added --disable-libblkid
 	  blkid is provided by util-linux instead from e2fsprogs from now
diff --git a/utils/util-linux/CONFLICTS b/utils/util-linux/CONFLICTS
new file mode 100755
index 0000000..16919a0
--- /dev/null
+++ b/utils/util-linux/CONFLICTS
@@ -0,0 +1 @@
+conflicts  e2fsprogs  y
diff --git a/utils/util-linux/DEPENDS b/utils/util-linux/DEPENDS
index 4f34676..1e23391 100755
--- a/utils/util-linux/DEPENDS
+++ b/utils/util-linux/DEPENDS
@@ -1,5 +1,4 @@
 depends  CONSOLE-TOOLS  &&
-depends  e2fsprogs      &&
 depends  gnupg          &&
 depends  smgl-fhs       &&
 depends  zlib
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 8d5ee80..7834727 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,8 @@
+2009-05-12 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: No longer depends on e2fsprogs for blkid
+	* CONFLICTS: Autoconflicts with e2fsprogs so that blkid from e2fsprogs
+	  is removed before installing blkid from util-linux
+
 2009-05-12 Ladislav Hagara <hgr at vabo.cz>
 	* BUILD: added --with-fsprobe=builtin
 	  blkid is provided by util-linux instead of e2fsprogs from now



More information about the SM-Commit mailing list