Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (784fc35b1253cd8c6f15184d96a7daa4972453b5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (784fc35b1253cd8c6f15184d96a7daa4972453b5)
  • Date: Wed, 13 May 2009 03:37:19 -0500

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

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

New commits:
commit 784fc35b1253cd8c6f15184d96a7daa4972453b5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "e2fsprogs: Depends on util-linux for blkid"

This reverts commit c3ff13022ef5564b2c6dbc28226532ec7ee39a34.

I'm not sure what's going on, but putting the dependency order correct
breaks.

e2fsprogs 1.41.4 used to provide blkid.
util-linux 2.15 now provides blkid.
e2fsprogs 1.41.5 requires blkid from util-linux 2.15

e2fsprogs 1.41.5 no longer provides blkid and needs it from util-linux.
util-linux 2.15 cannot compile without e2fsprogs.

Currently:
update e2fsprogs from 1.41.4 -> 1.41.5, removing libblkid.so.
mount (from util-linux) now fails as it cannot find libblkid.so.1.
update util-linux to 2.15, now providing libblkid.so.
mount is happy.
e2fsprogs is built with its old libblkid.so and seems to still be happy.
with util-linux's libblkid.so as they are ABI compatible (just moved
packages, AFAIK).

After this fun switch:
e2fsprogs will need to be cast after util-linux, since future updates to
libblkid.so will come from util-linux and are required by e2fsprogs.

Possible resolution:
Leave in current state (as above) and only fix the dependencies after
this switch has been in a few stable releases.

commit e654ba711e9707c2d1e2688ab5adf5d4e6fc6e5d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "util-linux: No longer depends on e2fsprogs for blkid"

This reverts commit 3396ebff9d9ad7bf0ea7b6f985edfcdb18f7f268.

But if e2fsprogs isn't installed when util-linux is cast, we get:
read.c:28:23: error: uuid/uuid.h: No such file or directory

diff --git a/disk/e2fsprogs/DEPENDS b/disk/e2fsprogs/DEPENDS
index c1758a4..95c4bbf 100755
--- a/disk/e2fsprogs/DEPENDS
+++ b/disk/e2fsprogs/DEPENDS
@@ -1,5 +1,4 @@
depends gawk &&
depends gnupg &&
depends init.d &&
-depends smgl-fhs &&
-depends util-linux
+depends smgl-fhs
diff --git a/disk/e2fsprogs/HISTORY b/disk/e2fsprogs/HISTORY
index b689d9d..d2307ee 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -1,8 +1,3 @@
-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/DEPENDS b/utils/util-linux/DEPENDS
index 1e23391..4f34676 100755
--- a/utils/util-linux/DEPENDS
+++ b/utils/util-linux/DEPENDS
@@ -1,4 +1,5 @@
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 badb19b..8d5ee80 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,6 +1,3 @@
-2009-05-12 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: No longer depends on e2fsprogs for blkid
-
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



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (784fc35b1253cd8c6f15184d96a7daa4972453b5), Eric Sandall, 05/13/2009

Archive powered by MHonArc 2.6.24.

Top of Page