[Parted-commits] GNU Parted Official Repository: Changes to 'master'
Jim Meyering
meyering at alioth.debian.org
Sat Feb 18 14:50:19 UTC 2012
bootstrap | 26 ++++++++++++++++++------
doc/po4a.mk | 2 -
gnulib | 2 -
libparted/fs/Makefile.am | 5 ++--
tests/init.sh | 5 +++-
tests/t3000-resize-fs.sh | 49 ++++++++++++++++++++++++++---------------------
6 files changed, 56 insertions(+), 33 deletions(-)
New commits:
commit 1f8079c668638f939eac1fe6a4a6fbedab0ac773
Author: Jim Meyering <meyering at redhat.com>
Date: Sat Feb 18 15:24:37 2012 +0100
tests: skip failing use of mkfs.hfs unless using newer, fixed version
The old, segfaulting version does not recognize the -v option, while
the new one does. Use that to skip the test when it seems that
fsck.hfs is broken.
* tests/t3000-resize-fs.sh: Skip part of this root-only test
when fsck.hfs is the always-segfaulting version.
diff --git a/tests/t3000-resize-fs.sh b/tests/t3000-resize-fs.sh
index 4a3c8a3..2fd36a5 100755
--- a/tests/t3000-resize-fs.sh
+++ b/tests/t3000-resize-fs.sh
@@ -77,27 +77,34 @@ for fs_type in hfs+ fat32; do
# Fedora 16's hfsplus-tools-332.14-12.fc15.x86_64.
# You can build a working version from
# git://cavan.codon.org.uk/hfsplus-tools.git
- # FIXME: check the version somehow and skip if it's not known to work.
- $fsck ${dev}1 > out || fail=1
- cat out
- # Oops. Currently, fsck.hfs reports this:
- # Executing fsck_hfs (version 540.1-Linux).
- # ** Checking non-journaled HFS Plus Volume.
- # The volume name is untitled
- # ** Checking extents overflow file.
- # ** Checking catalog file.
- # ** Checking multi-linked files.
- # ** Checking catalog hierarchy.
- # ** Checking volume bitmap.
- # Volume bitmap needs minor repair for orphaned blocks
- # ** Checking volume information.
- # Invalid volume free block count
- # (It should be 67189 instead of 65197)
- # Volume header needs minor repair
- # (2, 0)
- # FIXME: This means the HFS resizing code is wrong.
-
- # FIXME: parse "out" for FS size and verify that it's the new, smaller size
+
+ # Skip the fsck.hfs test unless it understands the -v option.
+ skip=0
+ case $fs_type in
+ hfs*) $fsck -v || { warn_ skipping $fsck test; skip=1; } ;; esac
+
+ if test $skip = 0; then
+ $fsck ${dev}1 > out || fail=1
+ cat out
+ # Oops. Currently, fsck.hfs reports this:
+ # Executing fsck_hfs (version 540.1-Linux).
+ # ** Checking non-journaled HFS Plus Volume.
+ # The volume name is untitled
+ # ** Checking extents overflow file.
+ # ** Checking catalog file.
+ # ** Checking multi-linked files.
+ # ** Checking catalog hierarchy.
+ # ** Checking volume bitmap.
+ # Volume bitmap needs minor repair for orphaned blocks
+ # ** Checking volume information.
+ # Invalid volume free block count
+ # (It should be 67189 instead of 65197)
+ # Volume header needs minor repair
+ # (2, 0)
+ # FIXME: This means the HFS resizing code is wrong.
+
+ # FIXME: parse "out" for FS size and verify that it's the new, smaller size
+ fi
# Remove the partition explicitly, so that mklabel doesn't evoke a warning.
parted -s $dev rm 1 || fail=1
commit 4fd8e74e4d3fe136fe0c4db83d5d249500e54744
Author: Jim Meyering <meyering at redhat.com>
Date: Sat Feb 18 14:29:41 2012 +0100
build,test: update gnulib, bootstrap and init.sh
* bootstrap: Update.
* tests/init.sh: Update.
* gnulib: Update.
* doc/po4a.mk: Updating gnulib pulls in newer syntax-check rules,
including one that rejects @lower_case@ variables in Makefiles.
Fix the sole violation: s/@mandir@/$(mandir)/
diff --git a/bootstrap b/bootstrap
index 66da981..c8ee3cc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2012-01-06.07; # UTC
+scriptversion=2012-02-11.09; # UTC
# Bootstrap this package from checked-out sources.
@@ -87,9 +87,9 @@ gnulib_files=
: ${AUTOPOINT=autopoint}
: ${AUTORECONF=autoreconf}
-# A function to be called to edit gnulib.mk right after it's created.
+# A function to be called right after gnulib-tool is run.
# Override it via your own definition in bootstrap.conf.
-gnulib_mk_hook() { :; }
+bootstrap_post_import_hook() { :; }
# A function to be called after everything else in this script.
# Override it via your own definition in bootstrap.conf.
@@ -604,7 +604,7 @@ if $bootstrap_sync; then
fi
gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-<$gnulib_tool || exit
+<$gnulib_tool || exit $?
# Get translations.
@@ -758,7 +758,7 @@ fi
# Autoreconf runs aclocal before libtoolize, which causes spurious
# warnings if the initial aclocal is confused by the libtoolized
# (or worse out-of-date) macro directory.
-if grep '^[ ]*LT_INIT' configure.ac >/dev/null; then
+if test $use_libtool = 1; then
echo "running: $LIBTOOLIZE --copy --install"
$LIBTOOLIZE --copy --install
fi
@@ -807,6 +807,9 @@ for file in $gnulib_files; do
symlink_to_dir "$GNULIB_SRCDIR" $file || exit
done
+bootstrap_post_import_hook \
+ || { echo >&2 "$me: bootstrap_post_import_hook failed"; exit 1; }
+
# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
# gnulib-populated directories. Such .m4 files would cause aclocal to fail.
# The following requires GNU find 4.2.3 or newer. Considering the usual
@@ -819,11 +822,20 @@ find "$m4_base" "$source_base" \
-depth \( -name '*.m4' -o -name '*.[ch]' \) \
-type l -xtype l -delete > /dev/null 2>&1
+# Some systems (RHEL 5) are using ancient autotools, for which the
+# --no-recursive option had not been invented. Detect that lack and
+# omit the option when it's not supported. FIXME in 2017: remove this
+# hack when RHEL 5 autotools are updated, or when they become irrelevant.
+no_recursive=
+case $($AUTORECONF --help) in
+ *--no-recursive*) no_recursive=--no-recursive;;
+esac
+
# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
echo "running: AUTOPOINT=true LIBTOOLIZE=true " \
- "$AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS"
+ "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS"
AUTOPOINT=true LIBTOOLIZE=true \
- $AUTORECONF --verbose --install --no-recursive -I $m4_base $ACLOCAL_FLAGS \
+ $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \
|| exit 1
# Get some extra files from gnulib, overriding existing files.
diff --git a/doc/po4a.mk b/doc/po4a.mk
index 1123c91..b378121 100644
--- a/doc/po4a.mk
+++ b/doc/po4a.mk
@@ -23,7 +23,7 @@
# threshold is 80%), it won't be distributed, and the build won't fail.
#
-mandir = @mandir@/$(lang)
+mandir = $(mandir)/$(lang)
# Inform automake that we want to install some man pages in section 1, 5
# and 8.
diff --git a/gnulib b/gnulib
index 89c006f..50bb21e 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 89c006fbb40a0455ad309155be38277490c0b94f
+Subproject commit 50bb21eab7dfc87bbfcbc75f0232407110cdd296
diff --git a/tests/init.sh b/tests/init.sh
index 5985552..ae86714 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -255,7 +255,10 @@ compare_dev_null_ ()
return 2
}
-if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null`; then
+if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null` \
+ && diff -u Makefile "$0" 2>/dev/null | grep '^[+]#!' >/dev/null; then
+ # diff accepts the -u option and does not (like AIX 7 'diff') produce an
+ # extra space on column 1 of every content line.
if test -z "$diff_out_"; then
compare_ () { diff -u "$@"; }
else
commit 763c1cf287d2b264eb5c988e52ffd32ded594e42
Author: Jim Meyering <meyering at redhat.com>
Date: Sat Feb 18 15:40:49 2012 +0100
build: avoid non-srcdir build failure
* libparted/fs/Makefile.am: s!fsresize.sym!$(srcdir)/fsresize.sym!
diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
index e1f675e..8d48ea1 100644
--- a/libparted/fs/Makefile.am
+++ b/libparted/fs/Makefile.am
@@ -65,11 +65,12 @@ CURRENT = 0
REVISION = 0
AGE = 0
+sym_file = $(srcdir)/fsresize.sym
libparted_fs_resize_la_LDFLAGS = \
- -Wl,--version-script=fsresize.sym \
+ -Wl,--version-script=$(sym_file) \
-version-info $(CURRENT):$(REVISION):$(AGE)
EXTRA_DIST += fsresize.sym
-libparted_fs_resize_la_DEPENDENCIES = fsresize.sym
+libparted_fs_resize_la_DEPENDENCIES = $(sym_file)
libparted_fs_resize_la_SOURCES = \
r/filesys.c \
More information about the Parted-commits
mailing list