Update notes on how to make a release

4 files changed, 17 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 99ce993..7db5d82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-13  Nick Clifton  <nickc@redhat.com>
+
+	* src-release.sh: Update copyright notice.  Change reference to devo
+	to be a reference to root.
+
 2018-01-10  Nick Clifton  <nickc@redhat.com>
 
 	* config-ml.in: Sync with gcc sources.
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index ffcdf2e..94e1c75 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,6 @@
 2018-01-13  Nick Clifton  <nickc@redhat.com>
 
+	* README-how-to-make-a-release: Update notes.
 	* po/binutils.pot: Regenerated.
 
 2018-01-13  Nick Clifton  <nickc@redhat.com>
diff --git a/binutils/README-how-to-make-a-release b/binutils/README-how-to-make-a-release
index 97ea210..ce1af8f 100644
--- a/binutils/README-how-to-make-a-release
+++ b/binutils/README-how-to-make-a-release
@@ -28,6 +28,8 @@ How to perform a release.
 
   3. When branch day arrives add markers for the upcoming release to
      gas, ld, gold and binutils NEWS files.
+       [If using the make-prerelease.sh script, check that
+        common.sh has the right values].       
        [make-prelease.sh command i]
        [make-prelease.sh command C]
      Likewise for all of the ChangeLog files.
@@ -54,28 +56,23 @@ How to perform a release.
   7. Regenerate various files on both branch and HEAD by configuring
      with --enable-maintainer-mode.  No need to check in changes to
      the autoconf/automake/etc files, but be sure the .pot files are
-     up to date.
+     up to date.  NB/ Remember to include gold and gprof.
 
   8. Create an initial prerelease:
 
-     a. Bump the version on the branch, and check this in.
+     a. Change the version on the branch (bfd/version.m4), regenerate
+        the files, and check this in.
 
-     b. Create a source tarball:
+     b. Create a source tarball of the branch sources:
      
-          git clean -f -d -x
-          CFLAGS="-O -g0" ./src-release.sh -b binutils
-          rm -rf $release_dir/proto-toplev
-          rm $release_dir/binutils-$version
-          rm $release_dir/binutils-$version.tar
-          mv $release_dir/binutils-$version.tar.lzip ..
+           ./src-release -x binutils
  
      c. Build a test target using this tarball.
 
      d. Upload the prerelease snapshot to the FTP:
 
-          scp ../binutils-$version.tar.bz2 sourceware.org:~ftp/pub/binutils/snapshots
-          ssh sourceware.org md5sum \~ftp/pub/binutils/snapshots/binutils-$version.tar.bz2
-          md5sum ../binutils-$version.tar.bz2
+          scp ../binutils-$version.tar.xz sourceware.org:~ftp/pub/binutils/snapshots
+          ssh sourceware.org md5sum ~ftp/pub/binutils/snapshots/binutils-$version.tar.xz
 
    9. Send it to the Translation Project:
    
diff --git a/src-release.sh b/src-release.sh
index 2414cd0..f724397 100755
--- a/src-release.sh
+++ b/src-release.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#   Copyright (C) 1990-2017 Free Software Foundation
+#   Copyright (C) 1990-2018 Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ MAKEINFOFLAGS=--split-size=5000000
 #
 # Support for building net releases
 
-# Files in devo used in any net release.
+# Files in root used in any net release.
 DEVO_SUPPORT="README Makefile.in configure configure.ac \
 	config.guess config.sub config move-if-change \
 	COPYING COPYING.LIB install-sh config-ml.in symlink-tree \