From 88fbf011e9cfe92b214abd3547d7a90ead1959b1 Mon Sep 17 00:00:00 2001 From: Vadim Zhukov Date: Wed, 14 Feb 2024 17:46:32 +0300 Subject: [PATCH 1/2] Unhardcode GCC and AR values. --- modlib/lib/build.sh | 4 ++-- modules/cpubench/build.sh | 2 +- modules/helloworld/build.sh | 2 +- modules/imfs/build.sh | 2 +- modules/ios/build.sh | 2 +- modules/pci/build.sh | 2 +- modules/ps2/build.sh | 2 +- modules/simd/build.sh | 2 +- modules/tga/build.sh | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modlib/lib/build.sh b/modlib/lib/build.sh index 8a56e17..59ad4e7 100755 --- a/modlib/lib/build.sh +++ b/modlib/lib/build.sh @@ -1,6 +1,6 @@ #/bin/sh -CC="gcc" -AR="ar" +CC=${CC:-gcc} +AR=${AR:-ar} ARCH_FLAGS="-fno-stack-protector -ffreestanding -O0 -g -fPIC -static -nostdlib " mkdir -p bin diff --git a/modules/cpubench/build.sh b/modules/cpubench/build.sh index 314de43..a5feba8 100755 --- a/modules/cpubench/build.sh +++ b/modules/cpubench/build.sh @@ -2,7 +2,7 @@ echo "Название: CPUBENCH" echo "Лицензия: Публичное достояние" -CC="gcc" +CC=${CC:-gcc} ARCH_FLAGS="-fno-stack-protector -ffreestanding -O0 -g -fPIC -static -nostdlib " if [ -d "../../sdk" ]; then diff --git a/modules/helloworld/build.sh b/modules/helloworld/build.sh index 5f81f6b..5af1054 100755 --- a/modules/helloworld/build.sh +++ b/modules/helloworld/build.sh @@ -2,7 +2,7 @@ echo "Название: Hello world" echo "Лицензия: Публичное достояние" -CC="gcc" +CC=${CC:-gcc} ARCH_FLAGS="-fno-stack-protector -ffreestanding -O0 -g -fPIC -static -nostdlib " if [ -d "../../sdk" ]; then diff --git a/modules/imfs/build.sh b/modules/imfs/build.sh index cdf1f8a..d5b0cc0 100755 --- a/modules/imfs/build.sh +++ b/modules/imfs/build.sh @@ -2,7 +2,7 @@ echo "Название: IMFS" echo "Лицензия: CC BY-NC 4.0" -CC="gcc" +CC=${CC:-gcc} ARCH_FLAGS="-fno-stack-protector -ffreestanding -O0 -g -fPIC -static -nostdlib " if [ -d "../../sdk" ]; then diff --git a/modules/ios/build.sh b/modules/ios/build.sh index 105b5aa..f0754d2 100755 --- a/modules/ios/build.sh +++ b/modules/ios/build.sh @@ -2,7 +2,7 @@ echo "Название: IOS" echo "Лицензия: CC BY-NC 4.0" -CC="gcc" +CC=${CC:-gcc} ARCH_FLAGS="-fno-stack-protector -ffreestanding -O0 -g -fPIC -static -nostdlib " if [ -d "../../sdk" ]; then diff --git a/modules/pci/build.sh b/modules/pci/build.sh index 4d29008..173a471 100755 --- a/modules/pci/build.sh +++ b/modules/pci/build.sh @@ -3,7 +3,7 @@ echo "Название: PCI" echo "Лицензия: Публичное достояние" -CC="gcc" +CC=${CC:-gcc} ARCH_FLAGS="-fno-stack-protector -ffreestanding -O0 -g -fPIC -static -nostdlib " if [ -d "../../sdk" ]; then diff --git a/modules/ps2/build.sh b/modules/ps2/build.sh index 0b6d85d..40abc26 100755 --- a/modules/ps2/build.sh +++ b/modules/ps2/build.sh @@ -3,7 +3,7 @@ echo "Название: PS/2" echo "Лицензия: Публичное достояние" -CC="gcc" +CC=${CC:-gcc} ARCH_FLAGS="-fno-stack-protector -ffreestanding -O0 -g -fPIC -static -nostdlib " if [ -d "../../sdk" ]; then diff --git a/modules/simd/build.sh b/modules/simd/build.sh index fa5824a..78614a3 100755 --- a/modules/simd/build.sh +++ b/modules/simd/build.sh @@ -2,7 +2,7 @@ echo "Название: SIMD" echo "Лицензия: Публичное достояние" -CC="gcc" +CC=${CC:-gcc} ARCH_FLAGS="-fno-stack-protector -ffreestanding -O0 -g -fPIC -static -nostdlib " if [ -d "../../sdk" ]; then diff --git a/modules/tga/build.sh b/modules/tga/build.sh index 01dcfb0..4136829 100755 --- a/modules/tga/build.sh +++ b/modules/tga/build.sh @@ -2,7 +2,7 @@ echo "Название: TGA" echo "Лицензия: Публичное достояние" -CC="gcc" +CC=${CC:-gcc} ARCH_FLAGS="-fno-stack-protector -ffreestanding -O0 -g -fPIC -static -nostdlib " if [ -d "../../sdk" ]; then From ed3af8d5704cab0e63593aff133a64ecdd732b90 Mon Sep 17 00:00:00 2001 From: Aren Date: Thu, 15 Feb 2024 18:05:06 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=20ISO?= =?UTF-8?q?=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/pbuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pbuild.py b/scripts/pbuild.py index 54c64a6..5aa8a5d 100644 --- a/scripts/pbuild.py +++ b/scripts/pbuild.py @@ -122,7 +122,7 @@ def create_iso(IMAGE_NAME): shutil.copytree("modules/bin", "iso_root/mod") os.system(f"cp -v limine/BOOTX64.EFI iso_root/EFI/BOOT/") os.system(f"cp -v limine/BOOTIA32.EFI iso_root/EFI/BOOT/") - os.system(f"xorriso -as mkisofs -b limine/limine-bios-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table --efi-boot limine/limine-uefi-cd.bin -efi-boot-part --efi-boot-image --protective-msdos-label iso_root -o {IMAGE_NAME}.iso") + os.system(f"xorriso -as mkisofs -b limine-bios-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table --efi-boot limine-uefi-cd.bin -efi-boot-part --efi-boot-image --protective-msdos-label iso_root -o {IMAGE_NAME}.iso") os.system(f"./limine/limine bios-install {IMAGE_NAME}.iso") if __name__ == "__main__":