From 310b3431701a5431c7cb300ea507dfdb3a2a2aca Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sat, 27 Feb 2021 17:20:15 +0000
Subject: build urls, doc

git-svn-id: svn://tug.org/texlive/trunk@57971 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/tlpkg/bin/c2l              | 2 ++
 Master/tlpkg/bin/tl-update-bindir | 5 +++--
 Master/tlpkg/doc/packages.txt     | 9 +++++----
 Master/tlpkg/doc/releng.txt       | 9 ++++++++-
 4 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'Master/tlpkg')

diff --git a/Master/tlpkg/bin/c2l b/Master/tlpkg/bin/c2l
index e239adaa5bd..40ee1923eb3 100755
--- a/Master/tlpkg/bin/c2l
+++ b/Master/tlpkg/bin/c2l
@@ -11,12 +11,14 @@ use Cwd;
 use File::Basename;
 
 $| = 1;
+umask 022;
 exit (&main ());
 
 sub main {
   my $real0 = Cwd::abs_path ($0);
   my $scriptdir = File::Basename::dirname ($real0);   # .../Master/tlpkg/bin
   my $TLROOT = Cwd::abs_path ("$scriptdir/../../.."); # ...
+  chdir ($scriptdir) || die "chdir($scriptdir) failed"; # avoid . in PATH confusion
 
   # platform abbrev
   my $arg = $ARGV[0];
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 35667451989..cb993f6034d 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -102,7 +102,8 @@ for tlplat in $tlplats; do
     default_bin_loc=$download_loc
     #https://faubox.rrze.uni-erlangen.de/open/MjdwNXE5NW5UcTU4RzVIWlRVUVVI/branch2018/texlive_bin_aarch64-linux.tar.xz
     #http://51.158.66.174:8080/texlive_bin_aarch64-linux.tar.xz
-    remurl=https://aekahwai.spdns.org/online/texlive_bin_aarch64-linux.tar.xz
+    #remurl=https://aekahwai.spdns.org/online/texlive_bin_aarch64-linux.tar.xz
+    remurl=https://taiyahfoboj.net/yeipaiyi/texlive_bin_aarch64-linux.tar.xz
     $grab $remurl;;
    alpha-linux)
     default_bin_loc=/home/preining/alpha-linux.tar.gz;;
@@ -127,7 +128,7 @@ for tlplat in $tlplats; do
     $grab http://boris.lk.net/texlive-2013/armv7l-unknown-linux-gnueabi.tgz;;
    armhf-linux)
     default_bin_loc=$download_loc
-    $grab http://getthingsfixed.co.uk/texlive/builds/2020/texlive-armhf.tar.gz;;
+    $grab http://getthingsfixed.co.uk/texlive/builds/2021/texlive-armhf.tar.gz;;
    hppa-hpux)
     default_bin_loc=$download_loc
     $grab http://www.jtartlabs.com/test/hppa2.0-hp-hpux10.20.tar.gz;;
diff --git a/Master/tlpkg/doc/packages.txt b/Master/tlpkg/doc/packages.txt
index 61c08a4fc30..72d72213dfa 100644
--- a/Master/tlpkg/doc/packages.txt
+++ b/Master/tlpkg/doc/packages.txt
@@ -1,10 +1,11 @@
 $Id$
-Public domain.
+Public domain. Information on package maintenance in TeX Live.
 
-See http://tug.org/texlive/pkgupdate.html (and scripts) for information
-on the CTAN-to-TL update process.
+Related:
+- See http://tug.org/texlive/pkgupdate.html (and scripts) for information
+  on the CTAN-to-TL update process.
+- See ./releng.txt for info about setting up the pretest and doing a release.
 
-See ./releng.txt for info about setting up the pretest and doing a release.
 
 To add a new platform:
 - check that the config.guess output maps to our architecture name
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 19b19949c61..3d14881c325 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -80,7 +80,7 @@ commit (which is the next item, in Part II).
   rev=57871 # for 2021 (svn info in trunk)
   tlyear=`date +%Y -d "last year"` # presumably
   umask 022 # keep TL files non-group-writable
-  branch=branch$tlyear
+  branch=branch$tlyear.final
   svn copy -r $rev \
     -m"$branch branch based on r$rev" \
     svn://tug.org/texlive/trunk svn://tug.org/texlive/branches/$branch
@@ -141,6 +141,7 @@ Also run fmtutil-user --all to check that all formats build, no config file
 problems.  Ensure that web2c/texmf.cnf is updated for the current year
 (per above).  Then, so things will get redone later as another check:
   rm -rf ~/.texlive`date +%Y`  # the new one
+(For karl@tug.org: create at least pdflatex.fmt and xelatex.fmt for bnb.)
 
 7. Check for Build-maintained updates to config files, new files, etc.
 (might have to merge back if Master was mistakenly updated):
@@ -472,6 +473,12 @@ svn co svn://tug.org/texlive/branches/branch$this/Build/source . >&out
 #   svn://tug.org/texlive/tags/texlive-$bt 
   (Using urls makes for an immediate commit, which is what we want.)
 
+By the way, in the event of a mistaken delete, the material is best
+recovered with, where 57911 is the good revision to restore from:
+  svn merge -r HEAD:57911 .
+so as to keep the version history, which retrieving the files and
+re-adding would not do.
+
 - update ~karl/bin/cron.tl, and reenable when feel ready:
 critical=
 pretest=
-- 
cgit v1.2.3