ps5-linux/ps5-linux-image
1
0
Fork 0
mirror of https://github.com/ps5-linux/ps5-linux-image.git synced 2026-07-16 01:50:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch default to ubuntu2604 and rename ubuntu to ubuntu2404.

Browse Source
This commit is contained in:
Andy Nguyen
2026-04-28 19:45:10 +02:00
parent 34de424611
commit 8a9d48bb65
12 changed files with 37 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docker/image-builder/entrypoint-multi.sh
View File

@@ -5,7 +5,7 @@ set -ex
IMG_SIZE="${IMG_SIZE:-32000}"
SKIP_CHROOT="${SKIP_CHROOT:-false}"
DISTROS="${DISTROS:-ubuntu ubuntu2604 arch alpine}"
DISTROS="${DISTROS:-ubuntu2404 ubuntu2604 arch alpine}"
STAGING="/tmp/build-staging"
EFI_LABEL="boot"
IMG="/output/ps5-multi.img"
@@ -252,9 +252,9 @@ for DISTRO in $DISTROS; do
rm -rf "$CHROOT/boot/efi"/*
done
# Ubuntu is default boot — copy its initrd as the generic initrd.img
if [ -f /tmp/mnt_boot/initrd-ubuntu.img ]; then
cp /tmp/mnt_boot/initrd-ubuntu.img /tmp/mnt_boot/initrd.img
# Ubuntu 26.04 is default boot — copy its initrd as the generic initrd.img
if [ -f /tmp/mnt_boot/initrd-ubuntu2604.img ]; then
cp /tmp/mnt_boot/initrd-ubuntu2604.img /tmp/mnt_boot/initrd.img
fi
# Generate per-distro cmdline files
@@ -262,8 +262,8 @@ for DISTRO in $DISTROS; do
sed "s|__DISTRO__|${DISTRO}|" /repo/boot/cmdline.txt > "/tmp/mnt_boot/cmdline-${DISTRO}.txt"
done
# Default cmdline points to ubuntu
sed "s|__DISTRO__|ubuntu|" /repo/boot/cmdline.txt > /tmp/mnt_boot/cmdline.txt
# Default cmdline points to ubuntu2604
sed "s|__DISTRO__|ubuntu2604|" /repo/boot/cmdline.txt > /tmp/mnt_boot/cmdline.txt
# Copy kexec scripts
for DISTRO in $DISTROS; do

2
docker/image-builder/entrypoint.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash
set -ex
DISTRO="${DISTRO:-ubuntu}"
DISTRO="${DISTRO:-ubuntu2604}"
IMG_SIZE="${IMG_SIZE:-12000}"
SKIP_CHROOT="${SKIP_CHROOT:-false}"
STAGING="/tmp/build-staging"