summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArwed von Merkatz2009-06-03 21:06:35 +0200
committerArwed von Merkatz2009-06-03 21:06:35 +0200
commit98aa6284ae32027934bb8c4d379117ea3567f28f (patch)
tree2a4371e8a4bbdd0de49f72d89c9694ad5d177f23
parentb86b89294b6949d1ea288613b84f60f8364c6162 (diff)
Revert "e2fsprogs: blkid is provided by util-linux instead from e2fsprogs from now"
This reverts commit 04dda0b8397fc7d6624bba125deaff57a257eed6. Conflicts: disk/e2fsprogs/DETAILS disk/e2fsprogs/HISTORY
-rwxr-xr-xdisk/e2fsprogs/BUILD2
-rw-r--r--disk/e2fsprogs/HISTORY5
2 files changed, 0 insertions, 7 deletions
diff --git a/disk/e2fsprogs/BUILD b/disk/e2fsprogs/BUILD
index 570a161994..b2676716b9 100755
--- a/disk/e2fsprogs/BUILD
+++ b/disk/e2fsprogs/BUILD
@@ -1,5 +1,3 @@
-OPTS="--disable-libblkid $OPTS" &&
-
[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=$HOST"
./configure --host=${BUILD} \
diff --git a/disk/e2fsprogs/HISTORY b/disk/e2fsprogs/HISTORY
index d9489cf511..7bbacd5e6f 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -1,11 +1,6 @@
2009-05-31 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: Updated to 1.41.6
-2009-05-12 Ladislav Hagara <hgr@vabo.cz>
- * BUILD: added --disable-libblkid
- blkid is provided by util-linux instead from e2fsprogs from now
- * DETAILS: PATCHLEVEL=1
-
2009-04-24 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.41.5