Skip to content

Commit 8f31f71

Browse files
classabbyampthe-maldridge
authored andcommitted
_platforms, _includes: update download page
- include aarch64 and asahi live ISOs - reorder arm pages so aarch64 stuff is as the top (probably more looked for by users) - consistent naming of platform images - rename page fragments from sbc to arm platforms, as that's more accurate - update docs links - consistent caps of download links
1 parent 158fc20 commit 8f31f71

File tree

7 files changed

+86
-28
lines changed

7 files changed

+86
-28
lines changed

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ defaults:
2626

2727
download_mirror: https://repo-default.voidlinux.org/live/current
2828
download_build_date: 2024-03-14
29-
container_url: https://github.com/void-linux/void-containers/pkgs/container/
29+
container_url: https://github.com/void-linux/void-containers/pkgs/container

_includes/download_arm.html

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,38 @@ <h3 id="{{ page.name }}">{{ page.name }}</h3>
66
<div>
77
{% for device in page.devices %}
88
<div class="download-device-title">
9-
<h4>{{ device }}</h4>
9+
<h4>{{ device.name }}</h4>
1010
<small>{{ site.download_build_date }}</small>
1111
</div>
1212
<ul class="inline-download-links">
13+
{% if device.name == "aarch64" %}
14+
{% for flavor in device.flavors %}
1315
<li>
1416
<a
15-
href="{{ site.download_mirror }}/void-{{ device }}-ROOTFS-{{ site.download_build_date | date: '%Y%m%d' }}.tar.xz"
17+
href="{{ site.download_mirror }}/void-live-{{ device.name }}-{{ site.download_build_date | date: '%Y%m%d' }}-{{ flavor | downcase }}.iso"
18+
>live image ({{ flavor | downcase }})</a
19+
>
20+
<span class="label label-default">glibc</span>
21+
</li>
22+
<li>
23+
<a
24+
href="{{ site.download_mirror }}/void-live-{{ device.name }}-musl-{{ site.download_build_date | date: '%Y%m%d' }}-{{ flavor | downcase }}.iso"
25+
>live image ({{ flavor | downcase }})</a
26+
>
27+
<span class="label label-warning">musl</span>
28+
</li>
29+
{% endfor %}
30+
{% endif %}
31+
<li>
32+
<a
33+
href="{{ site.download_mirror }}/void-{{ device.name }}-ROOTFS-{{ site.download_build_date | date: '%Y%m%d' }}.tar.xz"
1634
>rootfs tarball</a
1735
>
1836
<span class="label label-default">glibc</span>
1937
</li>
2038
<li>
2139
<a
22-
href="{{ site.download_mirror }}/void-{{ device }}-musl-ROOTFS-{{ site.download_build_date | date: '%Y%m%d' }}.tar.xz"
40+
href="{{ site.download_mirror }}/void-{{ device.name }}-musl-ROOTFS-{{ site.download_build_date | date: '%Y%m%d' }}.tar.xz"
2341
>rootfs tarball</a
2442
>
2543
<span class="label label-warning">musl</span>

_includes/download_sbc.html renamed to _includes/download_arm_platforms.html

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,35 @@ <h4>
1515
<small>{{ site.download_build_date }}</small>
1616
</div>
1717
<ul class="inline-download-links">
18+
{% if device.arch == "asahi" %}
19+
{% for flavor in device.flavors %}
20+
<li>
21+
<a
22+
href="{{ site.download_mirror }}/void-live-{{ device.arch }}-{{ site.download_build_date | date: '%Y%m%d' }}-{{ flavor | downcase }}.iso"
23+
>live image ({{ flavor | downcase }})</a
24+
>
25+
<span class="label label-default">glibc</span>
26+
</li>
27+
<li>
28+
<a
29+
href="{{ site.download_mirror }}/void-live-{{ device.arch }}-musl-{{ site.download_build_date | date: '%Y%m%d' }}-{{ flavor | downcase }}.iso"
30+
>live image ({{ flavor | downcase }})</a
31+
>
32+
<span class="label label-warning">musl</span>
33+
</li>
34+
{% endfor %}
35+
{% else %}
1836
<li>
1937
<a
2038
href="{{ site.download_mirror }}/void-{{ device.name }}-{{ site.download_build_date | date: '%Y%m%d' }}.img.xz"
21-
>Live image</a
39+
>platform image</a
2240
>
2341
<span class="label label-default">glibc</span>
2442
</li>
2543
<li>
2644
<a
2745
href="{{ site.download_mirror }}/void-{{ device.name }}-musl-{{ site.download_build_date | date: '%Y%m%d' }}.img.xz"
28-
>Live image</a
46+
>platform image</a
2947
>
3048
<span class="label label-warning">musl</span>
3149
</li>
@@ -43,6 +61,7 @@ <h4>
4361
>
4462
<span class="label label-warning">musl</span>
4563
</li>
64+
{% endif %}
4665
</ul>
4766
{% endfor %}
4867
</div>

_includes/download_pc.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ <h4>{{ flavor | downcase }}</h4>
1717
<li>
1818
<a
1919
href="{{ site.download_mirror }}/void-live-{{ page.name }}-{{ site.download_build_date | date: '%Y%m%d' }}-{{ flavor | downcase }}.iso"
20-
>Live image</a
20+
>live image</a
2121
>
2222
<span class="label label-default">glibc</span>
2323
</li>
2424
{% if page.supports_musl %}
2525
<li>
2626
<a
2727
href="{{ site.download_mirror }}/void-live-{{ page.name }}-musl-{{ site.download_build_date | date: '%Y%m%d' }}-{{ flavor | downcase }}.iso"
28-
>Live image</a
28+
>live image</a
2929
>
3030
<span class="label label-warning">musl</span>
3131
</li>

_platforms/arm-platforms.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
name: arm platforms
3+
date: 1970-01-01 05:00:00
4+
devices:
5+
- name: apple silicon
6+
arch: asahi
7+
flavors: [base, xfce]
8+
- name: rpi-aarch64
9+
- name: rpi-armv7l
10+
- name: rpi-armv6l
11+
---
12+
13+
{% capture download_details %}
14+
Platform images can be written onto an SD card (i.e. using `dd`) and they provide you with a ready to boot system. These images are prepared for 2GB SD cards. Alternatively, use the ROOTFS tarballs if you want to customize the partitions and filesystems.
15+
16+
Connect to the system using a virtual terminal or SSH and log in as `root` with password `voidlinux`.
17+
18+
Platform specific instructions for these images are available [in the documentation](https://docs.voidlinux.org/installation/guides/arm-devices/index.html).
19+
20+
Live ISOs are available for Apple Silicon devices. `void-installer` is not supported in these images.
21+
You can log into these images as `anon` or `root`, and the password is `voidlinux`.
22+
23+
In addition to the plain command line image, there is a graphical flavor with the XFCE desktop environment.
24+
Other graphical environments are fully supported by Void Linux, but are not offered as demonstration/installation
25+
images, in order to decrease the overhead involved with testing.
26+
{% endcapture %}
27+
28+
{% include download_arm_platforms.html content=download_details %}

_platforms/arm.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
---
22
name: arm
33
date: 1970-01-01 04:00:00
4-
devices: [armv6l, armv7l, aarch64]
4+
devices:
5+
- name: aarch64
6+
flavors: [base, xfce]
7+
- name: armv7l
8+
- name: armv6l
59
---
610

7-
{% capture download_details %}
11+
{% capture download_details %}
12+
Live ISOs are available for UEFI-supporting devices. `void-installer` is not supported in these images.
13+
You can log into these images as `anon` or `root`, and the password is `voidlinux`.
14+
15+
In addition to the plain command line image, there is a graphical flavor with the XFCE desktop environment.
16+
Other graphical environments are fully supported by Void Linux, but are not offered as demonstration/installation
17+
images, in order to decrease the overhead involved with testing.
18+
819
ROOTFS tarballs can be extracted to a previously prepared partition scheme or
920
used for chroot installation.
1021

_platforms/sbc.md

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)