diff options
Diffstat (limited to 'Master/tlpkg/bin')
| -rwxr-xr-x | Master/tlpkg/bin/tl-prune-platforms | 24 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-images | 47 |
2 files changed, 44 insertions, 27 deletions
diff --git a/Master/tlpkg/bin/tl-prune-platforms b/Master/tlpkg/bin/tl-prune-platforms index 8c40941b853..2d2acd0f00a 100755 --- a/Master/tlpkg/bin/tl-prune-platforms +++ b/Master/tlpkg/bin/tl-prune-platforms @@ -1,9 +1,10 @@ #!/usr/bin/env perl -# Copyright 2012 Norbert Preining +# Copyright 2012-2013 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # -# Prune (remove) platforms from a tlnet distribution tree +# Prune (remove) platforms from a tlnet distribution tree. +# Run from tl-update-images. my $vc_id; my $mydir; @@ -51,7 +52,7 @@ sub main my $format = $tlpdb->config_container_format; my $type = "xz"; - if ($format ne "xz") { + if ($format ne $type) { tlwarn("$0: unknown container format $format in 00texlive.config; ", "ignoring and continuing with $type"); } @@ -61,8 +62,7 @@ sub main my @all_archs = $tlpdb->available_architectures; for my $a (@ARGV) { if (!TeXLive::TLUtils::member($a, @all_archs)) { - print "Platform $a not installed, cannot prune, exiting\n"; - exit 1; + die "platform $a not installed, cannot prune, goodbye"; } } @@ -75,8 +75,8 @@ sub main my $tlp = $tlpdb->get_package($pkg); if (!$tlp) { - # that is a package foobar.$a that has already been remove but - # is still in the list above, so ignore that + # that is a package foobar.$a that has already been removed but + # is still in the list above, so ignore it. next; } foreach my $dep ($tlp->depends) { @@ -140,12 +140,12 @@ pseudo-package C<00texlive.config>. See L<TeXLive::TLPDB>. =head1 DESCRIPTION -This program removes all traces of all platforms given as arguments, -that is: remove the binfiles entries in the tlpdb, and remove the -containers. +This program removes the binary directories of the platforms given as +arguments; that is, remove the binfiles entries in the tlpdb, and remove +the containers. (Any xz and wget binaries for the installer remain, though.) -It is used during DVD production to exclude certain -platforms, and is run from the L<tl-update-image> script. +It is used during DVD production to exclude certain platforms, and is +run from the L<tl-update-images> script. =head1 AUTHORS AND COPYRIGHT diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images index aacf2c54b63..dcab9d5c84e 100755 --- a/Master/tlpkg/bin/tl-update-images +++ b/Master/tlpkg/bin/tl-update-images @@ -81,9 +81,9 @@ MAKEINST () mkdir $imgdir # files and a few dirs from master. - cp -p $master/.mkisofsrc $imgdir # mkisofs control - cp -p $master/* $imgdir 2>/dev/null || true # intentionally skip dirs - cp -pr $master/readme* $master/source $imgdir # do these few dirs + cp -p $master/.mkisofsrc $imgdir || exit 1 # mkisofs control + cp -p $master/* $imgdir 2>/dev/null # intentionally skip dirs + cp -pr $master/readme* $master/source $imgdir # but do these few dirs # included preformatted doc in new dir for the DVD. mkdir $imgdir/texlive-doc @@ -98,18 +98,31 @@ MAKEINST () fi cp -pr install-tl *.bat tlpkg archive $imgdir + # remove some platforms to save space on the dvd. + # do this here so that they can be kept in the tree, + # and thus installed normally over the net. + prune="mips-irix alpha-linux powerpc-linux i386-kfreebsd amd64-kfreebsd \ + mipsel-linux armel-linux armhf-linux" + echo "-- pruning platforms $prune..." + mkdir $imgdir/tlpkg/bin + cp $mydir/tl-prune-platforms $imgdir/tlpkg/bin + $imgdir/tlpkg/bin/tl-prune-platforms $prune >/tmp/imgprune + + # some files we don't want in the image after all. + rm -rf $imgdir/doc.html $imgdir/tlpkg/texlive.tlpdb.xz $imgdir/tlpkg/bin + + # the actual iso build. cd $imgdir || exit 1 - # cleanups of files we didn't want after all. - rm doc.html tlpkg/texlive.tlpdb.xz cmd="$mkisofs $common_mkisofs_options -o $iso ." echo "-- `date` with: $cmd" $cmd if test $? -ne 0; then - echo "$0: $mkisofs failed, goodbye." >&2 + echo "$0: $mkisofs failed (status $?), goodbye." >&2 + exit $? fi chmod a+rw $iso - rm -rf $imgdir + #rm -rf $imgdir # make checksums # and symlinks with short names (potentially used in /etc/fstab). @@ -172,9 +185,21 @@ do_tar () MAKETAR () { + echo + echo "-- `date` Writing tars to $target" + # remove old tarballs and checksums. rm -f $target/$NAME-*.tar.* + # make tar files based on the tree we are running out of. + cd $master || exit 1 + do_tar $NAME-$D-extra \ + LICENSE* README* autorun.inf *.html install* re* tl-* \ + tlpkg/TeXLive tlpkg/translations tlpkg/tlpostcode + + cd $master || exit 1 + do_tar $NAME-$D-texmf texmf* + if $tar_bin_only || $tar_all; then cd $master/bin || exit 1 do_tar $NAME-$D-bin * @@ -186,14 +211,6 @@ MAKETAR () do_tar $NAME-$D-source * $tar_source_only && return fi - - cd $master || exit 1 - do_tar $NAME-$D-extra \ - LICENSE* README* autorun.inf *.html install* re* tl-* \ - tlpkg/TeXLive tlpkg/translations tlpkg/tlpostcode - - cd $master || exit 1 - do_tar $NAME-$D-texmf texmf* # one more unusual case: the development sources, which we record in # the 00texlive.image (fake) package; see its .tlpsrc. |