Skip to content

Commit 15f607e

Browse files
committed
Fix build issues
1 parent 561c84c commit 15f607e

File tree

4 files changed

+11
-15
lines changed

4 files changed

+11
-15
lines changed

Scripts/builddisk.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ else
2020
fi
2121

2222
cleanup(){
23-
sudo umount /mnt/Lemon
24-
25-
if [ -z $1 ]; then
26-
sudo losetup -d ${LOOPBACK_DEVICE}
27-
fi
23+
sudo umount -dvf /mnt/Lemon
2824
}
2925

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

3733
echo "Unmounting /mnt/Lemon..."
38-
sudo sh -c "umount /mnt/Lemon;rmdir /mnt/Lemon"
39-
40-
if [ -z $1 ]; then
41-
sudo losetup -d ${LOOPBACK_DEVICE}
42-
fi
34+
cleanup

Scripts/createdisk.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export LEMONDIR=$(pwd)
99

1010
mkdir -p Disks
1111

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

1515
echo "Formatting disk!"

Scripts/partitions.sfdisk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ label: gpt
22
label-id: 7E8421FC-8351-C445-94B0-95B664609D03
33
unit: sectors
44
first-lba: 2048
5-
last-lba: 6290637
5+
last-lba: 2095104
66

77
start= 2048, size= 2048, type=21686148-6449-6E6F-744E-656564454649, uuid=FA2472D2-6D7D-D04A-A92C-F3531AFD1099
88
start= 4096, size= 262144, type=C12A7328-F81F-11D2-BA4B-00A0C93EC93B, uuid=835FB81F-D999-A745-BABD-9E27C34E6799
9-
start= 266240, size= 6024397, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=DF83EE12-D78E-ED47-B52E-6C80AE4462A0
9+
start= 266240, size= 1828864, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=DF83EE12-D78E-ED47-B52E-6C80AE4462A0

bootstrap.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,11 @@ tools:
198198
pkgs_required:
199199
- mlibc-headers
200200
compile:
201-
- args: ['ninja', 'clang']
201+
- args: ['ninja', 'clang', 'builtins']
202202
install:
203-
- args: ['ninja', 'install-clang', 'install-clang-resource-headers']
203+
- args: ['ninja', 'install-clang', 'install-clang-resource-headers', 'install-builtins']
204+
- args: ['mkdir', '-p', '@SYSROOT_DIR@/system/lib/']
205+
- args: ['sh', '-c', 'cp -r "@PREFIX@"/lib/clang/*/lib/x86_64-unknown-lemon/* "@SYSROOT_DIR@/system/lib/."']
204206
- name: everything-else
205207
pkgs_required:
206208
- mlibc
@@ -320,6 +322,7 @@ tools:
320322
- args: ['./autogen.sh']
321323
environ:
322324
NOCONFIGURE: 'yes'
325+
containerless: true
323326
configure:
324327
- args:
325328
- '@THIS_SOURCE_DIR@/configure'
@@ -805,6 +808,7 @@ tasks:
805808
- '@SOURCE_ROOT@/Scripts/buildinitrd.sh'
806809

807810
- name: build-disk
811+
containerless: true
808812
tools_required:
809813
- host-limine
810814
tasks_required:

0 commit comments

Comments
 (0)