summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-03-26 15:39:45 +0000
committerKarl Berry <karl@freefriends.org>2024-03-26 15:39:45 +0000
commit9f509b2d634f95e3b4973d83905365561bb78096 (patch)
tree09b19c31535e1d39afbc24ec2dd98cac53724c9d /Master/tlpkg
parent4e2372e78667aa348bf1c6918511e7929d349aa2 (diff)
doc,sync
git-svn-id: svn://tug.org/texlive/trunk@70774 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm2
-rwxr-xr-xMaster/tlpkg/bin/tl-update-bindir10
-rw-r--r--Master/tlpkg/dev/profiles/TLctx.pro8
-rw-r--r--Master/tlpkg/doc/releng.txt1
4 files changed, 13 insertions, 8 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index b6bbdb7875e..cc5d4ec90a7 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -2268,7 +2268,7 @@ Run the ConTeXt cache generation commands, using C<$bindir> and
C<$progext> to check if commands can be run. Use the function reference
C<$run_postinst_cmd> to actually run the commands. The return status is
zero if all succeeded, nonzero otherwise. If the main ConTeXt program
-(C<luametatex>) cannot be run at all, the return status is status.
+(C<luametatex>) cannot be run at all, the return status is zero.
Functions C<info> and C<debug> are called with status reports.
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 6f4bd6b6888..edcd6916e7d 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -157,7 +157,8 @@ for tlplat in $tlplats; do
case $tlplat in
aarch64-linux)
# cg build is much much faster than gh, so use it while it works.
- do_download ${cgurl}/${cgbranch}$tlplat.tar.xz;;
+ #do_download ${cgurl}/${cgbranch}$tlplat.tar.xz;;
+ do_download `github_url $tlplat`;;
amd64-freebsd)
do_download `github_url $tlplat`;;
@@ -168,7 +169,9 @@ for tlplat in $tlplats; do
do_download http://www.babafou.eu.org/texlive-netbsd/x86_64-netbsd.tar.xz;;
armhf-linux)
- do_download ${cgurl}/${cgbranch}$tlplat.tar.xz;; # see armhf comments above
+ # as with aarch.
+ #do_download ${cgurl}/${cgbranch}$tlplat.tar.xz;;
+ do_download `github_url $tlplat`;;
#do_download `github_url $tlplat`;;
#remurl=http://dl.contextgarden.net/build/texlive/${cgbranch}$tlplat.tar.xz
#do_download $remurl;;
@@ -211,7 +214,8 @@ for tlplat in $tlplats; do
# Then https://github.com/TeX-Live/texlive-source/releases
# "Draft a new release".
# "Choose a tag -> "find or create a new tag" -> "svnNNNNN"
- # "Target:trunk" should already be there,
+ # "Target:trunk" should already be there
+ # (or set Target to, e.g., "branch2024", if building from branch),
# "rNNNNN and perhaps brief msg from commits in "title",
# and anything relevant for "description", or leave it blank;
# check pre-release box (always),
diff --git a/Master/tlpkg/dev/profiles/TLctx.pro b/Master/tlpkg/dev/profiles/TLctx.pro
index 351134f43b8..acad38b7b41 100644
--- a/Master/tlpkg/dev/profiles/TLctx.pro
+++ b/Master/tlpkg/dev/profiles/TLctx.pro
@@ -10,7 +10,7 @@ TEXMFLOCAL /tmp/ki/texmf-local
TEXMFSYSCONFIG /tmp/ki/sys/conf
TEXMFSYSVAR /tmp/ki/sys/var
TEXMFVAR /tmp/ki/user/var
-binary_i386-linux 1
+binary_x86_64-linux 1
collection-basic 1
collection-context 1
option_desktop_integration 1
@@ -21,8 +21,8 @@ option_letter 0
option_path 0
option_post_code 1
option_src 0
-option_sys_bin /usr/local/bin
-option_sys_info /usr/local/info
-option_sys_man /usr/local/man
+option_sys_bin /tmp/ki/local/bin
+option_sys_info /tmp/ki/local/info
+option_sys_man /tmp/ki/local/man
option_w32_multi_user 0
option_write18_restricted 1
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 380244c7522..565c9b53195 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -626,6 +626,7 @@ tail out
make another tag:
brev=nnnnn # branch commit revision, e.g., 51236
btag=yyyy.n # next branch tag, e.g., 2021.3
+ when ready:
#svn copy -r $brev -m"texlive-$btag tag based on r$brev, with <whatever> fix" \
# svn://tug.org/texlive/branches/branch2021 \
# svn://tug.org/texlive/tags/texlive-$btag