Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--_includes/downloads/alpha.html1
-rw-r--r--_includes/downloads/amd64-advanced.html1
-rw-r--r--_includes/downloads/arm.html6
-rw-r--r--_includes/downloads/arm64-advanced.html1
-rw-r--r--_includes/downloads/hppa.html2
-rw-r--r--_includes/downloads/ia64.html1
-rw-r--r--_includes/downloads/loong.html1
-rw-r--r--_includes/downloads/m68k.html1
-rw-r--r--_includes/downloads/mips.html2
-rw-r--r--_includes/downloads/ppc.html8
-rw-r--r--_includes/downloads/riscv.html3
-rw-r--r--_includes/downloads/s390.html2
-rw-r--r--_includes/downloads/sparc.html2
-rw-r--r--_includes/downloads/x86.html1
14 files changed, 30 insertions, 2 deletions
diff --git a/_includes/downloads/alpha.html b/_includes/downloads/alpha.html
index 7ef09cb..fcda4f4 100644
--- a/_includes/downloads/alpha.html
+++ b/_includes/downloads/alpha.html
@@ -7,6 +7,7 @@
<div class="list-group">
{% include partials/download-link.html type="stage3" arch="alpha" id="alpha-openrc" title="Stage 3" tag="openrc" %}
{% include partials/download-link.html type="stage3" arch="alpha" id="alpha-systemd" title="Stage 3" tag="systemd" %}
+ {% include partials/download-link.html type="stage3" arch="alpha" id="alpha-systemd-mergedusr" title="Stage 3" tag="systemd | merged usr" %}
</div>
</div>
<div class="col-xs-12 col-md-6">
diff --git a/_includes/downloads/amd64-advanced.html b/_includes/downloads/amd64-advanced.html
index 7ca4326..f99d28e 100644
--- a/_includes/downloads/amd64-advanced.html
+++ b/_includes/downloads/amd64-advanced.html
@@ -11,6 +11,7 @@
{% include partials/download-link.html type="stage3" arch="amd64" id="amd64-openrc" title="Stage 3" tag="openrc" %}
{% include partials/download-link.html type="stage3" arch="amd64" id="amd64-desktop-openrc" title="Stage 3" tag="desktop profile | openrc" %}
{% include partials/download-link.html type="stage3" arch="amd64" id="amd64-systemd" title="Stage 3" tag="systemd" %}
+ {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-systemd-mergedusr" title="Stage 3" tag="systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="amd64" id="amd64-desktop-systemd" title="Stage 3" tag="desktop profile | systemd" %}
{% include partials/download-link.html type="stage3" arch="amd64" id="amd64-nomultilib-openrc" title="Stage 3" tag="no multilib | openrc" %}
{% include partials/download-link.html type="stage3" arch="amd64" id="amd64-nomultilib-systemd" title="Stage 3" tag="no multilib | systemd" %}
diff --git a/_includes/downloads/arm.html b/_includes/downloads/arm.html
index 7fa1482..dec87ed 100644
--- a/_includes/downloads/arm.html
+++ b/_includes/downloads/arm.html
@@ -3,16 +3,22 @@
<div class="list-group">
{% include partials/download-link.html type="stage3" arch="arm" id="armv4tl-openrc" title="Stage 3" tag="ARMv4tl | openrc" %}
{% include partials/download-link.html type="stage3" arch="arm" id="armv4tl-systemd" title="Stage 3" tag="ARMv4tl | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="arm" id="armv4tl-systemd-mergedusr" title="Stage 3" tag="ARMv4tl | systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="arm" id="armv5tel-openrc" title="Stage 3" tag="ARMv5tel | openrc" %}
{% include partials/download-link.html type="stage3" arch="arm" id="armv5tel-systemd" title="Stage 3" tag="ARMv5tel | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="arm" id="armv5tel-systemd-mergedusr" title="Stage 3" tag="ARMv5tel | systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="arm" id="armv6j-openrc" title="Stage 3" tag="ARMv6j | openrc" %}
{% include partials/download-link.html type="stage3" arch="arm" id="armv6j-systemd" title="Stage 3" tag="ARMv6j | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="arm" id="armv6j-systemd-mergedusr" title="Stage 3" tag="ARMv6j | systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="arm" id="armv6j_hardfp-openrc" title="Stage 3" tag="ARMv6j | HardFP | openrc" %}
{% include partials/download-link.html type="stage3" arch="arm" id="armv6j_hardfp-systemd" title="Stage 3" tag="ARMv6j | HardFP | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="arm" id="armv6j_hardfp-systemd-mergedusr" title="Stage 3" tag="ARMv6j | HardFP | systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="arm" id="armv7a-openrc" title="Stage 3" tag="ARMv7a | openrc" %}
{% include partials/download-link.html type="stage3" arch="arm" id="armv7a-systemd" title="Stage 3" tag="ARMv7a | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="arm" id="armv7a-systemd-mergedusr" title="Stage 3" tag="ARMv7a | systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="arm" id="armv7a_hardfp-openrc" title="Stage 3" tag="ARMv7a | HardFP | openrc" %}
{% include partials/download-link.html type="stage3" arch="arm" id="armv7a_hardfp-systemd" title="Stage 3" tag="ARMv7a | HardFP | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="arm" id="armv7a_hardfp-systemd-mergedusr" title="Stage 3" tag="ARMv7a | HardFP | systemd | merged usr" %}
</div>
</div>
<div class="col-xs-12 col-md-6">
diff --git a/_includes/downloads/arm64-advanced.html b/_includes/downloads/arm64-advanced.html
index 4089c69..fcb79c2 100644
--- a/_includes/downloads/arm64-advanced.html
+++ b/_includes/downloads/arm64-advanced.html
@@ -9,6 +9,7 @@
{% include partials/download-link.html type="stage3" arch="arm64" id="arm64-openrc" title="Stage 3" tag="openrc" %}
{% include partials/download-link.html type="stage3" arch="arm64" id="arm64-desktop-openrc" title="Stage 3" tag="desktop profile | openrc" %}
{% include partials/download-link.html type="stage3" arch="arm64" id="arm64-systemd" title="Stage 3" tag="systemd" %}
+ {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-systemd-mergedusr" title="Stage 3" tag="systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="arm64" id="arm64-desktop-systemd" title="Stage 3" tag="desktop profile | systemd" %}
{% include partials/download-link.html type="stage3" arch="arm64" id="arm64-llvm-openrc" title="Stage 3" tag="llvm | openrc" %}
{% include partials/download-link.html type="stage3" arch="arm64" id="arm64-llvm-systemd" title="Stage 3" tag="llvm | systemd" %}
diff --git a/_includes/downloads/hppa.html b/_includes/downloads/hppa.html
index b225ef7..eccd6b6 100644
--- a/_includes/downloads/hppa.html
+++ b/_includes/downloads/hppa.html
@@ -9,8 +9,10 @@
<div class="list-group">
{% include partials/download-link.html type="stage3" arch="hppa" id="hppa1.1-openrc" title="Stage 3" tag="HPPA 1.1 | openrc" %}
{% include partials/download-link.html type="stage3" arch="hppa" id="hppa1.1-systemd" title="Stage 3" tag="HPPA 1.1 | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="hppa" id="hppa1.1-systemd-mergedusr" title="Stage 3" tag="HPPA 1.1 | systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="hppa" id="hppa2.0-openrc" title="Stage 3" tag="HPPA 2.0 | openrc" %}
{% include partials/download-link.html type="stage3" arch="hppa" id="hppa2.0-systemd" title="Stage 3" tag="HPPA 2.0 | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="hppa" id="hppa2.0-systemd-mergedusr" title="Stage 3" tag="HPPA 2.0 | systemd | merged usr" %}
</div>
</div>
<div class="col-xs-12 col-md-6">
diff --git a/_includes/downloads/ia64.html b/_includes/downloads/ia64.html
index e9b36c0..aea4fa7 100644
--- a/_includes/downloads/ia64.html
+++ b/_includes/downloads/ia64.html
@@ -7,6 +7,7 @@
<div class="list-group">
{% include partials/download-link.html type="stage3" arch="ia64" id="ia64-openrc" title="Stage 3" tag="openrc" %}
{% include partials/download-link.html type="stage3" arch="ia64" id="ia64-systemd" title="Stage 3" tag="systemd" %}
+ {% include partials/download-link.html type="stage3" arch="ia64" id="ia64-systemd-mergedusr" title="Stage 3" tag="systemd | merged usr" %}
</div>
</div>
<div class="col-xs-12 col-md-6">
diff --git a/_includes/downloads/loong.html b/_includes/downloads/loong.html
index 97adecb..e337c0f 100644
--- a/_includes/downloads/loong.html
+++ b/_includes/downloads/loong.html
@@ -3,6 +3,7 @@
<div class="list-group">
{% include partials/download-link.html type="stage3" arch="loong" id="loong-openrc" title="Stage 3" tag="openrc" %}
{% include partials/download-link.html type="stage3" arch="loong" id="loong-systemd" title="Stage 3" tag="systemd" %}
+ {% include partials/download-link.html type="stage3" arch="loong" id="loong-systemd-mergedusr" title="Stage 3" tag="systemd | merged usr" %}
</div>
</div>
<div class="col-xs-12 col-md-6">
diff --git a/_includes/downloads/m68k.html b/_includes/downloads/m68k.html
index b47a657..849d026 100644
--- a/_includes/downloads/m68k.html
+++ b/_includes/downloads/m68k.html
@@ -3,6 +3,7 @@
<div class="list-group">
{% include partials/download-link.html type="stage3" arch="m68k" id="m68k-openrc" title="Stage 3" tag="openrc" %}
{% include partials/download-link.html type="stage3" arch="m68k" id="m68k-systemd" title="Stage 3" tag="systemd" %}
+ {% include partials/download-link.html type="stage3" arch="m68k" id="m68k-systemd-mergedusr" title="Stage 3" tag="systemd | merged usr" %}
</div>
</div>
<div class="col-xs-12 col-md-6">
diff --git a/_includes/downloads/mips.html b/_includes/downloads/mips.html
index a3b2a00..4051aed 100644
--- a/_includes/downloads/mips.html
+++ b/_includes/downloads/mips.html
@@ -38,8 +38,10 @@
<div class="list-group">
{% include partials/download-link.html type="stage3" arch="mips" id="mipsel3_n64-openrc" title="Stage 3" tag="mips3 | n64 | el | openrc" %}
{% include partials/download-link.html type="stage3" arch="mips" id="mipsel3_n64-systemd" title="Stage 3" tag="mips3 | n64 | el | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="mips" id="mipsel3_n64-systemd-mergedusr" title="Stage 3" tag="mips3 | n64 | el | systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="mips" id="mips64el_n64-openrc" title="Stage 3" tag="mips64 | n64 | el | openrc" %}
{% include partials/download-link.html type="stage3" arch="mips" id="mips64el_n64-systemd" title="Stage 3" tag="mips64 | n64 | el | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="mips" id="mips64el_n64-systemd-mergedusr" title="Stage 3" tag="mips64 | n64 | el | systemd | merged usr" %}
</div>
<h4>Stage archives, big-endian multilib</h4>
diff --git a/_includes/downloads/ppc.html b/_includes/downloads/ppc.html
index 9ff33c7..56a5f40 100644
--- a/_includes/downloads/ppc.html
+++ b/_includes/downloads/ppc.html
@@ -8,12 +8,16 @@
<div class="list-group">
{% include partials/download-link.html type="stage3" arch="ppc" id="ppc-openrc" title="PPC stage 3" tag="openrc" %}
{% include partials/download-link.html type="stage3" arch="ppc" id="ppc-systemd" title="PPC stage 3" tag="systemd" %}
+ {% include partials/download-link.html type="stage3" arch="ppc" id="ppc-systemd-mergedusr" title="PPC stage 3" tag="systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="ppc" id="ppc64-openrc" title="PPC64 stage 3" tag="openrc" %}
{% include partials/download-link.html type="stage3" arch="ppc" id="ppc64-systemd" title="PPC64 stage 3" tag="systemd" %}
+ {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64-systemd-mergedusr" title="PPC64 stage 3" tag="systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="ppc" id="ppc64le-openrc" title="PPC64LE stage 3" tag="openrc" %}
{% include partials/download-link.html type="stage3" arch="ppc" id="ppc64le-systemd" title="PPC64LE stage 3" tag="systemd" %}
- {% include partials/download-link.html type="stage3" arch="ppc" id="power9le-openrc" title="PPC64LE stage 3" tag="openrc | power9" %}
- {% include partials/download-link.html type="stage3" arch="ppc" id="power9le-systemd" title="PPC64LE stage 3" tag="systemd | power9" %}
+ {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64le-systemd-mergedusr" title="PPC64LE stage 3" tag="systemd | merged usr" %}
+ {% include partials/download-link.html type="stage3" arch="ppc" id="power9le-openrc" title="PPC64LE stage 3" tag="power9 | openrc" %}
+ {% include partials/download-link.html type="stage3" arch="ppc" id="power9le-systemd" title="PPC64LE stage 3" tag="power9 | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="ppc" id="power9le-systemd-mergedusr" title="PPC64LE stage 3" tag="power9 | systemd | merged usr" %}
</div>
<h4>Details (contents, hashes, and signatures)</h4>
diff --git a/_includes/downloads/riscv.html b/_includes/downloads/riscv.html
index d70ce37..747f238 100644
--- a/_includes/downloads/riscv.html
+++ b/_includes/downloads/riscv.html
@@ -3,14 +3,17 @@
<div class="list-group">
{% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64d-openrc" title="Stage 3" tag="lp64d | openrc" %}
{% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64d-systemd" title="Stage 3" tag="lp64d | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64d-systemd-mergedusr" title="Stage 3" tag="lp64d | systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64-openrc" title="Stage 3" tag="lp64 | openrc" %}
{% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64-systemd" title="Stage 3" tag="lp64 | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_lp64-systemd-mergedusr" title="Stage 3" tag="lp64 | systemd | merged usr" %}
</div>
<h4>Experimental multilib stage archives</h4>
<div class="list-group">
{% include partials/download-link.html type="stage3" arch="riscv" id="rv64_multilib-openrc" title="Stage 3" tag="multilib | openrc" %}
{% include partials/download-link.html type="stage3" arch="riscv" id="rv64_multilib-systemd" title="Stage 3" tag="multilib | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="riscv" id="rv64_multilib-systemd-mergedusr" title="Stage 3" tag="multilib | systemd | merged usr" %}
</div>
<h4>Processor compatibility</h4>
diff --git a/_includes/downloads/s390.html b/_includes/downloads/s390.html
index d235091..5bed9dc 100644
--- a/_includes/downloads/s390.html
+++ b/_includes/downloads/s390.html
@@ -3,8 +3,10 @@
<div class="list-group">
{% include partials/download-link.html type="stage3" arch="s390" id="s390-openrc" title="Stage 3" tag="s390 | openrc" %}
{% include partials/download-link.html type="stage3" arch="s390" id="s390-systemd" title="Stage 3" tag="s390 | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="s390" id="s390-systemd-mergedusr" title="Stage 3" tag="s390 | systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="s390" id="s390x-openrc" title="Stage 3" tag="s390x | openrc" %}
{% include partials/download-link.html type="stage3" arch="s390" id="s390x-systemd" title="Stage 3" tag="s390x | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="s390" id="s390x-systemd-mergedusr" title="Stage 3" tag="s390x | systemd | merged usr" %}
</div>
<h4>Boot media</h4>
diff --git a/_includes/downloads/sparc.html b/_includes/downloads/sparc.html
index 6da7cf4..e8e45ea 100644
--- a/_includes/downloads/sparc.html
+++ b/_includes/downloads/sparc.html
@@ -7,8 +7,10 @@
<div class="list-group">
{% include partials/download-link.html type="stage3" arch="sparc" id="sparc64" title="Stage 3 (64-bit userland)" tag="openrc" %}
{% include partials/download-link.html type="stage3" arch="sparc" id="sparc64-systemd" title="Stage 3 (64-bit userland)" tag="systemd" %}
+ {% include partials/download-link.html type="stage3" arch="sparc" id="sparc64-systemd-mergedusr" title="Stage 3 (64-bit userland)" tag="systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="sparc" id="sparc" title="Stage 3 (32-bit userland)" tag="openrc" %}
{% include partials/download-link.html type="stage3" arch="sparc" id="sparc-systemd" title="Stage 3 (32-bit userland)" tag="systemd" %}
+ {% include partials/download-link.html type="stage3" arch="sparc" id="sparc-systemd-mergedusr" title="Stage 3 (32-bit userland)" tag="systemd | merged usr" %}
</div>
</div>
<div class="col-xs-12 col-md-6">
diff --git a/_includes/downloads/x86.html b/_includes/downloads/x86.html
index 8aa4b11..f973ddd 100644
--- a/_includes/downloads/x86.html
+++ b/_includes/downloads/x86.html
@@ -9,6 +9,7 @@
<div class="list-group">
{% include partials/download-link.html type="stage3" arch="x86" id="i686-openrc" title="Stage 3" tag="i686 | openrc" %}
{% include partials/download-link.html type="stage3" arch="x86" id="i686-systemd" title="Stage 3" tag="i686 | systemd" %}
+ {% include partials/download-link.html type="stage3" arch="x86" id="i686-systemd-mergedusr" title="Stage 3" tag="i686 | systemd | merged usr" %}
{% include partials/download-link.html type="stage3" arch="x86" id="i486-openrc" title="Stage 3" tag="i486 | openrc" %}
</div>