Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v9.5 #7098

Merged
merged 64 commits into from
Jun 9, 2024
Merged
Changes from 52 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
bfd271b
v9.5
MichaIng May 13, 2024
1eb7e2e
v9.5
MichaIng May 13, 2024
c806e94
v9.4
MichaIng May 13, 2024
da7af8e
v9.5
MichaIng May 13, 2024
95a4f10
v9.5
MichaIng May 13, 2024
412b4d7
v9.5
MichaIng May 13, 2024
6a57c8a
v9.5
MichaIng May 14, 2024
2b34d77
v9.5
MichaIng May 14, 2024
0091219
v9.5
MichaIng May 14, 2024
34e76c4
v9.5
MichaIng May 14, 2024
237fdda
v9.5
MichaIng May 14, 2024
e4c2818
Init v9.5 (#7075)
StephanStS May 16, 2024
46831b7
v9.5 (#7082)
pulpe May 18, 2024
a310c54
v9.5
MichaIng May 18, 2024
591087d
v9.5
MichaIng May 19, 2024
f0d79c5
v9.5
MichaIng May 20, 2024
3ed3b53
v9.5
MichaIng May 20, 2024
c6c30fc
v9.5
MichaIng May 20, 2024
ff1ae27
v9.5
MichaIng May 20, 2024
d27048c
v9.5
MichaIng May 21, 2024
dba521d
v9.5
MichaIng May 22, 2024
896166d
v9.5
MichaIng May 22, 2024
5e01b39
v9.5
MichaIng May 22, 2024
2367460
v9.5
MichaIng May 22, 2024
bef95c9
v9.5
MichaIng May 22, 2024
457ae23
v9.5
MichaIng May 23, 2024
1f32880
v9.5
MichaIng May 25, 2024
4b9edba
v9.5
MichaIng May 26, 2024
81c04ee
v9.5
MichaIng May 26, 2024
29761ec
v9.5
MichaIng May 26, 2024
dace388
v9.5
MichaIng May 26, 2024
68ed703
v9.5
MichaIng May 26, 2024
412f656
v9.5
MichaIng May 29, 2024
1eea6eb
v9.5
MichaIng May 31, 2024
8307ba2
v9.5
MichaIng May 31, 2024
ba4c7e3
v9.5
MichaIng May 31, 2024
4f0cc5c
v9.5
MichaIng Jun 1, 2024
a299c0e
v9.5
MichaIng Jun 2, 2024
8229158
v9.5
MichaIng Jun 2, 2024
d78542d
v9.5
MichaIng Jun 2, 2024
8def429
v9.5
MichaIng Jun 2, 2024
7f46ac9
v9.5
MichaIng Jun 2, 2024
114da56
v9.5
MichaIng Jun 2, 2024
3848cbd
v9.5
MichaIng Jun 2, 2024
5216429
v9.5
MichaIng Jun 2, 2024
b48086a
v9.5
MichaIng Jun 2, 2024
311da5b
v9.5
MichaIng Jun 2, 2024
a3a4b37
v9.5
MichaIng Jun 2, 2024
f324d76
v9.5
MichaIng Jun 3, 2024
9b2d8c1
v9.5
MichaIng Jun 3, 2024
67a382d
v9.5 (#7071)
jcnils Jun 3, 2024
16221e3
Beta v9.5.0 (#7088)
MichaIng Jun 3, 2024
9cc51dc
v9.5
MichaIng Jun 3, 2024
43770fe
v9.5
MichaIng Jun 3, 2024
f37420f
v9.5
MichaIng Jun 4, 2024
6c04c86
v9.5
MichaIng Jun 4, 2024
d2b0079
v9.5
MichaIng Jun 8, 2024
475d581
v9.5
MichaIng Jun 8, 2024
486a2d4
v9.5
MichaIng Jun 8, 2024
8fad3e1
v9.5
MichaIng Jun 8, 2024
a4b1248
v9.5
MichaIng Jun 9, 2024
7582822
v9.5
MichaIng Jun 9, 2024
305257d
v9.5
MichaIng Jun 9, 2024
99eb8b2
Merge pull request #7099 from MichaIng/dev
MichaIng Jun 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions .build/images/dietpi-build
Original file line number Diff line number Diff line change
@@ -11,10 +11,15 @@ else
curl -sSf "https://raw.githubusercontent.com/${G_GITOWNER:=MichaIng}/DietPi/${G_GITBRANCH:=master}/dietpi/func/dietpi-globals" -o /tmp/dietpi-globals || exit 1
# shellcheck disable=SC1091
. /tmp/dietpi-globals
G_EXEC_NOHALT=1 G_EXEC rm /tmp/dietpi-globals
G_EXEC rm /tmp/dietpi-globals
export G_GITOWNER G_GITBRANCH G_HW_ARCH_NAME=$(uname -m)
# shellcheck disable=SC2015
[[ $(</etc/debian_version) =~ ^('12.'|'bookworm/sid')$ ]] && export G_DISTRO=7 || export G_DISTRO=6 # Ubuntu Jammy comes with "bookworm/sid"
read -r debian_version < /etc/debian_version
case $debian_version in
'11.'*|'bullseye/sid') G_DISTRO=6;;
'12.'*|'bookworm/sid') G_DISTRO=7;;
'13.'*|'trixie/sid') G_DISTRO=8;;
*) G_DIETPI-NOTIFY 1 "Unsupported distro version \"$debian_version\". Aborting ..."; exit 1;;
esac
fi
case $G_HW_ARCH_NAME in
'armv6l') export G_HW_ARCH=1;;
@@ -47,6 +52,8 @@ EDITION=
SUFFIX=
ADD_DOS_PART=1
SIGN_PASS=
TEST_KERNEL=0
TEST_UBOOT=0
while (( $# ))
do
case $1 in
@@ -63,6 +70,8 @@ do
'-s') shift; SUFFIX=$1;;
'--no-dos-part') ADD_DOS_PART=0;;
'--sign') shift; SIGN_PASS=$1;;
'--test-kernel') TEST_KERNEL=1;;
'--test-uboot') TEST_UBOOT=1;;
*) G_DIETPI-NOTIFY 1 "Invalid input \"$1\", aborting..."; exit 1;;
esac
shift
@@ -95,26 +104,26 @@ case $HW_MODEL in
45) iname='PINEH64' HW_ARCH=3 partition_start=4 root_size=1020;;
46) iname='PinebookPro' HW_ARCH=3 partition_start=16 root_size=1008;;
47) iname='NanoPiR4S' HW_ARCH=3 partition_start=16 root_size=1008;;
48) iname='NanoPiR1' HW_ARCH=2 partition_start=4 root_size=764;;
48) iname='NanoPiR1' HW_ARCH=2 partition_start=4 root_size=800;;
'49.1') iname='Quartz64A' HW_ARCH=3 partition_start=16 root_size=752;;
'49.2') iname='Quartz64B' HW_ARCH=3 partition_start=16 root_size=752;;
'49.3') iname='SOQuartz' HW_ARCH=3 partition_start=16 root_size=752;;
52) iname='ASUSTB' HW_ARCH=2 partition_start=4 root_size=764;;
54) iname='NanoPiK2' HW_ARCH=3 partition_start=4 root_size=1148;;
55) iname='NanoPiR2S' HW_ARCH=3 partition_start=16 root_size=1008;;
56) iname='NanoPiNEO3' HW_ARCH=3 partition_start=16 root_size=1008;;
57) iname='NanoPiNEOPlus2' HW_ARCH=3 partition_start=4 root_size=892;;
56) iname='NanoPiNEO3' HW_ARCH=3 partition_start=16 root_size=1100;;
57) iname='NanoPiNEOPlus2' HW_ARCH=3 partition_start=4 root_size=1000;;
58) iname='NanoPiM4V2' HW_ARCH=3 partition_start=16 root_size=1008;;
59) iname='ZeroPi' HW_ARCH=2 partition_start=4 root_size=764;;
60) iname='NanoPiNEO' HW_ARCH=2 partition_start=4 root_size=764;;
59) iname='ZeroPi' HW_ARCH=2 partition_start=4 root_size=800;;
60) iname='NanoPiNEO' HW_ARCH=2 partition_start=4 root_size=800;;
61) iname='NanoPiM2' HW_ARCH=2 partition_start=4 boot_size=64 root_size=700 boot_fstype='ext4';;
'62.1') iname='NanoPiM3' HW_ARCH=3 partition_start=4 root_size=700;;
'62.2') iname='NanoPiFire3' HW_ARCH=3 partition_start=4 root_size=700;;
63) iname='NanoPiM1' HW_ARCH=2 partition_start=4 root_size=764;;
64) iname='NanoPiNEOAir' HW_ARCH=2 partition_start=4 root_size=764;;
'62.1') iname='NanoPiM3' HW_ARCH=3 partition_start=4 root_size=800;;
'62.2') iname='NanoPiFire3' HW_ARCH=3 partition_start=4 root_size=800;;
63) iname='NanoPiM1' HW_ARCH=2 partition_start=4 root_size=800;;
64) iname='NanoPiNEOAir' HW_ARCH=2 partition_start=4 root_size=800;;
'65.1') iname='NanoPiNEO2' HW_ARCH=3 partition_start=4 root_size=1020;;
'65.2') iname='NanoPiNEO2Black' HW_ARCH=3 partition_start=4 root_size=1020;;
66) iname='NanoPiM1Plus' HW_ARCH=2 partition_start=4 root_size=764;;
66) iname='NanoPiM1Plus' HW_ARCH=2 partition_start=4 root_size=800;;
67) iname='NanoPiK1Plus' HW_ARCH=3 partition_start=4 root_size=1020;;
'68.1') iname='NanoPiM4' HW_ARCH=3 partition_start=16 root_size=1008;;
'68.2') iname='NanoPCT4' HW_ARCH=3 partition_start=16 root_size=1008;;
@@ -142,7 +151,7 @@ case $HW_MODEL in
86) iname='ASUSTB2' HW_ARCH=3 partition_start=16 root_size=1008;;
87) iname='OrangePi3B' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1136;;
88) iname='OrangePiZero2W' HW_ARCH=3 partition_start=4 root_size=1148;;
89) iname='OrangePi3LTS' HW_ARCH=3 partition_start=4 root_size=892;;
89) iname='OrangePi3LTS' HW_ARCH=3 partition_start=4 root_size=1000;;
90) iname='RadxaZERO3' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1136;;
*) G_DIETPI-NOTIFY 1 "Invalid hardware model \"$HW_MODEL\" passed, aborting..."; exit 1;;
esac
@@ -398,7 +407,7 @@ echo '[ INFO ] Running DietPi-Installer...'
_EOF_

cat << _EOF_ >> rootfs/etc/rc.local
export GITOWNER='$GITOWNER' GITBRANCH='$GITBRANCH' HW_MODEL='$HW_MODEL' IMAGE_CREATOR=0 PREIMAGE_INFO=0 WIFI_REQUIRED=1 DISTRO_TARGET=$DISTRO
export GITOWNER='$GITOWNER' GITBRANCH='$GITBRANCH' HW_MODEL='$HW_MODEL' IMAGE_CREATOR=0 PREIMAGE_INFO=0 WIFI_REQUIRED=1 DISTRO_TARGET=$DISTRO TEST_KERNEL=$TEST_KERNEL TEST_UBOOT=$TEST_UBOOT
echo '[ INFO ] Running DietPi-Installer for $G_GITOWNER/$G_GITBRANCH'
bash -c "\$(curl -sSf 'https://raw.githubusercontent.com/$G_GITOWNER/DietPi/$G_GITBRANCH/.build/images/dietpi-installer')" || poweroff
_EOF_
16 changes: 11 additions & 5 deletions .build/images/dietpi-imager
Original file line number Diff line number Diff line change
@@ -25,8 +25,14 @@
curl -sSf "https://raw.githubusercontent.com/$G_GITOWNER/DietPi/$G_GITBRANCH/dietpi/func/dietpi-globals" -o /tmp/dietpi-globals || exit 1
# shellcheck disable=SC1091
. /tmp/dietpi-globals
G_EXEC_NOHALT=1 G_EXEC rm /tmp/dietpi-globals
[[ $(</etc/debian_version) =~ ^('12.'|'bookworm/sid'$) ]] && G_DISTRO=7 || G_DISTRO=6 # Ubuntu Jammy comes with "bookworm/sid"
G_EXEC rm /tmp/dietpi-globals
read -r debian_version < /etc/debian_version
case $debian_version in
'11.'*|'bullseye/sid') G_DISTRO=6;;
'12.'*|'bookworm/sid') G_DISTRO=7;;
'13.'*|'trixie/sid') G_DISTRO=8;;
*) G_DIETPI-NOTIFY 1 "Unsupported distro version \"$debian_version\". Aborting ..."; exit 1;;
esac
fi
readonly G_PROGRAM_NAME='DietPi-Imager'
G_CHECK_ROOT_USER
@@ -621,10 +627,10 @@ _EOF_

# Install required packages
G_AG_CHECK_INSTALL_PREREQ unzip clonezilla partclone xz-utils syslinux-common xorriso isolinux
# - We need Clonezilla 5.x for loop device support
if [[ $(dpkg-query -Wf '${Version}' clonezilla 2> /dev/null) != '5'* ]]
# - Bullseye/Focal: We need Clonezilla 5.x for loop device support
if dpkg --compare-versions "$(dpkg-query -Wf '${Version}' clonezilla 2> /dev/null)" lt 5
then
G_EXEC curl -sSf 'https://deb.debian.org/debian/pool/main/c/clonezilla/clonezilla_5.2.7-1_all.deb' -o clonezilla.deb
G_EXEC curl -sSf 'https://deb.debian.org/debian/pool/main/c/clonezilla/clonezilla_5.3.17-2_all.deb' -o clonezilla.deb
G_EXEC dpkg -i ./clonezilla.deb
G_EXEC rm clonezilla.deb
fi
51 changes: 21 additions & 30 deletions .build/images/dietpi-installer
Original file line number Diff line number Diff line change
@@ -24,11 +24,17 @@
# - HW_MODEL=0 (must match one of the supported IDs below)
# - WIFI_REQUIRED=0 [01]
# - DISTRO_TARGET=7 [678] (Bullseye: 6, Bookworm: 7, Trixie: 8)
# - TEST_KERNEL=1 Install test kernel from https://dietpi.com/downloads/binaries/testing/
# - TEST_UBOOT=1 Install test U-Boot from https://dietpi.com/downloads/binaries/testing/
#------------------------------------------------------------------------------------------------

# Core globals
G_PROGRAM_NAME='DietPi-Installer'

# Input variables
[[ $TEST_KERNEL == 1 ]] || TEST_KERNEL=0
[[ $TEST_UBOOT == 1 ]] || TEST_UBOOT=0

#------------------------------------------------------------------------------------------------
# Critical checks and requirements to run this script
#------------------------------------------------------------------------------------------------
@@ -689,7 +695,6 @@ setenv rootuuid "true"' /boot/boot.cmd
79) (( $HW_VARIANT == 2 )) && G_CONFIG_INJECT 'fdtfile=' 'fdtfile=rockchip/rk3588s-nanopi-r6c.dtb' /boot/dietpiEnv.txt;;
85) G_CONFIG_INJECT 'fdtfile=' 'fdtfile=rockchip/rk3588s-rock-5a.dtb' /boot/dietpiEnv.txt;;
87) G_CONFIG_INJECT 'fdtfile=' 'fdtfile=rockchip/rk3566-orangepi-3b.dtb' /boot/dietpiEnv.txt;;
90) G_CONFIG_INJECT 'fdtfile=' 'fdtfile=rockchip/rk3566-radxa-zero3.dtb' /boot/dietpiEnv.txt;;
*) :;;
esac
case $G_HW_MODEL in
@@ -876,7 +881,7 @@ setenv rootuuid "true"' /boot/boot.cmd
'cron' # Background job scheduler
'curl' # Web address testing, downloading, uploading etc.
'fdisk' # Partitioning tool used by DietPi-FS_partition_resize and DietPi-Imager
'gnupg' # apt-key add / gpg
'gpg' # apt-key list / gpg
'htop' # System monitor
'iputils-ping' # "ping" command
'locales' # Support locales, used by dietpi-config > Language/Regional Options > Locale
@@ -1053,7 +1058,7 @@ _EOF_
# Update APT lists
G_AGUP
# Install kernel, device tree, U-Boot, firmware and initramfs packages
local model='odroidn2' kernel='meson64' arch='arm64' branch='current' zstd=() dietpi_uboot=0 dietpi_kernel=0
local model='odroidn2' kernel='meson64' arch='arm64' branch='current' zstd=()
case $G_HW_MODEL in
10) model='odroidc1' kernel='meson' arch='arm';;
11) model='odroidxu4' kernel='odroidxu4' arch='arm';;
@@ -1151,27 +1156,21 @@ blacklist rockchip_vdec
_EOF_
fi
# Install initramfs-tools first to have an initramfs generated on kernel install, and configure it to use zstd if supported for better compression and faster decompression
if (( $dietpi_kernel ))
then
G_EXEC_OUTPUT=1 G_EXEC curl -fo package.deb 'https://dietpi.com/downloads/binaries/armbian-firmware.deb'
G_EXEC_OUTPUT=1 G_EXEC dpkg -i package.deb
G_EXEC rm package.deb
fi
[[ $kernel == 'rockchip64' || $kernel == 'rk35xx' || $kernel == 'meson64' || $kernel == 'sunxi64' || $kernel == 'sunxi' || $kernel == 'rockchip' ]] && zstd=('zstd')
G_AGI initramfs-tools u-boot-tools armbian-firmware "${zstd[@]}"
[[ ${zstd[0]} ]] && G_CONFIG_INJECT 'COMPRESS=' 'COMPRESS=zstd' /etc/initramfs-tools/initramfs.conf
# Download and pre-install kernel hosted on dietpi.com where the Armbian APT repo provides a too old version or is not available
if (( $dietpi_kernel ))
if (( $TEST_KERNEL ))
then
G_EXEC_OUTPUT=1 G_EXEC curl -fo package1.deb "https://dietpi.com/downloads/binaries/linux-image-$branch-$kernel.deb"
G_EXEC_OUTPUT=1 G_EXEC curl -fo package2.deb "https://dietpi.com/downloads/binaries/linux-dtb-$branch-$kernel.deb"
G_EXEC_OUTPUT=1 G_EXEC curl -fo package1.deb "https://dietpi.com/downloads/binaries/testing/linux-image-$branch-$kernel.deb"
G_EXEC_OUTPUT=1 G_EXEC curl -fo package2.deb "https://dietpi.com/downloads/binaries/testing/linux-dtb-$branch-$kernel.deb"
G_EXEC_OUTPUT=1 G_EXEC dpkg -i package[12].deb
G_EXEC rm package[12].deb
fi
# Download and pre-install U-Boot hosted on dietpi.com where the Armbian APT repo provides a too old version or is not available
if (( $dietpi_uboot ))
if (( $TEST_UBOOT ))
then
G_EXEC_OUTPUT=1 G_EXEC curl -fo package.deb "https://dietpi.com/downloads/binaries/linux-u-boot-$model-$branch.deb"
G_EXEC_OUTPUT=1 G_EXEC curl -fo package.deb "https://dietpi.com/downloads/binaries/testing/linux-u-boot-$model-$branch.deb"
G_EXEC_OUTPUT=1 G_EXEC dpkg -i package.deb
G_EXEC rm package.deb
fi
@@ -1216,14 +1215,6 @@ _EOF_
G_CONFIG_INJECT 'user_overlays=' 'user_overlays=dietpi-usb-otg' /boot/dietpiEnv.txt
G_EXEC apt-mark auto device-tree-compiler

# Workaround for Odroid N2 failing to boot from eMMC: https://forum.armbian.com/topic/20206-odroid-n2-issues-with-recent-firmware-and-emmc-modules/#comment-142409
elif (( $G_HW_MODEL == 15 ))
then
G_EXEC curl -sSfo u-boot.gz 'https://dietpi.com/downloads/binaries/u-boot-odroidn2.bin.gz'
G_EXEC gzip -d u-boot.gz
G_EXEC dd if=u-boot "of=$BOOT_DEVICE" bs=512 seek=1 conv=notrunc,fdatasync
G_EXEC rm u-boot

# Workaround for NanoPi R1 failing boot: https://github.com/MichaIng/DietPi/issues/5927
elif (( $G_HW_MODEL == 48 ))
then
@@ -1574,26 +1565,26 @@ _EOF_
[[ -d '/etc/chromium.d' ]] && G_EXEC rm -R /etc/chromium.d
[[ -d '/etc/lightdm' ]] && G_EXEC rm -R /etc/lightdm

# - www
# www
[[ -d '/var/www' ]] && G_EXEC rm -Rf /var/www/{,.??,.[^.]}*

# - Source code and Linux headers
# Source code and Linux headers
[[ -d '/usr/src' ]] && G_EXEC rm -Rf /usr/src/{,.??,.[^.]}*

# - Documentation dirs: https://github.com/MichaIng/DietPi/issues/3259
# Documentation dirs: https://github.com/MichaIng/DietPi/issues/3259
#[[ -d '/usr/share/man' ]] && G_EXEC rm -R /usr/share/man
#[[ -d '/usr/share/doc' ]] && G_EXEC rm -R /usr/share/doc
#[[ -d '/usr/share/doc-base' ]] && G_EXEC rm -R /usr/share/doc-base
[[ -d '/usr/share/calendar' ]] && G_EXEC rm -R /usr/share/calendar

# - Unused DEB package config files
# Unused DEB package config files
find / \( -name '*?.dpkg-dist' -o -name '*?.dpkg-old' -o -name '*?.dpkg-new' -o -name '*?.dpkg-bak' -o -name '*?.dpkg-del' -o -name '*?.ucf-dist' -o -name '*?.ucf-old' -o -name '*?.ucf-new' \) -exec rm -v {} +

# - Fonts
# Fonts
[[ -d '/usr/share/fonts' ]] && G_EXEC rm -R /usr/share/fonts
[[ -d '/usr/share/icons' ]] && G_EXEC rm -R /usr/share/icons

# - Stop, disable and remove not required 3rd party services
# Stop, disable and remove not required 3rd party services
local aservices=(

# RPi
@@ -1639,7 +1630,7 @@ _EOF_
done
done

# - Remove obsolete SysV service entries
# Remove obsolete SysV service entries
aservices=(

'fake-hwclock'
@@ -2283,7 +2274,7 @@ _EOF_
fi

# Update config
G_CONFIG_INJECT 'GRUB_CMDLINE_LINUX_DEFAULT=' 'GRUB_CMDLINE_LINUX_DEFAULT="consoleblank=0"' /etc/default/grub
G_CONFIG_INJECT 'GRUB_CMDLINE_LINUX_DEFAULT=' 'GRUB_CMDLINE_LINUX_DEFAULT="consoleblank=0"' /etc/default/grub # NB: Removing "quiet" adds ~0.5s to boot time on my 6.5s - 7.5s boot time laptop.
G_CONFIG_INJECT 'GRUB_CMDLINE_LINUX=' 'GRUB_CMDLINE_LINUX="net.ifnames=0"' /etc/default/grub
G_CONFIG_INJECT 'GRUB_TIMEOUT=' 'GRUB_TIMEOUT=0' /etc/default/grub
G_EXEC_DESC='Regenerating GRUB config' G_EXEC_OUTPUT=1 G_EXEC grub-mkconfig -o /boot/grub/grub.cfg
3 changes: 0 additions & 3 deletions .build/software/Amiberry/container_build.bash
Original file line number Diff line number Diff line change
@@ -137,9 +137,6 @@ Pin-Priority: -1
_EOF_
fi

# ARMv6/7 Trixie: Temporarily prevent dist-upgrade on Trixie, as it fails due to 64-bit time_t transition causing dependency conflicts across the repo.
(( $arch < 3 )) && [[ $DISTRO == 'trixie' ]] && G_EXEC touch rootfs/boot/dietpi/.skip_distro_upgrade

# Automated build
cat << _EOF_ >> rootfs/boot/Automation_Custom_Script.sh || Error_Exit 'Failed to generate Automation_Custom_Script.sh'
echo '[ INFO ] Running Amiberry build script ...'
7 changes: 5 additions & 2 deletions .github/workflows/amiberry.yml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ jobs:
plat: ${{ steps.plat.outputs.plat }}
dist: ${{ steps.dist.outputs.dist }}
# https://github.com/actions/runner-images
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- id: plat
run: |
@@ -54,7 +54,10 @@ jobs:
- { plat: riscv64, dist: bookworm }
fail-fast: false
name: "${{ matrix.plat }} - ${{ matrix.dist }}"
runs-on: ubuntu-22.04
# aarch64 build in QEMU-emulated Bullseye containers on Ubuntu Noble hosts fail:
# Processing triggers for libc-bin (2.31-13+deb11u10) ...
# qemu: uncaught target signal 11 (Segmentation fault) - core dumped
runs-on: ${{ matrix.dist == 'bullseye' && ( endsWith(matrix.plat, '-64-sdl2') || matrix.plat == 'AMLSM1' || matrix.plat == 'n2' || matrix.plat == 'a64' || matrix.plat == 'rk3588' ) && 'ubuntu-22.04' || 'ubuntu-24.04' }}
steps:
- name: Build
run: sudo bash -c "G_GITOWNER=$GITHUB_REPOSITORY_OWNER G_GITBRANCH=$GITHUB_REF_NAME; $(curl -sSf "https://raw.githubusercontent.com/$GITHUB_REPOSITORY_OWNER/DietPi/$GITHUB_REF_NAME/.build/software/Amiberry/container_build.bash")" -- -p '${{ matrix.plat }}' -d '${{ matrix.dist }}'
7 changes: 4 additions & 3 deletions .github/workflows/armbian.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ on:
branch:
description: 'Branch'
type: choice
options: [legacy, current, edge, vendor, vendor-boogie-panthor, collabora]
options: [legacy, current, edge, vendor, collabora]
default: current
required: true
board:
@@ -32,7 +32,8 @@ permissions: {}
jobs:
build:
name: "${{ github.event.inputs.asset }} - ${{ github.event.inputs.branch }} - ${{ github.event.inputs.board }}"
runs-on: ubuntu-22.04
# https://github.com/actions/runner-images
runs-on: ubuntu-24.04
steps:
- name: Clone Armbian repo
run: |
@@ -71,7 +72,7 @@ jobs:
read -r version < VERSION
case '${{ github.event.inputs.asset }}' in
firmware) package='armbian-firmware';;
uboot) package='linux-uboot-${{ github.event.inputs.board }}-${{ github.event.inputs.board }}';;
uboot) package='linux-uboot-${{ github.event.inputs.board }}-${{ github.event.inputs.branch }}';;
kernel)
family=$(. 'config/boards/${{ github.event.inputs.board }}.'* &> /dev/null; echo "$BOARDFAMILY")
echo "Board family is: $family"
7 changes: 5 additions & 2 deletions .github/workflows/dietpi-build.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
outputs:
buildargs: ${{ steps.buildargs.outputs.buildargs }}
# https://github.com/actions/runner-images
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- id: buildargs
run: |
@@ -116,7 +116,10 @@ jobs:
buildargs: ${{ fromJson(needs.prep.outputs.buildargs) }}
fail-fast: false
name: "Build: ${{ matrix.buildargs }}"
runs-on: ubuntu-22.04
# aarch64 build in QEMU-emulated Bullseye containers on Ubuntu Noble hosts fail:
# Processing triggers for libc-bin (2.31-13+deb11u10) ...
# qemu: uncaught target signal 11 (Segmentation fault) - core dumped
runs-on: ${{ contains(matrix.buildargs, '-d 6') && 'ubuntu-22.04' || 'ubuntu-24.04' }}
steps:
- name: Generate upload script
run: |
7 changes: 5 additions & 2 deletions .github/workflows/dietpi-software-build.yml
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ jobs:
arch: ${{ steps.arch.outputs.arch }}
dist: ${{ steps.dist.outputs.dist }}
# https://github.com/actions/runner-images
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- id: name
run: |
@@ -72,7 +72,10 @@ jobs:
- { arch: x86_64, name: gogs }
fail-fast: false
name: "${{ matrix.name }} - ${{ matrix.arch }} - ${{ matrix.dist }}"
runs-on: ubuntu-22.04
# aarch64 build in QEMU-emulated Bullseye containers on Ubuntu Noble hosts fail:
# Processing triggers for libc-bin (2.31-13+deb11u10) ...
# qemu: uncaught target signal 11 (Segmentation fault) - core dumped
runs-on: ${{ matrix.dist == 'bullseye' && matrix.arch == 'aarch64' && 'ubuntu-22.04' || 'ubuntu-24.04' }}
steps:
- name: Build
run: sudo bash -c "G_GITOWNER=$GITHUB_REPOSITORY_OWNER G_GITBRANCH=$GITHUB_REF_NAME; $(curl -sSf "https://raw.githubusercontent.com/$GITHUB_REPOSITORY_OWNER/DietPi/$GITHUB_REF_NAME/.build/software/dietpi-software-build.bash")" -- -n '${{ matrix.name }}' -a '${{ matrix.arch }}' -d '${{ matrix.dist }}'
Loading