22.04 setup

boards/default/distros/ubuntu/Makefile

@@ -1,12 +1,11 @@
-RAWURL=https://cdimage.ubuntu.com/releases/20.04.5/release/ubuntu-20.04.5-preinstalled-server-riscv64+unmatched.img.xz
+RAWURL=https://cdimage.ubuntu.com/releases/22.04.4/release/ubuntu-22.04.4-preinstalled-server-riscv64+unmatched.img.xz
 COMPIMG=rootfs.img.xz
 NEWIMG=rootfs.img
 
 # Extract root partition without partition table
 # NOTE: Offset must be adjusted for different base image
 $(NEWIMG): $(COMPIMG)
-	xzcat -k $(COMPIMG) | dd of=$(NEWIMG) bs=512 skip=235554
-
+	xzcat -k $(COMPIMG) | dd of=$(NEWIMG) bs=512 skip=235520
 $(COMPIMG):
 	curl $(RAWURL) -o $(COMPIMG)
 

boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20apt-esm-hook.conf

@@ -1,15 +1,7 @@
-APT::Update::Post-Invoke-Stats {
-	"[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook post-invoke-stats || true";
+APT::Update::Pre-Invoke {
+	"[ ! -e /run/systemd/system ] || [ $(id -u) -ne 0 ] || systemctl start --no-block apt-news.service esm-cache.service || true";
 };
 
-APT::Install::Post-Invoke-Success {
-	"[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook post-invoke-success || true";
-}; 
-
-APT::Install::Pre-Invoke {
-	"[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook pre-invoke || true";
-};
-
-AptCli::Hooks::Upgrade {
+binary::apt::AptCli::Hooks::Upgrade {
 	"[ ! -f /usr/lib/ubuntu-advantage/apt-esm-json-hook ] || /usr/lib/ubuntu-advantage/apt-esm-json-hook || true";
 };

boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/20snapd.conf

@@ -0,0 +1 @@
+binary::apt::AptCli::Hooks::Install { "[ ! -f /usr/bin/snap ] || /usr/bin/snap advise-snap --from-apt 2>/dev/null || true"; };

boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/50unattended-upgrades

@@ -129,3 +129,15 @@ Unattended-Upgrade::DevRelease "auto";
 
 // Allow package downgrade if Pin-Priority exceeds 1000
 // Unattended-Upgrade::Allow-downgrade "false";
+
+// When APT fails to mark a package to be upgraded or installed try adjusting
+// candidates of related packages to help APT's resolver in finding a solution
+// where the package can be upgraded or installed.
+// This is a workaround until APT's resolver is fixed to always find a
+// solution if it exists. (See Debian bug #711128.)
+// The fallback is enabled by default, except on Debian's sid release because
+// uninstallable packages are frequent there.
+// Disabling the fallback speeds up unattended-upgrades when there are
+// uninstallable packages at the expense of rarely keeping back packages which
+// could be upgraded or installed.
+// Unattended-Upgrade::Allow-APT-Mark-Fallback "true";

boards/default/distros/ubuntu/overlay/etc/apt/apt.conf.d/99needrestart

@@ -0,0 +1,8 @@
+# needrestart - Restart daemons after library updates.
+#
+# Call needrestart after package upgrades/installations and check
+# for pending service restarts. Should only be triggered if there
+# was no error during installation.
+#
+
+DPkg::Post-Invoke {"test -x /usr/lib/needrestart/apt-pinvoke && /usr/lib/needrestart/apt-pinvoke || true"; };

boards/default/distros/ubuntu/overlay/etc/apt/sources.list

@@ -8,54 +8,43 @@
 
 # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
 # newer versions of the distribution.
-deb http://ports.ubuntu.com/ubuntu-ports focal main restricted
-# deb-src http://ports.ubuntu.com/ubuntu-ports focal main restricted
+deb http://ports.ubuntu.com/ubuntu-ports jammy main restricted
+# deb-src http://ports.ubuntu.com/ubuntu-ports jammy main restricted
 
 ## Major bug fix updates produced after the final release of the
 ## distribution.
-deb http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted
-# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted
+deb http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted
+# deb-src http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team. Also, please note that software in universe WILL NOT receive any
 ## review or updates from the Ubuntu security team.
-deb http://ports.ubuntu.com/ubuntu-ports focal universe
-# deb-src http://ports.ubuntu.com/ubuntu-ports focal universe
-deb http://ports.ubuntu.com/ubuntu-ports focal-updates universe
-# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates universe
+deb http://ports.ubuntu.com/ubuntu-ports jammy universe
+# deb-src http://ports.ubuntu.com/ubuntu-ports jammy universe
+deb http://ports.ubuntu.com/ubuntu-ports jammy-updates universe
+# deb-src http://ports.ubuntu.com/ubuntu-ports jammy-updates universe
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team, and may not be under a free licence. Please satisfy yourself as to
 ## your rights to use the software. Also, please note that software in
 ## multiverse WILL NOT receive any review or updates from the Ubuntu
 ## security team.
-deb http://ports.ubuntu.com/ubuntu-ports focal multiverse
-# deb-src http://ports.ubuntu.com/ubuntu-ports focal multiverse
-deb http://ports.ubuntu.com/ubuntu-ports focal-updates multiverse
-# deb-src http://ports.ubuntu.com/ubuntu-ports focal-updates multiverse
+deb http://ports.ubuntu.com/ubuntu-ports jammy multiverse
+# deb-src http://ports.ubuntu.com/ubuntu-ports jammy multiverse
+deb http://ports.ubuntu.com/ubuntu-ports jammy-updates multiverse
+# deb-src http://ports.ubuntu.com/ubuntu-ports jammy-updates multiverse
 
 ## N.B. software from this repository may not have been tested as
 ## extensively as that contained in the main release, although it includes
 ## newer versions of some applications which may provide useful features.
 ## Also, please note that software in backports WILL NOT receive any review
 ## or updates from the Ubuntu security team.
-deb http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse
-# deb-src http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse
+deb http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse
+# deb-src http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse
 
-## Uncomment the following two lines to add software from Canonical's
-## 'partner' repository.
-## This software is not part of Ubuntu, but is offered by Canonical and the
-## respective vendors as a service to Ubuntu users.
-# deb http://archive.canonical.com/ubuntu focal partner
-# deb-src http://archive.canonical.com/ubuntu focal partner
-
-deb http://ports.ubuntu.com/ubuntu-ports focal-security main restricted
-# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security main restricted
-deb http://ports.ubuntu.com/ubuntu-ports focal-security universe
-# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security universe
-deb http://ports.ubuntu.com/ubuntu-ports focal-security multiverse
-# deb-src http://ports.ubuntu.com/ubuntu-ports focal-security multiverse
-deb https://apt.kitware.com/ubuntu focal main
-# deb-src https://apt.kitware.com/ubuntu focal main
-deb https://download.docker.com/linux/ubuntu focal stable
-# deb-src https://download.docker.com/linux/ubuntu focal stable
+deb http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted
+# deb-src http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted
+deb http://ports.ubuntu.com/ubuntu-ports jammy-security universe
+# deb-src http://ports.ubuntu.com/ubuntu-ports jammy-security universe
+deb http://ports.ubuntu.com/ubuntu-ports jammy-security multiverse
+# deb-src http://ports.ubuntu.com/ubuntu-ports jammy-security multiverse