From b217136926af599219a410e426d8157101d8224a Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Mon, 10 Jun 2019 16:27:52 +0100 Subject: TeXlive: allows for updating itself and removes old version file Until now, TeXlive would only attempt to download/update LaTeX packages, but after some time, it will be necessary for it to update itself. When this happens, it complains about running it with `update --self'. To fix this problem, before installing/updating the LaTeX packages, we will first update tlmgr in any case. Also, we weren't removing the TeXlive package version file before appending the values to it. So it was just repeating the packages every time it was updated. With this commit, it is being removed on every new build. Finally, the version of Git was updated to its most recent version. --- .file-metadata | Bin 6001 -> 6001 bytes reproduce/software/config/installation/versions.mk | 2 +- reproduce/software/make/high-level.mk | 9 +++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.file-metadata b/.file-metadata index 7c7af19..b0c648d 100644 Binary files a/.file-metadata and b/.file-metadata differ diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk index 2b303dd..bd3b066 100644 --- a/reproduce/software/config/installation/versions.mk +++ b/reproduce/software/config/installation/versions.mk @@ -31,7 +31,7 @@ file-version = 5.36 findutils-version = 4.6.0.199-e3fc gawk-version = 5.0.0 gcc-version = 9.1.0 -git-version = 2.21.0 +git-version = 2.22.0 gmp-version = 6.1.2 grep-version = 3.3 gzip-version = 1.10 diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 0e7e72b..310b8e3 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -728,6 +728,14 @@ $(itidir)/texlive: reproduce/software/config/installation/texlive.mk \ if [ x"$$res" = x"NOT!" ]; then echo "" > $@ else + # To update itself, tlmgr needs a backup directory. + backupdir=$(idir)/texlive/backups + mkdir -p $$backupdir + + # Before checking LaTeX packages, update tlmgr itself. + tlmgr option backupdir $$backupdir + tlmgr update --self + # Install all the extra necessary packages. If LaTeX complains # about not finding a command/file/what-ever/XXXXXX, simply run # the following command to find which package its in, then add it @@ -748,6 +756,7 @@ $(itidir)/texlive: reproduce/software/config/installation/texlive.mk \ | awk '{print $$NF}'); # Package names and versions. + rm -f $@ tlmgr info $(texlive-packages) --only-installed | awk \ '$$1=="package:" {version=0; \ if($$NF=="tex-gyre") name="texgyre"; \ -- cgit v1.2.1