MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 15:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'script-enh' into 'master'

Browse Source 
Reorder install script for fedora apt tools, Use correct riscv qemu package for ubuntu

See merge request redox-os/redox!2107
This commit is contained in:
Jeremy Soller 2026-05-03 08:59:31 -06:00
commit 193c1cffcc
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
native_bootstrap.sh
View File

@ -456,9 +456,12 @@ ubuntu()
if [ "$1" == "qemu" ]; then
if [ -z "$(which qemu-system-x86_64)" ]; then
echo "Installing QEMU..."
if apt-cache show qemu-system-riscv > /dev/null 2>&1
then riscv="qemu-system-riscv" # ubuntu 26 / debian 13
else riscv="qemu-system-riscv64" # ubuntu 24 / debian 12
fi
sudo $install_command qemu-system-x86 qemu-kvm \
qemu-system-arm qemu-efi-aarch64 \
qemu-system-riscv
qemu-system-arm qemu-efi-aarch64 $riscv
else
echo "QEMU already installed!"
fi
@ -1144,12 +1147,12 @@ else
# SUSE and derivatives
elif hash 2>/dev/null zypper; then
suse "$emulator"
# Debian or any derivative of it
elif hash 2>/dev/null apt-get; then
ubuntu "$emulator" "$noninteractive" "$defpackman"
# Fedora
elif hash 2>/dev/null dnf; then
fedora "$emulator" "$noninteractive"
# Debian or any derivative of it
elif hash 2>/dev/null apt-get; then
ubuntu "$emulator" "$noninteractive" "$defpackman"
# Gentoo
elif hash 2>/dev/null emerge; then
gentoo "$emulator"

15
podman_bootstrap.sh
View File

@ -215,9 +215,12 @@ ubuntu()
if [ "$1" == "qemu" ]; then
if [ -z "$(which qemu-system-x86_64)" ]; then
echo "Installing QEMU..."
sudo "$2" install qemu-system-x86 qemu-kvm
sudo "$2" install qemu-system-arm qemu-efi-aarch64
sudo "$2" install qemu-system-riscv
if apt-cache show qemu-system-riscv > /dev/null 2>&1
then riscv="qemu-system-riscv" # ubuntu 26 / debian 13
else riscv="qemu-system-riscv64" # ubuntu 24 / debian 12
fi
sudo $install_command qemu-system-x86 qemu-kvm \
qemu-system-arm qemu-efi-aarch64 $riscv
else
echo "QEMU already installed!"
fi
@ -632,12 +635,12 @@ else
# SUSE and derivatives
if hash 2>/dev/null zypper; then
suse "$emulator"
# Debian or any derivative of it
elif hash 2>/dev/null apt-get; then
ubuntu "$emulator" "$defpackman"
# Fedora
elif hash 2>/dev/null dnf; then
fedora "$emulator"
# Debian or any derivative of it
elif hash 2>/dev/null apt-get; then
ubuntu "$emulator" "$defpackman"
# Gentoo
elif hash 2>/dev/null emerge; then
gentoo "$emulator"