Hi, Cyril Brulebois <[email protected]> wrote (Sun, 27 Aug 2023 21:42:54 +0200): > Holger Wansing <[email protected]> (2023-08-27): > > So no more netinst images, > > And any other sections about CD, DVD, etc. must go. > > > but the "Other images" section will stay (netboot images, hd-media > > ...)? > > Right, only that one stays.
I have prepared a patch with this changings. @kibi: Since this file has "# This file should only be updated by a D-I release manager." at its top: do you want to commit it or do a proofreading? Holger -- Holger Wansing <[email protected]> PGP-Fingerprint: 496A C6E8 1442 4B34 8508 3529 59F1 87CA 156E B076
diff --git a/english/devel/debian-installer/images.data b/english/devel/debian-installer/images.data index 499bce27778..ef84b9ba483 100644 --- a/english/devel/debian-installer/images.data +++ b/english/devel/debian-installer/images.data @@ -3,136 +3,136 @@ # This file should only be updated by a D-I release manager. #include wml::debian::installer <bind-gettext-domain domain="cdimage" /> # Release name <define-tag release-name>bookworm</define-tag> # Version <define-tag version>rc4</define-tag> <define-tag shortversion>rc4</define-tag> <define-tag humanversion>Bookworm RC 4</define-tag> # Has Alpha 1 happened already during this release cycle? (yes/no) <set-var testing-installer-released="no" /> # If arches are added here, then also comment them out for the # devel-other-images tag below <define-tag daily-broken-arches></define-tag> <define-tag netinst-images> -<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/iso-cd/debian-<release-name />-DI-<shortversion />-@[email protected]" arch="<strip-arches "<devel-images-arches />" "s390 s390x source" />" /> +<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/iso-cd/debian-<release-name />-DI-<shortversion />-@[email protected]" arch="<strip-arches "<devel-images-arches />" "i386 s390 s390x source" />" /> </define-tag> <define-tag netinst-images-jigdo> -<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/jigdo-cd/debian-<release-name />-DI-<shortversion />-@[email protected]" arch="<strip-arches "<devel-images-arches />" "s390 s390x source" />" /> +<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/jigdo-cd/debian-<release-name />-DI-<shortversion />-@[email protected]" arch="<strip-arches "<devel-images-arches />" "i386 s390 s390x source" />" /> </define-tag> # Turned out not to be such a good idea for official releases as the link would # point to the same directory as full CD images <define-tag small-cd-images> -<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/iso-cd/" arch="<strip-arches "<devel-images-arches />" "s390 s390x source" />" /> +<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/iso-cd/" arch="<strip-arches "<devel-images-arches />" "i386 s390 s390x source" />" /> </define-tag> <define-tag full-cd-images> -<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/iso-cd/" arch="<strip-arches "<devel-images-arches />" "source" />" /> +<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/iso-cd/" arch="<strip-arches "<devel-images-arches />" "i386 source" />" /> </define-tag> <define-tag full-dvd-images> -<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/iso-dvd/" arch="<devel-images-arches />" /> +<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/iso-dvd/" arch="<strip-arches "<devel-images-arches />" "i386" />" /> </define-tag> <define-tag full-cd-jigdo> -<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/jigdo-cd/" arch="<strip-arches "<devel-images-arches />" "source" />" /> +<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/jigdo-cd/" arch="<strip-arches "<devel-images-arches />" "i386 source" />" /> </define-tag> <define-tag full-dvd-jigdo> -<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/jigdo-dvd/" arch="<devel-images-arches />" /> +<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/jigdo-dvd/" arch="<strip-arches "<devel-images-arches />" "i386" />" /> </define-tag> <define-tag full-bd-jigdo> -<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/jigdo-bd/" arch="amd64 i386 source" /> +<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/jigdo-bd/" arch="amd64 source" /> </define-tag> # BitTorrent images not built anymore (to be removed) <define-tag full-cd-torrent> -<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/bt-cd/" arch="<devel-images-arches />" /> +<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/bt-cd/" arch="<strip-arches "<devel-images-arches />" "i386" />" /> </define-tag> <define-tag full-dvd-torrent> -<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/bt-dvd/" arch="<devel-images-arches />" /> +<images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/bt-dvd/" arch="<strip-arches "<devel-images-arches />" "i386" />" /> </define-tag> <define-tag other-images> <images-list url="https://deb.debian.org/debian/dists/testing/main/installer-@ARCH@/current/images/"; arch="<strip-arches "<devel-images-arches />" "source" />" /> </define-tag> # obsoleted; replaced by "devel-small-cd" <define-tag devel-netinst-images> <images-list url="https://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/@ARCH@/iso-cd/debian-testing-@[email protected]"; arch="<strip-arches "<devel-images-arches />" "<daily-broken-arches /> s390 s390x source" />" /> </define-tag> # obsoleted; replaced by "devel-small-cd" <define-tag devel-businesscard-images> <images-list url="https://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/@ARCH@/iso-cd/debian-testing-@[email protected]"; arch="<strip-arches "<devel-images-arches />" "<daily-broken-arches /> s390 s390x source" />" /> </define-tag> <define-tag devel-small-cd-images> -<images-list url="https://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/@ARCH@/iso-cd/"; arch="<strip-arches "<devel-images-arches />" "<daily-broken-arches /> s390 s390x source" />" /> +<images-list url="https://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/@ARCH@/iso-cd/"; arch="<strip-arches "<devel-images-arches />" "<daily-broken-arches /> i386 s390 s390x source" />" /> </define-tag> <define-tag devel-small-cd-jigdo> -<images-list url="https://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/@ARCH@/jigdo-cd/"; arch="<strip-arches "<devel-images-arches />" "<daily-broken-arches /> s390 s390x source" />" /> +<images-list url="https://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/@ARCH@/jigdo-cd/"; arch="<strip-arches "<devel-images-arches />" "<daily-broken-arches /> i386 s390 s390x source" />" /> </define-tag> # kibi/2023-02-19: Remove this tag once all translations have stopped referencing it! # (1 reference in each */devel/debian-installer/index.wml) <define-tag devel-multi-arch-cd> <div class="downloads"> <ul class="downlist"> <li><a href="https://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/multi-arch/iso-cd/";><gettext domain="cdimage">ISO images</gettext></a></li> <li><a href="https://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/multi-arch/jigdo-cd/";><gettext domain="cdimage">Jigdo files</gettext></a></li> </ul> </div> </define-tag> <define-tag devel-full-cd-images> -<images-list url="https://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/iso-cd/"; arch="<strip-arches "<devel-images-arches />" "source" />" /> +<images-list url="https://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/iso-cd/"; arch="<strip-arches "<devel-images-arches />" "i386 source" />" /> </define-tag> <define-tag devel-full-dvd-images> -<images-list url="https://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/iso-dvd/"; arch="<devel-images-arches />" /> +<images-list url="https://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/iso-dvd/"; arch="<strip-arches "<devel-images-arches />" "i386" />" /> </define-tag> <define-tag devel-full-cd-jigdo> -<images-list url="https://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/jigdo-cd/"; arch="<strip-arches "<devel-images-arches />" "source" />" /> +<images-list url="https://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/jigdo-cd/"; arch="<strip-arches "<devel-images-arches />" "i386 source" />" /> </define-tag> <define-tag devel-full-dvd-jigdo> -<images-list url="https://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/jigdo-dvd/"; arch="<devel-images-arches />" /> +<images-list url="https://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/jigdo-dvd/"; arch="<strip-arches "<devel-images-arches />" "i386" />" /> </define-tag> <define-tag devel-full-bd-jigdo> -<images-list url="https://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/jigdo-bd/"; arch="amd64 i386 source" /> +<images-list url="https://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/jigdo-bd/"; arch="amd64 source" /> </define-tag> # Include only amd64 and i386 as the only images that are seeded sufficiently <define-tag devel-full-cd-torrent> -<images-list url="https://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/bt-cd/"; arch="amd64 i386" /> +<images-list url="https://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/bt-cd/"; arch="amd64" /> </define-tag> # Weekly DVD torrents currently not included on webpage <define-tag devel-full-dvd-torrent> -<images-list url="https://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/bt-dvd/"; arch="<devel-images-arches />" /> +<images-list url="https://cdimage.debian.org/cdimage/weekly-builds/@ARCH@/bt-dvd/"; arch="<strip-arches "<devel-images-arches />" "i386" />" /> </define-tag> # Note that changes here should also be reflected in # scripts/daily-build-aggregator in the d-i repository, and in debian-cd. <define-tag devel-other-images> <div class="downloads"> <ul class="downlist"> <li><a href="https://d-i.debian.org/daily-images/amd64/daily/";>amd64</a></li> <li><a href="https://d-i.debian.org/daily-images/arm64/daily/";>arm64</a></li> <li><a href="https://d-i.debian.org/daily-images/armel/daily/";>armel</a></li> <li><a href="https://d-i.debian.org/daily-images/armhf/daily/";>armhf</a></li> <li><a href="https://d-i.debian.org/daily-images/hurd-i386/daily/";>hurd-i386</a></li> <li><a href="https://d-i.debian.org/daily-images/i386/daily/";>i386</a></li> <li><a href="https://d-i.debian.org/daily-images/mips64el/daily/";>mips64el</a></li> <li><a href="https://d-i.debian.org/daily-images/mipsel/daily/";>mipsel</a></li> <li><a href="https://d-i.debian.org/daily-images/ppc64el/daily/";>ppc64el</a></li> <li><a href="https://d-i.debian.org/daily-images/s390x/daily/";>s390x</a></li> </ul> </div> </define-tag>
