Merge branch 'dja/bootstrap-fixes' into 'master'
Fixes for bootstrapping on Ubuntu Noble See merge request redox-os/redox!1536
This commit is contained in:
commit
752910c5e4
|
@ -421,6 +421,7 @@ ubuntu()
|
|||
genisoimage \
|
||||
git \
|
||||
gperf \
|
||||
help2man \
|
||||
intltool \
|
||||
libexpat-dev \
|
||||
libfuse3-dev \
|
||||
|
@ -846,7 +847,7 @@ usage()
|
|||
echo "------------------------"
|
||||
echo "|Redox bootstrap script|"
|
||||
echo "------------------------"
|
||||
echo "Usage: ./bootstrap.sh"
|
||||
echo "Usage: ./native_bootstrap.sh"
|
||||
echo "OPTIONS:"
|
||||
echo
|
||||
echo " -h,--help Show this prompt"
|
||||
|
@ -863,7 +864,7 @@ usage()
|
|||
echo " package managers are supported."
|
||||
echo "EXAMPLES:"
|
||||
echo
|
||||
echo "./bootstrap.sh -e qemu"
|
||||
echo "./native_bootstrap.sh -e qemu"
|
||||
exit
|
||||
}
|
||||
|
||||
|
@ -982,7 +983,7 @@ boot()
|
|||
echo "Creating .config with PODMAN_BUILD=0"
|
||||
echo 'PODMAN_BUILD?=0' > redox/.config
|
||||
echo "Cleaning up..."
|
||||
rm bootstrap.sh
|
||||
rm native_bootstrap.sh
|
||||
echo
|
||||
echo "---------------------------------------"
|
||||
echo "Well it looks like you are ready to go!"
|
||||
|
|
|
@ -218,7 +218,7 @@ ubuntu()
|
|||
sudo "$2" update
|
||||
echo "Installing required packages..."
|
||||
sudo "$2" install \
|
||||
podman curl git make fuse3 fuse-overlayfs slirp4netns
|
||||
podman curl git make pkg-config fuse3 libfuse3-dev fuse-overlayfs slirp4netns
|
||||
if [ "$1" == "qemu" ]; then
|
||||
if [ -z "$(which qemu-system-x86_64)" ]; then
|
||||
echo "Installing QEMU..."
|
||||
|
|
Loading…
Reference in a new issue