summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--VERSION2
-rwxr-xr-xdisk/e2fsprogs/BUILD2
-rw-r--r--disk/e2fsprogs/HISTORY5
-rwxr-xr-xutils/util-linux/BUILD1
-rwxr-xr-xutils/util-linux/DETAILS8
-rw-r--r--utils/util-linux/HISTORY20
6 files changed, 5 insertions, 33 deletions
diff --git a/VERSION b/VERSION
index 6f7c639940..8cfb15dad6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.35-test
+0.34-rc
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 137776ef8f..ff93e4eaff 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -4,11 +4,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
diff --git a/utils/util-linux/BUILD b/utils/util-linux/BUILD
index 02bc5e405f..70f437b18f 100755
--- a/utils/util-linux/BUILD
+++ b/utils/util-linux/BUILD
@@ -1,4 +1,3 @@
-OPTS="--with-fsprobe=builtin $OPTS" &&
OPTS="--build=$BUILD $OPTS" &&
if [[ $CROSS_INSTALL == on ]]; then
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 00dd6e03e2..166760218d 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -1,7 +1,7 @@
SPELL=util-linux
if [[ $UL_VERSION == aes ]]; then
- VERSION=2.15.1
- SOURCE3=$SPELL-ng-$VERSION-20090624.diff.bz2
+ VERSION=2.14.2
+ SOURCE3=$SPELL-ng-$VERSION-20090214.diff.bz2
SOURCE4=$SOURCE3.sign
SOURCE3_URL[0]=http://loop-aes.sourceforge.net/updates/$SOURCE3
SOURCE3_URL[1]=http://koti.tnnet.fi/jari.ruusu/linux/$SOURCE3
@@ -10,12 +10,12 @@ if [[ $UL_VERSION == aes ]]; then
SOURCE3_GPG=loop-AES.gpg:$SOURCE4:UPSTREAM_KEY
SOURCE4_IGNORE=signature
else
- VERSION=2.15.1
+ VERSION=2.14.2
fi
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-ng-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-ng-$VERSION"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-ng-$VERSION
SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$SPELL-ng/v$BRANCH/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.sign
SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index d12559b044..ba13e36e33 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,23 +1,3 @@
-2009-06-26 Vlad Glagolev <stealth@sourcemage.org>
- * DETAILS: updated aes version to 2.15.1; updated aes patch to 20090626
-
-2009-06-10 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 2.15.1
-
-2009-05-27 Vlad Glagolev <stealth@sourcemage.org>
- * DETAILS: updated aes patch to 20090526
-
-2009-05-12 Ladislav Hagara <hgr@vabo.cz>
- * BUILD: added --with-fsprobe=builtin
- blkid is provided by util-linux instead of e2fsprogs from now
- * DETAILS: PATCHLEVEL=1
-
-2009-05-11 Vlad Glagolev <stealth@sourcemage.org>
- * DETAILS: updated aes version to 2.15; quoting paths
-
-2009-05-06 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 2.15
-
2009-02-14 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated aes version to 2.14.2