Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

BuildSystem: Don't hardcode partition UUID 

That was dumb :D I can just read the UUID parted assigned...
This commit is contained in:
Bananymous 2024-11-21 20:37:42 +02:00
parent 865061b492
commit 15c55b8c7d
6 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootloader/bios/command_line.S
View File

@ -83,5 +83,5 @@ command_line_enter_msg:
command_line: command_line:
# 100 character command line # 100 character command line
command_line_buffer: command_line_buffer:
.ascii "root=UUID=9C87D2AF-566A-4517-971A-57BA86EEA88D" .ascii "root=/dev/sda2"
.skip 100 - (. - command_line_buffer) .skip 100 - (. - command_line_buffer)

2
script/config.sh
View File

@ -33,5 +33,3 @@ if [[ -z $BANAN_BOOTLOADER ]]; then
fi fi
export BANAN_CMAKE=$BANAN_TOOLCHAIN_PREFIX/bin/cmake export BANAN_CMAKE=$BANAN_TOOLCHAIN_PREFIX/bin/cmake
export BANAN_ROOT_PART_UUID='9C87D2AF-566A-4517-971A-57BA86EEA88D'

9
script/image-create.sh
View File

@ -46,15 +46,6 @@ else
mkpart root ext2 2M 100% mkpart root ext2 2M 100%
fi fi
fdisk "$BANAN_DISK_IMAGE_PATH" >/dev/null << EOF
x
u
2
$BANAN_ROOT_PART_UUID
r
w
EOF
# create loop device # create loop device
LOOP_DEV=$(sudo losetup --show -fP "$BANAN_DISK_IMAGE_PATH" || exit 1 ) LOOP_DEV=$(sudo losetup --show -fP "$BANAN_DISK_IMAGE_PATH" || exit 1 )
PARTITION1=${LOOP_DEV}p1 PARTITION1=${LOOP_DEV}p1

79
script/install-bootloader.sh
View File

@ -32,58 +32,58 @@ fi
set -u set -u
MOUNT_DIR="$BANAN_BUILD_DIR/mount" mount_dir="$BANAN_BUILD_DIR/mount"
mkdir -p $MOUNT_DIR mkdir -p $mount_dir
install_grub_legacy() { install_grub_legacy() {
sudo mount $PARTITION2 "$MOUNT_DIR" sudo mount $partition2 "$mount_dir"
sudo grub-install \ sudo grub-install \
--no-floppy \ --no-floppy \
--target=i386-pc \ --target=i386-pc \
--modules="normal ext2 multiboot" \ --modules="normal ext2 multiboot" \
--boot-directory="$MOUNT_DIR/boot" \ --boot-directory="$mount_dir/boot" \
$LOOP_DEV $loop_dev
sudo mkdir -p "$MOUNT_DIR/boot/grub" sudo mkdir -p "$mount_dir/boot/grub"
sed "s/<ROOT>/UUID=$BANAN_ROOT_PART_UUID/" "$BANAN_TOOLCHAIN_DIR/grub-legacy-boot.cfg" | sudo tee "$MOUNT_DIR/boot/grub/grub.cfg" >/dev/null sudo cp "$BANAN_BUILD_DIR/grub-legacy-boot.cfg" "$mount_dir/boot/grub/grub.cfg"
sudo umount "$MOUNT_DIR" sudo umount "$mount_dir"
} }
install_grub_uefi() { install_grub_uefi() {
sudo mkfs.fat $PARTITION1 > /dev/null sudo mkfs.fat $partition1 > /dev/null
sudo mount $PARTITION1 "$MOUNT_DIR" sudo mount $partition1 "$mount_dir"
sudo mkdir -p "$MOUNT_DIR/EFI/BOOT" sudo mkdir -p "$mount_dir/EFI/BOOT"
sudo "$BANAN_TOOLCHAIN_PREFIX/bin/grub-mkstandalone" -O "$BANAN_ARCH-efi" -o "$MOUNT_DIR/EFI/BOOT/BOOTX64.EFI" "boot/grub/grub.cfg=$BANAN_TOOLCHAIN_DIR/grub-memdisk.cfg" sudo "$BANAN_TOOLCHAIN_PREFIX/bin/grub-mkstandalone" -O "$BANAN_ARCH-efi" -o "$mount_dir/EFI/BOOT/BOOTX64.EFI" "boot/grub/grub.cfg=$BANAN_BUILD_DIR/grub-memdisk.cfg"
sudo umount "$MOUNT_DIR" sudo umount "$mount_dir"
sudo mount $PARTITION2 "$MOUNT_DIR" sudo mount $partition2 "$mount_dir"
sudo mkdir -p "$MOUNT_DIR/boot/grub" sudo mkdir -p "$mount_dir/boot/grub"
sed "s/<ROOT>/UUID=$BANAN_ROOT_PART_UUID/" "$BANAN_TOOLCHAIN_DIR/grub-uefi.cfg" | sudo tee "$MOUNT_DIR/boot/grub/grub.cfg" >/dev/null sudo cp "$BANAN_BUILD_DIR/grub-uefi.cfg" "$mount_dir/boot/grub/grub.cfg"
sudo umount "$MOUNT_DIR" sudo umount "$mount_dir"
} }
install_banan_legacy() { install_banan_legacy() {
ROOT_DISK_INFO=$(fdisk -x "$BANAN_DISK_IMAGE_PATH" | tr -s ' ') root_disk_info=$(fdisk -x "$BANAN_DISK_IMAGE_PATH" | tr -s ' ')
ROOT_PART_GUID=$(echo "$ROOT_DISK_INFO" | grep "^$BANAN_DISK_IMAGE_PATH" | head -2 | tail -1 | cut -d' ' -f6) root_part_guid=$(echo "$root_disk_info" | grep "^$BANAN_DISK_IMAGE_PATH" | head -2 | tail -1 | cut -d' ' -f6)
INSTALLER_BUILD_DIR=$BANAN_ROOT_DIR/bootloader/installer/build/$BANAN_ARCH installer_build_dir=$BANAN_ROOT_DIR/bootloader/installer/build/$BANAN_ARCH
BOOTLOADER_ELF=$BANAN_BUILD_DIR/bootloader/bios/bootloader bootloader_elf=$BANAN_BUILD_DIR/bootloader/bios/bootloader
if [ ! -f $BOOTLOADER_ELF ]; then if [ ! -f $bootloader_elf ]; then
echo "You must build the bootloader first" >&2 echo "You must build the bootloader first" >&2
exit 1 exit 1
fi fi
if [ ! -d $INSTALLER_BUILD_DIR ]; then if [ ! -d $installer_build_dir ]; then
mkdir -p $INSTALLER_BUILD_DIR mkdir -p $installer_build_dir
cd $INSTALLER_BUILD_DIR cd $installer_build_dir
$BANAN_CMAKE -G Ninja ../.. $BANAN_CMAKE -G Ninja ../..
fi fi
cd $INSTALLER_BUILD_DIR cd $installer_build_dir
ninja ninja
echo installing bootloader echo installing bootloader
$INSTALLER_BUILD_DIR/banan_os-bootloader-installer "$BOOTLOADER_ELF" "$BANAN_DISK_IMAGE_PATH" "$ROOT_PART_GUID" $installer_build_dir/banan_os-bootloader-installer "$bootloader_elf" "$BANAN_DISK_IMAGE_PATH" "$root_part_guid"
} }
install_banan_uefi() { install_banan_uefi() {
@ -92,23 +92,34 @@ install_banan_uefi() {
} }
if [ $BANAN_BOOTLOADER = "GRUB" ]; then if [ $BANAN_BOOTLOADER = "GRUB" ]; then
loop_dev=$(sudo losetup --show -fP $BANAN_DISK_IMAGE_PATH || exit 1)
LOOP_DEV=$(sudo losetup --show -fP $BANAN_DISK_IMAGE_PATH || exit 1) partition1=${loop_dev}p1
PARTITION1=${LOOP_DEV}p1 partition2=${loop_dev}p2
PARTITION2=${LOOP_DEV}p2 if [ ! -b $partition1 ] || [ ! -b $partition2 ]; then
if [ ! -b $PARTITION1 ] || [ ! -b $PARTITION2 ]; then
echo "Failed to probe partitions for banan disk image." >&2 echo "Failed to probe partitions for banan disk image." >&2
sudo losetup -d $LOOP_DEV sudo losetup -d $loop_dev
exit 1 exit 1
fi fi
root_part_info=$(sudo blkid $partition2)
root_fs_uuid=$(grep -Pwo 'UUID=".*?"' <<< "$root_part_info")
root_fs_uuid=${root_fs_uuid:6:36}
root_part_uuid=$(grep -Pwo 'PARTUUID=".*?"' <<< "$root_part_info")
root_part_uuid=${root_part_uuid:10:36}
cp "$BANAN_TOOLCHAIN_DIR"/grub-*.cfg "$BANAN_BUILD_DIR/"
sed -i "s/<ROOT>/UUID=$root_part_uuid/" "$BANAN_BUILD_DIR"/grub-*.cfg
sed -i "s/<ROOT_FS>/$root_fs_uuid/" "$BANAN_BUILD_DIR"/grub-*.cfg
if (($BANAN_UEFI_BOOT)); then if (($BANAN_UEFI_BOOT)); then
install_grub_uefi install_grub_uefi
else else
install_grub_legacy install_grub_legacy
fi fi
sudo losetup -d $LOOP_DEV sudo losetup -d $loop_dev
elif [ $BANAN_BOOTLOADER = "BANAN" ]; then elif [ $BANAN_BOOTLOADER = "BANAN" ]; then
if (($BANAN_UEFI_BOOT)); then if (($BANAN_UEFI_BOOT)); then

5
toolchain/grub-memdisk.cfg
View File

@ -1,2 +1,5 @@
insmod part_gpt insmod part_gpt
configfile (hd0,gpt2)/boot/grub/grub.cfg insmod search_fs_uuid
search --no-floppy --fs-uuid --set=root <ROOT_FS>
configfile /boot/grub/grub.cfg

4
toolchain/grub-uefi.cfg
View File

@ -1,5 +1,7 @@
insmod part_gpt insmod part_gpt
set root=(hd0,gpt2) insmod search_fs_uuid
search --no-floppy --fs-uuid --set=root <ROOT_FS>
insmod all_video insmod all_video