From 539ac94563e670b072fa0f21f0c63d0a45896372 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Wed, 15 Jun 2022 05:01:22 +0200 Subject: [PATCH] build: Disable all ports by default --- .github/workflows/check.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- .gitignore | 4 ++-- configure.ac | 34 ++++++++++++++++++++-------------- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 869d6547..3e8e0b34 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -15,7 +15,7 @@ jobs: run: sudo apt-get update && sudo apt-get install git build-essential autoconf automake nasm curl mtools llvm clang lld -y - name: Build the bootloader (GNU) - run: ./bootstrap && ./configure --enable-werror && make all && make maintainer-clean + run: ./bootstrap && ./configure --enable-werror --enable-all && make all && make maintainer-clean - name: Build the bootloader (LLVM) - run: ./bootstrap && ./configure TOOLCHAIN=llvm --enable-werror && make all && make maintainer-clean + run: ./bootstrap && ./configure TOOLCHAIN=llvm --enable-werror --enable-all && make all && make maintainer-clean diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1159951c..fd386dc1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: run: mkdir -p build - name: Configure - run: cd build && ../configure + run: cd build && ../configure --enable-all - name: Build the bootloader run: make -C build @@ -80,7 +80,7 @@ jobs: run: git checkout $TAG_NAME && rm -rf * && git checkout . - name: Package release tarball - run: ./bootstrap && ./configure && make dist + run: ./bootstrap && ./configure --enable-all && make dist - name: Create release notes run: echo "Binary release can be found at https://github.com/limine-bootloader/limine/tree/$TAG_NAME-binary" > rel_notes.txt diff --git a/.gitignore b/.gitignore index a345e4c9..bc59d861 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,7 @@ /GNUmakefile /config.h /common-bios -/common-uefi32 -/common-uefi64 +/common-uefi-ia32 +/common-uefi-x86-64 /decompressor-build /stage1.stamp diff --git a/configure.ac b/configure.ac index b1eb13d0..bb425519 100644 --- a/configure.ac +++ b/configure.ac @@ -46,10 +46,16 @@ if ! test "x$GZIP_FOUND" = "xyes"; then AC_MSG_ERROR([gzip not found, please install gzip before configuring]) fi -BUILD_BIOS="default" +BUILD_ALL="no" + +AC_ARG_ENABLE([all], + AS_HELP_STRING([--enable-all], [enable ALL ports]), + BUILD_ALL="$enableval") + +BUILD_BIOS="$BUILD_ALL" AC_ARG_ENABLE([bios], - AS_HELP_STRING([--disable-bios], [disable building the x86 BIOS port]), + AS_HELP_STRING([--enable-bios], [enable building the x86 BIOS port]), BUILD_BIOS="$enableval") if test "x$BUILD_BIOS" = "xno"; then @@ -60,34 +66,34 @@ fi AC_SUBST(BUILD_BIOS, [$BUILD_BIOS]) -BUILD_LIMINE_DEPLOY="default" +BUILD_LIMINE_DEPLOY="$BUILD_ALL" AC_ARG_ENABLE([limine-deploy], - AS_HELP_STRING([--disable-limine-deploy], [disable building limine-deploy]), + AS_HELP_STRING([--enable-limine-deploy], [enable building limine-deploy]), BUILD_LIMINE_DEPLOY="$enableval") AC_SUBST(BUILD_LIMINE_DEPLOY, [$BUILD_LIMINE_DEPLOY]) -BUILD_CD="default" +BUILD_CD="$BUILD_ALL" AC_ARG_ENABLE([bios-cd], - AS_HELP_STRING([--disable-bios-cd], [disable building the x86 BIOS CD image]), + AS_HELP_STRING([--enable-bios-cd], [enable building the x86 BIOS CD image]), BUILD_CD="$enableval") AC_SUBST(BUILD_CD, [$BUILD_CD]) -BUILD_PXE="default" +BUILD_PXE="$BUILD_ALL" AC_ARG_ENABLE([bios-pxe], - AS_HELP_STRING([--disable-bios-pxe], [disable building the x86 BIOS PXE image]), + AS_HELP_STRING([--enable-bios-pxe], [enable building the x86 BIOS PXE image]), BUILD_PXE="$enableval") AC_SUBST(BUILD_PXE, [$BUILD_PXE]) -BUILD_UEFI_IA32="default" +BUILD_UEFI_IA32="$BUILD_ALL" AC_ARG_ENABLE([uefi-ia32], - AS_HELP_STRING([--disable-uefi-ia32], [disable building the IA-32 UEFI port]), + AS_HELP_STRING([--enable-uefi-ia32], [enable building the IA-32 UEFI port]), BUILD_UEFI_IA32="$enableval") if test "x$BUILD_UEFI_IA32" = "xno"; then @@ -98,10 +104,10 @@ fi AC_SUBST(BUILD_UEFI_IA32, [$BUILD_UEFI_IA32]) -BUILD_UEFI_X86_64="default" +BUILD_UEFI_X86_64="$BUILD_ALL" AC_ARG_ENABLE([uefi-x86-64], - AS_HELP_STRING([--disable-uefi-x86_64], [disable building the x86_64 UEFI port]), + AS_HELP_STRING([--enable-uefi-x86_64], [enable building the x86_64 UEFI port]), BUILD_UEFI_X86_64="$enableval") if test "x$BUILD_UEFI_X86_64" = "xno"; then @@ -112,10 +118,10 @@ fi AC_SUBST(BUILD_UEFI_X86_64, [$BUILD_UEFI_X86_64]) -BUILD_CD_EFI="default" +BUILD_CD_EFI="$BUILD_ALL" AC_ARG_ENABLE([cd-efi], - AS_HELP_STRING([--disable-cd-efi], [disable limine-cd-efi.bin build]), + AS_HELP_STRING([--enable-cd-efi], [enable limine-cd-efi.bin build]), BUILD_CD_EFI="$enableval") if ! test "x$BUILD_CD_EFI" = "xno"; then