Hi, Cyril Brulebois <[email protected]> wrote (Mon, 28 Aug 2023 18:03:35 +0200): > Holger Wansing <[email protected]> (2023-08-28): > > There's already a mechanism for filtering archs here, so I'm not > > sure, if inventing another method in parallel is an improvement. > > That's really apples and oranges: > - s390x is here and is here to stay (I have no opinions regarding the > current exclusion/implementation though — in passing, s390 is long > gone even if it still appears…); > - i386 is in a weird state where it's going to be in the archive, with > d-i builds, without debian-cd builds. > > It really does make sense to me to have both archs treated separately.
So you mean a changing like attached... Resulting in a html page like the attached html... 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..0fdc241bf2c 100644 --- a/english/devel/debian-installer/images.data +++ b/english/devel/debian-installer/images.data @@ -54,20 +54,23 @@ <images-list url="https://cdimage.debian.org/cdimage/<release-name />_di_<version />/@ARCH@/bt-cd/" arch="<devel-images-arches />" /> </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 />" /> </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> +<define-tag other-images-i386> +<images-list url="https://deb.debian.org/debian/dists/testing/main/installer-i386/current/images/"; arch="i386" /> +</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" />" /> @@ -121,21 +124,20 @@ # 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> # Support for <if-testing-installer released="yes|no"> tags: <set-var diversions:_testing_installer=0 /> diff --git a/english/devel/debian-installer/index.wml b/english/devel/debian-installer/index.wml index 47ba84021eb..c7dd0d32c1b 100644 --- a/english/devel/debian-installer/index.wml +++ b/english/devel/debian-installer/index.wml @@ -173,20 +173,21 @@ unstable. <div class="item col50 lastcol"> <strong>netinst CD images (via <a href="$(HOME)/CD/jigdo-cd">jigdo</a>)</strong> <devel-small-cd-jigdo /> </div> </div> <div class="line"> <div class="item col50"> <strong>other images (netboot, USB stick, etc.)</strong> <devel-other-images /> +<other-images-i386 /> </div> </div> <hr /> <p> <strong>Notes</strong> </p> <ul> # <li>Before you download the daily built images, we suggest you check for diff --git a/english/template/debian/installer.wml b/english/template/debian/installer.wml index 719743ecfac..e71ff1e0eb1 100644 --- a/english/template/debian/installer.wml +++ b/english/template/debian/installer.wml @@ -1,33 +1,33 @@ #use wml::debian::release_info -<define-tag devel-images-arches>amd64\narm64\narmel\narmhf\ni386\nmips64el\nmipsel\nppc64el\ns390x\nsource</define-tag> +<define-tag devel-images-arches>amd64\narm64\narmel\narmhf\nmips64el\nmipsel\nppc64el\ns390x\nsource</define-tag> <define-tag sarge-images-arches>alpha\narm\nhppa\ni386\nia64\nm68k\nmips\nmipsel\npowerpc\nsparc\ns390\nsource</define-tag> <define-tag etch-images-arches>alpha\namd64\narm\nhppa\ni386\nia64\nmips\nmipsel\npowerpc\nsparc\ns390\nsource</define-tag> <define-tag lenny-images-arches>alpha\namd64\narm\narmel\nhppa\ni386\nia64\nmips\nmipsel\npowerpc\nsparc\ns390\nsource</define-tag> <define-tag squeeze-images-arches>amd64\narmel\nkfreebsd-i386\nkfreebsd-amd64\ni386\nia64\nmips\nmipsel\npowerpc\nsparc\ns390\nsource</define-tag> <define-tag wheezy-images-arches>amd64\narmel\narmhf\ni386\nia64\nkfreebsd-i386\nkfreebsd-amd64\nmips\nmipsel\npowerpc\nsparc\ns390\ns390x\nsource</define-tag> <define-tag jessie-images-arches>amd64\narm64\narmel\narmhf\ni386\nmips\nmipsel\npowerpc\nppc64el\ns390x\nsource</define-tag> <define-tag jessie-nonlts-images-arches>arm64\nmips\nmipsel\npowerpc\nppc64el\ns390x\nsource</define-tag> <define-tag jessie-lts-images-arches>amd64\narmel\narmhf\ni386\nsource</define-tag> <define-tag stretch-images-arches>amd64\narm64\narmel\narmhf\ni386\nmips\nmips64el\nmipsel\nppc64el\ns390x\nsource</define-tag> <define-tag stretch-nonlts-images-arches>mips\nmipsel\npowerpc\nppc64el\ns390x\nsource</define-tag> <define-tag stretch-lts-images-arches>amd64\narm64\narmel\narmhf\ni386\nsource</define-tag> <define-tag buster-images-arches>amd64\narm64\narmel\narmhf\ni386\nmips\nmips64el\nmipsel\nppc64el\ns390x\nsource</define-tag> <define-tag buster-nonlts-images-arches>mips\nmipsel\npowerpc\nppc64el\ns390x\nsource</define-tag> <define-tag buster-lts-images-arches>amd64\narm64\narmel\narmhf\ni386\nsource</define-tag> <define-tag bullseye-images-arches>amd64\narm64\narmel\narmhf\ni386\nmips64el\nmipsel\nppc64el\ns390x\nsource</define-tag> <define-tag bullseye-nonlts-images-arches>mips\nmipsel\npowerpc\nppc64el\ns390x\nsource</define-tag> <define-tag bullseye-lts-images-arches>amd64\narm64\narmel\narmhf\ni386\nsource</define-tag> <define-tag bookworm-images-arches>amd64\narm64\narmel\narmhf\ni386\nmips64el\nmipsel\nppc64el\ns390x\nsource</define-tag> -<define-tag trixie-images-arches>amd64\narm64\narmel\narmhf\ni386\nmips64el\nmipsel\nppc64el\ns390x\nsource</define-tag> +<define-tag trixie-images-arches>amd64\narm64\narmel\narmhf\nmips64el\nmipsel\nppc64el\ns390x\nsource</define-tag> <define-tag stable-images-arches>\ <ifeq "<current_release_name />" "sarge" "<sarge-images-arches/>" />\ <ifeq "<current_release_name />" "etch" "<etch-images-arches/>" />\ <ifeq "<current_release_name />" "lenny" "<lenny-images-arches/>" />\ <ifeq "<current_release_name />" "squeeze" "<squeeze-images-arches/>" />\ <ifeq "<current_release_name />" "wheezy" "<wheezy-images-arches/>" />\ <ifeq "<current_release_name />" "jessie" "<jessie-images-arches/>" />\ <ifeq "<current_release_name />" "stretch" "<stretch-images-arches/>" />\ <ifeq "<current_release_name />" "buster" "<buster-images-arches/>" />\Title: Debian -- Debian-Installer
News
[27 May 2023] Debian Installer Bookworm RC 4 release
[16 May 2023] Debian Installer Bookworm RC 3 release
Older news
Installing with the Debian-Installer
For official Debian 12.1 installation media and information, see the bookworm page.
All images linked below are for the version of Debian Installer being
developed for the next Debian release and will install Debian testing
(trixie
) by default.
To install Debian testing, we recommend you use the daily builds of the installer. The following images are available for daily builds:
Current daily snapshots
Notes
- An architecture can be (temporarily) omitted from the overview of daily built images if daily builds are not (reliably) available.
- For the installation images, verification files (SHA512SUMS and SHA256SUMS) are available in the same directory as the images.
- For downloading full CD and DVD images the use of jigdo is recommended.
- Only a limited number of images from the full DVD sets are available as ISO files for direct download. Most users do not need all of the software available on all the discs, so to save space on download servers and mirrors the full sets are only available via jigdo.
After using the Debian-Installer, please send us an installation report, even if there weren't any problems.
Documentation
If you read only one document before installing, read our Installation Howto, a quick walkthrough of the installation process. Other useful documentation includes:
- Installation Guide:
development version (testing)
—
latest version (Git)
detailed installation instructions - Debian-Installer FAQ
and Debian-CD FAQ
common questions and answers - Debian-Installer Wiki
community maintained documentation
Contacting us
The debian-boot mailing list is the main forum for discussion and work on Debian-Installer.
We also have an IRC channel, #debian-boot on irc.debian.org. This channel is used mainly for development, but occasionally for support. If you do not receive a response, try the mailing list instead.
