From 35adcceb59dc15aba55051ddc4d88e26310309f2 Mon Sep 17 00:00:00 2001 From: Daniel Axtens Date: Wed, 1 Jan 2025 00:32:04 +1100 Subject: [PATCH 1/3] podman_bootstrap.sh: add libfuse3-dev and pkg-config for Ubuntu Noble These were needed to bootstrap on a fairly fresh Noble install --- podman_bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman_bootstrap.sh b/podman_bootstrap.sh index d4a771d..8ef1785 100755 --- a/podman_bootstrap.sh +++ b/podman_bootstrap.sh @@ -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..." From 2f81b15736511eae7d04e1f8aa3e6b008867358a Mon Sep 17 00:00:00 2001 From: Daniel Axtens Date: Tue, 7 Jan 2025 01:19:01 +1100 Subject: [PATCH 2/3] native_bootstrap.sh: Install help2man for Ubuntu Noble Otherwise the build fails --- native_bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/native_bootstrap.sh b/native_bootstrap.sh index 42aa057..1c5bf92 100755 --- a/native_bootstrap.sh +++ b/native_bootstrap.sh @@ -421,6 +421,7 @@ ubuntu() genisoimage \ git \ gperf \ + help2man \ intltool \ libexpat-dev \ libfuse3-dev \ From e87739bc4ac18484d33f3863611eb632036e82f7 Mon Sep 17 00:00:00 2001 From: Daniel Axtens Date: Tue, 7 Jan 2025 01:19:28 +1100 Subject: [PATCH 3/3] Use the name native_bootstrap.sh consistently Otherwise, the bootstrap fails when trying to delete bootstrap.sh which doesn't exist --- native_bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/native_bootstrap.sh b/native_bootstrap.sh index 1c5bf92..c23904e 100755 --- a/native_bootstrap.sh +++ b/native_bootstrap.sh @@ -847,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" @@ -864,7 +864,7 @@ usage() echo " package managers are supported." echo "EXAMPLES:" echo - echo "./bootstrap.sh -e qemu" + echo "./native_bootstrap.sh -e qemu" exit } @@ -983,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!"