Skip to content

Commit 28d43f7

Browse files
committed
Use jammy distro
1 parent e513740 commit 28d43f7

File tree

4 files changed

+29
-12
lines changed

4 files changed

+29
-12
lines changed

stage0/00-bootstrap/multistrap.conf

+11-10
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,32 @@ cleanup=true
55
noauth=false
66
explicitsuite=false
77
unpack=true
8-
debootstrap=Focal Focal-Updates Fictionlab
9-
aptsources=Focal Focal-Updates Fictionlab
8+
debootstrap=Jammy Jammy-Updates Fictionlab
9+
aptsources=Jammy Jammy-Updates Fictionlab
1010

11-
[Focal]
11+
[Jammy]
1212
source=http://ports.ubuntu.com/ubuntu-ports
1313
keyring=ubuntu-keyring
14-
suite=focal
14+
suite=jammy
1515
components=main restricted multiverse universe
1616

17-
[Focal-Updates]
17+
[Jammy-Updates]
1818
source=http://ports.ubuntu.com/ubuntu-ports
19-
suite=focal-updates
19+
suite=jammy-updates
2020
components=main restricted multiverse universe
2121

2222
[Fictionlab]
2323
source=http://files.fictionlab.pl/repo
2424
keyring=fictionlab-archive-keyring
25-
suite=focal
25+
suite=jammy
2626
components=main
2727

2828
# Base packages
29-
packages=adduser apt apt-utils bzip2 console-setup debconf debconf-i18n e2fsprogs init iproute2
29+
packages=adduser apt apt-utils console-setup debconf debconf-i18n e2fsprogs init iproute2
3030
packages=iputils-ping kbd kmod less locales lsb-release mount netbase netplan.io passwd procps
3131
packages=python3 sensible-utils sudo tzdata udev whiptail
3232

3333
# RPi specific
34-
packages=linux-raspi2 u-boot-tools u-boot-rpi-silent
35-
packages=libraspberrypi-bin libraspberrypi-dev
34+
packages=linux-raspi linux-modules-extra-raspi
35+
packages=flash-kernel u-boot-tools u-boot-rpi-silent
36+
packages=libraspberrypi-bin libraspberrypi-dev rpi-eeprom
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# This patch should be removed once this MR is merged:
2+
# https://salsa.debian.org/installer-team/flash-kernel/-/merge_requests/33
3+
# and available in jammy package archive
4+
--- a/rootfs/usr/share/flash-kernel/functions
5+
+++ b/rootfs/usr/share/flash-kernel/functions
6+
@@ -1017,8 +1017,8 @@ if [ -L "$kfile" ]; then
7+
kfile=$(readlink -e "$kfile")
8+
fi
9+
10+
-if [ -d /sys/firmware/efi ]; then
11+
- # skipping when detect EFI
12+
+if ! ischroot && [ -d /sys/firmware/efi ]; then
13+
+ # skipping when detect EFI and we are not running inside a chroot
14+
echo "System running in EFI mode, skipping."
15+
exit 0
16+
fi

stage0/01-configure/00-patches/series

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
00-fix-flash-kernel.patch

stage0/02-boot-files/01-packages

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# These packages need to be installed manually after the multistrap procedure
22
# to properly set diversions for binaries present in the linux-firmware package
3-
linux-firmware-raspi2
4-
rpi-eeprom
3+
linux-firmware-raspi

0 commit comments

Comments
 (0)