Skip to content

Commit 1792621

Browse files
Merge #1095
1095: Change Linux kernel versions from 5.x to 6.x for certain targets. r=Emilgardis a=Alexhuszagh Closes #1094. Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>
2 parents e23ef05 + 96531d9 commit 1792621

File tree

3 files changed

+33
-22
lines changed

3 files changed

+33
-22
lines changed

.changes/591-1095.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[
2+
{
3+
"description": "update Ubuntu images to 20.04 LTS.",
4+
"type": "changed",
5+
"breaking": true,
6+
"issues": [417, 517, 556, 616]
7+
},
8+
{
9+
"description": "remove Linux image from `mips-unknown-linux-gnu`.",
10+
"type": "removed",
11+
"breaking": true
12+
},
13+
{
14+
"type": "changed",
15+
"description": "upgraded most linux images to use a 5.x kernel instead of a 4.x kernel.",
16+
"breaking": true
17+
},
18+
{
19+
"type": "changed",
20+
"description": "updated powerpc64, riscv64, and sparc64 *-linux-gnu images to use a 6.x kernel instead of a 4.x kernel.",
21+
"breaking": true,
22+
"issues": [1094]
23+
}
24+
]

.changes/591.json

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

docker/linux-image.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ main() {
7878
;;
7979
armv7)
8080
arch=armhf
81-
kernel="5.*-armmp"
81+
kernel='5.*-armmp'
8282
deps=(libcrypt1:"${arch}")
8383
;;
8484
i686)
@@ -91,15 +91,15 @@ main() {
9191
libgcc="libgcc1"
9292
debsource="deb http://http.debian.net/debian/ buster main"
9393
debsource="${debsource}\ndeb http://security.debian.org/ buster/updates main"
94-
kernel="4.*-4kc-malta"
94+
kernel='4.*-4kc-malta'
9595
ncurses="=6.1*"
9696
;;
9797
mipsel)
98-
kernel="5.*-4kc-malta"
98+
kernel='5.*-4kc-malta'
9999
deps=(libcrypt1:"${arch}")
100100
;;
101101
mips64el)
102-
kernel="5.*-5kc-malta"
102+
kernel='5.*-5kc-malta'
103103
deps=(libcrypt1:"${arch}")
104104
;;
105105
powerpc)
@@ -123,32 +123,32 @@ main() {
123123
# there is no stable port
124124
arch=ppc64
125125
# https://packages.debian.org/en/sid/linux-image-powerpc64
126-
kernel='5.*-powerpc64'
126+
kernel='6.*-powerpc64'
127127
debsource="deb http://ftp.ports.debian.org/debian-ports unstable main"
128128
debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main"
129129
# sid version of dropbear requires these dependencies
130130
deps=(libcrypt1:"${arch}")
131131
;;
132132
powerpc64le)
133133
arch=ppc64el
134-
kernel="5.*-powerpc64le"
134+
kernel='5.*-powerpc64le'
135135
deps=(libcrypt1:"${arch}")
136136
;;
137137
riscv64)
138-
kernel="5.*-riscv64"
138+
kernel='6.*-riscv64'
139139
debsource="deb http://ftp.ports.debian.org/debian-ports unstable main"
140140
debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main"
141141
deps=(libcrypt1:"${arch}")
142142
;;
143143
s390x)
144144
arch=s390x
145-
kernel="5.*-s390x"
145+
kernel='5.*-s390x'
146146
deps=(libcrypt1:"${arch}")
147147
;;
148148
sparc64)
149149
# there is no stable port
150150
# https://packages.debian.org/en/sid/linux-image-sparc64
151-
kernel='5.*-sparc64'
151+
kernel='6.*-sparc64'
152152
debsource="deb http://ftp.ports.debian.org/debian-ports unstable main"
153153
debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main"
154154
# sid version of dropbear requires these dependencies

0 commit comments

Comments
 (0)