Skip to content

Add download links to the download page #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ snow: 0

plugins:
- jekyll-redirect-from

collections:
platforms:
output: true

download_mirror: https://alpha.de.repo.voidlinux.org/live/current
download_build_date: 2019-11-09
30 changes: 30 additions & 0 deletions _includes/download_arm.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<div class="split-section">
<div>
<h3 id="{{ page.name }}">{{ page.name }}</h3>
{{ include.content | markdownify }}
</div>
<div>
{% for device in page.devices %}
<div class="download-device-title">
<h4>{{ device }}</h4>
<small>{{ site.download_build_date }}</small>
</div>
<ul class="inline-download-links">
<li>
<a
href="{{ site.download_mirror }}/void-{{ device }}-ROOTFS-{{ site.download_build_date | date: '%Y%m%d' }}.tar.xz"
>rootfs tarball</a
>
<span class="label label-default">glibc</span>
</li>
<li>
<a
href="{{ site.download_mirror }}/void-{{ device }}-musl-ROOTFS-{{ site.download_build_date | date: '%Y%m%d' }}.tar.xz"
>rootfs tarball</a
>
<span class="label label-warning">musl</span>
</li>
</ul>
{% endfor %}
</div>
</div>
5 changes: 5 additions & 0 deletions _includes/download_details_pc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Installable live images support a local installation (with the included packages) or a network installation (packages are downloaded from official repository).

You can log into these images as `anon` or `root`, and the password is `voidlinux`.

To start the installer, execute the `void-installer` utility with appropriate permissions (i.e., `sudo void-installer`).
75 changes: 75 additions & 0 deletions _includes/download_pc.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<div class="split-section">
<div>
<h3 id="{{ page.name }}">{{ page.name }}</h3>
{{ include.content | markdownify }}
<div class="alert alert-warning" role="alert">
To install the packages for the desktop environment, DON'T choose "install
from network" choose the "local install" option.
</div>
</div>
<div>
<div class="download-device-title">
<h4>base</h4>
<small>{{ site.download_build_date }}</small>
</div>
<ul class="inline-download-links">
<li>
<a
href="{{ site.download_mirror }}/void-live-{{ page.name }}-{{ site.download_build_date | date: '%Y%m%d' }}.iso"
>Live image</a
>
<span class="label label-default">glibc</span>
</li>
{% if page.supports_musl %}
<li>
<a
href="{{ site.download_mirror }}/void-live-{{ page.name }}-musl-{{ site.download_build_date | date: '%Y%m%d' }}.iso"
>Live image</a
>
<span class="label label-warning">musl</span>
</li>
{% endif %}
<li>
<a
href="{{ site.download_mirror }}/void-{{ page.name }}-ROOTFS-{{ site.download_build_date | date: '%Y%m%d' }}.tar.xz"
>rootfs tarball</a
>
<span class="label label-default">glibc</span>
</li>
{% if page.supports_musl %}
<li>
<a
href="{{ site.download_mirror }}/void-{{ page.name }}-musl-ROOTFS-{{ site.download_build_date | date: '%Y%m%d' }}.tar.xz"
>rootfs tarball</a
>
<span class="label label-warning">musl</span>
</li>
{% endif %}
</ul>

{% for flavor in page.flavors %}
<div class="download-device-title">
<h4>{{ flavor | downcase }}</h4>
<small>{{ site.download_build_date }}</small>
</div>
<ul class="inline-download-links">
<li>
<a
href="{{ site.download_mirror }}/void-live-{{ page.name }}-{{ site.download_build_date | date: '%Y%m%d' }}-{{ flavor | downcase }}.iso"
>Live image</a
>
<span class="label label-default">glibc</span>
</li>
{% if page.supports_musl %}
<li>
<a
href="{{ site.download_mirror }}/void-live-{{ page.name }}-musl-{{ site.download_build_date | date: '%Y%m%d' }}-{{ flavor | downcase }}.iso"
>Live image</a
>
<span class="label label-warning">musl</span>
</li>
{% endif %}
</ul>
{% endfor %}
</div>
</div>
49 changes: 49 additions & 0 deletions _includes/download_sbc.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<div class="split-section">
<div>
<h3 id="{{ page.name }}">{{ page.name }}</h3>
{{ include.content | markdownify }}
</div>
<div>
{% for device in page.devices %}
<div class="download-device-title">
<h4>
{{ device.name }}
{% if device.arch %}
({{ device.arch }})
{% endif %}
</h4>
<small>{{ site.download_build_date }}</small>
</div>
<ul class="inline-download-links">
<li>
<a
href="{{ site.download_mirror }}/void-{{ device.name }}-{{ site.download_build_date | date: '%Y%m%d' }}.img.xz"
>Live image</a
>
<span class="label label-default">glibc</span>
</li>
<li>
<a
href="{{ site.download_mirror }}/void-{{ device.name }}-musl-{{ site.download_build_date | date: '%Y%m%d' }}.img.xz"
>Live image</a
>
<span class="label label-warning">musl</span>
</li>
<li>
<a
href="{{ site.download_mirror }}/void-{{ device.name }}-PLATFORMFS-{{ site.download_build_date | date: '%Y%m%d' }}.tar.xz"
>rootfs tarball</a
>
<span class="label label-default">glibc</span>
</li>
<li>
<a
href="{{ site.download_mirror }}/void-{{ device.name }}-musl-PLATFORMFS-{{ site.download_build_date | date: '%Y%m%d' }}.tar.xz"
>rootfs tarball</a
>
<span class="label label-warning">musl</span>
</li>
</ul>
{% endfor %}
</div>
</div>
1 change: 1 addition & 0 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<link rel="alternate" type="application/atom+xml" title="Atom feed" href="/atom.xml" />
<script src="/assets/js/jquery.min.js"></script>
<script src="/assets/js/bootstrap.min.js"></script>
<script src="/assets/js/tabbar.js"></script>
</head>
<body role="document">
<nav class="navbar navbar-default navbar-inverse navbar-fixed-top" role="navigation">
Expand Down
27 changes: 27 additions & 0 deletions _layouts/download.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
layout: default
---

<div class="container">
{{ content }}

<ul class="tab-bar" id="tab-bar">
{% for platform in site.platforms %}
<li>
<a href="#{{ platform.name }}">{{ platform.name }}</a>
</li>
{% endfor %}
</ul>

<div id="tab-content">
{% for platform in site.platforms %}
<div>
{{ platform.content }}
<noscript>
<hr />
</noscript>
</div>
{% endfor %}
</div>
<section id="tab-content"></section>
</div>
15 changes: 15 additions & 0 deletions _platforms/arm.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not entirely happy calling this arm when we have both specific dialects as well as platform filesystems. I'd almost rather split this section into two and have one that just talks about that you can get arbitrary rootfs tarballs, and another page that talks about SBCs and links to the relevant pages in the documentation.

This would also be nice as I'd like to add a tab for the various cloud platforms that Void supports.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have split ARM into 2 sections and sketched content for both, would appreciate a review on those.

re cloud images: I only see GCP tarball at https://alpha.de.repo.voidlinux.org/live/current/ , what other platforms we want to show on the downloads page?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both GCP and DigitalOcean are known to work and are some semblance of supported (Void itself has infrastructure running on DigitalOcean). For both though the images are not distributed by default, so just having a place to link back to the docs on how to generate the image on demand would be great.

name: arm
date: 1970-01-01 04:00:00
devices: [armv6l, armv7l, aarch64]
---

{% capture download_details %}
ROOTFS tarballs can be extracted to a previously prepared partition scheme or
used for chroot installation.

General and platform specific instructions are available [in the
documentation](https://docs.voidlinux.org/installation/guides/arm-devices/index.html).
{% endcapture %}

{% include download_arm.html content=download_details %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we are losing some of the information here, such as the link to the page about RPis in the handbook. I also wouldn't like to lose the device information for each board (like ARMv7, hard float we currently have). Not sure if it could fit inside this, though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have added arch back without hard float since all devices are hard float. I have removed a link to the RPI docs because the copy before it points to the related doc page (General and platform specific instructions for these images are available in the documentation.), I think this should be enough in this case. WDYT?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds great.

12 changes: 12 additions & 0 deletions _platforms/i686.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: i686
date: 1970-01-01 03:00:00
flavors: [enlightenment, cinnamon, lxde, lxqt, mate, xfce]
supports_musl: false
---

{% capture download_details %}
{% include download_details_pc.md %}
{% endcapture %}

{% include download_pc.html content=download_details %}
36 changes: 36 additions & 0 deletions _platforms/sbc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
---
name: arm platforms
date: 1970-01-01 05:00:00
devices:
- name: beaglebone
arch: armv7
- name: cubieboard2
arch: armv7
- name: odroid-c2
arch: armv7
- name: rpi
arch: armv6
- name: rpi2
arch: armv7
- name: rpi3
arch: aarch64
- name: usbarmory
arch: armv7
---

{% capture download_details %}
Live 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.

Connect to the system using a virtual terminal or SSH and log in as `root` with password `voidlinux`.

Platform specific instructions for these images are available [in the documentation](https://docs.voidlinux.org/installation/guides/arm-devices/platforms.html).

Deprecated instructions for the following platforms can be found in these wiki pages (you can help by porting them over to the [Void Handbook](https://github.com/void-linux/void-docs/blob/master/CONTRIBUTING.md)):

- [BeagleBone/BeagleBone Black](https://wiki.voidlinux.org/Beaglebone)
- [Cubieboard2](https://wiki.voidlinux.org/Cubieboard2_SD-Card)
- [Odroid U2/U3](https://wiki.voidlinux.org/Odroid_U2)
- [USB Armory](https://wiki.voidlinux.org/USB_Armory)
{% endcapture %}

{% include download_sbc.html content=download_details %}
12 changes: 12 additions & 0 deletions _platforms/x86_64.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: x86_64
date: 1970-01-01 01:00:00
flavors: [enlightenment, cinnamon, lxde, lxqt, mate, xfce]
supports_musl: true
---

{% capture download_details %}
{% include download_details_pc.md %}
{% endcapture %}

{% include download_pc.html content=download_details %}
88 changes: 88 additions & 0 deletions assets/css/misc.css
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,91 @@ h1[id], h2[id], h3[id], h4[id], h5[id], h6[id] {
background-color: black;
border-color: black;
}

.tab-bar {
list-style: none;
display: flex;
padding: 0;
margin: 0;
border-bottom: 1px solid #ddd;
}
.tab-bar li {
padding: 1em 2em;
cursor: pointer;
border-bottom: 2px solid white;
transition: border-color 0.4s;
}
.tab-bar li:hover {
border-bottom: 2px solid #ddd;
}
.tab-bar li.active {
font-weight: bold;
border-bottom: 2px solid #478061;
}
@media (max-width: 500px) {
.tab-bar li {
padding: 1em;
}
}
.tab-bar li a {
color: inherit;
}
.tab-bar li a:focus {
text-decoration: none;
}

.split-section {
display: flex;
flex-wrap: wrap;
}
.split-section h3 {
margin-top: 20px;
padding-top: 0;
}
.split-section > div {
flex: 1;
}
.split-section > div:first-of-type {
padding-right: 4rem;
}
@media (max-width: 600px) {
.split-section {
flex-direction: column;
}
.split-section > div:first-of-type {
padding-right: 0;
}
}

.download-device-title {
display: flex;
justify-content: space-between;
align-items: baseline;
}
.download-device-title h4 {
margin-top: 2rem;
}

.inline-download-links {
list-style: none;
display: flex;
flex-wrap: wrap;
margin: 0;
padding: 0;
border-bottom: 1px solid #ddd;
}
.inline-download-links:last-of-type {
border-bottom: none;
}
.inline-download-links li {
margin-right: 1.5em;
margin-bottom: 2rem;
}
.inline-download-links .label-warning {
background-color: #fdf6e3;
color: #535353;
}
.inline-download-links .label-default {
background-color: #ddd;
color: #535353;
}
Loading