oops, go back to sh mktexlsr, accidentally got pl version; other tweaks

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

20 files changed, 41 insertions, 22 deletions

diff --git a/Build/source/.github/workflows/main.yml b/Build/source/.github/workflows/main.yml
index 9de46f08a17..ad8c23a5905 100644
--- a/Build/source/.github/workflows/main.yml
+++ b/Build/source/.github/workflows/main.yml
@@ -37,7 +37,8 @@ jobs:
       matrix:
         # we need to list the archs here, otherwise the matrix contains only
         # one element release_build and that is overwritten by the include statements
-        tl_name: [ i386-linux, x86_64-linux, x86_64-linuxmusl, aarch64-linux, armhf-linux ]
+        tl_name: [ i386-linux, x86_64-linux, x86_64-linuxmusl ]
+#        tl_name: [ i386-linux, x86_64-linux, x86_64-linuxmusl, aarch64-linux, armhf-linux ]
         release_build:
           - ${{ startsWith(github.ref, 'refs/tags/') }}
         include:
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index 80de5a62621..ce49acbf8d7 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,3 +1,9 @@
+2024-02-10  Karl Berry  <karl@tug.org>
+
+	* .github/workflows/main.yml: aarch64 and armhf are taking forever
+	(1h50m and counting), try disabling.  Also try disabling the
+	build-on-push-to-trunk for the moment.
+
 2023-12-31  Karl Berry  <karl@freefriends.org>
 
 	* reautoconf: add -f / --force option to pass to autoreconf.
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index ea0f8c2febc..4d166d0ebd0 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2023-02-10  Karl Berry  <karl@tug.org>
+
+	* texmf.cnf (TEXMFVAR, TEXMFCONFIG, doc): 2024.
+
 2024-01-31  Akira Kakuto  <kakuto@jcom.zaq.ne.jp>
 
 	* tex-file.c (kpathsea_name_ok) [MSDOS]: change #ifndef MSDOS
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index 6d25925494a..83faca77dae 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -4,8 +4,8 @@
 % If you modify this original file, YOUR CHANGES WILL BE LOST when it is
 % updated.  Instead, put your changes -- and only your changes, not an
 % entire copy! -- in ../../texmf.cnf.  That is, if this file is
-% installed in /some/path/to/texlive/2023/texmf-dist/web2c/texmf.cnf,
-% put your custom settings in /some/path/to/texlive/2023/texmf.cnf.
+% installed in /some/path/to/texlive/2024/texmf-dist/web2c/texmf.cnf,
+% put your custom settings in /some/path/to/texlive/2024/texmf.cnf.
 % (Below, we use YYYY in place of the specific year.)
 % 
 % What follows is a super-summary of what this .cnf file can
@@ -87,10 +87,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
 TEXMFHOME = ~/texmf
 
 % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2023/texmf-var
+TEXMFVAR = ~/.texlive2024/texmf-var
 
 % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2023/texmf-config
+TEXMFCONFIG = ~/.texlive2024/texmf-config
 
 % This is the value manipulated by tlmgr's auxtrees subcommand in the
 % root texmf.cnf. Kpathsea warns about a literally empty string for a
diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog
index 61004496ffb..346742bf0cd 100644
--- a/Build/source/texk/tex4htk/ChangeLog
+++ b/Build/source/texk/tex4htk/ChangeLog
@@ -1,3 +1,7 @@
+2024-02-10  Karl Berry  <karl@tug.org>
+
+	* Makefile.am (shell_scripts): remove htcontext.
+
 2023-10-13  Karl Berry  <karl@freefriends.org>
 
 	* tex4ht.c: avoid invalid read and uninitialized comparisons.
diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am
index cce13b45005..3a3342aa9e1 100644
--- a/Build/source/texk/tex4htk/Makefile.am
+++ b/Build/source/texk/tex4htk/Makefile.am
@@ -27,7 +27,7 @@ LDADD = $(KPATHSEA_LIBS)
 @KPATHSEA_RULE@
 
 perl_scripts = mk4ht
-shell_scripts = ht htcontext htlatex htmex httex httexi \
+shell_scripts = ht htlatex htmex httex httexi \
   htxelatex htxetex xhlatex
 
 scriptsdir = texmf-dist/scripts/tex4ht
diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in
index 78323e37be0..be2f29049a0 100644
--- a/Build/source/texk/tex4htk/Makefile.in
+++ b/Build/source/texk/tex4htk/Makefile.in
@@ -130,8 +130,8 @@ am_tex4ht_OBJECTS = tex4ht.$(OBJEXT)
 tex4ht_OBJECTS = $(am_tex4ht_OBJECTS)
 tex4ht_LDADD = $(LDADD)
 tex4ht_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__dist_bin_SCRIPTS_DIST = ht.bat htcontext.bat htlatex.bat htmex.bat \
-	httex.bat httexi.bat htxelatex.bat htxetex.bat xhlatex.bat
+am__dist_bin_SCRIPTS_DIST = ht.bat htlatex.bat htmex.bat httex.bat \
+	httexi.bat htxelatex.bat htxetex.bat xhlatex.bat
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -412,7 +412,7 @@ t4ht_SOURCES = t4ht.c
 tex4ht_SOURCES = tex4ht.c
 LDADD = $(KPATHSEA_LIBS)
 perl_scripts = mk4ht
-shell_scripts = ht htcontext htlatex htmex httex httexi \
+shell_scripts = ht htlatex htmex httex httexi \
   htxelatex htxetex xhlatex
 
 scriptsdir = texmf-dist/scripts/tex4ht
diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index ee9a74c2659..833d2a0fe30 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,9 @@
+2024-02-11  Karl Berry  <karl@tug.org>
+
+	* Makefile.am (texmf_other_scripts): whoops, undo
+	mktexlsr.pl, it's overwriting the sh version. Something
+	to look at later.
+
 2024-02-08  Karl Berry  <karl@tug.org>
 
 	* Makefile.am (texmf_other_scripts): add texlive/mktexlsr.pl,
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index cbbd589b138..d7c0ca1ec0c 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -238,7 +238,6 @@ texmf_other_scripts = \
 	texlive/fmtutil-user.sh \
 	texlive/fmtutil.pl \
 	texlive/mktexlsr \
-	texlive/mktexlsr.pl \
 	texlive/mktexmf \
 	texlive/mktexpk \
 	texlive/mktextfm \
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index 3862963416e..30953906f8d 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -455,7 +455,6 @@ texmf_other_scripts = \
 	texlive/fmtutil-user.sh \
 	texlive/fmtutil.pl \
 	texlive/mktexlsr \
-	texlive/mktexlsr.pl \
 	texlive/mktexmf \
 	texlive/mktexpk \
 	texlive/mktextfm \
diff --git a/Master/bin/aarch64-linux/mktexlsr b/Master/bin/aarch64-linux/mktexlsr
index ae516694ea0..a36378a2b9f 120000
--- a/Master/bin/aarch64-linux/mktexlsr
+++ b/Master/bin/aarch64-linux/mktexlsr
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/mktexlsr b/Master/bin/amd64-freebsd/mktexlsr
index ae516694ea0..a36378a2b9f 120000
--- a/Master/bin/amd64-freebsd/mktexlsr
+++ b/Master/bin/amd64-freebsd/mktexlsr
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/mktexlsr b/Master/bin/i386-freebsd/mktexlsr
index ae516694ea0..a36378a2b9f 120000
--- a/Master/bin/i386-freebsd/mktexlsr
+++ b/Master/bin/i386-freebsd/mktexlsr
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file
diff --git a/Master/bin/i386-linux/mktexlsr b/Master/bin/i386-linux/mktexlsr
index ae516694ea0..a36378a2b9f 120000
--- a/Master/bin/i386-linux/mktexlsr
+++ b/Master/bin/i386-linux/mktexlsr
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/mktexlsr b/Master/bin/i386-solaris/mktexlsr
index ae516694ea0..a36378a2b9f 120000
--- a/Master/bin/i386-solaris/mktexlsr
+++ b/Master/bin/i386-solaris/mktexlsr
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/mktexlsr b/Master/bin/x86_64-darwinlegacy/mktexlsr
index ae516694ea0..a36378a2b9f 120000
--- a/Master/bin/x86_64-darwinlegacy/mktexlsr
+++ b/Master/bin/x86_64-darwinlegacy/mktexlsr
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/mktexlsr b/Master/bin/x86_64-linux/mktexlsr
index ae516694ea0..a36378a2b9f 120000
--- a/Master/bin/x86_64-linux/mktexlsr
+++ b/Master/bin/x86_64-linux/mktexlsr
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/mktexlsr b/Master/bin/x86_64-linuxmusl/mktexlsr
index ae516694ea0..a36378a2b9f 120000
--- a/Master/bin/x86_64-linuxmusl/mktexlsr
+++ b/Master/bin/x86_64-linuxmusl/mktexlsr
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/mktexlsr b/Master/bin/x86_64-solaris/mktexlsr
index ae516694ea0..a36378a2b9f 120000
--- a/Master/bin/x86_64-solaris/mktexlsr
+++ b/Master/bin/x86_64-solaris/mktexlsr
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
+../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 9b186922d79..ce3375b1861 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -181,14 +181,14 @@ When removing platforms, also have to remove from /home/texlive/trunk.
   env force_rebuild=true cron.pretest  # will update repository, hopefully
 We use cp -a because we want to start with exactly the last tlnet,
 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.
+overwritten. 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 this installation updated daily as normal users do,
 that is, with tlmgr update --self --all.
 
 9c. Update other automatically-built binary sets, 
-and ask tlbuild to build all (including asymptote).
+and ask tlbuild to build all (including asymptote, if new).
 
 9d. In 2020, as a special case, after a first successful build, this was run:
   tl-fix-container-links