[Parted-commits] GNU Parted Official Repository: Changes to 'master'
Jim Meyering
meyering at alioth.debian.org
Sat Jun 26 07:27:01 UTC 2010
README-release | 98 ++++++++++++++++++++++++++++++++-----------
bootstrap | 8 +--
gnulib | 2
libparted/labels/sun.c | 47 --------------------
tests/init.sh | 43 +++++++++---------
tests/t4000-sun-raid-type.sh | 4 -
6 files changed, 104 insertions(+), 98 deletions(-)
New commits:
commit f6c32e8ed71438154282066eb835c725211035c9
Author: Jim Meyering <meyering at redhat.com>
Date: Sat Jun 26 08:59:18 2010 +0200
build: update gnulib submodule to latest
* bootstrap: Update from gnulib.
* tests/init.sh: Likewise.
diff --git a/bootstrap b/bootstrap
index 2422549..e55b3d2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2010-05-17.18; # UTC
+scriptversion=2010-04-30.16; # UTC
# Bootstrap this package from checked-out sources.
@@ -409,7 +409,6 @@ git_modules_config () {
}
gnulib_path=`git_modules_config submodule.gnulib.path`
-: ${gnulib_path=gnulib}
# Get gnulib files.
@@ -425,8 +424,7 @@ case ${GNULIB_SRCDIR--} in
trap cleanup_gnulib 1 2 13 15
- shallow=
- git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
+ git clone -h|grep -- --depth > /dev/null && shallow='--depth 2' || shallow=
git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
cleanup_gnulib
@@ -490,7 +488,7 @@ update_po_files() {
test -d $ref_po_dir || mkdir $ref_po_dir || return
download_po_files $ref_po_dir $domain \
&& ls "$ref_po_dir"/*.po 2>/dev/null |
- sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
+ sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS"
langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
test "$langs" = '*' && langs=x
diff --git a/gnulib b/gnulib
index 8ab5996..1261942 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 8ab5996c4a14364411442d93babb343cc2ce0d89
+Subproject commit 12619428c2ef7601f014af01048a28274de7a36c
diff --git a/tests/init.sh b/tests/init.sh
index ef0957c..7943526 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -57,6 +57,28 @@
# 4. Finally
# $ exit
+ME_=`expr "./$0" : '.*/\(.*\)$'`
+
+# We use a trap below for cleanup. This requires us to go through
+# hoops to get the right exit status transported through the handler.
+# So use `Exit STATUS' instead of `exit STATUS' inside of the tests.
+# Turn off errexit here so that we don't trip the bug with OSF1/Tru64
+# sh inside this function.
+Exit () { set +e; (exit $1); exit $1; }
+
+# Print warnings (e.g., about skipped and failed tests) to this file number.
+# Override by defining to say, 9, in init.cfg, and putting say,
+# "export ...ENVVAR_SETTINGS...; exec 9>&2; $(SHELL)" in the definition
+# of TESTS_ENVIRONMENT in your tests/Makefile.am file.
+# This is useful when using automake's parallel tests mode, to print
+# the reason for skip/failure to console, rather than to the .log files.
+: ${stderr_fileno_=2}
+
+warn_() { echo "$@" 1>&$stderr_fileno_; }
+fail_() { warn_ "$ME_: failed test: $@"; Exit 1; }
+skip_() { warn_ "$ME_: skipped test: $@"; Exit 77; }
+framework_failure_() { warn_ "$ME_: set-up failure: $@"; Exit 99; }
+
# We require $(...) support unconditionally.
# We require a few additional shell features only when $EXEEXT is nonempty,
# in order to support automatic $EXEEXT emulation:
@@ -118,26 +140,6 @@ test -n "$EXEEXT" && shopt -s expand_aliases
: ${MALLOC_PERTURB_=87}
export MALLOC_PERTURB_
-# We use a trap below for cleanup. This requires us to go through
-# hoops to get the right exit status transported through the handler.
-# So use `Exit STATUS' instead of `exit STATUS' inside of the tests.
-# Turn off errexit here so that we don't trip the bug with OSF1/Tru64
-# sh inside this function.
-Exit () { set +e; (exit $1); exit $1; }
-
-# Print warnings (e.g., about skipped and failed tests) to this file number.
-# Override by defining to say, 9, in init.cfg, and putting say,
-# "export ...ENVVAR_SETTINGS...; exec 9>&2; $(SHELL)" in the definition
-# of TESTS_ENVIRONMENT in your tests/Makefile.am file.
-# This is useful when using automake's parallel tests mode, to print
-# the reason for skip/failure to console, rather than to the .log files.
-: ${stderr_fileno_=2}
-
-warn_() { echo "$@" 1>&$stderr_fileno_; }
-fail_() { warn_ "$ME_: failed test: $@"; Exit 1; }
-skip_() { warn_ "$ME_: skipped test: $@"; Exit 77; }
-framework_failure_() { warn_ "$ME_: set-up failure: $@"; Exit 1; }
-
# This is a stub function that is run upon trap (upon regular exit and
# interrupt). Override it with a per-test function, e.g., to unmount
# a partition, or to undo any other global state changes.
@@ -247,7 +249,6 @@ setup_()
test "$VERBOSE" = yes && set -x
initial_cwd_=$PWD
- ME_=`expr "./$0" : '.*/\(.*\)$'`
pfx_=`testdir_prefix_`
test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \
commit f51344a1a5f8e703b503d0f20d5bf2ef5f1ce98b
Author: Colin Watson <cjwatson at ubuntu.com>
Date: Tue Jun 15 19:49:40 2010 +0100
sun: revert "implement disk flag operations"
This reverts the libparted/labels/sun.c part of
723ea23c5df68cbe67d1f518ef484f4c77f516fa. Sun disk labels do
not appear to be able to handle non-cylinder alignment
(http://bugs.debian.org/579948).
* libparted/labels/sun.c: Revert.
diff --git a/libparted/labels/sun.c b/libparted/labels/sun.c
index 177a47c..e14a81d 100644
--- a/libparted/labels/sun.c
+++ b/libparted/labels/sun.c
@@ -109,7 +109,6 @@ struct _SunPartitionData {
struct _SunDiskData {
PedSector length; /* This is based on cyl - alt-cyl */
SunRawLabel raw_label;
- int cylinder_alignment;
};
static PedDiskType sun_disk_type;
@@ -191,7 +190,6 @@ sun_alloc (const PedDevice* dev)
PED_ASSERT (bios_geom->cylinders == (PedSector) (dev->length / cyl_size),
return NULL);
sun_specific->length = ped_round_down_to (dev->length, cyl_size);
- sun_specific->cylinder_alignment = 1;
label = &sun_specific->raw_label;
memset(label, 0, sizeof(SunRawLabel));
@@ -258,42 +256,6 @@ sun_free (PedDisk *disk)
}
static int
-sun_disk_set_flag (PedDisk *disk, PedDiskFlag flag, int state)
-{
- SunDiskData *disk_specific = disk->disk_specific;
- switch (flag) {
- case PED_DISK_CYLINDER_ALIGNMENT:
- disk_specific->cylinder_alignment = !!state;
- return 1;
- default:
- return 0;
- }
-}
-
-static int
-sun_disk_get_flag (const PedDisk *disk, PedDiskFlag flag)
-{
- SunDiskData *disk_specific = disk->disk_specific;
- switch (flag) {
- case PED_DISK_CYLINDER_ALIGNMENT:
- return disk_specific->cylinder_alignment;
- default:
- return 0;
- }
-}
-
-static int
-sun_disk_is_flag_available (const PedDisk *disk, PedDiskFlag flag)
-{
- switch (flag) {
- case PED_DISK_CYLINDER_ALIGNMENT:
- return 1;
- default:
- return 0;
- }
-}
-
-static int
_check_geometry_sanity (PedDisk* disk, SunRawLabel* label)
{
PedDevice* dev = disk->dev;
@@ -804,10 +766,7 @@ sun_partition_align (PedPartition* part, const PedConstraint* constraint)
{
PED_ASSERT (part != NULL, return 0);
- SunDiskData *disk_specific = part->disk->disk_specific;
-
- if (disk_specific->cylinder_alignment &&
- _ped_partition_attempt_align (part, constraint,
+ if (_ped_partition_attempt_align (part, constraint,
_get_strict_constraint (part->disk)))
return 1;
if (_ped_partition_attempt_align (part, constraint,
@@ -921,10 +880,6 @@ static PedDiskOps sun_disk_ops = {
clobber: NULL,
write: NULL_IF_DISCOVER_ONLY (sun_write),
- disk_set_flag: sun_disk_set_flag,
- disk_get_flag: sun_disk_get_flag,
- disk_is_flag_available: sun_disk_is_flag_available,
-
get_partition_alignment: sun_get_partition_alignment,
partition_set_name: NULL,
commit a582ca642f4817dd02e65a3ecc55e951008969b2
Author: Jim Meyering <meyering at redhat.com>
Date: Sat Jun 26 09:22:59 2010 +0200
tests: adjust sun-partition-creating test to conform
* tests/t4000-sun-raid-type.sh: Adjust partition size so the
end falls on a cylinder boundary.
diff --git a/tests/t4000-sun-raid-type.sh b/tests/t4000-sun-raid-type.sh
index 5ef8ab4..853809e 100755
--- a/tests/t4000-sun-raid-type.sh
+++ b/tests/t4000-sun-raid-type.sh
@@ -26,7 +26,7 @@ ss=$sector_size_
N=2000 # number of sectors
dev=sun-disk-file
-exp="BYT;\n---:${N}s:file:$ss:$ss:sun:;\n1:0s:50s:51s"
+exp="BYT;\n---:${N}s:file:$ss:$ss:sun:;\n1:0s:127s:128s"
test_expect_success \
'create an empty file as a test disk' \
'dd if=/dev/zero of=$dev bs=${ss}c count=$N 2> /dev/null'
@@ -38,7 +38,7 @@ test_expect_success 'check for empty output' 'compare out /dev/null'
test_expect_success \
'create a single partition' \
- 'parted -s $dev unit s mkpart ext2 0s 50s > out 2>&1'
+ 'parted -s $dev unit s mkpart ext2 0s 127s > out 2>&1'
test_expect_success 'check for empty output' 'compare out /dev/null'
test_expect_success \
commit 6da484a858d6e28302e3f0bf2b2dddacc6120131
Author: Jim Meyering <meyering at redhat.com>
Date: Fri May 28 21:02:45 2010 +0200
maint: update README-release
* README-release: Update to match the template used for diffutils,
coreutils, etc.
diff --git a/README-release b/README-release
index a6f46a1..9b0a40a 100644
--- a/README-release
+++ b/README-release
@@ -1,31 +1,83 @@
-Here are most of the steps a maintainer followas when making a release.
+Here are most of the steps we (maintainers) follow when making a release.
-0. Adjust the shared library version number in libparted/Makefile.am.
- See the three variables there, CURRENT, REVISION, AGE, and follow
- the guidelines in "info libtool".
+* start from a clean, up-to-date git directory.
-1. Execute build-aux/parted-release. `parted-release --help` contains
- additional information.
+ git checkout master; git pull
-2. Test the tarball. Copy it to a few odd-ball systems and ensure that it
- builds and passes all tests.
+* Run ./configure && make maintainer-clean
-3. Write the release announcement that will be posted to the mailing lists.
- Start with the generated template in ~/announce-parted-$VERSION.
- Remember to include a description of parted. You can find this at
- http://www.gnu.org/software/parted/index.shtml
+* Ensure that the desired versions of autoconf, automake, etc.
+ are in your PATH. See the buildreq list in bootstrap.conf for
+ the complete list.
-4. Run the gnupload command that was suggested by the release script. You can
- find this at the end of release.log.
+* Ensure that you're on "master" with no uncommitted diffs.
+ This should produce no output: git checkout master; git diff
-5. Wait a few minutes (maybe up to 30?) and then use the release URLs to
- download all tarball/signature pairs and use gpg --verify to ensure that
- they're all valid. You will also need these URLs in the announcement mail.
+* Run bootstrap one last time. This downloads any new translations:
-6. Push the new tag with the following command:
- git push origin tag v$VERSION
+ ./bootstrap
-7. Send the gpg-signed announcement mail, e.g.,
- To: info-gnu at gnu.org, parted-devel at lists.alioth.debian.org
- Cc: coordinator at translationproject.org, bug-parted at gnu.org
- Subject: parted-$VERSION released [stable]
+* Pre-release testing:
+ Ensure that make check syntax-check succeeds.
+
+* Run "make distcheck"
+
+* Set the date, version number, and release type [stable/alpha/beta] on
+ line 3 of NEWS, commit that, and tag the release by running e.g.,
+
+ build-aux/do-release-commit-and-tag X.Y stable
+
+* Run the following to create release tarballs. Your choice selects the
+ corresponding upload-to destination in the emitted gnupload command.
+ The different destinations are specified in cfg.mk. See the definitions
+ of gnu_ftp_host-{alpha,beta,stable}.
+
+ # "TYPE" must be stable, beta or alpha
+ make TYPE
+
+* Test the tarball. copy it to a few odd-ball systems and ensure that
+ it builds and passes all tests.
+
+* While that's happening, write the release announcement that you will
+ soon post.
+
+Once all the builds and tests have passed,
+
+* Run the gnupload command that was suggested by your "make stable" run above.
+
+* Wait a few minutes (maybe up to 30?) and then use the release URLs to
+ download all tarball/signature pairs and use gpg --verify to ensure
+ that they're all valid.
+
+* Push the NEWS-updating changes and the new tag:
+
+ v=$(cat .prev-version)
+ git push origin master tag v$v
+
+* Announce it on Savannah first, so you can include the preferable
+ savannah.org announcement link in the email message.
+
+ From here:
+ https://savannah.gnu.org/projects/parted/
+ click on the "submit news", then write something like the following:
+ (If there is no such button, then enable "News" for the project via
+ the Main -> "Select Features" menu item, or via this link:
+ https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=parted)
+
+ Subject: parted-X.Y released [stable]
+ +verbatim+
+ ...paste the announcement here...
+ -verbatim-
+
+ Then go here to approve it:
+ https://savannah.gnu.org/news/approve.php?group=parted
+
+* Send the announcement email message.
+
+* After each non-alpha release, update the on-line manual accessible via
+
+ http://www.gnu.org/software/parted/manual/
+
+ by running this:
+
+ build-aux/gnu-web-doc-update
More information about the Parted-commits
mailing list