doc,sync

git-svn-id: svn://tug.org/texlive/trunk@62297 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 28 insertions, 14 deletions

diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 33b46665785..4fe2883b18e 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -502,7 +502,7 @@ sub platform_desc {
     'amd64-midnightbsd'=> 'MidnightBSD on x86_64',
     'amd64-netbsd'     => 'NetBSD on x86_64',
     'armel-linux'      => 'GNU/Linux on ARM',
-    'armhf-linux'      => 'GNU/Linux on ARMv6/RPi',
+    'armhf-linux'      => 'GNU/Linux on RPi(32-bit) and ARMv7',
     'hppa-hpux'        => 'HP-UX',
     'i386-cygwin'      => 'Cygwin on Intel x86',
     'i386-darwin'      => 'MacOSX legacy (10.5-10.6) on Intel x86',
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index c5331cddf6b..b931087ec00 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -76,7 +76,8 @@ will continue to commit normal package updates and update tlnet, while
 the trunk is updating tlpretest for YYYY+1.
 
 The branch must be created right before the first pretest-specific
-commit (which is the next item, in Part II).
+commit (which is the next item, in Part II). Ensure *.pm are updated in
+Build/source first.
 
   cd /home/texlive/branch
   rm -rf * .[^.]* # be sure .svn et al. are gone
@@ -127,9 +128,6 @@ Master/tlpkg/TeXLive/TLUtils.pm  -- $mactex_darwin and -darwin strings
 Master/tlpkg/bin/tl-update-images
 Master/tlpkg/bin/tl-update-messages 
 Master/tlpkg/bin/tl-update-tlnet
-Master/tlpkg/installer/*.png
-  (make -C Master/tlpkg/doc/graphics -W texlive-installer-graphics.tex texlive.png)
-  then mv into place.
 Master/texmf-dist/web2c/texmfcnf.lua
 Master/texmf-dist/web2c/texmf.cnf  # from Build/.../kpathsea
   (also ensure that the Build and Master texmf.cnf files are in sync)
@@ -144,7 +142,7 @@ Add new scripts to linked_scripts if not already handled.
 6. Run tex \\end to check that dynamic mktexfmt works. 
 Ensure that web2c/texmf.cnf is updated for the current year (per above).
 
-6a. Then run fmtutil-user --all to check that all formats build.
+6a. Then run fmtutil-user --all to check that all formats build ok.
 
 6b. (For karl@tug.org: leave new ~karl/.texlive`date +%Y` for bnb,
 and update ~bnb/.cshrc after commit.)
@@ -155,7 +153,7 @@ and update ~bnb/.cshrc after commit.)
     Build/source/inst/texmf-dist Master/texmf-dist
 
 8. Now, finally, try a first update of tlpretest:
-  env force_rebuild=true ~karl/bin/cron.pretest
+  env force_rebuild=true ~karl/bin/cron.pretest  # ~15min
 This will fail because the pretest dir is not yet set up, but
 that's ok; the idea is to check the output and ensure all is basically ok.
 The complaints about unknown "svn status output line"s are ok.
@@ -172,22 +170,38 @@ and not recreate all packages, so that a file with a given name is never
 rewritten. See recreate comments in tl-update-tlpdb and tl-update-containers.
 
 9b. Sanity check: Do an installation as a normal user from the new
-tlpretest, and keep it updated daily.
+tlpretest, and keep this installation updated daily as normal users do,
+that is, with tlmgr update --self --all.
 
-9c. In 2020, as a special case, after a first successful build, this was run:
+9c. Update other automatically-built binary sets, and ask tlbuild to
+build all (including asymptote).
+
+9d. In 2020, as a special case, after a first successful build, this was run:
   tl-fix-container-links
 In order to make all the archive/*.tar.xz files into versioned symlinks,
 so a given tarball will not be regenerated unless the content changes.
 This was a one-time event, but left here as an example for the unknown future.
 
 10. As of 2021, we want to keep updating tlnet from the new branch, as
-described in I.6. For sanity, it is best to edit cron.tl to use a temp
-destination instead of tlnet for the branch, initialize that repo from
-tlnet (as above with tlpretest), and then do a test build before the
-real one. To do the build:
+described in item I.6. For safety, let's do a trial build from the new
+branch to a temporary destination, say /home/texlive/tmp, before
+updating the real tlnet.  Initialize the tmp dir as above with
+tlpretest, item 9):
+  cd /home/texlive/tmp
+  rm -rf *
+  cp -ar ~ftp/texlive/tlnet/[a-u]* .  # omit tlnet/README*
+  
+10a. Edit ~karl/bin/cron.tl:
+- use /home/texlive/tmp instead of $ftp/tlnet for tlnet_dir;
+- add --testlocation=/home/texlive/trial to the tl-update-tlnet invocation.
+
+10b. To do the test branch build:
   env force_rebuild=true cron.branch
+Assuming it goes ok, then undo the edits.
+There will be no linked_scripts dir (no build done), but that's ok;
+we won't be installing binaries from a build.
 
-11. In cron.tl, set net_frozen=false, critical= , and
+11. In cron.tl, set critical= , net_frozen=false, and
     return to regular catalogue_compare=true updates.
     In the crontab, enable the pretest entries.