Skip to content

Commit

Permalink
Fix build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
fido2020 committed Jul 11, 2024
1 parent 561c84c commit 823519e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 13 deletions.
12 changes: 2 additions & 10 deletions Scripts/builddisk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ else
fi

cleanup(){
sudo umount /mnt/Lemon

if [ -z $1 ]; then
sudo losetup -d ${LOOPBACK_DEVICE}
fi
sudo umount -dvf /mnt/Lemon
}

trap 'cleanup' 1
Expand All @@ -35,8 +31,4 @@ sudo sh -c "mount $DEVICE /mnt/Lemon; chown -R $USER /mnt/Lemon"
cp -rau "$LEMOND/Build/sysroot/system/." /mnt/Lemon

echo "Unmounting /mnt/Lemon..."
sudo sh -c "umount /mnt/Lemon;rmdir /mnt/Lemon"

if [ -z $1 ]; then
sudo losetup -d ${LOOPBACK_DEVICE}
fi
cleanup
2 changes: 1 addition & 1 deletion Scripts/createdisk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export LEMONDIR=$(pwd)

mkdir -p Disks

dd if=/dev/zero of=Disks/Lemon.img bs=512 count=6291456
dd if=/dev/zero of=Disks/Lemon.img bs=512 count=2097152
sfdisk Disks/Lemon.img < Scripts/partitions.sfdisk

echo "Formatting disk!"
Expand Down
4 changes: 2 additions & 2 deletions Scripts/partitions.sfdisk
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ label: gpt
label-id: 7E8421FC-8351-C445-94B0-95B664609D03
unit: sectors
first-lba: 2048
last-lba: 6290637
last-lba: 2095104

start= 2048, size= 2048, type=21686148-6449-6E6F-744E-656564454649, uuid=FA2472D2-6D7D-D04A-A92C-F3531AFD1099
start= 4096, size= 262144, type=C12A7328-F81F-11D2-BA4B-00A0C93EC93B, uuid=835FB81F-D999-A745-BABD-9E27C34E6799
start= 266240, size= 6024397, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=DF83EE12-D78E-ED47-B52E-6C80AE4462A0
start= 266240, size= 1828864, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=DF83EE12-D78E-ED47-B52E-6C80AE4462A0
3 changes: 3 additions & 0 deletions bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ tools:
- 'clang++'
- '@PREFIX@/bin/c++'
- args: ['cp', '-r', '@PREFIX@/lib/x86_64-unknown-lemon/.', '@SYSROOT_DIR@/system/lib']
- args: ['cp', '-r', '@PREFIX@/lib/clang/*/lib/x86_64-unknown-lemon/.', '@SYSROOT_DIR@/system/lib']

- name: host-compiler
tools_required:
Expand Down Expand Up @@ -320,6 +321,7 @@ tools:
- args: ['./autogen.sh']
environ:
NOCONFIGURE: 'yes'
containerless: true
configure:
- args:
- '@THIS_SOURCE_DIR@/configure'
Expand Down Expand Up @@ -805,6 +807,7 @@ tasks:
- '@SOURCE_ROOT@/Scripts/buildinitrd.sh'

- name: build-disk
containerless: true
tools_required:
- host-limine
tasks_required:
Expand Down

0 comments on commit 823519e

Please sign in to comment.