:: commit 7eb22e5c15d0b29ccf0126d3104fa996e416b868

mintsuki <mintsuki@protonmail.com> — 2021-02-23 00:16

parents: 20055d3e11

misc: Remove binaries from repo

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f23d8957..2aa36245 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install packages
-        run: sudo apt install build-essential gcc-multilib
+        run: sudo apt install build-essential
 
       - name: Build the toolchain
         run: make toolchain
@@ -35,7 +35,7 @@ jobs:
       - name: Build limine-install-linux-x86_32
         uses: mintsuki/ubuntu-18.04-x86@0.1
         with:
-          command: make CFLAGS="-m32 -O2 -pipe -static" clean all
+          command: make CFLAGS="-O2 -pipe -static" clean all
 
       - name: Strip limine-install-linux-x86_32
         uses: mintsuki/ubuntu-18.04-x86@0.1
diff --git a/.gitignore b/.gitignore
index ac2046e4..97c31e71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,13 +8,10 @@
 /**/*.elf
 /**/*.hdd
 /**/*.iso
+/**/*.sys
 /bochsout.txt
 /bx_enh_dbg.ini
 .vscode
 /limine-install
-!/limine.bin
-!/limine-pxe.bin
-!/limine-cd.bin
-!/stage2.map
 /stivale
 /test_image
diff --git a/limine-cd.bin b/limine-cd.bin
deleted file mode 100644
index 43f1e81e..00000000
Binary files a/limine-cd.bin and /dev/null differ
diff --git a/limine-pxe.bin b/limine-pxe.bin
deleted file mode 100644
index 9c268085..00000000
Binary files a/limine-pxe.bin and /dev/null differ
diff --git a/limine.bin b/limine.bin
deleted file mode 100644
index 29be9daf..00000000
Binary files a/limine.bin and /dev/null differ
diff --git a/limine.sys b/limine.sys
deleted file mode 100644
index 53cac2c0..00000000
Binary files a/limine.sys and /dev/null differ
diff --git a/stage2.map b/stage2.map
deleted file mode 100644
index 7bde8641..00000000
--- a/stage2.map
+++ /dev/null
@@ -1 +0,0 @@
-ÿÿÿÿ
\ No newline at end of file
diff --git a/stages/Makefile b/stages/Makefile
index 7ffaed8d..1f2975d0 100644
--- a/stages/Makefile
+++ b/stages/Makefile
@@ -4,7 +4,7 @@ OBJCOPY = i386-elf-objcopy
 OBJDUMP = i386-elf-objdump
 READELF = i386-elf-readelf
 
-LIMINE_VERSION := $(shell git branch --show-current | sed 's/-branch//')
+LIMINE_VERSION := $(shell git describe --exact-match --tags `git log -n1 --pretty='%h'` || git log -n1 --pretty='%h')
 WERROR = -Werror
 CFLAGS = -Os -pipe -Wall -Wextra $(WERROR)
 
tab: 248 wrap: offon