Eric Blake wrote: > According to Karl Berry on 11/17/2009 6:17 PM: >> Many of our announcements include text like this: >> >> Please use a mirror to reduce stress on the >> main gnu machine: >> http://www.gnu.org/order/ftp.html >> >> That is good, but we can also promulgate a direct url to help reduce >> load on ftp.gnu.org: http://ftpmirror.gnu.org/PACKAGE/ redirects to a >> (supposedly) nearby and (supposedly) up-to-date mirror. >> >> However, since the multiplexing is not and can never be perfect, it's >> good to continue to mention the explicit mirror list >> (http://www.gnu.org/order/ftp.html) as well. > > Let's set a good example in gnulib, then. This change moves some > package-agnostic items that are currently in several packages' cfg.mk into > a common location in maint.mk, while leaving room for overrides. Does it > look okay? ... > Subject: [PATCH] build: mention ftp redirector in release announcements > > Now that http://ftpmirror.gnu.org/PACKAGE/ redirects to a nearby > mirror, we should promote its use in release announcements. > Meanwhile, mention the mirror list. > > * top/maint.mk (gnu_rel_host, url_dir_list): Provide defaults for > values that used to come from cfg.mk; mention FTP redirect URL. > * build-aux/announce-gen (get_tool_versions): Mention the mirror > list. > Suggested by Karl Berry. > > Signed-off-by: Eric Blake <e...@byu.net> > --- > ChangeLog | 9 +++++++++ > build-aux/announce-gen | 7 ++++++- > top/maint.mk | 14 ++++++++++++++ > 3 files changed, 29 insertions(+), 1 deletions(-) > > diff --git a/ChangeLog b/ChangeLog > index 41eea4b..78d5704 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,12 @@ > +2009-11-20 Eric Blake <e...@byu.net> > + > + build: mention ftp redirector in release announcements > + * top/maint.mk (gnu_rel_host, url_dir_list): Provide defaults for > + values that used to come from cfg.mk; mention FTP redirect URL. > + * build-aux/announce-gen (get_tool_versions): Mention the mirror > + list. > + Suggested by Karl Berry. ... > +# Override gnu_rel_host and url_dir_list in cfg.mk if these are not right. > +# Use alpha.gnu.org for alpha and beta releases. > +# Use ftp.gnu.org for stable releases. > +gnu_ftp_host-alpha = alpha.gnu.org > +gnu_ftp_host-beta = alpha.gnu.org > +gnu_ftp_host-stable = ftp.gnu.org > +gnu_rel_host ?= $(gnu_ftp_host-$(RELEASE_TYPE)) > + > +ifeq ($(gnu_rel_host),ftp.gnu.org) > +url_dir_list ?= http://ftpmirror.gnu.org/$(PACKAGE) > +else > +url_dir_list ?= ftp://$(gnu_rel_host)/gnu/$(PACKAGE) > +endif > + > # Prevent programs like 'sort' from considering distinct strings to be equal. > # Doing it here saves us from having to set LC_ALL elsewhere in this file. > export LC_ALL = C
Nice improvement. It got tiresome having to fix s/master/stable/ in 6 or 7 repositories. Now to remove those default values from 6 or 7 repos.